merge with upstream policy, ebuild cleanup

diff --git a/sec-policy/selinux-arpwatch/ChangeLog b/sec-policy/selinux-arpwatch/ChangeLog
index 496871a4057cb3d5a0db7aa6c23294be8560e623..8a2f4b38f28f221b78d86735e8d572b08d42246f 100644 (file)
--- a/sec-policy/selinux-arpwatch/ChangeLog
+++ b/sec-policy/selinux-arpwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-arpwatch
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/ChangeLog,v 1.3 2004/11/23 17:01:00 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/ChangeLog,v 1.4 2004/12/12 11:39:11 kaiowas Exp $
+
+*selinux-arpwatch-20041208 (12 Dec 2004)
+
+  12 Dec 2004; petre rodan <kaiowas@gentoo.org>
+  -selinux-arpwatch-20041114.ebuild, +selinux-arpwatch-20041208.ebuild:
+  merge with upstream policy, ebuild cleanup
 
   23 Nov 2004; petre rodan <kaiowas@gentoo.org>
   selinux-arpwatch-20041120.ebuild:

diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 3e6b4fc1d7f979d555090cfd7adb96d512563a5d..afdaddb3b683c25df2201714284729718415cb89 100644 (file)
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 14b712c6ee133aefb7aea429c8709494 ChangeLog 639
+MD5 5f97441ef62dbcdb422554893a3b4486 ChangeLog 847
 MD5 33ce69af63f7ed3517790f2af7695d3d metadata.xml 510
-MD5 e9354f830027d163d49574318ef53a65 selinux-arpwatch-20041114.ebuild 400
 MD5 8a76331d2d7436327347ba5641d4f9e5 selinux-arpwatch-20041120.ebuild 396
-MD5 a172c3a352436cdc40f8582c1d7b6ea3 files/digest-selinux-arpwatch-20041114 75
+MD5 44aa1e2c9b301a5b55fe5b64662957af selinux-arpwatch-20041208.ebuild 400
+MD5 6c371f37ad307397dc877d0392244f89 files/digest-selinux-arpwatch-20041208 75
 MD5 7c95cb31752f85a350f27d4286692fbb files/digest-selinux-arpwatch-20041120 75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBo205GSBEIeh4AEYRAqQNAKCNGQRK+Ezgtleay+NMMMQP079kWQCfSqhp
-0YP0islAZwwW8zWi8/UBvzA=
-=bDnb
+iD8DBQFBvCwiGSBEIeh4AEYRAmhOAJ96q2N78RcyGof/m/4cGgo9TTd7SwCfXLkJ
+kM0jDl6YV7LTrQxk4q7v4mM=
+=v350
 -----END PGP SIGNATURE-----

diff --git a/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041114 b/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041114
deleted file mode 100644 (file)
index b548e8e..0000000
--- a/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041114
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45da74872d76e247ec9d0b556e888c56 selinux-arpwatch-20041114.tar.bz2 862

diff --git a/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041208 b/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041208
new file mode 100644 (file)
index 0000000..bec028a
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041208
@@ -0,0 +1 @@
+MD5 c94a0bac365719697ef788badc73d116 selinux-arpwatch-20041208.tar.bz2 783

diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-20041114.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-20041208.ebuild
similarity index 84%
rename from sec-policy/selinux-arpwatch/selinux-arpwatch-20041114.ebuild
rename to sec-policy/selinux-arpwatch/selinux-arpwatch-20041208.ebuild
index 59970411501b157f2f0954bf965954915c4fb5c6..aebed922caf555d28830e737d0d487c219b1abaf 100644 (file)
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-20041114.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-20041208.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/selinux-arpwatch-20041114.ebuild,v 1.1 2004/11/14 20:46:18 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/selinux-arpwatch-20041208.ebuild,v 1.1 2004/12/12 11:39:11 kaiowas Exp $
 
 inherit selinux-policy
 

diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
new file mode 100644 (file)
index 0000000..c390632
--- /dev/null
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f1d178de323826ac1ca724ebde19db00 ChangeLog 388
+MD5 cf770d71587c51d11992c592aa9980b6 metadata.xml 544
+MD5 90074002c18fd1e6e6b67d645849d80a selinux-asterisk-20041211.ebuild 441
+MD5 7ad67216d3c19bac764ebbe868cd89c6 files/digest-selinux-asterisk-20041211 75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBvCxlGSBEIeh4AEYRAqTMAJwNL4faJ1Qa40ZBTM5dEPIO6Um0lwCfZW0p
+333LSekm3dQtZDha+SQWT38=
+=Onqn
+-----END PGP SIGNATURE-----