Added a patch to samba to fix bug #27858. Patch originated from IBM at http://oss.software.ibm.com/linux/patches/?patch_id=764.

4 files changed, 38 insertions, 15 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 9ae46aa5fd73..449651bf7ecb 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.41 2003/08/29 20:17:02 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.42 2003/09/04 01:56:20 weeve Exp $
+
+  03 Sep 2003; Jason Wever <weeve@gentoo.org> samba-2.2.8a.ebuild,
+  files/samba-2.2.8-statfs.patch:
+  Added a patch to samba to fix bug #27858. Patch originated from IBM at
+  http://oss.software.ibm.com/linux/patches/?patch_id=764.
 
 *samba-3.0.0_rc2 (29 Aug 2003)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c425e7aaef99..a0f7b996a4eb 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,20 +1,26 @@
+MD5 c59326926c7602a64499dd18d7bddeea ChangeLog 10341
+MD5 b4f7c9e6b05c610bf52033ed430de265 samba-2.2.8.ebuild 10688
+MD5 c6ca541cd6ede56525c6b8f2c02eb60d samba-2.2.8a.ebuild 10847
+MD5 b35c300a3c9d6b4b3c21a23da57593e9 samba-3.0.0_beta2-r1.ebuild 9825
+MD5 b12c5f63b8d75ec5d13b8b40e3a529e7 samba-3.0.0_beta3-r1.ebuild 9986
+MD5 6adb64b61b61cb31435b40d5f1bc0f8c samba-3.0.0_rc1-r1.ebuild 9954
+MD5 95a05e98c918368222103c9c5a39b404 samba-3.0.0_rc2.ebuild 9405
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
+MD5 f81075bc9908642f554abe7b46124a00 files/digest-samba-2.2.8 134
 MD5 9780745de080ee53a34c1b2f9fb1f228 files/digest-samba-2.2.8a 135
+MD5 0ebf7918a0dd0d1e8fd7a037dd36dc5e files/digest-samba-3.0.0_beta2-r1 151
 MD5 792eb07cbe155ffac7c111cb9bda3568 files/digest-samba-3.0.0_beta3-r1 151
-MD5 62ce7e86ce55b199ebad4383018c772d files/digest-samba-3.0.0_rc1-r1 149
 MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
 MD5 092f8dd0b4f6f5da13ce2daafb534978 files/nsswitch.conf-wins 390
 MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
 MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
 MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
-MD5 1c1b5910a6a4d51f778242721f46bd5c files/digest-samba-3.0.0_rc2 145
-MD5 0ebf7918a0dd0d1e8fd7a037dd36dc5e files/digest-samba-3.0.0_beta2-r1 151
 MD5 e66c856d458f6ded226460c605854547 files/samba-init 892
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
 MD5 9faccd0fa1bfb58b4ffa0e9dd01e1ec6 files/samba-slapd-include.conf 497
-MD5 6a704f9490e7462978d9d4c3e8664596 files/samba-svc 994
+MD5 16a0f8dc632f6701c1fe5832488cc43e files/samba-svc 994
 MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
 MD5 2a8e771c143fc19819c4b6bd022f12ed files/smb.conf.example 16181
 MD5 cf9aae0d1cf55f47d1434f6bf1cee52e files/smbldap_conf.pm 7093
@@ -22,12 +28,7 @@ MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
 MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
 MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
 MD5 23bf9d13bd13e51abb07688b00cab9b6 files/winbind-init 896
+MD5 62ce7e86ce55b199ebad4383018c772d files/digest-samba-3.0.0_rc1-r1 149
 MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 f81075bc9908642f554abe7b46124a00 files/digest-samba-2.2.8 134
-MD5 c85711f678e651f9a12bcad37f5653e7 samba-2.2.8a.ebuild 10695
-MD5 b12c5f63b8d75ec5d13b8b40e3a529e7 samba-3.0.0_beta3-r1.ebuild 9986
-MD5 6adb64b61b61cb31435b40d5f1bc0f8c samba-3.0.0_rc1-r1.ebuild 9954
-MD5 9b7453afd1c93b480f189357fce8f5c7 ChangeLog 10110
-MD5 95a05e98c918368222103c9c5a39b404 samba-3.0.0_rc2.ebuild 9405
-MD5 b4f7c9e6b05c610bf52033ed430de265 samba-2.2.8.ebuild 10688
-MD5 b35c300a3c9d6b4b3c21a23da57593e9 samba-3.0.0_beta2-r1.ebuild 9825
+MD5 1c1b5910a6a4d51f778242721f46bd5c files/digest-samba-3.0.0_rc2 145
+MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
diff --git a/net-fs/samba/files/samba-2.2.8-statfs.patch b/net-fs/samba/files/samba-2.2.8-statfs.patch
new file mode 100644
index 000000000000..ca658ae7e3df
--- /dev/null
+++ b/net-fs/samba/files/samba-2.2.8-statfs.patch
@@ -0,0 +1,10 @@
+--- includes.h	Fri Feb 28 07:56:18 2003
++++ includes.h.diff	Tue Apr  1 15:39:16 2003
+@@ -276,6 +276,7 @@
+ 
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
++#define _LINUX_VFS_H 1
+ #endif
+ 
+ #ifdef HAVE_SYS_ACL_H
diff --git a/net-fs/samba/samba-2.2.8a.ebuild b/net-fs/samba/samba-2.2.8a.ebuild
index c0d9fc4916d6..92956da875f5 100644
--- a/net-fs/samba/samba-2.2.8a.ebuild
+++ b/net-fs/samba/samba-2.2.8a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.8a.ebuild,v 1.3 2003/07/18 21:34:26 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.8a.ebuild,v 1.4 2003/09/04 01:56:20 weeve Exp $
 
 inherit eutils
 
@@ -58,6 +58,13 @@ src_unpack() {
 	use oav && \
 	cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples.bin/VFS
 
+	# Add a patch for sparc to fix bug #27858
+	if [ "${ARCH}" = "sparc" ]
+	then
+		cd ${S}/source/include
+		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
+	fi
+
 	cd ${S}/source
 	autoconf || die
 }