Fix segmentation fault in playlist wrt #390783 by Rafał Mużyło

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

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index ce4c0e23611bed0080b71ab5573450df1509e99d..fc28f83c21d643eded12cebd8673bc6325ed5ee8 100644 (file)
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gxine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.112 2011/10/10 19:33:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.113 2011/11/25 18:13:06 ssuominen Exp $
+
+*gxine-0.5.906-r1 (25 Nov 2011)
+
+  25 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> +gxine-0.5.906-r1.ebuild,
+  +files/gxine-0.5.906-playlist_segfault.patch:
+  Fix segmentation fault in playlist wrt #390783 by Rafał Mużyło
 
   10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gxine-0.5.906.ebuild:
   Release to ~arch for testing. This one works with mozjs185 wrt #360971 by

diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 919d871455f187035f83e99ccd0b77c58308dcb4..a93b9ec7228e32183f1f93612d8ca2728c746c7e 100644 (file)
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -5,20 +5,22 @@ AUX gxine-0.5.905-desktop.patch 377 RMD160 ea7d11a796ff9142cf0f578b3b5a2fe3de4f2
 AUX gxine-0.5.905-fix-nspr-useage.patch 433 RMD160 65af0ddee220ca456acf20eea521fe6a4600cd23 SHA1 fc7a2ce90a8e84d1f519a786de9f477264ea925b SHA256 4d05d9144eba4f30976ed3e33e3985c782b95227d165ab90b4f453c377451ea6
 AUX gxine-0.5.905-spidermonkey-update.patch 674 RMD160 de859a4e370271edcb9b3fc18a3f896596a88dc7 SHA1 efa8619defd5af20cd7e57fcb8364ba491e374dd SHA256 c054c12984ddf6fd07ad029a52fcbce209bd443de9d44e827cbf4e9e4b8144d7
 AUX gxine-0.5.906-endif.patch 349 RMD160 0683bb409616d8ef878e4144e747bd0032fc236f SHA1 0c48cf0457f21dea9bdc70bed62421cd6bbdebfb SHA256 d3d14fdffe9f8e1872bcbf28670d48b72ed76d7a882902bb298902bb8ca4b6fa
+AUX gxine-0.5.906-playlist_segfault.patch 784 RMD160 722c43658e6a74005d941a70db5ce8a0e7cca6a6 SHA1 109819cb076a9ea53f3a5adffb0415b5ee3005fa SHA256 b1fe13c17b71f871a82c7dcc58bc70270e6d3157506f91554a19b721b1591f7d
 DIST gxine-0.5.905.tar.bz2 1203720 RMD160 3dc30ba9f402d20e3ad3f469cc753607ccc3d194 SHA1 dc01b617641d6eac4152259c592f15f31b9d9bf0 SHA256 9dcca3e581fddfc4cea8f9e45c99652f4dd336c1ca7726e910870b9c778b0cbf
 DIST gxine-0.5.906.tar.xz 906964 RMD160 6c131bc266acf50bea6f240b3c93ee0fa8692426 SHA1 88495a76f5d7e885d8c75ef145667f21e9a55ede SHA256 7cab1f17cedddef947d32cdc94aa276d20f741db356b08e5efdbf954e9ceaf14
 EBUILD gxine-0.5.905-r1.ebuild 2334 RMD160 e783d2100c2eda581471ea5696cf3b72406224a9 SHA1 c0da7181251c3f91a7a518eb02e2098b52fac371 SHA256 510fed87da5591d01e0a8ae054156cefc09a6dd8e9fd1d22f6f7b2ec143ebeb5
+EBUILD gxine-0.5.906-r1.ebuild 2504 RMD160 308129394715983ed4b8023fa3ddf0792af9bec5 SHA1 31d6bcdb815620936de335c7fad2c74bf15abd46 SHA256 4e8c496cedb597ffdeeb283ac4baf42b1e668c242f3aa5db5d9056cedb98e5f7
 EBUILD gxine-0.5.906.ebuild 2454 RMD160 4ac5b1513c48da51b5ea055488ef6bc3169840a0 SHA1 4d6d99a8453c4332f08dd295be7746b49d9f5930 SHA256 71ad060ced1fa7689c08808b182525b8fc62a27157a1afd7043456452bf86302
