Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/star/, app-arch/star/files/
Date: Mon, 21 Sep 2015 12:10:53
Message-Id: 1442837445.77b31c9df4862f107080d665a8ef9f3a916fa909.jlec@gentoo
1 commit: 77b31c9df4862f107080d665a8ef9f3a916fa909
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 21 12:05:01 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 21 12:10:45 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77b31c9d
7
8 app-arch/star: Drop old
9
10 Package-Manager: portage-2.2.20.1
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 app-arch/star/Manifest | 1 -
14 .../star/files/star-1.5.1-bufferoverflow.patch | 21 -----
15 .../star/files/star-1.5.1-changewarnSegv.patch | 80 ----------------
16 .../star/files/star-1.5.1-multivolsigsegv.patch | 12 ---
17 app-arch/star/files/star-1.5.1-stdioconflict.patch | 92 -------------------
18 app-arch/star/star-1.5.2.ebuild | 102 ---------------------
19 6 files changed, 308 deletions(-)
20
21 diff --git a/app-arch/star/Manifest b/app-arch/star/Manifest
22 index 4221d04..0bb1433 100644
23 --- a/app-arch/star/Manifest
24 +++ b/app-arch/star/Manifest
25 @@ -1,2 +1 @@
26 -DIST star-1.5.2.tar.bz2 874558 SHA256 762645b98af13bb9b0512812814ec8e90635d1400c94eb5911e9774daed2addf SHA512 6ea9bd3db79a83c5fae5cb791ea6fc2d79cb464d97702ca0167fdd068df77f047a53037f5be342f138dd950c2c863ee07de0bf3390e37d39a1105634ca8fc9d5 WHIRLPOOL 957a499bdbc7cca5704635c89bd7703fb0018ee22ab99a7cacab4b5241131001f6b9a65b69c227dc513c210d772b4a3a560a1a5d602e6b9dde4778ab1a329876
27 DIST star-1.5.3.tar.bz2 889881 SHA256 070342833ea83104169bf956aa880bcd088e7af7f5b1f8e3d29853b49b1a4f5b SHA512 622032a0e87f3df06ab1091af0af99d0362f478f70351cfe3d47195eec0fcc96f458fb6e50cae3531183984b1d390b598176ce008bcc5f29764795f66436efef WHIRLPOOL fd786e38666392813311d04350680bb9e1f4cf892412697652f8531eec95b9954c8e0ec3d1538dc1a7cc469e28dbbc38a0a21f8e210fdf929a65de3b73ab55d6
28
29 diff --git a/app-arch/star/files/star-1.5.1-bufferoverflow.patch b/app-arch/star/files/star-1.5.1-bufferoverflow.patch
30 deleted file mode 100644
31 index afc0b4a..0000000
32 --- a/app-arch/star/files/star-1.5.1-bufferoverflow.patch
33 +++ /dev/null
34 @@ -1,21 +0,0 @@
35 -diff -urNp star-1.5.1-orig/star/longnames.c star-1.5.1/star/longnames.c
36 ---- star-1.5.1-orig/star/longnames.c 2009-10-16 00:38:55.000000000 +0200
37 -+++ star-1.5.1/star/longnames.c 2010-02-03 13:36:03.000000000 +0100
38 -@@ -155,7 +155,7 @@ name_to_tcb(info, ptb)
39 - if (add)
40 - strcatl(ptb->dbuf.t_name, name, "/", (char *)NULL);
41 - else
42 -- strcpy(ptb->dbuf.t_name, name);
43 -+ strncpy(ptb->dbuf.t_name, name, props.pr_maxsname);
44 - return (TRUE);
45 - }
46 -
47 -@@ -198,7 +198,7 @@ name_to_tcb(info, ptb)
48 - if (add)
49 - strcatl(ptb->dbuf.t_name, &np[1], "/", (char *)NULL);
50 - else
51 -- strcpy(ptb->dbuf.t_name, &np[1]);
52 -+ strncpy(ptb->dbuf.t_name, &np[1], props.pr_maxsname);
53 - strncpy(ptb->dbuf.t_prefix, name, np - name);
54 - info->f_flags |= F_SPLIT_NAME;
55 - return (TRUE);
56
57 diff --git a/app-arch/star/files/star-1.5.1-changewarnSegv.patch b/app-arch/star/files/star-1.5.1-changewarnSegv.patch
58 deleted file mode 100644
59 index 74d4870..0000000
60 --- a/app-arch/star/files/star-1.5.1-changewarnSegv.patch
61 +++ /dev/null
62 @@ -1,80 +0,0 @@
63 ---- star-1.5/star/checkerr.c.orig-segv 2006-10-31 18:06:25.000000000 +0100
64 -+++ star-1.5/star/checkerr.c 2007-08-27 11:42:39.000000000 +0200
65 -@@ -183,39 +183,45 @@ LOCAL struct eflags {
66 - */
67 - LOCAL UInt32_t
68 - errflags(eflag, doexit)
69 -- char *eflag;
70 -- BOOL doexit;
71 -+ char *eflag;
72 -+ BOOL doexit;
73 - {
74 -- register char *p = eflag;
75 -- char *ef = _endword(eflag);
76 -- register struct eflags *ep;
77 -- register int slen;
78 -- register UInt32_t nflags = 0;
79 --
80 -- do {
81 -- for (ep = eflags; ep->fname; ep++) {
82 -- slen = strlen(ep->fname);
83 -- if ((strncmp(ep->fname, p, slen) == 0) &&
84 -- (p[slen] == '|' || p[slen] == ' ' ||
85 -- p[slen] == '\0')) {
86 -- nflags |= ep->fval;
87 -- break;
88 -- }
89 -- }
90 -- if (ep->fname == NULL) {
91 -- if (doexit)
92 -- comerrno(EX_BAD, "Bad flag '%s'\n", p);
93 -- return (0);
94 -- }
95 -- p = strchr(p, '|');
96 -- } while (p < ef && p && *p++ == '|');
97 --
98 -- if ((nflags & ~(UInt32_t)(E_ABORT|E_WARN)) == 0) {
99 -- if (doexit)
100 -- comerrno(EX_BAD, "Bad error condition '%s'.\n", eflag);
101 -- return (0);
102 -- }
103 -- return (nflags);
104 -+ register struct eflags *ep;
105 -+ register int slen;
106 -+ register UInt32_t nflags = 0;
107 -+ char *curflags;
108 -+ char *curflag;
109 -+
110 -+ curflags = strdup (eflag);
111 -+ *_endword(curflags) = '\0';
112 -+ curflag = strtok (curflags, "|");
113 -+
114 -+ while (curflag != NULL) {
115 -+ for (ep = eflags; ep->fname; ep++) {
116 -+ slen = strlen (ep->fname);
117 -+ if ((strncmp (ep->fname, curflag, slen)) == 0) {
118 -+ nflags |= ep->fval;
119 -+ goto next;
120 -+ }
121 -+ }
122 -+
123 -+ if (doexit)
124 -+ comerrno (EX_BAD, "Bad flag '%s' \n", curflag);
125 -+
126 -+ free (curflags);
127 -+ return (0);
128 -+ next:
129 -+ curflag = strtok (NULL, "|");
130 -+ }
131 -+
132 -+ free (curflags);
133 -+
134 -+ if ((nflags & ~(UInt32_t)(E_ABORT|E_WARN)) == 0) {
135 -+ if (doexit)
136 -+ comerrno(EX_BAD, "Bad error condition '%s'.\n", eflag);
137 -+ return (0);
138 -+ }
139 -+ return (nflags);
140 - }
141 -
142 - LOCAL ec_t *
143
144 diff --git a/app-arch/star/files/star-1.5.1-multivolsigsegv.patch b/app-arch/star/files/star-1.5.1-multivolsigsegv.patch
145 deleted file mode 100644
146 index 204a29d..0000000
147 --- a/app-arch/star/files/star-1.5.1-multivolsigsegv.patch
148 +++ /dev/null
149 @@ -1,12 +0,0 @@
150 -diff -urNp star-1.5.1-orig/star/buffer.c star-1.5.1/star/buffer.c
151 ---- star-1.5.1-orig/star/buffer.c 2009-07-13 21:05:02.000000000 +0200
152 -+++ star-1.5.1/star/buffer.c 2011-01-04 13:50:25.452138625 +0100
153 -@@ -799,7 +799,7 @@ initbuf(nblocks)
154 -
155 - bigptr = bigbuf = ___malloc((size_t) bufsize+10+pagesize,
156 - "buffer");
157 -- bigptr = bigbuf = (char *)roundup((Intptr_t)bigptr, pagesize);
158 -+ bigptr = bigbuf = (char *)roundup((UIntptr_t)bigptr, pagesize);
159 - fillbytes(bigbuf, bufsize, '\0');
160 - fillbytes(&bigbuf[bufsize], 10, 'U');
161 -
162
163 diff --git a/app-arch/star/files/star-1.5.1-stdioconflict.patch b/app-arch/star/files/star-1.5.1-stdioconflict.patch
164 deleted file mode 100644
165 index e0be2d4..0000000
166 --- a/app-arch/star/files/star-1.5.1-stdioconflict.patch
167 +++ /dev/null
168 @@ -1,92 +0,0 @@
169 -diff -urNp star-1.5.1-orig/include/schily/schily.h star-1.5.1/include/schily/schily.h
170 ---- star-1.5.1-orig/include/schily/schily.h 2009-10-22 23:18:55.000000000 +0200
171 -+++ star-1.5.1/include/schily/schily.h 2010-01-13 13:17:10.000000000 +0100
172 -@@ -174,7 +174,7 @@ extern int fexecle __PR((const char *, F
173 - /* 6th arg not const, fexecv forces av[ac] = NULL */
174 - extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
175 - char **));
176 --extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
177 -+extern int sch_fexecve __PR((const char *, FILE *, FILE *, FILE *,
178 - char * const *, char * const *));
179 - extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
180 - extern int fspawnl __PR((FILE *, FILE *, FILE *, const char *, ...));
181 -@@ -311,7 +311,7 @@ extern char *findbytes __PR((const void
182 - extern char *findinpath __PR((char *__name, int __mode, BOOL __plain_file));
183 - extern int findline __PR((const char *, char, const char *,
184 - int, char **, int));
185 --extern int getline __PR((char *, int));
186 -+extern int sch_getline __PR((char *, int));
187 - extern int getstr __PR((char *, int));
188 - extern int breakline __PR((char *, char, char **, int));
189 - extern int getallargs __PR((int *, char * const**, const char *, ...));
190 -diff -urNp star-1.5.1-orig/lib/fexec.c star-1.5.1/lib/fexec.c
191 ---- star-1.5.1-orig/lib/fexec.c 2009-11-15 15:14:28.000000000 +0100
192 -+++ star-1.5.1/lib/fexec.c 2010-01-13 13:17:10.000000000 +0100
193 -@@ -198,7 +198,7 @@ const char **pav;
194 - } while (p != NULL);
195 - va_end(args);
196 -
197 -- ret = fexecve(name, in, out, err, av, env);
198 -+ ret = sch_fexecve(name, in, out, err, av, env);
199 - if (av != xav)
200 - free(av);
201 - return (ret);
202 -@@ -212,11 +212,11 @@ fexecv(name, in, out, err, ac, av)
203 - char *av[];
204 - {
205 - av[ac] = NULL; /* force list to be null terminated */
206 -- return (fexecve(name, in, out, err, av, environ));
207 -+ return (sch_fexecve(name, in, out, err, av, environ));
208 - }
209 -
210 - EXPORT int
211 --fexecve(name, in, out, err, av, env)
212 -+sch_fexecve(name, in, out, err, av, env)
213 - const char *name;
214 - FILE *in, *out, *err;
215 - char * const av[], * const env[];
216 -diff -urNp star-1.5.1-orig/lib/libschily-mapvers star-1.5.1/lib/libschily-mapvers
217 ---- star-1.5.1-orig/lib/libschily-mapvers 2007-10-06 15:21:55.000000000 +0200
218 -+++ star-1.5.1/lib/libschily-mapvers 2010-01-13 13:17:10.000000000 +0100
219 -@@ -77,7 +77,7 @@ global:
220 - fexecl;
221 - fexecle;
222 - fexecv;
223 -- fexecve;
224 -+ sch_fexecve;
225 - ffileread;
226 - ffilewrite;
227 - fgetline;
228 -@@ -123,7 +123,7 @@ global:
229 - geterrno;
230 - getfiles;
231 - getfp;
232 -- getline;
233 -+ sch_getline;
234 - getmainfp;
235 - #getstr;
236 - #handlecond;
237 -diff -urNp star-1.5.1-orig/lib/stdio/fgetline.c star-1.5.1/lib/stdio/fgetline.c
238 ---- star-1.5.1-orig/lib/stdio/fgetline.c 2004-09-25 14:23:36.000000000 +0200
239 -+++ star-1.5.1/lib/stdio/fgetline.c 2010-01-13 13:17:10.000000000 +0100
240 -@@ -61,7 +61,7 @@ fgetline(f, buf, len)
241 - }
242 -
243 - EXPORT int
244 --getline(buf, len)
245 -+sch_getline(buf, len)
246 - char *buf;
247 - int len;
248 - {
249 -diff -urNp star-1.5.1-orig/libfind/find.c star-1.5.1/libfind/find.c
250 ---- star-1.5.1-orig/libfind/find.c 2009-11-15 16:25:02.000000000 +0100
251 -+++ star-1.5.1/libfind/find.c 2010-01-13 13:17:10.000000000 +0100
252 -@@ -1747,7 +1747,7 @@ doexec(f, ac, av, state)
253 - #endif
254 - av[ac] = NULL; /* -exec {} \; is not NULL terminated */
255 -
256 -- fexecve(av[0], state->std[0], state->std[1], state->std[2],
257 -+ sch_fexecve(av[0], state->std[0], state->std[1], state->std[2],
258 - av, state->env);
259 - err = geterrno();
260 - #ifdef PLUS_DEBUG
261
262 diff --git a/app-arch/star/star-1.5.2.ebuild b/app-arch/star/star-1.5.2.ebuild
263 deleted file mode 100644
264 index b65b048..0000000
265 --- a/app-arch/star/star-1.5.2.ebuild
266 +++ /dev/null
267 @@ -1,102 +0,0 @@
268 -# Copyright 1999-2015 Gentoo Foundation
269 -# Distributed under the terms of the GNU General Public License v2
270 -# $Id$
271 -
272 -EAPI=5
273 -
274 -inherit eutils toolchain-funcs
275 -
276 -DESCRIPTION="An enhanced (world's fastest) tar, as well as enhanced mt/rmt"
277 -HOMEPAGE="http://s-tar.sourceforge.net/"
278 -SRC_URI="mirror://sourceforge/s-tar/${P}.tar.bz2"
279 -
280 -LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
281 -SLOT="0"
282 -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
283 -IUSE="acl xattr"
284 -
285 -DEPEND="
286 - acl? ( sys-apps/acl )
287 - xattr? ( sys-apps/attr )"
288 -RDEPEND="${DEPEND}"
289 -
290 -S=${WORKDIR}/${P/_alpha[0-9][0-9]}
291 -
292 -src_prepare() {
293 - find -type f -exec chmod -c u+w '{}' + || die
294 - sed \
295 - -e "s:/opt/schily:${EPREFIX}/usr:g" \
296 - -e 's:bin:root:g' \
297 - -e "s:/usr/src/linux/include:${EPREFIX}/usr/include:" \
298 - -i DEFAULTS/Defaults.linux || die
299 -
300 - # Disable libacl autodependency (hacky build system, hacky fix...)
301 - if use acl; then
302 - sed \
303 - -e 's:[$]ac_cv_header_sys_acl_h:disable acl:' \
304 - -i "${S}/autoconf/configure" || die
305 - fi
306 -
307 - if use xattr; then
308 - sed \
309 - -e 's:[$]ac_cv_header_attr_xattr_h:disable xattr:' \
310 - -i "${S}/autoconf/configure" || die
311 - fi
312 -
313 - # Create additional symlinks needed for some archs.
314 - pushd "${S}/RULES" > /dev/null
315 - local t
316 - for t in ppc64 s390x ; do
317 - ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
318 - ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
319 - done
320 - popd > /dev/null
321 -
322 - epatch "${FILESDIR}"/${PN}-1.5.1-changewarnSegv.patch
323 -}
324 -
325 -src_configure() { :; } #avoid ./configure run
326 -
327 -src_compile() {
328 - emake \
329 - CC="$(tc-getCC)" \
330 - COPTX="${CFLAGS}" \
331 - CPPOPTX="${CPPFLAGS}" \
332 - COPTGPROF= \
333 - COPTOPT= \
334 - LDOPTX="${LDFLAGS}"
335 -}
336 -
337 -src_install() {
338 - # Joerg Schilling suggested to integrate star into the main OS using call:
339 - # make INS_BASE=/usr DESTDIR="${D}" install
340 -
341 - dobin \
342 - star/OBJ/*-*-cc/star \
343 - tartest/OBJ/*-*-cc/tartest \
344 - star_sym/OBJ/*-*-cc/star_sym \
345 - mt/OBJ/*-*-cc/smt
346 -
347 - newsbin rmt/OBJ/*-*-cc/rmt rmt.star
348 - newman rmt/rmt.1 rmt.star.1
349 -
350 - # Note that we should never install gnutar, tar or rmt in this package.
351 - # tar and rmt are provided by app-arch/tar. gnutar is not compatible with
352 - # GNU tar and breakes compilation, or init scripts. bug #33119
353 - dosym {star,/usr/bin/ustar}
354 - dosym {star,/usr/bin/spax}
355 - dosym {star,/usr/bin/scpio}
356 - dosym {star,/usr/bin/suntar}
357 -
358 - # match is needed to understand the pattern matcher, if you wondered why ;)
359 - doman man/man1/match.1 tartest/tartest.1 \
360 - star/{star.4,star.1,spax.1,scpio.1,suntar.1}
361 -
362 - insinto /etc/default
363 - newins star/star.dfl star
364 - newins rmt/rmt.dfl rmt
365 -
366 - dodoc star/{README.ACL,README.crash,README.largefiles,README.otherbugs} \
367 - star/{README.pattern,README.pax,README.posix-2001,README,STARvsGNUTAR} \
368 - rmt/default-rmt.sample TODO AN-* Changelog CONTRIBUTING
369 -}