Fixed compilation problems with python and gcc-4.3 (bug #219604, thanks to vorfeed.canal_AT_gmail_com for the hint)

Package-Manager: portage-2.1.5_rc7

4 files changed, 43 insertions, 12 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index e87e3f71bdfc..b597b3039a7d 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.332 2008/04/21 22:07:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.333 2008/05/17 12:33:00 dev-zero Exp $
+
+  17 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/3.0.28a-wrong_python_ldflags.patch, samba-3.0.28a.ebuild:
+  Fixed compilation problems with python and gcc-4.3 (bug #219604, thanks to
+  vorfeed.canal_AT_gmail_com for the hint)
 
   21 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
   +files/3.0.28-autoconf-2.62-fix.patch, samba-3.0.28.ebuild,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 0a71bbe6c6c1..34c6c0c54e01 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,6 +5,7 @@ AUX 3.0.28-autoconf-2.62-fix.patch 524 RMD160 843a8adb134376259485fba22deceeebf4
 AUX 3.0.28-fix_broken_readdir_detection.patch 430 RMD160 f881e5a61ee2de714b9409a5a4f4c87d7a9a6dc0 SHA1 092b1ed0abce1eaf90aece7f637e72c3d4a902ff SHA256 7756d512df664d6f55851566d050797a6fc33f13ded4b1df5e2484a578ffd3f4
 AUX 3.0.28-inotify_include.patch 1675 RMD160 056cde16ad2b1e2e84a184b8c07002bd25a832b2 SHA1 ab989d0d4f102ed574f34af9292f5109368e749b SHA256 bcc4e5f4853d40ad66246c540ff3a7f2299185e5729aaaffa06230de9fbc3c14
 AUX 3.0.28-libcap_detection.patch 1676 RMD160 72cb751432db3911aedb32cf21a822bf9fceb278 SHA1 0348cc988150169b42a420a52fbf418aaf90e9e6 SHA256 73540a245115288f43dfd6abe6983a015886c93a14d906f38d59732e390cd070
+AUX 3.0.28a-wrong_python_ldflags.patch 996 RMD160 9514ef1b21129a950388ccabf797243dc92b390c SHA1 432366d841bbd2ec97c7a529c0c48d352aace356 SHA256 6f75e2e797d4a7a9f8758c5b3066cc1af86d392457d6f9ae8804427d74be4696
 AUX README.gentoo 3208 RMD160 858aee78e07bdc0ebee7bc6c2212d4c528325633 SHA1 819ae809566e967cdc03024adae4443c5833dfc5 SHA256 9e87efa3fcea73becdfad4adb0fe677e1969c2951f03c47d1b0f4aeb00999578
 AUX config-3.2/lmhosts 134 RMD160 7c99b13a2f273ee190c7df9392b1678b00ec461a SHA1 d63d8d846c3cecfc706d28d916ea323f2eae4ef1 SHA256 b891ca7448db3fadefd9f5ddaeb28ea19bad63c3ee21ea8f74cdc2dfecd6ab6b
 AUX config-3.2/nsswitch.conf-winbind 414 RMD160 71491dd98acc39aea8f18f5cc382f6a56d80259f SHA1 fa5c1e24437d4ffc0150a2b202f5ba6df5d40463 SHA256 5466dc681036731046f53e4ef59fb7c2110783e77a38d0887432d94776c3dafa
@@ -33,7 +34,7 @@ DIST samba-3.0.28a.tar.gz 18172643 RMD160 646680c49fd56d98430d325884a5911d406e13
 DIST samba-3.2.0pre2.tar.gz 16593448 RMD160 8e233f98623b7a31a7c745d69a108997e803c7f5 SHA1 4b656ae17ebfb5ce1ecdc7124673eb7da19f515c SHA256 bb71293c8587b2def6c35553c8f062252f18f4a5f0e871dcbed8f747c90a4e69
 EBUILD samba-3.0.27.ebuild 8773 RMD160 a3a889c643267c254309f36d2bd08447186bb6b5 SHA1 aa91fab445d3e3f94c4cbbd35cddf0df84f0c956 SHA256 e3d330432891f3f3b6ef441587f283e3c72b6364207e7eaea0d1346b1e72fb2b
 EBUILD samba-3.0.28.ebuild 9283 RMD160 7b7b2c477fb2abcafd32067575c33eb712a92140 SHA1 afb536f0dcafcdd411ed0ac51d7f852c6925ed1b SHA256 857d28fc7d3dfdf424b23ad5d03cd34030051a95932ca6797ed41b504bc358ec
-EBUILD samba-3.0.28a.ebuild 9313 RMD160 6f76058167b2fce554a6cabc9f67c61e29f71225 SHA1 f9edeb4728039fe3d11efe330d435b6ae7f98033 SHA256 17f5a6768f04ab88e786e9e179f2beef9605e0df3b3e8e6daa7d644a251b5b30
+EBUILD samba-3.0.28a.ebuild 9347 RMD160 17a39d9fc440f1a3aaca46d8eca6f166a4e71c99 SHA1 83c849b4c33007f6a147dd1919227be7fa8e8f3a SHA256 a9868f2d6fbab25f31460f29e9abe541ff3d5e58e7bc542a9c688c1c170439f5
 EBUILD samba-3.2.0_pre2.ebuild 8681 RMD160 146b3c435100eccec6b7bdcef510b0847f7b317f SHA1 af627d61a536c2055fb693b8ae5334f0721172d6 SHA256 d4f80695aaf4b3ba7f5e505f1b422efcb5c6fdc859aa9296c69060aaccc0fc44
-MISC ChangeLog 56901 RMD160 dfc894341c08a951d7395f0f44fa6cbbd3a01388 SHA1 54f9098dbac73b33ebbf317cd9216ff81fda6548 SHA256 a74b6b6a52797be6d3a92cdd7380b5cb9d07af2e41343363770faa90dc67ee35
+MISC ChangeLog 57142 RMD160 f4481aaabd69db9e799f541b0296e85fd17fb2c4 SHA1 9c4d91ebc46941157b13a474fea360d0f9bbf84b SHA256 47e4df71b97b327f8b31f5959a803b525dc692cec2a6c5da03f33e455f885367
 MISC metadata.xml 489 RMD160 36eed0edca609c521314ae415efd57ca9acfecb4 SHA1 317e61704a10a3bd888d32c6834721f5d40d00ff SHA256 6f35f13dd39bb51d304fd59b5352c92bc35a957c9c9412c5c1f3f58e98519792
diff --git a/net-fs/samba/files/3.0.28a-wrong_python_ldflags.patch b/net-fs/samba/files/3.0.28a-wrong_python_ldflags.patch
new file mode 100644
index 000000000000..6f5c8baa736e
--- /dev/null
+++ b/net-fs/samba/files/3.0.28a-wrong_python_ldflags.patch
@@ -0,0 +1,25 @@
+diff -Naur samba-3.0.28a.orig/source/Makefile.in samba-3.0.28a/source/Makefile.in
+--- samba-3.0.28a.orig/source/Makefile.in	2008-05-17 12:20:23.000000000 +0200
++++ samba-3.0.28a/source/Makefile.in	2008-05-17 12:23:38.000000000 +0200
+@@ -1666,7 +1666,8 @@
+ 	fi
+ 	PYTHON_OBJS="$(PYTHON_OBJ)" \
+ 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
+-	LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
++	LDFLAGS="$(LDSHFLAGS)" \
++	LIBS="$(LDSHFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
+ 		$(PYTHON) python/setup.py build
+ 
+ python_install: $(PYTHON_OBJ)
+@@ -1676,8 +1677,9 @@
+ 	fi
+ 	PYTHON_OBJS="$(PYTHON_OBJ)" \
+ 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+-	LIBS="$(LDFLAGS) $(LIBS)" \
+-		$(PYTHON) python/setup.py install --root=$(DESTDIR)
++	LDFLAGS="$(LDSHFLAGS)" \
++	LIBS="$(LDSHFLAGS) $(LIBS)" \
++		$(PYTHON) python/setup.py install --root="$(DESTDIR)"
+ 
+ python_clean:
+ 	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
diff --git a/net-fs/samba/samba-3.0.28a.ebuild b/net-fs/samba/samba-3.0.28a.ebuild
index 5ce78b678357..75ad6e32f528 100644
--- a/net-fs/samba/samba-3.0.28a.ebuild
+++ b/net-fs/samba/samba-3.0.28a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.28a.ebuild,v 1.2 2008/04/21 22:07:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.28a.ebuild,v 1.3 2008/05/17 12:33:00 dev-zero Exp $
 
 inherit autotools eutils pam python multilib versionator confutils
 
@@ -49,16 +49,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}/source"
 
-	# This patch adds "-Wl,-z,now" to smb{mnt,umount}
-	# Please read ... for further informations
-	epatch "${FILESDIR}/3.0.26a-lazyldflags.patch"
+	# lazyldflags.patch: adds "-Wl,-z,now" to smb{mnt,umount}
+	# invalid-free-fix.patch: Bug #196015 (upstream: #5021)
 
-	# Bug #196015 (upstream: #5021)
-	epatch "${FILESDIR}/3.0.26a-invalid-free-fix.patch"
-
-	epatch "${FILESDIR}/3.0.28-libcap_detection.patch" \
+	epatch \
+		"${FILESDIR}/3.0.26a-lazyldflags.patch" \
+		"${FILESDIR}/3.0.26a-invalid-free-fix.patch" \
+		"${FILESDIR}/3.0.28-libcap_detection.patch" \
 		"${FILESDIR}/3.0.28-fix_broken_readdir_detection.patch" \
-		"${FILESDIR}/3.0.28-autoconf-2.62-fix.patch"
+		"${FILESDIR}/3.0.28-autoconf-2.62-fix.patch" \
+		"${FILESDIR}/${PV}-wrong_python_ldflags.patch"
 
 	eautoconf -I. -Ilib/replace