1 |
commit: 2dee3213eab1d7a589a42c99297a98de5846a0ee |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 11 06:38:31 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 11 06:38:31 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dee3213 |
7 |
|
8 |
app-misc/detox: drop 1.2.0-r3 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
app-misc/detox/Manifest | 1 - |
13 |
app-misc/detox/detox-1.2.0-r3.ebuild | 50 --------------- |
14 |
app-misc/detox/files/detox-1.2.0-LDFLAGS.patch | 18 ------ |
15 |
...change-default-sequence-to-use-utf8-table.patch | 17 ----- |
16 |
.../detox/files/detox-1.2.0-format-security.patch | 72 ---------------------- |
17 |
.../files/detox-1.2.0-install-missing-file.patch | 18 ------ |
18 |
app-misc/detox/files/detox-1.2.0-parallel.patch | 29 --------- |
19 |
7 files changed, 205 deletions(-) |
20 |
|
21 |
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest |
22 |
index e820c4d29cc..85d09041d8d 100644 |
23 |
--- a/app-misc/detox/Manifest |
24 |
+++ b/app-misc/detox/Manifest |
25 |
@@ -1,3 +1,2 @@ |
26 |
-DIST detox-1.2.0.tar.bz2 86118 BLAKE2B 2dbde6ebd98b59c18c60f99006731484dcbc698ab77b56991f2af94f4ad45da141046975af47b66242ff42d4e3a8bb3b515d4b70ba30f12cb1b8ceea5832f52a SHA512 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a |
27 |
DIST detox-1.4.0.tar.gz 106361 BLAKE2B 5993ded30282a16a81481885cdee41fe0b1c2ac34e5f389b53981e098d13acdfe367c7de462436fe3a4ee8ff86220f4c69d54a47c1122a0f39bde12c4d6ec908 SHA512 9486056b3b58dbb5ae16bc461586a997f8990ddb6e0db5ba561df862c16dfe926911fd09f065ef2578d39c3e3f1a267be201f865cf3f6b576c01910bda39cecb |
28 |
DIST detox-1.4.2.tar.gz 106736 BLAKE2B a27f9d93bf6f6c1634517c0f193affe576b2eec6be4b8fc38e91ef75a6f1a01a4376684d5a9b109b3971d0e311b64faeba020a3b7660ff130086956a7ebe92bd SHA512 ca1327e127cf1ba1803d8931aa119c9d11fc5b998f45ad5f7c339cea7f7928a5a6a45f90db9a51a7ccf6d4ee268cd316461c621db62dcc7182cd0255e74a1481 |
29 |
|
30 |
diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild |
31 |
deleted file mode 100644 |
32 |
index 2ec1846e2a5..00000000000 |
33 |
--- a/app-misc/detox/detox-1.2.0-r3.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,50 +0,0 @@ |
36 |
-# Copyright 1999-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=5 |
40 |
- |
41 |
-inherit epatch |
42 |
- |
43 |
-MY_P="${PN}-${PV/_/-}" |
44 |
- |
45 |
-DESCRIPTION="Safely remove spaces and strange characters from filenames" |
46 |
-HOMEPAGE="http://detox.sourceforge.net/" |
47 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" |
48 |
- |
49 |
-LICENSE="BSD" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux" |
52 |
-IUSE="" |
53 |
- |
54 |
-S="${WORKDIR}"/${MY_P} |
55 |
- |
56 |
-RDEPEND=" |
57 |
- dev-libs/popt |
58 |
- !dev-python/detox" |
59 |
- |
60 |
-DEPEND=" |
61 |
- ${RDEPEND} |
62 |
- sys-devel/flex |
63 |
- sys-devel/bison" |
64 |
- |
65 |
-PATCHES=( |
66 |
- "${FILESDIR}"/${P}-parallel.patch |
67 |
- "${FILESDIR}"/${P}-LDFLAGS.patch |
68 |
- "${FILESDIR}"/${P}-change-default-sequence-to-use-utf8-table.patch |
69 |
- "${FILESDIR}"/${P}-install-missing-file.patch |
70 |
- "${FILESDIR}"/${P}-format-security.patch |
71 |
- ) |
72 |
- |
73 |
-src_prepare() { |
74 |
- sed \ |
75 |
- -e 's:Fl c Ar:Fl f Ar:g' \ |
76 |
- -i ${PN}.1 || die |
77 |
- epatch "${PATCHES[@]}" |
78 |
- sed \ |
79 |
- -e '/detoxrc.sample/d' \ |
80 |
- -i Makefile.in || die |
81 |
-} |
82 |
- |
83 |
-src_configure() { |
84 |
- econf --with-popt="${EPREFIX}/usr" |
85 |
-} |
86 |
|
87 |
diff --git a/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch b/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch |
88 |
deleted file mode 100644 |
89 |
index 3f0daa08801..00000000000 |
90 |
--- a/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch |
91 |
+++ /dev/null |
92 |
@@ -1,18 +0,0 @@ |
93 |
-https://sourceforge.net/tracker/index.php?func=detail&aid=2166388&group_id=101612&atid=630105 |
94 |
- |
95 |
---- Makefile.in 2008-10-14 16:37:22 +0000 |
96 |
-+++ Makefile.in 2008-10-14 16:38:17 +0000 |
97 |
-@@ -70,10 +70,10 @@ |
98 |
- # |
99 |
- |
100 |
- detox: ${detoxOBJS} |
101 |
-- ${CC} -o detox ${detoxOBJS} ${L_OPT} |
102 |
-+ ${CC} ${LDFLAGS} -o detox ${detoxOBJS} ${L_OPT} |
103 |
- |
104 |
- inline-detox: ${inline-detoxOBJS} |
105 |
-- ${CC} -o inline-detox ${inline-detoxOBJS} ${L_OPT} |
106 |
-+ ${CC} ${LDFLAGS} -o inline-detox ${inline-detoxOBJS} ${L_OPT} |
107 |
- |
108 |
- # |
109 |
- # Special Source Compiles |
110 |
- |
111 |
|
112 |
diff --git a/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch b/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch |
113 |
deleted file mode 100644 |
114 |
index 2e54642f45b..00000000000 |
115 |
--- a/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch |
116 |
+++ /dev/null |
117 |
@@ -1,17 +0,0 @@ |
118 |
-# Patch from Teemu Likonen <tlikonen@×××.fi> |
119 |
-# to change the default sequence to use utf8 instead of iso8859-1 |
120 |
---- detox-1.2.0/detoxrc~ 2006-07-03 19:45:54.000000000 +0300 |
121 |
-+++ detox-1.2.0/detoxrc 2009-05-28 15:34:26.497832449 +0300 |
122 |
-@@ -32,10 +32,10 @@ |
123 |
- # |
124 |
- |
125 |
- # |
126 |
--# Basically just ISO8859_1 |
127 |
-+# Basically just utf_8 |
128 |
- # |
129 |
- sequence default { |
130 |
-- iso8859_1; |
131 |
-+ utf_8; |
132 |
- safe; |
133 |
- wipeup; |
134 |
- }; |
135 |
|
136 |
diff --git a/app-misc/detox/files/detox-1.2.0-format-security.patch b/app-misc/detox/files/detox-1.2.0-format-security.patch |
137 |
deleted file mode 100644 |
138 |
index c03a98aa046..00000000000 |
139 |
--- a/app-misc/detox/files/detox-1.2.0-format-security.patch |
140 |
+++ /dev/null |
141 |
@@ -1,72 +0,0 @@ |
142 |
- parse_options_getopt.c | 8 ++++---- |
143 |
- parse_options_popt.c | 8 ++++---- |
144 |
- 2 files changed, 8 insertions(+), 8 deletions(-) |
145 |
- |
146 |
-diff --git a/parse_options_getopt.c b/parse_options_getopt.c |
147 |
-index 1f80966..ea2b266 100644 |
148 |
---- a/parse_options_getopt.c |
149 |
-+++ b/parse_options_getopt.c |
150 |
-@@ -98,9 +98,9 @@ struct detox_options *parse_options_getopt(int argc, char **argv) |
151 |
- #endif |
152 |
- switch (optcode) { |
153 |
- case 'h': |
154 |
-- printf(usage_message); |
155 |
-+ printf("%s", usage_message); |
156 |
- printf("\n"); |
157 |
-- printf(help_message); |
158 |
-+ printf("%s", help_message); |
159 |
- exit(EXIT_SUCCESS); |
160 |
- |
161 |
- case 'f': |
162 |
-@@ -138,7 +138,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv) |
163 |
- exit(EXIT_SUCCESS); |
164 |
- |
165 |
- case '?': |
166 |
-- printf(usage_message); |
167 |
-+ printf("%s", usage_message); |
168 |
- exit(EXIT_SUCCESS); |
169 |
- |
170 |
- case 0: |
171 |
-@@ -195,7 +195,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv) |
172 |
- } |
173 |
- else { |
174 |
- #ifndef INLINE_MODE |
175 |
-- printf(usage_message); |
176 |
-+ printf("%s", usage_message); |
177 |
- exit(EXIT_FAILURE); |
178 |
- #endif |
179 |
- } |
180 |
-diff --git a/parse_options_popt.c b/parse_options_popt.c |
181 |
-index 60dad7a..370c3cc 100644 |
182 |
---- a/parse_options_popt.c |
183 |
-+++ b/parse_options_popt.c |
184 |
-@@ -94,9 +94,9 @@ struct detox_options *parse_options_popt(int argc, const char **argv) |
185 |
- while ((c = poptGetNextOpt(optCon)) >= 0) { |
186 |
- switch (c) { |
187 |
- case 'h': |
188 |
-- printf(usage_message); |
189 |
-+ printf("%s", usage_message); |
190 |
- printf("\n"); |
191 |
-- printf(help_message); |
192 |
-+ printf("%s", help_message); |
193 |
- exit(EXIT_SUCCESS); |
194 |
- |
195 |
- case 'f': |
196 |
-@@ -142,7 +142,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv) |
197 |
- break; |
198 |
- |
199 |
- case '?': |
200 |
-- printf(usage_message); |
201 |
-+ printf("%s", usage_message); |
202 |
- exit(EXIT_SUCCESS); |
203 |
- |
204 |
- } |
205 |
-@@ -177,7 +177,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv) |
206 |
- |
207 |
- #ifndef INLINE_MODE |
208 |
- if (i == 0) { |
209 |
-- fprintf(stderr, usage_message); |
210 |
-+ fprintf(stderr, "%s", usage_message); |
211 |
- exit(EXIT_FAILURE); |
212 |
- } |
213 |
- #endif |
214 |
|
215 |
diff --git a/app-misc/detox/files/detox-1.2.0-install-missing-file.patch b/app-misc/detox/files/detox-1.2.0-install-missing-file.patch |
216 |
deleted file mode 100644 |
217 |
index 97863268bc4..00000000000 |
218 |
--- a/app-misc/detox/files/detox-1.2.0-install-missing-file.patch |
219 |
+++ /dev/null |
220 |
@@ -1,18 +0,0 @@ |
221 |
-# Patch by Nelson A. de Oliveira <naoliv@××××××.org> |
222 |
-# |
223 |
-# Patch upstream Makefile to install missing safe.tbl (#566785) |
224 |
- |
225 |
---- detox-1.2.0/Makefile.in 2010-06-20 23:41:34.000000000 -0300 |
226 |
-+++ detox-1.2.0/Makefile.in 2010-06-20 23:42:34.000000000 -0300 |
227 |
-@@ -147,6 +147,11 @@ |
228 |
- else \ |
229 |
- echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \ |
230 |
- fi |
231 |
-+ @if [ ! -f ${DESTDIR}${datadir}/detox/safe.tbl ]; then \ |
232 |
-+ ${INSTALL} -m 644 safe.tbl ${DESTDIR}${datadir}/detox; \ |
233 |
-+ else \ |
234 |
-+ echo "${DESTDIR}${datadir}/detox/safe.tbl exists, skipping"; \ |
235 |
-+ fi |
236 |
- |
237 |
- install-unsafe-config: install-base |
238 |
- ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir} |
239 |
|
240 |
diff --git a/app-misc/detox/files/detox-1.2.0-parallel.patch b/app-misc/detox/files/detox-1.2.0-parallel.patch |
241 |
deleted file mode 100644 |
242 |
index 73abd73d61b..00000000000 |
243 |
--- a/app-misc/detox/files/detox-1.2.0-parallel.patch |
244 |
+++ /dev/null |
245 |
@@ -1,29 +0,0 @@ |
246 |
-https://sourceforge.net/tracker/index.php?func=detail&aid=2166387&group_id=101612&atid=630105 |
247 |
- |
248 |
---- Makefile.in 2008-10-14 16:39:34 +0000 |
249 |
-+++ Makefile.in 2008-10-14 16:38:51 +0000 |
250 |
-@@ -131,7 +131,7 @@ |
251 |
- ${INSTALL} -m 644 detox.1 ${DESTDIR}${mandir}/man1 |
252 |
- ${INSTALL} -m 644 detoxrc.5 detox.tbl.5 ${DESTDIR}${mandir}/man5 |
253 |
- |
254 |
--install-safe-config: |
255 |
-+install-safe-config: install-base |
256 |
- @if [ ! -f ${DESTDIR}${sysconfdir}/detoxrc ]; then \ |
257 |
- ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}; \ |
258 |
- else \ |
259 |
-@@ -148,12 +148,12 @@ |
260 |
- echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \ |
261 |
- fi |
262 |
- |
263 |
--install-unsafe-config: |
264 |
-+install-unsafe-config: install-base |
265 |
- ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir} |
266 |
- ${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox |
267 |
- ${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox |
268 |
- |
269 |
--install-sample-config: |
270 |
-+install-sample-config: install-base |
271 |
- ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}/detoxrc.sample |
272 |
- ${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox/iso8859_1.tbl.sample |
273 |
- ${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox/unicode.tbl.sample |
274 |
- |