| 1 |
commit: 270f6af778bcf8f5c6bb68bf9aac10593b20de4d |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 29 07:53:08 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 29 07:53:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270f6af7 |
| 7 |
|
| 8 |
app-misc/fdupes: remove stdin as lvalue, bug #574610 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
app-misc/fdupes/fdupes-1.51.ebuild | 5 +++-- |
| 13 |
.../fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch | 20 ++++++++++++++++++++ |
| 14 |
2 files changed, 23 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/fdupes/fdupes-1.51.ebuild b/app-misc/fdupes/fdupes-1.51.ebuild |
| 17 |
index 6bff666..8037f87 100644 |
| 18 |
--- a/app-misc/fdupes/fdupes-1.51.ebuild |
| 19 |
+++ b/app-misc/fdupes/fdupes-1.51.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2015 Gentoo Foundation |
| 22 |
+# Copyright 1999-2016 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
@@ -26,7 +26,8 @@ src_prepare() { |
| 27 |
epatch \ |
| 28 |
"${FILESDIR}"/${P}-makefile.patch \ |
| 29 |
"${FILESDIR}"/${PN}-1.50_pre2-compare-file.patch \ |
| 30 |
- "${FILESDIR}"/${PN}-1.50_pre2-typo.patch |
| 31 |
+ "${FILESDIR}"/${PN}-1.50_pre2-typo.patch \ |
| 32 |
+ "${FILESDIR}"/${P}-fix-stdin-lvalue.patch |
| 33 |
|
| 34 |
append-lfs-flags |
| 35 |
} |
| 36 |
|
| 37 |
diff --git a/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..65c06e3 |
| 40 |
--- /dev/null |
| 41 |
+++ b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch |
| 42 |
@@ -0,0 +1,20 @@ |
| 43 |
+This is a combination of upstream's fe2d8334 and 03abad. See |
| 44 |
+https://bugs.gentoo.org/show_bug.cgi?id=574610. |
| 45 |
+ |
| 46 |
+diff -Naur fdupes-1.51.orig/fdupes.c fdupes-1.51/fdupes.c |
| 47 |
+--- fdupes-1.51.orig/fdupes.c 2013-04-20 14:02:18.000000000 -0400 |
| 48 |
++++ fdupes-1.51/fdupes.c 2016-02-29 02:45:36.360804360 -0500 |
| 49 |
+@@ -1164,7 +1164,12 @@ |
| 50 |
+ } |
| 51 |
+ else |
| 52 |
+ { |
| 53 |
+- stdin = freopen("/dev/tty", "r", stdin); |
| 54 |
++ if (freopen("/dev/tty", "r", stdin) == 0) |
| 55 |
++ { |
| 56 |
++ errormsg("could not open terminal for input\n"); |
| 57 |
++ exit(1); |
| 58 |
++ } |
| 59 |
++ |
| 60 |
+ deletefiles(files, 1, stdin); |
| 61 |
+ } |
| 62 |
+ } |
Archives