summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetre Rodan <kaiowas@gentoo.org>2004-12-12 17:29:24 +0000
committerPetre Rodan <kaiowas@gentoo.org>2004-12-12 17:29:24 +0000
commita25e987b16b3224c2eb7e9e35981fdf1e6f89c93 (patch)
tree31ecc61cbfe779148eade81384b4b27bb7c1309c /sec-policy
parentStable on sparc. (Manifest recommit) (diff)
downloadgentoo-2-a25e987b16b3224c2eb7e9e35981fdf1e6f89c93.tar.gz
gentoo-2-a25e987b16b3224c2eb7e9e35981fdf1e6f89c93.tar.bz2
gentoo-2-a25e987b16b3224c2eb7e9e35981fdf1e6f89c93.zip
merge with upstream policy
Diffstat (limited to 'sec-policy')
-rw-r--r--sec-policy/selinux-snmpd/ChangeLog9
-rw-r--r--sec-policy/selinux-snmpd/Manifest16
-rw-r--r--sec-policy/selinux-snmpd/files/digest-selinux-snmpd-200410141
-rw-r--r--sec-policy/selinux-snmpd/files/digest-selinux-snmpd-200411201
-rw-r--r--sec-policy/selinux-snmpd/files/digest-selinux-snmpd-200411281
-rw-r--r--sec-policy/selinux-snmpd/selinux-snmpd-20041120.ebuild14
-rw-r--r--sec-policy/selinux-snmpd/selinux-snmpd-20041128.ebuild (renamed from sec-policy/selinux-snmpd/selinux-snmpd-20041014.ebuild)2
7 files changed, 12 insertions, 32 deletions
diff --git a/sec-policy/selinux-snmpd/ChangeLog b/sec-policy/selinux-snmpd/ChangeLog
index beec76120d42..3fda4457e140 100644
--- a/sec-policy/selinux-snmpd/ChangeLog
+++ b/sec-policy/selinux-snmpd/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sec-policy/selinux-snmpd
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/ChangeLog,v 1.2 2004/11/22 21:08:10 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/ChangeLog,v 1.3 2004/12/12 17:29:24 kaiowas Exp $
+
+*selinux-snmpd-20041128 (12 Dec 2004)
+
+ 12 Dec 2004; petre rodan <kaiowas@gentoo.org>
+ -selinux-snmpd-20041014.ebuild, -selinux-snmpd-20041120.ebuild,
+ +selinux-snmpd-20041128.ebuild:
+ merge with upstream policy
*selinux-snmpd-20041120 (22 Nov 2004)
diff --git a/sec-policy/selinux-snmpd/Manifest b/sec-policy/selinux-snmpd/Manifest
index 22db6bb4f5cf..cb0fabbadbb8 100644
--- a/sec-policy/selinux-snmpd/Manifest
+++ b/sec-policy/selinux-snmpd/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 c8e4c8f8ece11f5d3d18d66df756b8c8 ChangeLog 516
MD5 b99cfd64dc18e0af6e9328ece6d0f38b metadata.xml 515
-MD5 bb684ca59207ad6400ab2cb142d584bb selinux-snmpd-20041014.ebuild 392
-MD5 43e6adf086e5bce736f2cb2737c363e3 selinux-snmpd-20041120.ebuild 392
-MD5 b425fa6ee8832231c3d51f141b006f21 files/digest-selinux-snmpd-20041014 73
-MD5 57d0ae872ec48dfffd9bd12ef0358d05 files/digest-selinux-snmpd-20041120 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBokBNGSBEIeh4AEYRAlWRAKCQqlCzMnlEhPJ+UQWtPAiYBo2p4QCfep6t
-SWNZxVRN75yN4K8JchdRvTM=
-=7SMj
------END PGP SIGNATURE-----
+MD5 1e544a0488ec9a1e349a44a61eecd105 selinux-snmpd-20041128.ebuild 279
+MD5 89762f06cdb38fb95039b679b7085f73 files/digest-selinux-snmpd-20041128 73
diff --git a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041014 b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041014
deleted file mode 100644
index ed822e563577..000000000000
--- a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041014
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf326acfd431554984f1a0a4d384018c selinux-snmpd-20041014.tar.bz2 1191
diff --git a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041120 b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041120
deleted file mode 100644
index 08276086f0af..000000000000
--- a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041120
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68703efdb73191e76ed656e94c736279 selinux-snmpd-20041120.tar.bz2 1197
diff --git a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041128 b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041128
new file mode 100644
index 000000000000..6396dfd3e70f
--- /dev/null
+++ b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041128
@@ -0,0 +1 @@
+MD5 bb0a9c8d10cc8b6a4906b4019b861afb selinux-snmpd-20041128.tar.bz2 1188
diff --git a/sec-policy/selinux-snmpd/selinux-snmpd-20041120.ebuild b/sec-policy/selinux-snmpd/selinux-snmpd-20041120.ebuild
deleted file mode 100644
index 9b3281e5fd1a..000000000000
--- a/sec-policy/selinux-snmpd/selinux-snmpd-20041120.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/selinux-snmpd-20041120.ebuild,v 1.1 2004/11/22 21:08:10 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="snmpd.te"
-FCFILES="snmpd.fc"
-IUSE=""
-
-DESCRIPTION="SELinux policy for snmp daemons"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
diff --git a/sec-policy/selinux-snmpd/selinux-snmpd-20041014.ebuild b/sec-policy/selinux-snmpd/selinux-snmpd-20041128.ebuild
index 195d7ef89144..fdc24281800a 100644
--- a/sec-policy/selinux-snmpd/selinux-snmpd-20041014.ebuild
+++ b/sec-policy/selinux-snmpd/selinux-snmpd-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-snmpd/selinux-snmpd-20041014.ebuild,v 1.1 2004/10/23 08:49:41 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/selinux-snmpd-20041128.ebuild,v 1.1 2004/12/12 17:29:24 kaiowas Exp $
inherit selinux-policy