-MISC ChangeLog 16086 RMD160 7dab0524082f60874972f858c2a5323ccdddc717 SHA1 c5534f708224d0d3939355d3a00106758d3449fa SHA256 8c49ff40e0a655254d99c21deb0ef2f3afa903473829caf991a61da61fff933e
+MISC ChangeLog 16316 RMD160 57910b5ed118def3bffaa8f964914d85dab690b0 SHA1 f953a12cf9608f9102d5f65557a7026e8edbac21 SHA256 0af36b13878d4009a903035dec5e4e3570a1cd6cb9930dd75939a3c2e3d001ae
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOk0i4AAoJEEdUh39IaPFNOJoH/3hMGRT8oY8J6417sutFuKzg
-zdqKPAi6RmZgx1Q2p3grd2h/HiQr8ZHyw3XAIFrBxxl10rXFHgcr4Sc6eW6ENDkB
-4Mlh9pTKvdgWm3gDZXDOyTTnGJLehUe6pBO50ImqFEkjfjItRP4z8iqB2Yj0xbmH
-knWe7nnKn52P7FPqv9iWmWT0kFmoz8mJbEqoAAgOaxWPt4hU26vZG7KAZ55zIYJd
-fdFT3cc8m+6jl3f0Z8V3TFXNVI3jvVY5f/K/9Xzr9atrqSZlHkQ4Xb73hDoXUqbM
-zhiN1aIZD7aAIqy0ZjSXy+aIH8yPBhNRrEv/kCx5CPTsCPHl3rKIfkfUza/cAxY=
-=WCwN
+iQEcBAEBAgAGBQJOz9oyAAoJEEdUh39IaPFNN0cH+QEsddpHTys8v/rOfEqkjE2w
+kmcEjVbzFgyEKP60hox/iI4Hng08wUT0LQCYpnLf84rwdaTMQ1Ttaw+GXX+WETOT
+YuhLk/CQcfrc7Bk43yMypD6gC6ZIl8sUusX6Lx2AQ4jnuJ8rlmWTS7xeUeBhj6pk
+hFp0P+PSkHJ7mKUpd8+jKeoa4q21An2E39/37zs5iv351tfNiZzGnZ7LZro/3xMh
+IJ7KwG9wHpIjR33EvZ7TKhPE8QxP4WTJFJW3qwQXYNtTRowo36qDmHodiaXwEqhG
+d3l3NjXxJ7Fsj9VXxvJsyokpNo8zYgFbzva6RTtTMKSRQgIMByHXXT3G1wqthgI=
+=LdTF
 -----END PGP SIGNATURE-----

diff --git a/media-video/gxine/files/gxine-0.5.906-playlist_segfault.patch b/media-video/gxine/files/gxine-0.5.906-playlist_segfault.patch
new file mode 100644 (file)
index 0000000..acc6f05
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.906-playlist_segfault.patch
@@ -0,0 +1,25 @@
+Fix segmentation fault in playlist wrt http://bugs.gentoo.org/390783 by Rafał Mużyło
+
+--- src/playlist.c
++++ src/playlist.c
+@@ -427,7 +427,7 @@ static int playlist_load (const char *fn
+     if (errno != ENOENT && (defaultfile || errno != ENOTDIR))
+       display_error (FROM_GXINE, _("Loading of playlist file failed."),
+                    _("Failed to open file ‘%s’\n%s"), fname, strerror (errno));
+-    goto ret0;
++    goto ret1;
+   }
+ 
+   xml_parser_init_R (xml_parser_t *xml, plfile, st.st_size, XML_PARSER_CASE_INSENSITIVE);
+@@ -524,9 +524,10 @@ static int playlist_load (const char *fn
+   return 1;
+ 
+   ret0:
+-  free (plfile);
+   xml_parser_free_tree (root);
+   xml_parser_finalize_R (xml);
++  free (plfile);
++  ret1:
+   if (defaultfile)
+     free ((char *)fname);
+   return ret;

diff --git a/media-video/gxine/gxine-0.5.906-r1.ebuild b/media-video/gxine/gxine-0.5.906-r1.ebuild
new file mode 100644 (file)
index 0000000..11369fe
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.906-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.906-r1.ebuild,v 1.1 2011/11/25 18:13:06 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="gnome lirc nls nsplugin udev xcb xinerama"
+
+RDEPEND=">=media-libs/xine-lib-1.1.17
+       >=x11-libs/gtk+-2.8:2
+       >=dev-libs/glib-2.10:2
+       >=x11-libs/pango-1.12
+       >=dev-lang/spidermonkey-1.8.2.15
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXrender
+       gnome? ( >=dev-libs/dbus-glib-0.88 )
+       lirc? ( app-misc/lirc )
+       nls? ( virtual/libintl )
+       nsplugin? ( dev-libs/nspr
+               x11-libs/libXaw
+               x11-libs/libXt )
+       udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )
+       xcb? ( x11-libs/libxcb )
+       xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       nls? ( sys-devel/gettext )"
+
+src_prepare() {
+       # ld: cannot find -ljs
+       sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
+
+       epatch \
+               "${FILESDIR}"/${PN}-0.5.905-desktop.patch \
+               "${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
+               "${FILESDIR}"/${P}-endif.patch \
+               "${FILESDIR}"/${P}-playlist_segfault.patch
+
+       # need to disable calling of xine-list when running without
+       # userpriv, otherwise we get sandbox violations (bug #233847)
+       if [[ ${EUID} == "0" ]]; then
+               sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
+       fi
+
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               $(use_enable nls) \
+               $(use_enable lirc) \
+               --enable-watchdog \
+               $(use_with xcb) \
+               $(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
+               $(use_with nsplugin browser-plugin) \
+               $(use_with udev gudev) \
+               --without-hal \
+               $(use_with gnome dbus) \
+               $(use_with xinerama)
+}
+
+src_install() {
+       emake DESTDIR="${D}" \
+               docdir=/usr/share/doc/${PF} \
+               docsdir=/usr/share/doc/${PF} \
+               install
+
+       dodoc AUTHORS BUGS ChangeLog NEWS README{,.{cs,de},_l10n} TODO
+       use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_database_update
+       gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_database_update
+       gnome2_icon_cache_update
+}