ppc stable for security bug #57962

2 files changed, 26 insertions, 17 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 55d074625d51..010ef3935eeb 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,14 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 ea7dfbf31185b5984cae1c8300a0f03e ChangeLog 18207
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
-MD5 633511d04d7a7d7702c17089c85ba697 samba-3.0.1-r1.ebuild 11333
-MD5 df4f73693b725799675e37ba3f90643f samba-3.0.2a-r2.ebuild 12249
 MD5 7d7c900829bc2bdf39895d5890a0d20d samba-3.0.4-r1.ebuild 11146
 MD5 454de7e8cda4a125cd5ee36d9636ef32 samba-3.0.5-r1.ebuild 13428
-MD5 399939e8ed3ebbed01673d90de2bb712 samba-3.0.5.ebuild 11139
+MD5 3e50362e1316f7f50c89637e5e9f15ec samba-3.0.5.ebuild 11138
+MD5 633511d04d7a7d7702c17089c85ba697 samba-3.0.1-r1.ebuild 11333
+MD5 df4f73693b725799675e37ba3f90643f samba-3.0.2a-r2.ebuild 12249
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
-MD5 81931e1d9764390841dec0d0f327a114 files/digest-samba-3.0.2a-r2 204
 MD5 a86336201c2eced7a6e5a5138514e2f7 files/digest-samba-3.0.4-r1 203
+MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
 MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
@@ -18,10 +20,6 @@ MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
 MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
 MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
 MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
 MD5 83b384d6b47ecbf20525cc9a7baaa77a files/samba-init 1093
 MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
 MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
@@ -34,8 +32,20 @@ MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
 MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
 MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
 MD5 ccc96fcdc7493be42da52364061c6c17 files/winbind-init 484
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
+MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
+MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
+MD5 81931e1d9764390841dec0d0f327a114 files/digest-samba-3.0.2a-r2 204
 MD5 43a38a5331805a2fa61e899f18413ccd files/digest-samba-3.0.5 203
 MD5 4356a18128f7107bb7a2270bea78b3aa files/digest-samba-3.0.5-r1 203
 MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.x-python-setup.patch 833
 MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFBCEC1HTu7gpaalycRAjZhAKCgBw1O86OY1ugjBHboM12/8a4JUgCfaooh
+NRDEHYtQDAysXyROf5voMVw=
+=qlD5
+-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.0.5.ebuild b/net-fs/samba/samba-3.0.5.ebuild
index 045ddfff697f..e052430fdfc8 100644
--- a/net-fs/samba/samba-3.0.5.ebuild
+++ b/net-fs/samba/samba-3.0.5.ebuild
@@ -1,12 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.5.ebuild,v 1.4 2004/07/28 05:04:37 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.5.ebuild,v 1.5 2004/07/29 00:11:20 vapier Exp $
 
 inherit eutils
 
-IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
-IUSE="${IUSE} oav"
-
 DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
 HOMEPAGE="http://www.samba.org/
 	http://www.openantivirus.org/projects.php
@@ -23,6 +20,12 @@ SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
 	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
 	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
 
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ~ia64 ppc64"
+SLOT="0"
+IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
+IUSE="${IUSE} oav"
+
 _COMMON_DEPS="dev-libs/popt
 	readline? sys-libs/readline
 	ldap? ( kerberos? ( virtual/krb5 ) )
@@ -41,10 +44,6 @@ DEPEND="sys-devel/autoconf
 #IDEALX scripts are now using Net::LDAP
 RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
 
-KEYWORDS="x86 ~ppc sparc mips hppa amd64 ~ia64 alpha ppc64"
-LICENSE="GPL-2"
-SLOT="0"
-
 src_unpack() {
 	local i
 	unpack ${A} || die