summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-09-17 08:48:11 +0000
committerPeter Volkov <pva@gentoo.org>2008-09-17 08:48:11 +0000
commit3430154b25857c8efacb39f72522f8f66c532e5d (patch)
tree2fbfa4578efaa6cc3afe9d5a9fb67a0e72e42055
parentalpha/x86 stable wrt #237738 (diff)
downloadgentoo-2-3430154b25857c8efacb39f72522f8f66c532e5d.tar.gz
gentoo-2-3430154b25857c8efacb39f72522f8f66c532e5d.tar.bz2
gentoo-2-3430154b25857c8efacb39f72522f8f66c532e5d.zip
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)
-rw-r--r--app-misc/fdupes/ChangeLog10
-rw-r--r--app-misc/fdupes/fdupes-1.40-r3.ebuild (renamed from app-misc/fdupes/fdupes-1.40-r2.ebuild)3
-rw-r--r--app-misc/fdupes/files/fdupes-1.40-external-md5sum-qoutation.patch17
3 files changed, 28 insertions, 2 deletions
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-r3.ebuild
index 29e58ef797db..6f402d996119 100644
--- a/app-misc/fdupes/fdupes-1.40-r2.ebuild
+++ b/app-misc/fdupes/fdupes-1.40-r3.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $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
@@ -20,6 +20,7 @@ src_unpack() {
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"
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) {
+