Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/
Date: Sat, 04 Feb 2017 21:22:21
Message-Id: 1486243244.bd75d46ed98623712e23b29491a3fa64b6c4a1cf.soap@gentoo
1 commit: bd75d46ed98623712e23b29491a3fa64b6c4a1cf
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Feb 3 15:22:30 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 21:20:44 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd75d46e
7
8 sys-devel/automake: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/3791
11
12 .../automake/files/automake-1.10.1-tests.patch | 111 ---------------------
13 .../automake/files/automake-1.10.2-bash4.patch | 22 ----
14 2 files changed, 133 deletions(-)
15
16 diff --git a/sys-devel/automake/files/automake-1.10.1-tests.patch b/sys-devel/automake/files/automake-1.10.1-tests.patch
17 deleted file mode 100644
18 index 02e7194..00000000
19 --- a/sys-devel/automake/files/automake-1.10.1-tests.patch
20 +++ /dev/null
21 @@ -1,111 +0,0 @@
22 -commit eed743342cfa0ff8cc69666243233229e7417f8f
23 -Author: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
24 -Date: Wed Jan 30 21:23:16 2008 +0100
25 -
26 - Split instsh2.test, so that only the new part requires non-root.
27 -
28 - * tests/instsh2.test: Split off testing of `install-sh -C' ...
29 - * tests/instsh3.test: ... to this new test, requiring non-root.
30 - * tests/Makefile.am: Adjust.
31 - * THANKS: Update.
32 - Report by Theodoros V. Kalamatianos.
33 -
34 -diff --git a/tests/Makefile.am b/tests/Makefile.am
35 -index ec10801..8405c7a 100644
36 ---- a/tests/Makefile.am
37 -+++ b/tests/Makefile.am
38 -@@ -293,6 +293,7 @@ install2.test \
39 - installdir.test \
40 - instsh.test \
41 - instsh2.test \
42 -+instsh3.test \
43 - instdat.test \
44 - instdat2.test \
45 - instexec.test \
46 -diff --git a/tests/Makefile.in b/tests/Makefile.in
47 -index 6ba81ab..1bcb573 100644
48 ---- a/tests/Makefile.in
49 -+++ b/tests/Makefile.in
50 -@@ -442,6 +442,7 @@ install2.test \
51 - installdir.test \
52 - instsh.test \
53 - instsh2.test \
54 -+instsh3.test \
55 - instdat.test \
56 - instdat2.test \
57 - instexec.test \
58 -diff --git a/tests/instsh2.test b/tests/instsh2.test
59 -index 17b61ab..f0b729e 100755
60 ---- a/tests/instsh2.test
61 -+++ b/tests/instsh2.test
62 -@@ -1,5 +1,5 @@
63 - #! /bin/sh
64 --# Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
65 -+# Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
66 - #
67 - # This program is free software; you can redistribute it and/or modify
68 - # it under the terms of the GNU General Public License as published by
69 -@@ -77,20 +77,6 @@ test -f d3/y
70 - ./install-sh -T x d3 && exit 1
71 - ./install-sh -T x d4// && exit 1
72 -
73 --# Do not change the timestamps when using -C.
74 --echo foo >file
75 --./install-sh -C file d1
76 --TZ=UTC0 touch -t $old_timestamp d1/file
77 --./install-sh -C file d1
78 --is_newest file d1/file
79 --echo foo1 >file
80 --./install-sh -C file d1
81 --diff file d1/file
82 --# Rights must be updated.
83 --./install-sh -C -m 444 file d1
84 --test -r d1/file
85 --test ! -w d1/file
86 --
87 - # Ensure that install-sh works with names that include spaces
88 - touch 'a b'
89 - mkdir 'x y'
90 -diff --git a/tests/instsh3.test b/tests/instsh3.test
91 -new file mode 100755
92 -index 0000000..95b74c7
93 ---- /dev/null
94 -+++ b/tests/instsh3.test
95 -@@ -0,0 +1,37 @@
96 -+#! /bin/sh
97 -+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
98 -+#
99 -+# This program is free software; you can redistribute it and/or modify
100 -+# it under the terms of the GNU General Public License as published by
101 -+# the Free Software Foundation; either version 3, or (at your option)
102 -+# any later version.
103 -+#
104 -+# This program is distributed in the hope that it will be useful,
105 -+# but WITHOUT ANY WARRANTY; without even the implied warranty of
106 -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
107 -+# GNU General Public License for more details.
108 -+#
109 -+# You should have received a copy of the GNU General Public License
110 -+# along with this program. If not, see <http://www.gnu.org/licenses/>.
111 -+
112 -+# More install-sh checks: check -C.
113 -+
114 -+required=non-root
115 -+. ./defs || exit 1
116 -+set -e
117 -+
118 -+./install-sh -d d1
119 -+
120 -+# Do not change the timestamps when using -C.
121 -+echo foo >file
122 -+./install-sh -C file d1
123 -+TZ=UTC0 touch -t $old_timestamp d1/file
124 -+./install-sh -C file d1
125 -+is_newest file d1/file
126 -+echo foo1 >file
127 -+./install-sh -C file d1
128 -+diff file d1/file
129 -+# Rights must be updated.
130 -+./install-sh -C -m 444 file d1
131 -+test -r d1/file
132 -+test ! -w d1/file
133
134 diff --git a/sys-devel/automake/files/automake-1.10.2-bash4.patch b/sys-devel/automake/files/automake-1.10.2-bash4.patch
135 deleted file mode 100644
136 index 01829ce..00000000
137 --- a/sys-devel/automake/files/automake-1.10.2-bash4.patch
138 +++ /dev/null
139 @@ -1,22 +0,0 @@
140 -An upstream patch to fix ksh test issues, which also affect bash 4.0
141 -
142 -http://bugs.gentoo.org/263068
143 -http://git.savannah.gnu.org/cgit/automake.git/commit/?h=branch-1-10&id=319305db77dfdcbba3d5a1703c781750affdb20a
144 -
145 -2008-12-21 Ralf Wildenhues <Ralf.Wildenhues@×××.de>
146 -
147 - Testsuite fix for ksh.
148 - * tests/check10.test: Add ':' as last command in subshell, for
149 - zero exit status of the subshell.
150 - Missing backport from master reported by Tim Rice.
151 -
152 ---- a/tests/check10.test
153 -+++ b/tests/check10.test
154 -@@ -72,6 +72,7 @@
155 - env TESTS="xpass xpass2" $MAKE -e check
156 - env TESTS='pass skip xfail' $MAKE -e check
157 - $MAKE check
158 -+ :
159 - ) >stdout
160 - cat stdout
161 -