1 |
commit: ef66f5cc0415920b7b4a28f4f25f567c5436e66e |
2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
3 |
AuthorDate: Fri Sep 25 23:01:14 2020 +0000 |
4 |
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
5 |
CommitDate: Fri Sep 25 23:01:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ef66f5cc |
7 |
|
8 |
dev-libs/libunzip: drop dead package |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
11 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
12 |
|
13 |
.../files/libunzip-5.52-CVE-2008-0888.patch | 35 --------------- |
14 |
.../libunzip/files/libunzip-5.52-Makefile.patch | 31 ------------- |
15 |
.../files/libunzip-5.52-no-exec-stack.patch | 13 ------ |
16 |
dev-libs/libunzip/libunzip-5.52.ebuild | 51 ---------------------- |
17 |
dev-libs/libunzip/metadata.xml | 4 -- |
18 |
5 files changed, 134 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/libunzip/files/libunzip-5.52-CVE-2008-0888.patch b/dev-libs/libunzip/files/libunzip-5.52-CVE-2008-0888.patch |
21 |
deleted file mode 100644 |
22 |
index 368b3eeb1..000000000 |
23 |
--- a/dev-libs/libunzip/files/libunzip-5.52-CVE-2008-0888.patch |
24 |
+++ /dev/null |
25 |
@@ -1,35 +0,0 @@ |
26 |
-http://bugs.gentoo.org/213761 |
27 |
- |
28 |
-fix for CVE-2008-0888 |
29 |
- |
30 |
---- inflate.c |
31 |
-+++ inflate.c |
32 |
-@@ -983,6 +983,7 @@ |
33 |
- unsigned l; /* last length */ |
34 |
- unsigned m; /* mask for bit lengths table */ |
35 |
- unsigned n; /* number of lengths to get */ |
36 |
-+ struct huft *tlp; |
37 |
- struct huft *tl; /* literal/length code table */ |
38 |
- struct huft *td; /* distance code table */ |
39 |
- unsigned bl; /* lookup bits for tl */ |
40 |
-@@ -996,6 +997,8 @@ |
41 |
- int retval = 0; /* error code returned: initialized to "no error" */ |
42 |
- |
43 |
- |
44 |
-+ td = tlp = tl = (struct huft *)NULL; |
45 |
-+ |
46 |
- /* make local bit buffer */ |
47 |
- Trace((stderr, "\ndynamic block")); |
48 |
- b = G.bb; |
49 |
-@@ -1047,9 +1050,9 @@ |
50 |
- while (i < n) |
51 |
- { |
52 |
- NEEDBITS(bl) |
53 |
-- j = (td = tl + ((unsigned)b & m))->b; |
54 |
-+ j = (tlp = tl + ((unsigned)b & m))->b; |
55 |
- DUMPBITS(j) |
56 |
-- j = td->v.n; |
57 |
-+ j = tlp->v.n; |
58 |
- if (j < 16) /* length of code in bits (0..15) */ |
59 |
- ll[i++] = l = j; /* save last length in l */ |
60 |
- else if (j == 16) /* repeat last length 3 to 6 times */ |
61 |
|
62 |
diff --git a/dev-libs/libunzip/files/libunzip-5.52-Makefile.patch b/dev-libs/libunzip/files/libunzip-5.52-Makefile.patch |
63 |
deleted file mode 100644 |
64 |
index b8787f2f2..000000000 |
65 |
--- a/dev-libs/libunzip/files/libunzip-5.52-Makefile.patch |
66 |
+++ /dev/null |
67 |
@@ -1,31 +0,0 @@ |
68 |
---- unix/Makefile 2005-02-26 20:58:34.000000000 +0100 |
69 |
-+++ unix/Makefile.new 2009-04-12 19:49:56.000000000 +0200 |
70 |
-@@ -45,6 +45,7 @@ |
71 |
- CC = cc# try using "gcc" target rather than changing this (CC and LD |
72 |
- LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) |
73 |
- AS = as |
74 |
-+RANLIB = |
75 |
- LOC = $(LOCAL_UNZIP) |
76 |
- AF = $(LOC) |
77 |
- CF = -O -I. -DUNIX $(LOC) |
78 |
-@@ -810,14 +810,14 @@ |
79 |
- # |
80 |
- linux_shlib: unix_make |
81 |
- # $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL $(LOC)" |
82 |
-- $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DASM_CRC $(LOC)"\ |
83 |
-- AS=gcc AF="-fPIC -Di386 $(AF)" CRC32=crc_gcc |
84 |
-- ln -sf crc_gcc.pic.o crc32.pic.o |
85 |
-- gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL) |
86 |
-+ $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DUNIX $(LOC)" |
87 |
-+ $(LD) $(LDFLAGS) -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL) |
88 |
-+ $(AR) $(ARFLAGS) libunzip.a $(OBJSDLL) |
89 |
-+ $(RANLIB) libunzip.a |
90 |
- ln -sf libunzip.so.0.4 libunzip.so.0 |
91 |
- ln -sf libunzip.so.0 libunzip.so |
92 |
-- gcc -c -O unzipstb.c |
93 |
-- gcc -o unzip_shlib unzipstb.o -L. -lunzip |
94 |
-+ $(CC) $(CFLAGS) -c unzipstb.c |
95 |
-+ $(LD) $(LDFLAGS) -o unzip_shlib unzipstb.o -L. -lunzip |
96 |
- |
97 |
- # Linux ELF shared library, as above, but using inflate() from zlib (libz.so) |
98 |
- # instead of the original UnZip version. (libz was libgz prior to 0.94) |
99 |
|
100 |
diff --git a/dev-libs/libunzip/files/libunzip-5.52-no-exec-stack.patch b/dev-libs/libunzip/files/libunzip-5.52-no-exec-stack.patch |
101 |
deleted file mode 100644 |
102 |
index e2869bfe8..000000000 |
103 |
--- a/dev-libs/libunzip/files/libunzip-5.52-no-exec-stack.patch |
104 |
+++ /dev/null |
105 |
@@ -1,13 +0,0 @@ |
106 |
-Make sure that the asm files don't incorrectly trigger an executable |
107 |
-stack marking in the final shared library. That's bad, mmmkay. |
108 |
- |
109 |
---- unzip/crc_i386.S |
110 |
-+++ unzip/crc_i386.S |
111 |
-@@ -238,3 +238,7 @@ |
112 |
- #endif /* i386 || _i386 || _I386 || __i386 */ |
113 |
- |
114 |
- #endif /* !USE_ZLIB */ |
115 |
-+ |
116 |
-+#ifdef __ELF__ |
117 |
-+.section .note.GNU-stack,"",%progbits |
118 |
-+#endif |
119 |
|
120 |
diff --git a/dev-libs/libunzip/libunzip-5.52.ebuild b/dev-libs/libunzip/libunzip-5.52.ebuild |
121 |
deleted file mode 100644 |
122 |
index 15f6ae723..000000000 |
123 |
--- a/dev-libs/libunzip/libunzip-5.52.ebuild |
124 |
+++ /dev/null |
125 |
@@ -1,51 +0,0 @@ |
126 |
-# Copyright 1999-2015 Gentoo Foundation |
127 |
-# Distributed under the terms of the GNU General Public License v2 |
128 |
- |
129 |
-EAPI=5 |
130 |
- |
131 |
-inherit eutils flag-o-matic toolchain-funcs |
132 |
- |
133 |
-MY_PN="${PN#lib}" |
134 |
- |
135 |
-DESCRIPTION="libunzip.so" |
136 |
-HOMEPAGE="http://www.info-zip.org/" |
137 |
-SRC_URI="mirror://gentoo/${MY_PN}${PV/.}.tar.gz" |
138 |
- |
139 |
-LICENSE="Info-ZIP" |
140 |
-SLOT="0" |
141 |
-KEYWORDS="~amd64 ~x86" |
142 |
-IUSE="static-libs" |
143 |
- |
144 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
145 |
- |
146 |
-src_prepare() { |
147 |
- epatch \ |
148 |
- "${FILESDIR}"/${P}-no-exec-stack.patch \ |
149 |
- "${FILESDIR}"/${P}-CVE-2008-0888.patch \ |
150 |
- "${FILESDIR}"/${P}-Makefile.patch |
151 |
- sed -i \ |
152 |
- -e 's:-O3:$(CFLAGS) $(CPPFLAGS):' \ |
153 |
- -e 's:-O :$(CFLAGS) $(CPPFLAGS) :' \ |
154 |
- -e "s:CC=gcc :CC=$(tc-getCC) :" \ |
155 |
- -e "s:CC = cc:CC=$(tc-getCC) :" \ |
156 |
- -e "s:LD=gcc :LD=$(tc-getCC) :" \ |
157 |
- -e "s:AS=gcc :AS=$(tc-getCC) :" \ |
158 |
- -e "s:RANLIB =:RANLIB = $(tc-getRANLIB) :" \ |
159 |
- -e 's:LF2 = -s:LF2 = :' \ |
160 |
- -e 's:LF = :LF = $(LDFLAGS) :' \ |
161 |
- -e 's:SL = :SL = $(LDFLAGS) :' \ |
162 |
- -e 's:FL = :FL = $(LDFLAGS) :' \ |
163 |
- unix/Makefile \ |
164 |
- || die "sed unix/Makefile failed" |
165 |
-} |
166 |
- |
167 |
-src_compile() { |
168 |
- append-lfs-flags #104315 |
169 |
- emake -f unix/Makefile linux_shlib |
170 |
-} |
171 |
- |
172 |
-src_install() { |
173 |
- dolib.so ${PN}.so* |
174 |
- use static-libs && dolib.a ${PN}.a |
175 |
- doheader unzip.h |
176 |
-} |
177 |
|
178 |
diff --git a/dev-libs/libunzip/metadata.xml b/dev-libs/libunzip/metadata.xml |
179 |
deleted file mode 100644 |
180 |
index 097975e3a..000000000 |
181 |
--- a/dev-libs/libunzip/metadata.xml |
182 |
+++ /dev/null |
183 |
@@ -1,4 +0,0 @@ |
184 |
-<?xml version="1.0" encoding="UTF-8"?> |
185 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
186 |
-<pkgmetadata> |
187 |
-</pkgmetadata> |