1 |
commit: 20de1f8605a98ddbc7d4e951830e0be7854b2f2c |
2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
3 |
AuthorDate: Tue Jan 27 18:35:20 2015 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 29 23:00:15 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=20de1f86 |
7 |
|
8 |
app-arch/gzip: In tree version works fine |
9 |
|
10 |
--- |
11 |
.../gzip/files/gzip-1.3.8-install-symlinks.patch | 11 ----- |
12 |
app-arch/gzip/files/gzip-1.5-fix-gnulib-musl.patch | 30 -------------- |
13 |
app-arch/gzip/gzip-1.5-r99.ebuild | 47 ---------------------- |
14 |
app-arch/gzip/metadata.xml | 11 ----- |
15 |
4 files changed, 99 deletions(-) |
16 |
|
17 |
diff --git a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch |
18 |
deleted file mode 100644 |
19 |
index 8d92b60..0000000 |
20 |
--- a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch |
21 |
+++ /dev/null |
22 |
@@ -1,11 +0,0 @@ |
23 |
---- Makefile.in |
24 |
-+++ Makefile.in |
25 |
-@@ -926,7 +926,7 @@ |
26 |
- rm -f "$$dest" && \ |
27 |
- case $@ in \ |
28 |
- install-exec-hook) \ |
29 |
-- ln "$$source" "$$dest" || $(LN_S) "$$source" "$$dest";; \ |
30 |
-+ $(LN_S) "$$source" "$$dest";; \ |
31 |
- esac \ |
32 |
- ) || exit; \ |
33 |
- done; \ |
34 |
|
35 |
diff --git a/app-arch/gzip/files/gzip-1.5-fix-gnulib-musl.patch b/app-arch/gzip/files/gzip-1.5-fix-gnulib-musl.patch |
36 |
deleted file mode 100644 |
37 |
index 1353017..0000000 |
38 |
--- a/app-arch/gzip/files/gzip-1.5-fix-gnulib-musl.patch |
39 |
+++ /dev/null |
40 |
@@ -1,30 +0,0 @@ |
41 |
-diff -Naur gzip-1.5.orig/lib/freadahead.c gzip-1.5/lib/freadahead.c |
42 |
---- gzip-1.5.orig/lib/freadahead.c 2012-03-03 12:51:02.000000000 +0000 |
43 |
-+++ gzip-1.5/lib/freadahead.c 2013-07-06 02:54:02.293243836 +0000 |
44 |
-@@ -25,6 +25,7 @@ |
45 |
- size_t |
46 |
- freadahead (FILE *fp) |
47 |
- { |
48 |
-+#if 0 |
49 |
- #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
50 |
- if (fp->_IO_write_ptr > fp->_IO_write_base) |
51 |
- return 0; |
52 |
-@@ -90,4 +91,6 @@ |
53 |
- #else |
54 |
- #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread, ungetc on your system, then report this to bug-gnulib." |
55 |
- #endif |
56 |
-+#endif |
57 |
-+ return 0; |
58 |
- } |
59 |
-diff -Naur gzip-1.5.orig/lib/fseterr.c gzip-1.5/lib/fseterr.c |
60 |
---- gzip-1.5.orig/lib/fseterr.c 2012-03-03 12:51:02.000000000 +0000 |
61 |
-+++ gzip-1.5/lib/fseterr.c 2013-07-06 02:54:45.035246226 +0000 |
62 |
-@@ -48,7 +48,7 @@ |
63 |
- #elif defined EPLAN9 /* Plan9 */ |
64 |
- if (fp->state != 0 /* CLOSED */) |
65 |
- fp->state = 5 /* ERR */; |
66 |
--#elif 0 /* unknown */ |
67 |
-+#elif 1 /* unknown */ |
68 |
- /* Portable fallback, based on an idea by Rich Felker. |
69 |
- Wow! 6 system calls for something that is just a bit operation! |
70 |
- Not activated on any system, because there is no way to repair FP when |
71 |
|
72 |
diff --git a/app-arch/gzip/gzip-1.5-r99.ebuild b/app-arch/gzip/gzip-1.5-r99.ebuild |
73 |
deleted file mode 100644 |
74 |
index ad351bf..0000000 |
75 |
--- a/app-arch/gzip/gzip-1.5-r99.ebuild |
76 |
+++ /dev/null |
77 |
@@ -1,47 +0,0 @@ |
78 |
-# Copyright 1999-2012 Gentoo Foundation |
79 |
-# Distributed under the terms of the GNU General Public License v2 |
80 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.5.ebuild,v 1.8 2012/09/09 15:56:45 armin76 Exp $ |
81 |
- |
82 |
-inherit eutils flag-o-matic unpacker |
83 |
- |
84 |
-DESCRIPTION="Standard GNU compressor" |
85 |
-HOMEPAGE="http://www.gnu.org/software/gzip/" |
86 |
-SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz |
87 |
- mirror://gnu/gzip/${P}.tar.xz |
88 |
- mirror://gentoo/${P}.tar.xz" |
89 |
- |
90 |
-LICENSE="GPL-3" |
91 |
-SLOT="0" |
92 |
-KEYWORDS="amd64 arm ~mips ppc x86" |
93 |
-IUSE="nls pic static" |
94 |
- |
95 |
-RDEPEND="" |
96 |
-DEPEND="${RDEPEND} |
97 |
- nls? ( sys-devel/gettext )" |
98 |
- |
99 |
-src_unpack() { |
100 |
- unpacker |
101 |
- cd "${S}" |
102 |
- epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch |
103 |
- epatch "${FILESDIR}"/${P}-fix-gnulib-musl.patch |
104 |
-} |
105 |
- |
106 |
-src_compile() { |
107 |
- use static && append-flags -static |
108 |
- # avoid text relocation in gzip |
109 |
- use pic && export DEFS="NO_ASM" |
110 |
- econf || die |
111 |
- emake || die |
112 |
-} |
113 |
- |
114 |
-src_install() { |
115 |
- emake install DESTDIR="${D}" || die |
116 |
- dodoc ChangeLog NEWS README THANKS TODO |
117 |
- docinto txt |
118 |
- dodoc algorithm.doc gzip.doc |
119 |
- |
120 |
- # keep most things in /usr, just the fun stuff in / |
121 |
- dodir /bin |
122 |
- mv "${D}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${D}"/bin/ || die |
123 |
- sed -e 's:/usr::' -i "${D}"/bin/gunzip || die |
124 |
-} |
125 |
|
126 |
diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml |
127 |
deleted file mode 100644 |
128 |
index 6620916..0000000 |
129 |
--- a/app-arch/gzip/metadata.xml |
130 |
+++ /dev/null |
131 |
@@ -1,11 +0,0 @@ |
132 |
-<?xml version="1.0" encoding="UTF-8"?> |
133 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
134 |
-<pkgmetadata> |
135 |
-<herd>base-system</herd> |
136 |
-<upstream> |
137 |
- <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id> |
138 |
-</upstream> |
139 |
-<use> |
140 |
-<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag> |
141 |
-</use> |
142 |
-</pkgmetadata> |