summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetre Rodan <kaiowas@gentoo.org>2004-12-12 12:53:06 +0000
committerPetre Rodan <kaiowas@gentoo.org>2004-12-12 12:53:06 +0000
commitff9342fb23be6837e14da3970fb830437e728a9b (patch)
tree2b0c2fd4707a912db41ecc52bc2e2e37d72fb1bc /sec-policy
parentversion bump (Manifest recommit) (diff)
downloadgentoo-2-ff9342fb23be6837e14da3970fb830437e728a9b.tar.gz
gentoo-2-ff9342fb23be6837e14da3970fb830437e728a9b.tar.bz2
gentoo-2-ff9342fb23be6837e14da3970fb830437e728a9b.zip
merge with upstream policy
Diffstat (limited to 'sec-policy')
-rw-r--r--sec-policy/selinux-stunnel/ChangeLog8
-rw-r--r--sec-policy/selinux-stunnel/Manifest12
-rw-r--r--sec-policy/selinux-stunnel/files/digest-selinux-stunnel-200411121
-rw-r--r--sec-policy/selinux-stunnel/files/digest-selinux-stunnel-200411281
-rw-r--r--sec-policy/selinux-stunnel/selinux-stunnel-20041128.ebuild (renamed from sec-policy/selinux-stunnel/selinux-stunnel-20041112.ebuild)2
5 files changed, 11 insertions, 13 deletions
diff --git a/sec-policy/selinux-stunnel/ChangeLog b/sec-policy/selinux-stunnel/ChangeLog
index 34b3464d3477..e87c03c3556b 100644
--- 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/Manifest b/sec-policy/selinux-stunnel/Manifest
index da5835ba24e0..824aab4e4248 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 d54fb37e3c7b7b6518bd51a5add63095 ChangeLog 626
MD5 4589f0004a12b9e69d69d6fbea17c95f metadata.xml 509
MD5 33dee60010e5ac3d55be33452b74b896 selinux-stunnel-20041112.ebuild 395
MD5 fc1359bab70979c7ef389dc65ac0c2b2 selinux-stunnel-20041119.ebuild 391
+MD5 8e2440af78765bfc44bb1065a024734b selinux-stunnel-20041128.ebuild 278
MD5 555ad264358e78df4109887e6988f1ba files/digest-selinux-stunnel-20041112 74
MD5 6b21ae4d2108d6ba7fe95e5c435bf4e1 files/digest-selinux-stunnel-20041119 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo25VGSBEIeh4AEYRAoHNAJ9yV2ur9cIvbOHsOObHiifDMlYGwACdGgZJ
-/nEo7/0Y2UzxncmfW460rY8=
-=b7Jz
------END PGP SIGNATURE-----
+MD5 75736458d0b2077baa708c0066d58957 files/digest-selinux-stunnel-20041128 74
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
index 0b0b73a54acd..000000000000
--- 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
index 000000000000..7b1111c58aa0
--- /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
index f7c4c5e03bc9..c011821cda95 100644
--- 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