From 3430154b25857c8efacb39f72522f8f66c532e5d Mon Sep 17 00:00:00 2001
From: Peter Volkov <pva@gentoo.org>
Date: Wed, 17 Sep 2008 08:48:11 +0000
Subject: Fix qoutation issues reported in bug #237828, thank Chad A. Simmons
 for report. (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

---
 app-misc/fdupes/ChangeLog                          | 10 +++++-
 app-misc/fdupes/fdupes-1.40-r2.ebuild              | 38 ---------------------
 app-misc/fdupes/fdupes-1.40-r3.ebuild              | 39 ++++++++++++++++++++++
 .../fdupes-1.40-external-md5sum-qoutation.patch    | 17 ++++++++++
 4 files changed, 65 insertions(+), 39 deletions(-)
 delete mode 100644 app-misc/fdupes/fdupes-1.40-r2.ebuild
 create mode 100644 app-misc/fdupes/fdupes-1.40-r3.ebuild
 create mode 100644 app-misc/fdupes/files/fdupes-1.40-external-md5sum-qoutation.patch

(limited to 'app-misc/fdupes')

diff --git a/app-misc/fdupes/ChangeLog b/app-misc/fdupes/ChangeLog
index 512e86f55d38..14fe4d079c83 100644
--- a/app-misc/fdupes/ChangeLog
+++ b/app-misc/fdupes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/fdupes
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/ChangeLog,v 1.14 2008/07/31 16:08:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/ChangeLog,v 1.15 2008/09/17 08:48:11 pva Exp $
+
+*fdupes-1.40-r3 (17 Sep 2008)
+
+  17 Sep 2008; Peter Volkov <pva@gentoo.org>
+  +files/fdupes-1.40-external-md5sum-qoutation.patch,
+  -fdupes-1.40-r2.ebuild, +fdupes-1.40-r3.ebuild:
+  Fix qoutation issues reported in bug #237828, thank Chad A. Simmons for
+  report.
 
   31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-misc/fdupes/fdupes-1.40-r2.ebuild b/app-misc/fdupes/fdupes-1.40-r2.ebuild
deleted file mode 100644
index 29e58ef797db..000000000000
--- a/app-misc/fdupes/fdupes-1.40-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40-r2.ebuild,v 1.1 2008/05/12 22:02:27 pva Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="identify/delete duplicate files residing within specified directories"
-HOMEPAGE="http://netdial.caribe.net/~adrian2/fdupes.html"
-SRC_URI="http://netdial.caribe.net/~adrian2/programs/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="md5sum-external"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-memcpy.patch
-	if use md5sum-external; then
-		sed -i -e 's/^#EXTERNAL_MD5[[:blank:]]*= /EXTERNAL_MD5 = /g' \
-					Makefile || die "sed failed"
-	fi
-}
-
-src_compile() {
-	sed -i -e "s:gcc:$(tc-getCC):" Makefile
-	emake || die
-}
-
-src_install() {
-	dobin fdupes || die
-	doman fdupes.1
-	dodoc CHANGES CONTRIBUTORS INSTALL README TODO
-}
diff --git a/app-misc/fdupes/fdupes-1.40-r3.ebuild b/app-misc/fdupes/fdupes-1.40-r3.ebuild
new file mode 100644
index 000000000000..6f402d996119
--- /dev/null
+++ b/app-misc/fdupes/fdupes-1.40-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40-r3.ebuild,v 1.1 2008/09/17 08:48:11 pva Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="identify/delete duplicate files residing within specified directories"
+HOMEPAGE="http://netdial.caribe.net/~adrian2/fdupes.html"
+SRC_URI="http://netdial.caribe.net/~adrian2/programs/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="md5sum-external"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-memcpy.patch
+	epatch "${FILESDIR}"/${P}-external-md5sum-qoutation.patch
+	if use md5sum-external; then
+		sed -i -e 's/^#EXTERNAL_MD5[[:blank:]]*= /EXTERNAL_MD5 = /g' \
+					Makefile || die "sed failed"
+	fi
+}
+
+src_compile() {
+	sed -i -e "s:gcc:$(tc-getCC):" Makefile
+	emake || die
+}
+
+src_install() {
+	dobin fdupes || die
+	doman fdupes.1
+	dodoc CHANGES CONTRIBUTORS INSTALL README TODO
+}
diff --git a/app-misc/fdupes/files/fdupes-1.40-external-md5sum-qoutation.patch b/app-misc/fdupes/files/fdupes-1.40-external-md5sum-qoutation.patch
new file mode 100644
index 000000000000..f52908d723d4
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.40-external-md5sum-qoutation.patch
@@ -0,0 +1,17 @@
+Source: Peter Volkov <pva@gentoo.org>
+Upstream: notified (sent email to <adrian2 AT caribe DOT net>
+Reason: bugs.gentoo.org/237828 comment #1
+With md5sum-external fails on filenames with spaces in their names.
+
+--- fdupes.c	2008-09-17 08:33:26 +0000
++++ fdupes.c	2008-09-17 08:33:42 +0000
+@@ -301,7 +301,7 @@
+     exit(1);
+   }
+ 
+-  sprintf(command, "%s %s", EXTERNAL_MD5, filename);
++  sprintf(command, "%s '%s'", EXTERNAL_MD5, filename);
+ 
+   result = popen(command, "r");
+   if (result == NULL) {
+
-- 
cgit v1.2.3-65-gdbad