Fixing #73618

5 files changed, 99 insertions, 2 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 88db5345d299..7cfb8296922b 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.23 2004/12/07 06:56:05 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.24 2004/12/10 09:06:35 phosphan Exp $
+
+*xsane-0.96-r1 (10 Dec 2004)
+
+  10 Dec 2004; Patrick Kursawe <phosphan@gentoo.org> +files/doublefree.patch,
+  +xsane-0.96-r1.ebuild:
+  Adding a fix for bug #73618
 
   07 Dec 2004; Patrick Kursawe <phosphan@gentoo.org> metadata.xml:
   edited metadata
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index d5cf13350f25..39c2812a49d6 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -2,9 +2,12 @@ MD5 8334fe50faaf45139c016090b8d78696 xsane-0.96.ebuild 1351
 MD5 67a434ebc6d1f88f08796bfa45a26e55 xsane-0.91.ebuild 1300
 MD5 07db658e079b67e9afe635608d6a4085 xsane-0.93.ebuild 1144
 MD5 43efa03a561b91273966a5280d3438a4 xsane-0.95.ebuild 1351
-MD5 5d0b2492ddd99d61190f244e210c35ea ChangeLog 3060
+MD5 0efb1b588c7f0fb2b1d2738d69339fe6 xsane-0.96-r1.ebuild 1448
+MD5 b03bf4b7ab76936823a5c6559b17633a ChangeLog 3224
 MD5 1f00d52c238ab654e46144b458cb8090 metadata.xml 347
 MD5 47560da8eff54c663c54a71ebf16b7cb files/digest-xsane-0.91 63
 MD5 fe7857f02174456de620f30b19323804 files/digest-xsane-0.93 63
 MD5 253d4e47a0b33d8bb9a060940a16cb1b files/digest-xsane-0.95 63
 MD5 ea4d74ef911486be99ff2905dbc5597f files/digest-xsane-0.96 63
+MD5 c24003808e1c9ca9b7869f81db36d288 files/doublefree.patch 455
+MD5 ea4d74ef911486be99ff2905dbc5597f files/digest-xsane-0.96-r1 63
diff --git a/media-gfx/xsane/files/digest-xsane-0.96-r1 b/media-gfx/xsane/files/digest-xsane-0.96-r1
new file mode 100644
index 000000000000..e0b42d717937
--- /dev/null
+++ b/media-gfx/xsane/files/digest-xsane-0.96-r1
@@ -0,0 +1 @@
+MD5 32e4693c207d0380436c76096f8c157c xsane-0.96.tar.gz 3173665
diff --git a/media-gfx/xsane/files/doublefree.patch b/media-gfx/xsane/files/doublefree.patch
new file mode 100644
index 000000000000..4db6cb37f1f5
--- /dev/null
+++ b/media-gfx/xsane/files/doublefree.patch
@@ -0,0 +1,22 @@
+--- src/xsane-save.c	2004-09-06 19:08:00.000000000 +0200
++++ src/xsane-save.c.new	2004-12-10 09:49:03.592387322 +0100
+@@ -718,9 +718,6 @@
+ 
+   fflush(outfile);
+ 
+-  fclose(infile);
+-  fclose(outfile);
+-
+   if (size != bytes_sum)
+   {
+     DBG(DBG_info, "copy errro, not complete, %d bytes of %d bytes copied\n", bytes_sum, size);
+@@ -775,6 +772,9 @@
+     gtk_main_iteration();
+   }
+ 
++  fclose(infile);
++  fclose(outfile);
++
+  return (*cancel_save);
+ }
+ 
diff --git a/media-gfx/xsane/xsane-0.96-r1.ebuild b/media-gfx/xsane/xsane-0.96-r1.ebuild
new file mode 100644
index 000000000000..75910546342f
--- /dev/null
+++ b/media-gfx/xsane/xsane-0.96-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.96-r1.ebuild,v 1.1 2004/12/10 09:06:36 phosphan Exp $
+
+inherit eutils
+
+DESCRIPTION="graphical scanning frontend"
+SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
+HOMEPAGE="http://www.xsane.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
+IUSE="gtk2 nls jpeg png tiff"
+
+DEPEND="media-gfx/sane-backends
+	|| (
+		gtk2? ( >=x11-libs/gtk+-2.0 )
+		=x11-libs/gtk+-1.2*
+	)
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/doublefree.patch
+}
+
+src_compile() {
+	econf \
+		`use_enable nls` \
+		`use_enable jpeg` \
+		`use_enable png` \
+		`use_enable tiff` \
+		`use_enable gtk2` \
+		|| die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc xsane.[A-Z]*
+	dohtml -r doc
+
+	# link xsane so it is seen as a plugin in gimp
+	if [ -d /usr/lib/gimp/1.2 ]; then
+		dodir /usr/lib/gimp/1.2/plug-ins
+		dosym /usr/bin/xsane /usr/lib/gimp/1.2/plug-ins
+	fi
+	if [ -d /usr/lib/gimp/2.0 ]; then
+		dodir /usr/lib/gimp/2.0/plug-ins
+		dosym /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins
+	fi
+}
+
+pkg_postinst() {
+	einfo ""
+	ewarn "If you are upgrading from <=xsane-0.93, please make sure to"
+	ewarn "remove ~/.sane/xsane/xsane.rc _before_ you start xsane for"
+	ewarn "the first time."
+	einfo ""
+}