mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-arch/zoo: remove 2.10-r4
Package-Manager: Portage-2.3.8, Repoman-2.3.3
This commit is contained in:
@@ -1,4 +1,2 @@
|
||||
DIST zoo-2.10-gcc-issues-fix.patch 19467 SHA256 0215efd7aa218048f5f8bc085810f89cad6a9f710234f0d0e93be959a02f582b SHA512 a5b5e857b3d38633224ca8a28717cb529a11a2e66ca974fb9b7e326d18443657439b88b4af4867492399813845496dc0812a7e07885b01116e0163416562ce3c WHIRLPOOL dcf18afbfb097e4edf35dd0b9a10f8253c949d0017ad4c26b7bf3f0acfaa090bc32a3d06e5fa55960073baa06b6d4a8721674a355a060d31ee6acf32c13ec247
|
||||
DIST zoo-2.10pl1.tar.gz 172096 SHA256 ad8d8fee5e524aca0e1e9a1e431c21cd59943d8373d5dffe4edca03a7e4284f4 SHA512 cf69b15020ebcbd10bda19967a52ac6f8fe09dc598e8034b82449c50f4c5000571a5be284452f5e7801d134e1581f8f9e871fbef65518dc9c69a77fb536f2c12 WHIRLPOOL 430fe2bd185dc1845afd36426966d0c29a2df5495d6c5c8e3092de5da48a77b781430cf95c93467826da03b646ab4641b881c5bacd4e6e763cb409dcbcf11762
|
||||
DIST zoo_2.10-28.debian.tar.xz 14984 SHA256 17ce35beb831b9d67a2fc19172f519881ef88fd6f134ffe69f327c7a8c9e7a78 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708 WHIRLPOOL bb21e803f88471806ada28d279925b3841fa93b19d730a202341c58d2c95907f71ebdfa1627f14587c96890ac313523a0e35d8c12b9195c883eae4eef39c4893
|
||||
DIST zoo_2.10.orig.tar.gz 172629 SHA256 a8bd2fb9907db425760831eb28b3b690c18529a53568e7e9c42a97f9ef70f129 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f WHIRLPOOL 566645ea8e00ec0f938657cc725deac3bdef42f5773a1c9514079afebffb27c1770b305b6448e848da511e1434e19cd41dca2ed77be690735921112ade1ec005
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
Taken from Fedora
|
||||
|
||||
--- portable.c
|
||||
+++ portable.c
|
||||
@@ -364,6 +364,31 @@
|
||||
show_dir(direntry);
|
||||
}
|
||||
#endif
|
||||
+ char *p;
|
||||
+ /* take off '../' */
|
||||
+ while ((p = strstr( direntry->dirname, "../" )) != NULL) {
|
||||
+ while (*(p+3) != '\0') {
|
||||
+ *p = *(p + 3);
|
||||
+ p++;
|
||||
+ }
|
||||
+ *p = *(p+3); /* move last null */
|
||||
+ //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname);
|
||||
+ }
|
||||
+ /* take off '/' */
|
||||
+ if ( direntry->dirname[0] == '/' ) {
|
||||
+ p = direntry->dirname;
|
||||
+ while (*p != '\0') {
|
||||
+ *p = *(p + 1);
|
||||
+ p++;
|
||||
+ }
|
||||
+ *p = *(p+1); /* move last null */
|
||||
+ //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname);
|
||||
+ }
|
||||
+ /* take off '..' */
|
||||
+ if(!strcmp(direntry->dirname, ".."))
|
||||
+ direntry->dirname[0] = '\0';
|
||||
+ /* direntry->dirlen = strlen(direntry->dirname); */
|
||||
+
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
Taken from Fedora
|
||||
|
||||
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183426
|
||||
http://bugs.gentoo.org/125622
|
||||
|
||||
--- zoo/parse.c
|
||||
+++ zoo/parse.c
|
||||
@@ -39,7 +39,7 @@
|
||||
char *namep; /* points to relevant part of tempname */
|
||||
|
||||
char *p;
|
||||
- strcpy (tempname, fname);
|
||||
+ strncpy(tempname, fname, LFNAMESIZE);
|
||||
|
||||
#ifdef DEBUG
|
||||
printf ("parse: supplied name is [%s].\n", tempname);
|
||||
@@ -1,25 +0,0 @@
|
||||
--- sysv.c 2007-06-16 15:01:53 +0200
|
||||
+++ sysv.c.new 2007-06-16 14:38:38 +0200
|
||||
@@ -63,8 +63,8 @@
|
||||
return (fname); /* default is no-op */
|
||||
}
|
||||
|
||||
-extern long timezone; /* defined by library routine */
|
||||
-long time ();
|
||||
+/*extern long timezone; defined by library routine */
|
||||
+/* long time (); */
|
||||
struct tm *localtime ();
|
||||
|
||||
/* Function gettz(), returns the offset from GMT in seconds of the
|
||||
--- zoo.h 2007-06-16 15:01:53 +0200
|
||||
+++ zoo.h.new 2007-06-16 14:57:58 +0200
|
||||
@@ -95,6 +95,9 @@
|
||||
#endif
|
||||
|
||||
typedef unsigned char uchar;
|
||||
+typedef unsigned int uint;
|
||||
+typedef unsigned long ulong;
|
||||
+typedef unsigned short ushort;
|
||||
|
||||
/* WARNING: Static initialization in zooadd.c or zooext.c depends on the
|
||||
order of fields in struct zoo_header */
|
||||
@@ -1,71 +0,0 @@
|
||||
diff -ur zoo-2.10-r2/zooext.c zoo-2.10-r3/zooext.c
|
||||
--- zoo-2.10-r2/zooext.c 2007-05-23 23:39:14.000000000 +0200
|
||||
+++ zoo-2.10-r3/zooext.c 2007-05-23 23:36:37.000000000 +0200
|
||||
@@ -89,6 +89,7 @@
|
||||
#endif
|
||||
struct direntry direntry; /* directory entry */
|
||||
int first_dir = 1; /* first dir entry seen? */
|
||||
+ unsigned long zoo_pointer = 0; /* Track our position in the file */
|
||||
|
||||
static char extract_ver[] = "Zoo %d.%d is needed to extract %s.\n";
|
||||
static char no_space[] = "Insufficient disk space to extract %s.\n";
|
||||
@@ -169,6 +170,9 @@
|
||||
exit_status = 1;
|
||||
}
|
||||
zooseek (zoo_file, zoo_header.zoo_start, 0); /* seek to where data begins */
|
||||
+
|
||||
+ /* Begin tracking our position in the file */
|
||||
+ zoo_pointer = zoo_header.zoo_start;
|
||||
}
|
||||
|
||||
#ifndef PORTABLE
|
||||
@@ -597,6 +601,11 @@
|
||||
} /* end if */
|
||||
|
||||
loop_again:
|
||||
+ /* Make sure we are not seeking to already processed data */
|
||||
+ if (next_ptr <= zoo_pointer)
|
||||
+ prterror ('f', "ZOO chain structure is corrupted\n");
|
||||
+ zoo_pointer = next_ptr;
|
||||
+
|
||||
zooseek (zoo_file, next_ptr, 0); /* ..seek to next dir entry */
|
||||
} /* end while */
|
||||
|
||||
Nur in zoo-2.10-r3: zooext.c~.
|
||||
Nur in zoo-2.10-r3: zooext.c.orig.
|
||||
diff -ur zoo-2.10-r2/zoolist.c zoo-2.10-r3/zoolist.c
|
||||
--- zoo-2.10-r2/zoolist.c 1991-07-20 00:57:27.000000000 +0200
|
||||
+++ zoo-2.10-r3/zoolist.c 2007-05-23 23:38:19.000000000 +0200
|
||||
@@ -92,7 +92,7 @@
|
||||
int show_mode = 0; /* show file protection */
|
||||
#endif
|
||||
int first_dir = 1; /* if first direntry -- to adjust dat_ofs */
|
||||
-
|
||||
+unsigned long zoo_pointer = 0; /* Track our position in the file */
|
||||
while (*option) {
|
||||
switch (*option) {
|
||||
case 'a': show_name++; break;
|
||||
@@ -211,6 +211,9 @@
|
||||
show_acmt (&zoo_header, zoo_file, 0); /* show archive comment */
|
||||
}
|
||||
|
||||
+ /* Begin tracking our position in the file */
|
||||
+ zoo_pointer = zoo_header.zoo_start;
|
||||
+
|
||||
/* Seek to the beginning of the first directory entry */
|
||||
if (zooseek (zoo_file, zoo_header.zoo_start, 0) != 0) {
|
||||
ercount++;
|
||||
@@ -437,6 +440,11 @@
|
||||
if (verb_list && !fast)
|
||||
show_comment (&direntry, zoo_file, 0, (char *) NULL);
|
||||
} /* end if (lots of conditions) */
|
||||
+
|
||||
+ /* Make sure we are not seeking to already processed data */
|
||||
+ if (direntry.next <= zoo_pointer)
|
||||
+ prterror ('f', "ZOO chain structure is corrupted\n");
|
||||
+ zoo_pointer = direntry.next;
|
||||
|
||||
/* ..seek to next dir entry */
|
||||
zooseek (zoo_file, direntry.next, 0);
|
||||
Nur in zoo-2.10-r3: zoolist.c~.
|
||||
Nur in zoo-2.10-r3: zoolist.c.orig.
|
||||
@@ -1,23 +0,0 @@
|
||||
Taken from Fedora
|
||||
|
||||
--- misc.c
|
||||
+++ misc.c
|
||||
@@ -135,11 +135,17 @@
|
||||
char *fullpath (direntry)
|
||||
struct direntry *direntry;
|
||||
{
|
||||
- static char result[PATHSIZE];
|
||||
+ static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/
|
||||
combine (result,
|
||||
direntry->dirlen != 0 ? direntry->dirname : "",
|
||||
(direntry->namlen != 0) ? direntry->lfname : direntry->fname
|
||||
);
|
||||
+
|
||||
+ if (strlen (result) >= PATHSIZE) {
|
||||
+ prterror ('f', "Combined dirname and filename too long!\n");
|
||||
+ *result = '\0';
|
||||
+ }
|
||||
+
|
||||
return (result);
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Manipulate archives of files in compressed form"
|
||||
HOMEPAGE="ftp://ftp.kiarchive.ru/pub/unix/arcers"
|
||||
SRC_URI="ftp://ftp.kiarchive.ru/pub/unix/arcers/${P}pl1.tar.gz
|
||||
mirror://gentoo/${P}-gcc-issues-fix.patch"
|
||||
|
||||
LICENSE="zoo"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
epatch "${DISTDIR}"/${P}-gcc-issues-fix.patch
|
||||
epatch "${FILESDIR}"/${P}-CAN-2005-2349.patch
|
||||
epatch "${FILESDIR}"/${P}-febz-183426.patch
|
||||
epatch "${FILESDIR}"/${P}-security_pathsize.patch
|
||||
epatch "${FILESDIR}"/${P}-multiple-dos-fix.patch
|
||||
epatch "${FILESDIR}"/${P}-gentoo-fbsd.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# emake no workie on FreeBSD
|
||||
make CC="$(tc-getCC)" linux || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin zoo fiz || die
|
||||
doman zoo.1 fiz.1
|
||||
}
|
||||
Reference in New Issue
Block a user