app-misc/fdupes: Import some fixes from fedora

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

9 files changed, 159 insertions, 115 deletions

diff --git a/app-misc/fdupes/ChangeLog b/app-misc/fdupes/ChangeLog
index f90eb5a952ae..d94cab7eb362 100644
--- a/app-misc/fdupes/ChangeLog
+++ b/app-misc/fdupes/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/fdupes
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/ChangeLog,v 1.46 2011/10/12 16:50:09 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/ChangeLog,v 1.47 2012/07/06 07:28:37 jlec Exp $
+
+*fdupes-1.50_pre2-r1 (06 Jul 2012)
+
+  06 Jul 2012; Justin Lecher <jlec@gentoo.org>
+  -files/fdupes-1.40-external-md5sum-quotation.patch,
+  -files/fdupes-1.40-external-md5sum-quotation-1.patch,
+  -files/fdupes-1.40-memcpy.patch, +fdupes-1.50_pre2-r1.ebuild,
+  +files/fdupes-1.50_pre2-compare-file.patch,
+  +files/fdupes-1.50_pre2-lfs.patch, +files/fdupes-1.50_pre2-typo.patch:
+  Import some fixes from fedora
 
   12 Oct 2011; Justin Lecher <jlec@gentoo.org> fdupes-1.50_pre2.ebuild,
   metadata.xml:
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index e7e6af9ba679..f709fe96033c 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -1,8 +1,20 @@
-AUX fdupes-1.40-external-md5sum-quotation-1.patch 1869 SHA256 a4425dc0237018b5297d2f0e76c1449893692107c350b212e930100c525bf5a9 SHA512 7c51c2a2bb4be3ef15873849536d8c67e6f79091f879f507e9fd79454212885da8f912e640bc1cac58b6bab85f3ad5abd108cae925aa82de280f2a9d371fe691 WHIRLPOOL be362e699e805c297e481aefce82c7ffeeaf201eff23d7de435d656ac335496090b148af6596d14c145ff512f27fb0d5bb415605e37c1bac40d57a7d93680cf5
-AUX fdupes-1.40-external-md5sum-quotation.patch 501 SHA256 b7793ba36f71e1037375e96aee95b525e0c57b49d9bd3274d5c10626ad3bc841 SHA512 4e4c55fe4b5a2f98ec54fcffb1c6f3fb0f9c4b734559f6eef68b4392f99e84574d060f29ef3128ca19d7bf84320f82b64ae4ce29537190744d44f3dfdadbbb01 WHIRLPOOL 82f766846573b3354ce2bc178684e9be126af52ff7202709015f5ca813d0ff30fca996f9dff5fd0b227e4e1e89abe19fb98325d497c0ff02c952691221f8f941
-AUX fdupes-1.40-memcpy.patch 404 SHA256 fab0d75c156101524e105902a488de4bcebdec415c2dfa6cec596b757cb576d4 SHA512 80304f8e951a7413c8d2c810921922536df0360f7ed0fe86b725fb014cb62b5d4916a53a13771d79b32fa567c9084cb7270e8e6f0f36be043238de3cb08bc9c9 WHIRLPOOL 493095d5e34707f827b0168f173aa1074878e6f1b9a026813f48bef984d03d9303c0d591017a180206824049c20a38fd08f9a27b2a76c35404b54070c1b89a67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX fdupes-1.50_pre2-compare-file.patch 2002 SHA256 a4e7bf30c18c81a3a5f5d37b0bf22354860512b1feb6a2307fa8a0c905b76ffb SHA512 53a61081cf4f0cde8ec98926edea6a6d46864b0b48f30c2112148f1aa92971b3127dd04a55689a9ba408d52a43ff0a6ebccbe5f1ff918e83943c942beca086a3 WHIRLPOOL 0633b1a6bc23a946a0f446596870fd1a0f35dbf6578a8df6205b07153f50f8807704b5f1e6c05b8706c4621ff4e28706334a5caf593927bf644e29a1fc152be3
+AUX fdupes-1.50_pre2-lfs.patch 1069 SHA256 f28c009b7955420049555b821baa035eb214e1068d5cec6501d60b448b42b9cd SHA512 88c928112a9d574a5e813dcfe92d1d75067c49afdb15fae50c421ef6280c48c5252e174e320d21df903a4067a6339c9a7bd5cc1f07ac85728c6e1380544cc35d WHIRLPOOL 51433a67fbf0fd0bac3744f39cebd671ce6ef257862e32355fcf71738c4cdf846dbc46a81198b267c3511363b354cfd0522365c0c7d1dd7b075790930adc1ef0
 AUX fdupes-1.50_pre2-makefile.patch 786 SHA256 ab29bf86681a607519d1b21139b2d2734f57b63bf27138e9c10cfb3ca23f97ad SHA512 cc8cd3c0932ad40968d36ecebc4d1e46ae08c3ff8f1b37bfa3a5594e4d2ae2e116b367b52cc04dfa76bcb2447a6134633cabd4938784c9601b533dadbdc2df34 WHIRLPOOL 33a76aa6a3139b9a8d1c2e9bff2f20a810bc3570be9295ce2dd529348ab0746e3ca7770a5ae5e6ad62a23912ddcee21a6d9ce330cf6c9efaebaf58f0ccefee2d
