From: Samuli Suominen Date: Sun, 23 Oct 2011 10:39:36 +0000 (+0000) Subject: Fix segmentation fault with empty directories wrt #331135 by "Vladimir" X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=247f2f2326986b47b308f4855ec262cc65d4615e;p=gentoo.git Fix segmentation fault with empty directories wrt #331135 by "Vladimir" Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64 --- diff --git a/app-cdr/xfburn/ChangeLog b/app-cdr/xfburn/ChangeLog index 42be65b37268..a4af8e18eba9 100644 --- a/app-cdr/xfburn/ChangeLog +++ b/app-cdr/xfburn/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-cdr/xfburn # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.34 2011/04/27 20:24:50 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.35 2011/10/23 10:39:36 ssuominen Exp $ + +*xfburn-0.4.3-r2 (23 Oct 2011) + + 23 Oct 2011; Samuli Suominen +xfburn-0.4.3-r2.ebuild, + +files/xfburn-0.4.3-empty_directory_segmentation_fault.patch: + Fix segmentation fault with empty directories wrt #331135 by "Vladimir" 27 Apr 2011; Christoph Mende xfburn-0.4.3-r1.ebuild: Fixed gstreamer slot deps diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest index b2cc7abd365b..99d1ce98949c 100644 --- a/app-cdr/xfburn/Manifest +++ b/app-cdr/xfburn/Manifest @@ -1,14 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 +AUX xfburn-0.4.3-empty_directory_segmentation_fault.patch 1600 RMD160 77de719551a90a3c6c5b0396ef588e56aed8ece2 SHA1 6456f186567aede44acdb573119b33df4083bf68 SHA256 bf89abd6499f784b30dc33b1ef05911a6a6c15aae1517824563f0b00aba027c1 DIST xfburn-0.4.3.tar.bz2 652080 RMD160 01dff258d42d05812cf0697304ebe0062291b185 SHA1 52d33e56b7ce9774fba680f50723eaf1a7215091 SHA256 c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe EBUILD xfburn-0.4.3-r1.ebuild 1109 RMD160 55cd3f38d32cbf1452e66e6f3f8eb47d8c7fdf49 SHA1 ea78c6fe06474e48da6c372a70d7a7e17e1639df SHA256 58da13a4f52c93cb7ebfa25744aac73a203717be7437d3e6e7403f153e710b03 -MISC ChangeLog 6344 RMD160 344f508ebf4742b383baebfa33b36dd74cce4d10 SHA1 ca5088bdad68e9c5771087c1c5b11237c50c0573 SHA256 7edc1e205b2a081095719cf370ef068b5a0aa339bf353a95aa185eb983ebbd07 +EBUILD xfburn-0.4.3-r2.ebuild 1186 RMD160 8b6a303edf24c95f8bd02ad4acf950e5fac85afe SHA1 7880534fd8348f247b39b827f53dabaf0236e352 SHA256 c3ae9820d062a1e9cf99055daea21db41bd7630943960ace2e75cb3a107c0125 +MISC ChangeLog 6596 RMD160 ea47ca1fc0aaf1e22da00edce0414c3dcca96669 SHA1 47dc86b3500fc55133dcc145b55bac3af0fff49f SHA256 1d415db8ad0ce6fc46889dfc36940b3e232ffcc11bec9092fb8a5d7488efc059 MISC metadata.xml 569 RMD160 7924d2fa97fc89007c4f2fd5d0a100b99eced706 SHA1 b55b51a5adbe95b51cee59960d0a439eb38db395 SHA256 b77cc26004978479303a4b0159aa70a4d07dfaae2d474089ac1390965c409979 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk3VluAACgkQXkR9YqOcLPGGOAEApMDvZFT0J2aqjRhg/nJnvj7u -mcwtz9jFou8SZmFOXJIA/0ic3gg33aPMv7zaaEvKlAFR/OlYGCu8eyXJIkpHVkRO -=QGNT +iQEcBAEBAgAGBQJOo+68AAoJEEdUh39IaPFNVpIH/jHRvRJ6fXeGlzz96nWeO79O +zBfWZNGiQcdm3Kog1Ns5N3TCUH7sNHae4z3GRslzkGFEQ3OqNHmWnXF5F3hVLphE +FzDNq4TiMjuvm2LIUbPJ8N6Xf9a4BUINIPsz2O/KwD7sJLBi5tTImLsBZvcWZbMJ +h0CALuwKVy/hALkEMmbnu+x+iVJXHKx20oHaqNm1dAJ/5v+HGK27DZ5tqdW0AcPB +VKaTEHBpOVEgm4mNg3ESJtc49pdkYhutl7Lns3DyFcKPPxQmu1Dkvx5mVWvITJYx +q4/koInxqwhSMFlNZMnseJOy+pfoTIpxmluGxUmv+uY2yqyD8clZxFtNzM21s+Y= +=D/NX -----END PGP SIGNATURE----- diff --git a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch b/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch new file mode 100644 index 000000000000..d80f98eff580 --- /dev/null +++ b/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch @@ -0,0 +1,51 @@ +http://bugs.gentoo.org/show_bug.cgi?id=331135 +http://bugzilla.xfce.org/show_bug.cgi?id=6805 + +--- xfburn/xfburn-data-composition.c ++++ xfburn/xfburn-data-composition.c +@@ -1874,26 +1874,29 @@ + g_error ("Failed adding %s as a node to the image: code %X!", src, r); + } + +- basename = g_path_get_basename (src); ++ /* Check names only for items not manually created (#613563) */ ++ if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) { ++ basename = g_path_get_basename (src); ++ ++ /* check if the file has been renamed */ ++ if (strcmp (basename, name) != 0) { ++ /* rename the iso_node */ ++ r = iso_node_set_name (node, name); ++ ++ if (r == 0) { ++ /* The first string is the renamed name, the second one the original name */ ++ xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); ++ ++ g_free (basename); ++ g_free (name); ++ g_free (src); + +- /* check if the file has been renamed */ +- if (strcmp (basename, name) != 0) { +- /* rename the iso_node */ +- r = iso_node_set_name (node, name); +- +- if (r == 0) { +- /* The first string is the renamed name, the second one the original name */ +- xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); +- +- g_free (basename); +- g_free (name); +- g_free (src); +- +- continue; ++ continue; ++ } + } ++ g_free (basename); + } + +- g_free (basename); + g_free (name); + g_free (src); + diff --git a/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild b/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild new file mode 100644 index 000000000000..49e0e0d874cf --- /dev/null +++ b/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild,v 1.1 2011/10/23 10:39:36 ssuominen Exp $ + +EAPI=4 +inherit xfconf + +DESCRIPTION="GTK+ based CD and DVD burning application" +HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn" +SRC_URI="mirror://xfce/src/apps/${PN}/0.4/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="dbus debug gstreamer thunar" + +RDEPEND=">=dev-libs/libburn-0.4.2 + >=dev-libs/libisofs-0.6.2 + >=x11-libs/gtk+-2.10:2 + x11-themes/hicolor-icon-theme + >=xfce-base/libxfcegui4-4.8 + >=xfce-base/exo-0.6 + dbus? ( >=dev-libs/dbus-glib-0.88 ) + gstreamer? ( media-libs/gstreamer:0.10 + >=media-libs/gst-plugins-base-0.10.20:0.10 ) + thunar? ( xfce-extra/thunar-vfs )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool + sys-devel/gettext" + +pkg_setup() { + PATCHES=( "${FILESDIR}"/${P}-empty_directory_segmentation_fault.patch ) + + XFCONF=( + $(use_enable dbus) + $(xfconf_use_debug) + $(use_enable gstreamer) + --disable-hal + $(use_enable thunar thunar-vfs) + ) + + DOCS=( AUTHORS ChangeLog NEWS README TODO ) +}