merge with upstream policy to support smbfs (un)mounting

(Portage version: 2.0.51.22-r1)

7 files changed, 15 insertions, 35 deletions

diff --git a/sec-policy/selinux-samba/ChangeLog b/sec-policy/selinux-samba/ChangeLog
index 3bd77d7da929..2e080cef9dc0 100644
--- a/sec-policy/selinux-samba/ChangeLog
+++ b/sec-policy/selinux-samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-samba
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/ChangeLog,v 1.6 2004/11/23 17:17:17 kaiowas Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/ChangeLog,v 1.7 2005/05/26 12:06:22 kaiowas Exp $
+
+*selinux-samba-20050526 (26 May 2005)
+
+  26 May 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-samba-20040406.ebuild, -selinux-samba-20041016.ebuild,
+  +selinux-samba-20050526.ebuild:
+  merge with upstream policy to support smbfs (un)mounting
 
   23 Nov 2004; petre rodan <kaiowas@gentoo.org>
   selinux-samba-20041117.ebuild:
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index a7817d0f71c5..74dcfee10471 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d1613ddcdc25a389b8a5412cc8a8524a ChangeLog 950
 MD5 b99e999a2b338c63b407d5d138bab325 metadata.xml 508
-MD5 8e935540822515d731e8a0fdff3d97c1 selinux-samba-20040406.ebuild 382
-MD5 5defd7153e442022de8df64cec04832b selinux-samba-20041016.ebuild 381
+MD5 4949e71842f7aa3a8022ee94aed52679 selinux-samba-20050526.ebuild 272
 MD5 0ac241df6240728f4ca5f5b0f3630af4 selinux-samba-20041117.ebuild 381
-MD5 0ba0ec08361084bff6d98cef04bb7951 files/digest-selinux-samba-20040406 73
-MD5 3bf8d4931dbc9dca61b9860de5455faf files/digest-selinux-samba-20041016 73
+MD5 3a0bca7ce7fd400c6d4f4d7f06841b8e files/digest-selinux-samba-20050526 73
 MD5 60147fa77df94c78722e2f6161eb1e49 files/digest-selinux-samba-20041117 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo24gGSBEIeh4AEYRAjDxAJ9yKn8i1CPdgIZtbOoXNX4PxPRPhgCgjvTo
-FsPTyXD9LjZjmAJwfrYomMA=
-=hfqV
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-samba/files/digest-selinux-samba-20040406 b/sec-policy/selinux-samba/files/digest-selinux-samba-20040406
deleted file mode 100644
index a1701bcc96de..000000000000
--- a/sec-policy/selinux-samba/files/digest-selinux-samba-20040406
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb425ee00b891aa2249dc17f2047ceb0 selinux-samba-20040406.tar.bz2 1569
diff --git a/sec-policy/selinux-samba/files/digest-selinux-samba-20041016 b/sec-policy/selinux-samba/files/digest-selinux-samba-20041016
deleted file mode 100644
index 84f6e0187d83..000000000000
--- a/sec-policy/selinux-samba/files/digest-selinux-samba-20041016
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a361057c3fafd9bcd13bf37dfb11b24 selinux-samba-20041016.tar.bz2 1557
diff --git a/sec-policy/selinux-samba/files/digest-selinux-samba-20050526 b/sec-policy/selinux-samba/files/digest-selinux-samba-20050526
new file mode 100644
index 000000000000..74a95b4a3ebe
--- /dev/null
+++ b/sec-policy/selinux-samba/files/digest-selinux-samba-20050526
@@ -0,0 +1 @@
+MD5 a7adf9fa48c3a4c7c89c29f5eb76a0a6 selinux-samba-20050526.tar.bz2 1857
diff --git a/sec-policy/selinux-samba/selinux-samba-20040406.ebuild b/sec-policy/selinux-samba/selinux-samba-20040406.ebuild
deleted file mode 100644
index a586ff8beb57..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-20040406.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-samba/selinux-samba-20040406.ebuild,v 1.4 2004/09/20 01:55:47 pebenito Exp $
-
-TEFILES="samba.te"
-FCFILES="samba.fc"
-IUSE=""
-
-inherit selinux-policy
-
-DESCRIPTION="SELinux policy for samba"
-
-KEYWORDS="x86 ppc sparc amd64"
-
diff --git a/sec-policy/selinux-samba/selinux-samba-20041016.ebuild b/sec-policy/selinux-samba/selinux-samba-20050526.ebuild
index 2f3d6e23e8cb..c53a54c3d457 100644
--- a/sec-policy/selinux-samba/selinux-samba-20041016.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-20050526.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/selinux-samba-20041016.ebuild,v 1.2 2004/10/24 16:15:37 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/selinux-samba-20050526.ebuild,v 1.1 2005/05/26 12:06:22 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -10,5 +10,5 @@ IUSE=""
 
 DESCRIPTION="SELinux policy for samba"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"