[gentoo-commits] proj/hardened-dev:musl commit in: app-arch/gzip/files/, app-arch/gzip/

[gentoo-commits] proj/hardened-dev:musl commit in: app-arch/gzip/files/, app-arch/gzip/

[Anthony G. Basile]

commit:     20de1f8605a98ddbc7d4e951830e0be7854b2f2c
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Tue Jan 27 18:35:20 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 23:00:15 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=20de1f86

app-arch/gzip: In tree version works fine

---
 .../gzip/files/gzip-1.3.8-install-symlinks.patch   | 11 -----
 app-arch/gzip/files/gzip-1.5-fix-gnulib-musl.patch | 30 --------------
 app-arch/gzip/gzip-1.5-r99.ebuild                  | 47 ----------------------
 app-arch/gzip/metadata.xml                         | 11 -----
 4 files changed, 99 deletions(-)

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
deleted file mode 100644
index 8d92b60..0000000
--- a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -926,7 +926,7 @@
- 	     rm -f "$$dest" && \
- 	     case $@ in \
- 	     install-exec-hook) \
--	       ln "$$source" "$$dest" || $(LN_S) "$$source" "$$dest";; \
-+	       $(LN_S) "$$source" "$$dest";; \
- 	     esac \
- 	    ) || exit; \
- 	  done; \

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
deleted file mode 100644
index 1353017..0000000
--- a/app-arch/gzip/files/gzip-1.5-fix-gnulib-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur gzip-1.5.orig/lib/freadahead.c gzip-1.5/lib/freadahead.c
---- gzip-1.5.orig/lib/freadahead.c	2012-03-03 12:51:02.000000000 +0000
-+++ gzip-1.5/lib/freadahead.c	2013-07-06 02:54:02.293243836 +0000
-@@ -25,6 +25,7 @@
- size_t
- freadahead (FILE *fp)
- {
-+#if 0
- #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return 0;
-@@ -90,4 +91,6 @@
- #else
-  #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."
- #endif
-+#endif
-+  return 0;
- }
-diff -Naur gzip-1.5.orig/lib/fseterr.c gzip-1.5/lib/fseterr.c
---- gzip-1.5.orig/lib/fseterr.c	2012-03-03 12:51:02.000000000 +0000
-+++ gzip-1.5/lib/fseterr.c	2013-07-06 02:54:45.035246226 +0000
-@@ -48,7 +48,7 @@
- #elif defined EPLAN9                /* Plan9 */
-   if (fp->state != 0 /* CLOSED */)
-     fp->state = 5 /* ERR */;
--#elif 0                             /* unknown  */
-+#elif 1                             /* unknown  */
-   /* Portable fallback, based on an idea by Rich Felker.
-      Wow! 6 system calls for something that is just a bit operation!
-      Not activated on any system, because there is no way to repair FP when

diff --git a/app-arch/gzip/gzip-1.5-r99.ebuild b/app-arch/gzip/gzip-1.5-r99.ebuild
deleted file mode 100644
index ad351bf..0000000
--- a/app-arch/gzip/gzip-1.5-r99.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.5.ebuild,v 1.8 2012/09/09 15:56:45 armin76 Exp $
-
-inherit eutils flag-o-matic unpacker
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="http://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
-	mirror://gnu/gzip/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="nls pic static"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpacker
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
-	epatch "${FILESDIR}"/${P}-fix-gnulib-musl.patch
-}
-
-src_compile() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog NEWS README THANKS TODO
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${D}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${D}"/bin/ || die
-	sed -e 's:/usr::' -i "${D}"/bin/gunzip || die
-}

diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml
deleted file mode 100644
index 6620916..0000000
--- a/app-arch/gzip/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<upstream>
- <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id>
-</upstream>
-<use>
-<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
-</use>
-</pkgmetadata>