merge with upstream policy

diff --git a/sec-policy/selinux-stunnel/ChangeLog b/sec-policy/selinux-stunnel/ChangeLog
index 34b3464d347705449b64abcceeac2cf624d58a32..e87c03c3556bf4783a56084c08ad1a70f791622f 100644 (file)
--- a/sec-policy/selinux-stunnel/ChangeLog
+++ b/sec-policy/selinux-stunnel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-stunnel
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/ChangeLog,v 1.3 2004/11/23 17:21:01 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/ChangeLog,v 1.4 2004/12/12 12:53:06 kaiowas Exp $
+
+*selinux-stunnel-20041128 (12 Dec 2004)
+
+  12 Dec 2004; petre rodan <kaiowas@gentoo.org>
+  -selinux-stunnel-20041112.ebuild, +selinux-stunnel-20041128.ebuild:
+  merge with upstream policy
 
   23 Nov 2004; petre rodan <kaiowas@gentoo.org>
   selinux-stunnel-20041119.ebuild:

diff --git a/sec-policy/selinux-stunnel/files/digest-selinux-stunnel-20041112 b/sec-policy/selinux-stunnel/files/digest-selinux-stunnel-20041112
deleted file mode 100644 (file)
index 0b0b73a..0000000
--- a/sec-policy/selinux-stunnel/files/digest-selinux-stunnel-20041112
+++ /dev/null
@@ -1 +0,0 @@
-MD5 077c4534dc65c6caced2200d25b4413e selinux-stunnel-20041112.tar.bz2 586

diff --git a/sec-policy/selinux-stunnel/files/digest-selinux-stunnel-20041128 b/sec-policy/selinux-stunnel/files/digest-selinux-stunnel-20041128
new file mode 100644 (file)
index 0000000..7b1111c
--- /dev/null
+++ b/sec-policy/selinux-stunnel/files/digest-selinux-stunnel-20041128
@@ -0,0 +1 @@
+MD5 8cc945f5d52af24cda0f25c4b887af06 selinux-stunnel-20041128.tar.bz2 612

diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-20041112.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-20041128.ebuild
similarity index 83%
rename from sec-policy/selinux-stunnel/selinux-stunnel-20041112.ebuild
rename to sec-policy/selinux-stunnel/selinux-stunnel-20041128.ebuild
index f7c4c5e03bc96e7239e019588936102ad1c6ca26..c011821cda95b931bd57fd3ea3a324292099f696 100644 (file)
--- a/sec-policy/selinux-stunnel/selinux-stunnel-20041112.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-20041128.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-stunnel/selinux-stunnel-20041112.ebuild,v 1.1 2004/11/14 20:53:40 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/selinux-stunnel-20041128.ebuild,v 1.1 2004/12/12 12:53:06 kaiowas Exp $
 
 inherit selinux-policy
 

diff --git a/sec-policy/selinux-ucspi-tcp/Manifest b/sec-policy/selinux-ucspi-tcp/Manifest
index 9929897ea388c82490170f5ece12a60b471ba97f..1306d33238d4a34cb73bd0c3757e4c70f23656d5 100644 (file)
--- a/sec-policy/selinux-ucspi-tcp/Manifest
+++ b/sec-policy/selinux-ucspi-tcp/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e55eedc125c72660474d94802c51130a ChangeLog 466
+MD5 a1acd9e49d2417135be0c2d352ffc4c2 ChangeLog 645
 MD5 f4d91f7617ad4c2a053060b0105e726d metadata.xml 549
+MD5 afe2488f88acf9f65b60afb65b66fdec selinux-ucspi-tcp-20041211.ebuild 405
 MD5 612c2196242373d876d7cf9d4af56f49 selinux-ucspi-tcp-20041111.ebuild 401
+MD5 e8f3cc9a60eb09190f15cd32b5100cfa files/digest-selinux-ucspi-tcp-20041211 76
 MD5 ae5e0e5f0b8c77c03955315df16eaf80 files/digest-selinux-ucspi-tcp-20041111 76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBljwRGSBEIeh4AEYRAhtwAJ0dZNaF0kVD0prxAY6mPe07RfTQDwCaAvmN
-huocI9/Z15X7aJj+MAvjAMw=
-=YL1W
+iD8DBQFBvDGjGSBEIeh4AEYRArNNAJ0QyS2uog6gOOpLffMBbgDT8Eik3gCfc9zt
+UWle69zYGormWi/oBGKYH/U=
+=tLhQ
 -----END PGP SIGNATURE-----