GCC4 compile fix. bug #85172

(Portage version: 2.0.51.19)

4 files changed, 67 insertions, 46 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 16699b3edabc..ee30f9eda19a 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.153 2005/03/12 16:22:47 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.154 2005/03/14 08:26:31 halcy0n Exp $
+
+  14 Mar 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/samba-3.0.11-gcc4.patch, samba-3.0.11.ebuild:
+  GCC 4 compile fix.  bug #85172
 
   12 Mar 2005; Christian Andreetta <satya@gentoo.org> samba-3.0.11.ebuild:
   minor fixes: dirs creations via keepdir, examples permissions (bug #83563)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 8a9047575254..ac6ebef29950 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,58 +1,59 @@
-MD5 998e5fa677027d5f9c34c6e11a2f2300 samba-3.0.7.ebuild 13959
-MD5 752029d2b65f2faafedafcbc8f74c0cb samba-3.0.7-r1.ebuild 15430
-MD5 a099bbaec41e1bf990ab5b7986ce4cf1 samba-3.0.6-r4.ebuild 14235
-MD5 3d65369aa548911ecf9127df42eb3a17 samba-3.0.11.ebuild 16418
-MD5 0f3d8c9bb836841be55e78eadd0ea0b7 samba-3.0.9.ebuild 16226
-MD5 636cefb79b33da2114659a179850f094 samba-3.0.6-r3.ebuild 14258
-MD5 7b437485608a9d4133c07e606ab9fda8 samba-3.0.9-r1.ebuild 16411
-MD5 4ec9fc723b0d9801152c2ddfd4442de9 samba-3.0.10.ebuild 16380
-MD5 8df69d51a4a13d38c421f32cbf82d2a6 samba-3.0.8.ebuild 16847
 MD5 657700870c391ea65a3fcde7b65f3ce9 ChangeLog 27070
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 4ec9fc723b0d9801152c2ddfd4442de9 samba-3.0.10.ebuild 16380
+MD5 d439f98f915e01491fe276bf025df368 samba-3.0.11.ebuild 16528
+MD5 636cefb79b33da2114659a179850f094 samba-3.0.6-r3.ebuild 14258
+MD5 a099bbaec41e1bf990ab5b7986ce4cf1 samba-3.0.6-r4.ebuild 14235
+MD5 752029d2b65f2faafedafcbc8f74c0cb samba-3.0.7-r1.ebuild 15430
+MD5 998e5fa677027d5f9c34c6e11a2f2300 samba-3.0.7.ebuild 13959
 MD5 e561c6780260096813f060bcbd96b61f samba-3.0.8-r1.ebuild 17161
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
+MD5 8df69d51a4a13d38c421f32cbf82d2a6 samba-3.0.8.ebuild 16847
+MD5 7b437485608a9d4133c07e606ab9fda8 samba-3.0.9-r1.ebuild 16411
+MD5 0f3d8c9bb836841be55e78eadd0ea0b7 samba-3.0.9.ebuild 16226
+MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
 MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206
 MD5 5cb8bfa14396777d6e3b69975cf7e181 files/digest-samba-3.0.11 204
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
-MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
-MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
-MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
-MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
-MD5 f1bd70937bb822e70fcd5a81efba02d2 files/samba-init 1090
-MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
-MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
-MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
-MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
-MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
-MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
-MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
-MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
-MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7 203
-MD5 66e68bb6d3ceb275479b3c68e7becf9d files/digest-samba-3.0.8 203
-MD5 afb788b7b2370ba7045b8d7d7ba8b11a files/digest-samba-3.0.9 205
-MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
-MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
-MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
-MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
 MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r3 203
 MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r4 203
+MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7 203
 MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7-r1 203
+MD5 66e68bb6d3ceb275479b3c68e7becf9d files/digest-samba-3.0.8 203
 MD5 94d8eb813ea041a79ee00914c5052b3f files/digest-samba-3.0.8-r1 205
+MD5 afb788b7b2370ba7045b8d7d7ba8b11a files/digest-samba-3.0.9 205
 MD5 5933e87f1c72bc7a29a1ea4073b49441 files/digest-samba-3.0.9-r1 284
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
-MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
-MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
-MD5 4b541de7c65bbbb129d2522d821b4609 files/samba-3.0.8-lanman.patch 472
-MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
+MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
+MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
+MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
+MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
+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 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
 MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.6-libdirsymlink.patch 592
-MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
-MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
+MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
+MD5 4b541de7c65bbbb129d2522d821b4609 files/samba-3.0.8-lanman.patch 472
 MD5 48bea6e2bb73a2b7ce286bedefae3011 files/samba-3.0.9-util.c-bitpmap.c-4120.patch 1872
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
+MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
+MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
+MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
-MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
+MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 f1bd70937bb822e70fcd5a81efba02d2 files/samba-init 1090
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
+MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
+MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
+MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
+MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
+MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
+MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
+MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
+MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
+MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
+MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485
diff --git a/net-fs/samba/files/samba-3.0.11-gcc4.patch b/net-fs/samba/files/samba-3.0.11-gcc4.patch
new file mode 100644
index 000000000000..dd914650d2f2
--- /dev/null
+++ b/net-fs/samba/files/samba-3.0.11-gcc4.patch
@@ -0,0 +1,12 @@
+diff -ur samba-3.0.11-orig/source/include/popt_common.h samba-3.0.11/source/include/popt_common.h
+--- samba-3.0.11-orig/source/include/popt_common.h	2005-03-14 01:51:39.000000000 -0500
++++ samba-3.0.11/source/include/popt_common.h	2005-03-14 01:51:56.000000000 -0500
+@@ -21,6 +21,8 @@
+ #ifndef _POPT_COMMON_H
+ #define _POPT_COMMON_H
+ 
++#include <popt.h>
++
+ /* Common popt structures */
+ extern struct poptOption popt_common_samba[];
+ extern struct poptOption popt_common_connection[];
diff --git a/net-fs/samba/samba-3.0.11.ebuild b/net-fs/samba/samba-3.0.11.ebuild
index 957c36bdfd59..3c92bdcdc5f5 100644
--- a/net-fs/samba/samba-3.0.11.ebuild
+++ b/net-fs/samba/samba-3.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.11.ebuild,v 1.4 2005/03/12 16:22:48 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.11.ebuild,v 1.5 2005/03/14 08:26:31 halcy0n Exp $
 
 inherit eutils flag-o-matic
 #---------------------------------------------------------------------------
@@ -90,6 +90,10 @@ src_unpack() {
 	#amd64 lib location is not lib32 nor lib -------------------------------
 	cd ${S} || die
 	use amd64 && epatch ${FILESDIR}/samba-3.0.x-libdirsymlink.patch
+
+	# GCC 4 fix bug #85172 -------------------------------------------------
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
 	# examples: to be copied as docs ---------------------------------------
 	rm -rf ${S}/examples.ORIG
 	cp -a ${S}/examples ${S}/examples.ORIG