Fixed ebuild to ensure we're in the right place before applying the smbprint patch. Only should have effected PPC and SPARC.

3 files changed, 32 insertions, 26 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 2ecc03b24562..d4cd12ce99ed 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.65 2004/04/21 16:58:17 dmwaters Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.66 2004/04/22 15:05:50 weeve Exp $
+
+  22 Apr 2004; Jason Wever <weeve@gentoo.org> samba-3.0.2a-r1.ebuild:
+  Fixed ebuild to ensure we're in the right place before applying the smbprint
+  patch. Only should have effected PPC and SPARC.
 
 *samba-3.0.2a-r1 (21 Apr 2004)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 11dbef570a9a..aa953400e8d6 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,37 +1,37 @@
-MD5 70172eea79bd0ccb6f357d1dba8803a2 samba-3.0.1-r1.ebuild 11339
-MD5 de64a273fa9255026741a70b56a0abf5 ChangeLog 14524
-MD5 a14d55690d52d6770c50855d7fd48efd samba-2.2.8a.ebuild 10853
+MD5 398baaaa106a622fd3da13bafc4b9221 ChangeLog 14721
 MD5 eeb3ec0ae25e9d4f7ce62c32b52d5996 metadata.xml 466
+MD5 a14d55690d52d6770c50855d7fd48efd samba-2.2.8a.ebuild 10853
 MD5 e49613d30093a41ce2883cf670cbe11f samba-3.0.0-r1.ebuild 10860
-MD5 ed43a15fad7475e6f490cf3a4967a630 samba-3.0.2a-r1.ebuild 12177
+MD5 70172eea79bd0ccb6f357d1dba8803a2 samba-3.0.1-r1.ebuild 11339
 MD5 d5164790d64a6f7b353475b65104f1ea samba-3.0.1.ebuild 11320
 MD5 82eb0b7e2463631169db64ddfb80e32f samba-3.0.2a.ebuild 11464
-MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a 204
-MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
-MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
-MD5 a4597c467bc5322bfba790e526867ae0 files/samba-svc 982
-MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
+MD5 387ee977d885cbccc2dd79cb07ada060 samba-3.0.2a-r1.ebuild 12243
+MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
 MD5 9780745de080ee53a34c1b2f9fb1f228 files/digest-samba-2.2.8a 135
-MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a-r1 204
-MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
-MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
-MD5 2a8e771c143fc19819c4b6bd022f12ed files/smb.conf.example 16181
-MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
-MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
 MD5 9ad118eb4f2d3eff69927ab1ab1913be files/digest-samba-3.0.0-r1 202
 MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1 202
-MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
+MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
+MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a 204
+MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 934e6115a71e2969b6d3f9dac091f52a files/samba-init 882
-MD5 d95c7a841071087246ef23a1f72b890f files/winbind-init 491
-MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
 MD5 092f8dd0b4f6f5da13ce2daafb534978 files/nsswitch.conf-wins 390
-MD5 9faccd0fa1bfb58b4ffa0e9dd01e1ec6 files/samba-slapd-include.conf 497
+MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
 MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
-MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
-MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
-MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 cf9aae0d1cf55f47d1434f6bf1cee52e files/smbldap_conf.pm 7093
 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 934e6115a71e2969b6d3f9dac091f52a files/samba-init 882
 MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+MD5 9faccd0fa1bfb58b4ffa0e9dd01e1ec6 files/samba-slapd-include.conf 497
+MD5 a4597c467bc5322bfba790e526867ae0 files/samba-svc 982
+MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 2a8e771c143fc19819c4b6bd022f12ed files/smb.conf.example 16181
+MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
+MD5 cf9aae0d1cf55f47d1434f6bf1cee52e files/smbldap_conf.pm 7093
+MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
+MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
+MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
+MD5 d95c7a841071087246ef23a1f72b890f files/winbind-init 491
+MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a-r1 204
+MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
diff --git a/net-fs/samba/samba-3.0.2a-r1.ebuild b/net-fs/samba/samba-3.0.2a-r1.ebuild
index 8a7f1f15c07a..1e8fb5013fdd 100644
--- a/net-fs/samba/samba-3.0.2a-r1.ebuild
+++ b/net-fs/samba/samba-3.0.2a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a-r1.ebuild,v 1.1 2004/04/21 16:58:17 dmwaters Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a-r1.ebuild,v 1.2 2004/04/22 15:05:50 weeve Exp $
 
 inherit eutils
 
@@ -64,6 +64,8 @@ src_unpack() {
 	# bug 45965; smbprint tmpfile vulnerability
 	# NOTE that this should be removed for Samba 3.0.3, as it will be included
 	# in that release.
+	# Additional Note: Make sure w're in ${S} before patching.
+	cd ${S}
 	epatch ${FILESDIR}/samba-3.0.2a-smbprint.patch
 
 	#Bug #36200; sys-kernel/linux-headers dependent