+AUX fdupes-1.50_pre2-typo.patch 675 SHA256 414555ab71bf985da76d5b7163870ff069ec8116ea1561e48f32309caef53980 SHA512 fdc313c2bfa44c17bc30f2f001f06b818eeea7fddc0b2c6a600b4694cbaeb53aa4fcfd93a7fe6eb0b6d48297b1a8654481f8efa57e2a78908e75b35df5959619 WHIRLPOOL 252fde3e9a853ec76c66bad35b5cb84f65ad54d486c67e57ef041b080af8c529d16d2c0889562586574013f903e6e204dde5b1f1d9da7e2107394bce32f54843
 DIST fdupes-1.50-PR2.tar.gz 19436 SHA256 5af2c71206fece42e0f9554427e323bef96653a4dceb5130bc8ac63e2ceb1619 SHA512 2a2f849110e6c55a372354c6ce556561bc38525459503d3c80ce07fa76f0cdf62a1900474dc021c913ae0f67b49cd2f2607de08b8f937f641eb4200a03a0a43d WHIRLPOOL 1e34e1e44fa6b769a05a7b4811cf956caaad7b0ba24957d170a34c93179d19789138dd3efcb9dafdca9d56a98f2eb10b0c486df033baa7a515641d1e058d71ec
+EBUILD fdupes-1.50_pre2-r1.ebuild 1008 SHA256 1de040e185b9cb908f73f1a367c6bb9890b9f7e4c2bcf5819b2df9be3245cb7b SHA512 63ca8ceabdafb9eb4189e17d09077c62d147add8e3125e7fbe305bef38187ec0d9e53123f77b7c9bad2b84158ba22e3f1527c790f7525585ac140af6db5c567b WHIRLPOOL 9e179404afb9845c7e7c6dbf63d6776c2c993e51a40d50c1b753033fabca1113570be2efc000e84e089c402bc7a0f7e6b33116c3e5e9054e01fe692b1c224090
 EBUILD fdupes-1.50_pre2.ebuild 852 SHA256 10d3695a5901d7670316ee60c9ea1397f8dd972c3b91db38fbd4a21575a980d2 SHA512 0f9ae832d72fe08a7fc0160dfdde24b859889ea80d88aa09a3d2e1bf34e0156811d24930767d6d68724b46984627089c859bcef2d0c3f519259259200ce71310 WHIRLPOOL f74788c791be5b81e58f79d0ed44c0efd0d1dbfa3d25d87c23a451ada6fadde79a60f0cc49807968020f0b1e8ecef3bc48134911a51affd7a99e6de05349349d
-MISC ChangeLog 5797 SHA256 0f772c0f0cb3163b95b6b9c1105fb7d08f3f86b36193668402a268d645b7f888 SHA512 331f1d90df7650da06389cde010642bb0165240ed3543c473d75fa52bafdc3de01e5149ed486235af8a953ce7ea5aebc13939d3f608df10a9fbcbb46a9ffaaf4 WHIRLPOOL 848fc049b63eca4387dc0ddab361f963ae2def5832fc24a425258bc332eec188a21d1803f9dca9ead050bbb9013b79fdc7acbb83a46dee68a5b7a48c3de550ed
+MISC ChangeLog 6206 SHA256 82a37edd72398e040c3c617c2f7b0636352200f07ad6643d688c46e71bda23ba SHA512 6db3e1d6c4bc25cb7bb5ca1ee9b37acd9ce2e3aefc499d946368e7b9269e41da8996c51e0c909a8a44d79a7ce33490d2462f0757302086900249b9d7caff7eee WHIRLPOOL c98dc2b665d3f58132647e521b46f454cb70b901b580a7cb213fca5282480f276aaf535fe7203965c0c467e8138f60ce78c620283ed7c733fe368b26399b72c2
 MISC metadata.xml 165 SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd SHA512 d99326d50355f1fa041618844027c043a114e7e63dec3c2d6c0c6023a5863bde8e62706bed974a394e21ce2e64ddf5539750c30e5913dacb39ed37cfd62e6eb3 WHIRLPOOL bb8b8cc1c4d9312dfe9015934c3c315a1ea6b9b6da2db22b231b434fd144ee7690ec2e242a1fba9c8e601610dc5cc9061c1995dd33c5b59c78a19a71f71d7a76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/2k6oACgkQgAnW8HDreRZeQwCg0FmrTsO8F7Ed9QHhdoG1PseB
+wAoAnA8vRuKn2A9WlcmQdAE+bs+Y++cs
+=KOyP
+-----END PGP SIGNATURE-----
diff --git a/app-misc/fdupes/fdupes-1.50_pre2-r1.ebuild b/app-misc/fdupes/fdupes-1.50_pre2-r1.ebuild
new file mode 100644
index 000000000000..8dce9b58c7df
--- /dev/null
+++ b/app-misc/fdupes/fdupes-1.50_pre2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.50_pre2-r1.ebuild,v 1.1 2012/07/06 07:28:37 jlec Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="${PN}-${PV/_pre/-PR}"
+
+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/${PN}/beta/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-compare-file.patch \
+		"${FILESDIR}"/${P}-lfs.patch \
+		"${FILESDIR}"/${P}-typo.patch
+
+	append-lfs-flags
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin fdupes
+	doman fdupes.1
+	dodoc CHANGES CONTRIBUTORS README TODO
+}
diff --git a/app-misc/fdupes/files/fdupes-1.40-external-md5sum-quotation-1.patch b/app-misc/fdupes/files/fdupes-1.40-external-md5sum-quotation-1.patch
deleted file mode 100644
index 1815f7b6d152..000000000000
--- a/app-misc/fdupes/files/fdupes-1.40-external-md5sum-quotation-1.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Source: Peter Volkov <pva@gentoo.org>
-Upstream: notified (sent email to <adrian2 AT caribe DOT net>
-Reason: bugs.gentoo.org/237828 comment #1
-With USE=md5sum-external fails on filenames with spaces in their names.
-
-Updated on 2009/06/20:
- * Fixed free due to wrong length of memory allocation bugs.gentoo.org/273597
- * Now works with filename that have " in name...
-
---- fdupes.c	2009-06-20 10:51:31 +0000
-+++ fdupes.c	2009-06-20 13:38:39 +0000
-@@ -291,17 +291,48 @@
- char *getcrcsignature(char *filename)
- {
-   static char signature[256];
-+  char *backslashedfilename;
-   char *command;
-   char *separator;
-   FILE *result;
--
--  command = (char*) malloc(strlen(filename)+strlen(EXTERNAL_MD5)+2);
-+  int i=0;
-+  int j=0;
-+  int numofquotes=0;
-+
-+  /* Find number of " in filename */
-+  while ( filename[i] != '\0' ) {
-+    if ( filename[i] == '\"' )
-+      numofquotes++;
-+      i++;
-+  }
-+
-+  backslashedfilename = (char*) malloc(strlen(filename)+numofquotes+1);
-+  if (backslashedfilename == NULL) {
-+    errormsg("out of memory\n");
-+    exit(1);
-+  }
-+
-+  /* Put backslash before each " */
-+  i=0;
-+  while ( filename[i] != '\0' ) {
-+    if ( filename[i] == '\"' ) {
-+      backslashedfilename[j]='\\';
-+      j++;
-+    }
-+    backslashedfilename[j]=filename[i];
-+    i++;
-+    j++;
-+  }
-+  backslashedfilename[j]='\0';
-+
-+  command = (char*) malloc(strlen(backslashedfilename)+strlen(EXTERNAL_MD5)+6);
-   if (command == NULL) {
-     errormsg("out of memory\n");
-     exit(1);
-   }
- 
--  sprintf(command, "%s %s", EXTERNAL_MD5, filename);
-+  /* Qoutation required to works spaces in filenames */
-+  sprintf(command, "%s \"%s\"", EXTERNAL_MD5, backslashedfilename);
- 
-   result = popen(command, "r");
-   if (result == NULL) {
-@@ -309,6 +340,7 @@
-     exit(1);
-   }
-  
-+  free(backslashedfilename);
-   free(command);
- 
-   if (fgets(signature, 256, result) == NULL) {
-
diff --git a/app-misc/fdupes/files/fdupes-1.40-external-md5sum-quotation.patch b/app-misc/fdupes/files/fdupes-1.40-external-md5sum-quotation.patch
deleted file mode 100644
index f52908d723d4..000000000000
--- a/app-misc/fdupes/files/fdupes-1.40-external-md5sum-quotation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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) {
-
diff --git a/app-misc/fdupes/files/fdupes-1.40-memcpy.patch b/app-misc/fdupes/files/fdupes-1.40-memcpy.patch
deleted file mode 100644
index 03ec0ce2ca8c..000000000000
--- a/app-misc/fdupes/files/fdupes-1.40-memcpy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-=== modified file 'md5/md5.c'
---- md5/md5.c	2008-05-12 21:06:07 +0000
-+++ md5/md5.c	2008-05-12 21:06:23 +0000
-@@ -39,6 +39,7 @@
-  */
- 
- #include "md5.h"
-+#include <string.h>
- 
- #ifdef TEST
- /*
-@@ -46,7 +47,6 @@
-  * The test program should print out the same values as given in section
-  * A.5 of RFC 1321, reproduced below.
-  */
--#include <string.h>
- main()
- {
-     static const char *const test[7] = {
-
diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch
new file mode 100644
index 000000000000..fa9e2a34a893
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch
@@ -0,0 +1,58 @@
+diff -urNp fdupes-1.50-PR2.orig/fdupes.c fdupes-1.50-PR2/fdupes.c
+--- fdupes-1.50-PR2.orig/fdupes.c	2009-01-31 20:11:49.577968848 +0530
++++ fdupes-1.50-PR2/fdupes.c	2009-01-31 22:01:11.872219443 +0530
+@@ -492,7 +492,10 @@ file_t **checkmatch(filetree_t **root, f
+   else {
+     if (checktree->file->crcpartial == NULL) {
+       crcsignature = getcrcpartialsignature(checktree->file->d_name);
+-      if (crcsignature == NULL) return NULL;
++      if (crcsignature == NULL) {
++        errormsg ("cannot read file %s\n", checktree->file->d_name);
++        return NULL;
++      }
+ 
+       checktree->file->crcpartial = (char*) malloc(strlen(crcsignature)+1);
+       if (checktree->file->crcpartial == NULL) {
+@@ -504,7 +507,10 @@ file_t **checkmatch(filetree_t **root, f
+ 
+     if (file->crcpartial == NULL) {
+       crcsignature = getcrcpartialsignature(file->d_name);
+-      if (crcsignature == NULL) return NULL;
++      if (crcsignature == NULL) {
++        errormsg ("cannot read file %s\n", file->d_name);
++        return NULL;
++      }
+ 
+       file->crcpartial = (char*) malloc(strlen(crcsignature)+1);
+       if (file->crcpartial == NULL) {
+@@ -577,8 +583,8 @@ file_t **checkmatch(filetree_t **root, f
+ 
+ int confirmmatch(FILE *file1, FILE *file2)
+ {
+-  unsigned char c1 = 0;
+-  unsigned char c2 = 0;
++  unsigned char c1[CHUNK_SIZE];
++  unsigned char c2[CHUNK_SIZE];
+   size_t r1;
+   size_t r2;
+   
+@@ -586,14 +592,13 @@ int confirmmatch(FILE *file1, FILE *file
+   fseek(file2, 0, SEEK_SET);
+ 
+   do {
+-    r1 = fread(&c1, sizeof(c1), 1, file1);
+-    r2 = fread(&c2, sizeof(c2), 1, file2);
++    r1 = fread(c1, 1, sizeof(c1), file1);
++    r2 = fread(c2, 1, sizeof(c2), file2);
+ 
+-    if (c1 != c2) return 0; /* file contents are different */
+-  } while (r1 && r2);
++    if (r1 != r2) return 0; /* file lengths are different */
++    if (memcmp (c1, c2, r1)) return 0; /* file contents are different */
++  } while (r2);
+   
+-  if (r1 != r2) return 0; /* file lengths are different */
+-
+   return 1;
+ }
+ 
diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-lfs.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-lfs.patch
new file mode 100644
index 000000000000..bd63f83291c1
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.50_pre2-lfs.patch
@@ -0,0 +1,21 @@
+diff -urNp fdupes-1.50-PR2.orig/fdupes.c fdupes-1.50-PR2/fdupes.c
+--- fdupes-1.50-PR2.orig/fdupes.c	2009-01-31 20:11:49.577968848 +0530
++++ fdupes-1.50-PR2/fdupes.c	2009-01-31 20:29:17.103220311 +0530
+@@ -643,7 +643,7 @@ void printmatches(file_t *files)
+   while (files != NULL) {
+     if (files->hasdupes) {
+       if (!ISFLAG(flags, F_OMITFIRST)) {
+-	if (ISFLAG(flags, F_SHOWSIZE)) printf("%ld byte%seach:\n", files->size,
++	if (ISFLAG(flags, F_SHOWSIZE)) printf("%lld byte%seach:\n", files->size,
+ 	 (files->size != 1) ? "s " : " ");
+ 	if (ISFLAG(flags, F_DSAMELINE)) escapefilename("\\ ", &files->d_name);
+ 	printf("%s%c", files->d_name, ISFLAG(flags, F_DSAMELINE)?' ':'\n');
+@@ -796,7 +796,7 @@ void deletefiles(file_t *files, int prom
+       do {
+ 	printf("Set %d of %d, preserve files [1 - %d, all]", 
+           curgroup, groups, counter);
+-	if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%ld byte%seach)", files->size,
++	if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%lld byte%seach)", files->size,
+ 	  (files->size != 1) ? "s " : " ");
+ 	printf(": ");
+ 	fflush(stdout);
diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch
new file mode 100644
index 000000000000..1615a15f49b1
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch
@@ -0,0 +1,12 @@
+diff -urNp fdupes-1.50-PR2.orig/fdupes.1 fdupes-1.50-PR2/fdupes.1
+--- fdupes-1.50-PR2.orig/fdupes.1	2009-01-31 20:11:49.581967819 +0530
++++ fdupes-1.50-PR2/fdupes.1	2009-01-31 20:32:46.383969471 +0530
+@@ -84,7 +84,7 @@ If fdupes returns with an error message 
+ .B fdupes: error invoking md5sum
+ it means the program has been compiled to use an external
+ program to calculate MD5 signatures (otherwise, fdupes uses
+-interal routines for this purpose), and an error has occurred
++internal routines for this purpose), and an error has occurred
+ while attempting to execute it. If this is the case, the 
+ specified program should be properly installed prior 
+ to running fdupes.