updating patches to reflect upstream submittion of patches

prepped build folder is identical after remastering patch set
epel9
Jon Schlueter 10 years ago
parent 36ec3ed9ea
commit 0e85dc5d40

@ -1,3 +1,5 @@
# cherry picked from commit: c62a5331a5feef2b09556546d02a2b2fc67f6e67
# which fixed this CVE in upstream master
diff -Naur fdupes-1.51.orig/fdupes.1 fdupes-1.51/fdupes.1 diff -Naur fdupes-1.51.orig/fdupes.1 fdupes-1.51/fdupes.1
--- fdupes-1.51.orig/fdupes.1 2013-04-20 12:00:09.000000000 -0500 --- fdupes-1.51.orig/fdupes.1 2013-04-20 12:00:09.000000000 -0500
+++ fdupes-1.51/fdupes.1 2013-07-16 13:01:16.264491871 -0500 +++ fdupes-1.51/fdupes.1 2013-07-16 13:01:16.264491871 -0500

@ -1,3 +1,6 @@
# cherry picked from commit: 5d9143b8168cbf7fe55e2273f42486bcc9175208
# and adapted
# This effective patch has already been applied to upstream
diff -Naur fdupes-1.51.orig/Makefile fdupes-1.51/Makefile diff -Naur fdupes-1.51.orig/Makefile fdupes-1.51/Makefile
--- fdupes-1.51.orig/Makefile 2013-04-20 12:51:58.000000000 -0500 --- fdupes-1.51.orig/Makefile 2013-04-20 12:51:58.000000000 -0500
+++ fdupes-1.51/Makefile 2013-07-16 09:22:30.169197997 -0500 +++ fdupes-1.51/Makefile 2013-07-16 09:22:30.169197997 -0500

@ -1,8 +1,30 @@
Index: fdupes-1.51/Makefile From b8f3a4ea82bbff053ba785fb2e719d2ac6d82e15 Mon Sep 17 00:00:00 2001
=================================================================== From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <bjoern.esser@gmail.com>
--- fdupes-1.51.orig/Makefile Date: Fri, 19 Jun 2015 22:15:52 -0400
+++ fdupes-1.51/Makefile Subject: [PATCH] obey ldflags
@@ -102,7 +102,7 @@ OBJECT_FILES = fdupes.o md5/md5.o $(ADDI MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
backport of patch submitted to fedora dist-git repo for fdupes
cherry picked from commit: b8f3a4ea82bbff053ba785fb2e719d2ac6d82e15
commit 2fefedf7da42a6e73894e6d361e65b054ce80001
Author: Björn Esser <bjoern.esser@gmail.com>
Date: Tue Mar 18 13:51:11 2014 +0100
added Patch3: fdupes-1.51-obey-ldflags.patch to repo
Signed-off-by: Jon Schlueter <jschluet@redhat.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 921d910..e6947ea 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ OBJECT_FILES = fdupes.o md5/md5.o $(ADDITIONAL_OBJECTS)
all: fdupes all: fdupes
fdupes: $(OBJECT_FILES) fdupes: $(OBJECT_FILES)
@ -11,3 +33,6 @@ Index: fdupes-1.51/Makefile
installdirs: installdirs:
test -d $(DESTDIR)$(BIN_DIR) || $(MKDIR) $(DESTDIR)$(BIN_DIR) test -d $(DESTDIR)$(BIN_DIR) || $(MKDIR) $(DESTDIR)$(BIN_DIR)
--
2.1.0

@ -1,7 +1,20 @@
diff -urNp fdupes-1.50-PR2.orig/fdupes.1 fdupes-1.50-PR2/fdupes.1 From cc2fe14c2397b84ff61d00e038462dc6dac3bda2 Mon Sep 17 00:00:00 2001
--- fdupes-1.50-PR2.orig/fdupes.1 2009-01-31 20:11:49.581967819 +0530 From: Alfie Costa <agcosta@gis.net>
+++ fdupes-1.50-PR2/fdupes.1 2009-01-31 20:32:46.383969471 +0530 Date: Fri, 12 Oct 2012 14:58:00 +0200
@@ -87,7 +87,7 @@ If fdupes returns with an error message Subject: [PATCH 03/17] Fix a typo in a manpage
Fixes: http://bugs.debian.org/353789
cherry picked from commit: cc2fe14c2397b84ff61d00e038462dc6dac3bda2
---
fdupes.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fdupes.1 b/fdupes.1
index c0a02f0..71da2c4 100644
--- a/fdupes.1
+++ b/fdupes.1
@@ -84,7 +84,7 @@ If fdupes returns with an error message such as
.B fdupes: error invoking md5sum .B fdupes: error invoking md5sum
it means the program has been compiled to use an external it means the program has been compiled to use an external
program to calculate MD5 signatures (otherwise, fdupes uses program to calculate MD5 signatures (otherwise, fdupes uses
@ -10,3 +23,6 @@ diff -urNp fdupes-1.50-PR2.orig/fdupes.1 fdupes-1.50-PR2/fdupes.1
while attempting to execute it. If this is the case, the while attempting to execute it. If this is the case, the
specified program should be properly installed prior specified program should be properly installed prior
to running fdupes. to running fdupes.
--
2.1.0

Loading…
Cancel
Save