make gdk-pixbuf-query-loaders more atomic, fix segfault due to __GL_NO_DSO_FINALIZER=1 in environment

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

6 files changed, 56 insertions, 24 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index b523ce48529c..4be3e0c47a51 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.32 2011/09/15 19:40:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.33 2011/10/03 08:54:19 lxnay Exp $
+
+  03 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
+  gdk-pixbuf-2.23.5.ebuild, gdk-pixbuf-2.24.0.ebuild,
+  gdk-pixbuf-2.24.0-r1.ebuild:
+  make gdk-pixbuf-query-loaders more atomic, fix segfault due to
+  __GL_NO_DSO_FINALIZER=1 in environment
 
 *gdk-pixbuf-2.24.0-r1 (15 Sep 2011)
 
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 2f718ed4aab8..676b004de880 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 715 RMD160 efeaa25e97e7620018ae3ca5b62d74ff6e0fd0d1 SHA1 d67d28548ce340034f5afb0ca07b699fd1a0619e SHA256 e977da6d4731a0164b7346a790dfabb95a951f9986fa623abd171bce79f63bcb
 AUX gdk-pixbuf-2.22.1-CVE-2011-2485.patch 2230 RMD160 5250b2c5404691d988edd586514566edcba67744 SHA1 5147710cd7d6670c47d6bf785f85de1a6c62ce87 SHA256 10f7e6ef2c4ab8a3dd744ad2711963202b2a7e63fe3baea3d9c3401b84644c47
 AUX gdk-pixbuf-2.22.1-fix-libpng15.patch 2000 RMD160 807024ae02a5c4a4f1df588a9a93b482f255f243 SHA1 4e8235e2cd36364f1fadaba49b6fb4ba02472de2 SHA256 57010dd154e31f669651f8916521c1b251920aec84c7da0d328a70cc8105fb07
 DIST gdk-pixbuf-2.22.1.tar.bz2 1543273 RMD160 d05d6642e147281b7dc1dd21657595333f13f6f1 SHA1 b452208963ddd84f7280865695b50255fcafaa2e SHA256 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
 DIST gdk-pixbuf-2.23.5.tar.xz 1171372 RMD160 d873ee2c547f883368b8589a066e916d713e46c3 SHA1 8fca3db7165bce01f0f14b85367736d4cc8d00e8 SHA256 7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500
 DIST gdk-pixbuf-2.24.0.tar.xz 1176324 RMD160 38e9896dd9a1ed6bf207509cd635828cebe674b8 SHA1 6a78751630a54fdef9a6a3928322c98e6c1ef60c SHA256 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7
-EBUILD gdk-pixbuf-2.22.1-r2.ebuild 2642 RMD160 cae459c3793b1270af70f0e2a491a4e237f3ffc3 SHA1 28e2ab7bee17a18300d08ab1db911ec696eca32c SHA256 273636c806f4ffc693c31bc4b07612d36a877508aeaf4a796fa012e16aa8c899
-EBUILD gdk-pixbuf-2.23.5.ebuild 2475 RMD160 c6e78b22c154c73a5861210119a5ef6d94ec3de4 SHA1 f3c75c186f937e4f1d87f1c3a9725b705ed013e8 SHA256 f968e786f933c1206f16428d5c58db0298e9629915c6a640866c106344b7b599
-EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2643 RMD160 a0ebf6f5d47fd52a667c6c3696433884613fbea3 SHA1 7ce4ea9d45dd4412b8c2d3814314bd856c0ff62c SHA256 71f18454eeba51d58a7497a0c215d37f4fdf603aeebd72462d80f61e9a9c405d
-EBUILD gdk-pixbuf-2.24.0.ebuild 2445 RMD160 a02d4f42c212ad1b47b91e01496bc62fbc76f291 SHA1 c7c4cb814c0c09065c5b2a6dc0c7e7cd9a5497d1 SHA256 58f2edcd7586f92411b32c5a67a150a589b607477b75b0e22f1408fcc7958027
-MISC ChangeLog 4877 RMD160 8f658e860ae516d283e0970575e8b42ba66d3d44 SHA1 9582a0d958a3ad9a47000b5495667ca8788ee66b SHA256 7a61045d31c333c1d8d56034ffdb21f50c8bb573edd54c865b4627d76b8b5d00
+EBUILD gdk-pixbuf-2.22.1-r2.ebuild 2857 RMD160 b67b446071000083b1bf02c8f473104121f07ab9 SHA1 aa54fab658d856bac14c8ca842ec24848130c4b6 SHA256 d13044b82afc30c0d434e403e02ccf516e30866d8799664a4a6e2de8607c4a60
+EBUILD gdk-pixbuf-2.23.5.ebuild 2691 RMD160 5d1fd1520b9c57b75811f1bef7ac50fc0f92fa9e SHA1 1c27d112d612d6ad8139ee2b7ef7fe4c8e5c659f SHA256 fef763d5c2c0de2ff58f2ec7e8d5791f284d60c5b6d44d456869f2fb18f62093
+EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2857 RMD160 05ad021dd887ef9fc571e2fa0b2fdb861c07bfc9 SHA1 6a9755df44d8b500c91317468112cc8a64451884 SHA256 b3c9aae1dc704cecfd3e9f237f50ca0e74b29a9490b2430036fd31c5be043212
+EBUILD gdk-pixbuf-2.24.0.ebuild 2663 RMD160 8f709f12f9a6a3a4ea97ed236c3850514a177c84 SHA1 772c2742ec2d9d83221d2272bc771f42cda104ce SHA256 fb5d88e8c19785e77eff613ee5d8a721e6e154ea5d543b4023dc77c081d8a20d
+MISC ChangeLog 5144 RMD160 dfd6bf0642da98deee1cb1977ebd9a05f0320c2d SHA1 3c3fd92a5cc80768b4dc2f04202f64f5229f4d88 SHA256 97a31b5e23f55e8cff90afdee68b6b091cfb5b175f8b327f767304c0136dd6a3
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk5yVO0ACgkQXkR9YqOcLPHu2QD/bN4LE4wK1XGQOy4XLDTbcDhN
-t/0H6JGdv9YUzDN4tScBAKgBQ/c/0XXkdo/kgpFXoNVX9um51xANGfDAXna8JLA7
-=u2Wl
------END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
index e1ab038bd0f1..0a7818b2b891 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild,v 1.7 2011/07/11 00:06:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild,v 1.8 2011/10/03 08:54:19 lxnay Exp $
 
 EAPI="3"
 
@@ -77,7 +77,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 
 	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
 		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
index fdbcf494c10b..af3295c147f2 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild,v 1.2 2011/08/28 13:25:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild,v 1.3 2011/10/03 08:54:19 lxnay Exp $
 
 EAPI="4"
 
@@ -71,7 +71,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 
 	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
 		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild
index 2c6817626351..518d0e8cb1a7 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild,v 1.1 2011/09/15 19:40:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild,v 1.2 2011/10/03 08:54:19 lxnay Exp $
 
 EAPI="4"
 
@@ -74,7 +74,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 
 	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
 		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild
index dff2ab6c2ec6..c1868cf593d3 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild,v 1.1 2011/08/28 19:13:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild,v 1.2 2011/10/03 08:54:19 lxnay Exp $
 
 EAPI="4"
 
@@ -70,7 +70,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 
 	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
 		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders