From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-arch/bzip2/Manifest | 13 -- app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 114 -------------- app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 116 --------------- app-arch/bzip2/files/bzip2-1.0.3-no-test.patch | 9 -- app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch | 21 --- .../bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch | 25 ---- app-arch/bzip2/files/bzip2-1.0.4-man-links.patch | 12 -- .../bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch | 18 --- app-arch/bzip2/files/bzip2-1.0.6-mingw.patch | 27 ---- .../files/bzip2-1.0.6-out-of-tree-build.patch | 79 ---------- app-arch/bzip2/files/bzip2-1.0.6-progress.patch | 163 --------------------- app-arch/bzip2/files/bzip2-1.0.6-saneso.patch | 13 -- app-arch/bzip2/metadata.xml | 11 -- 13 files changed, 621 deletions(-) delete mode 100644 app-arch/bzip2/Manifest delete mode 100644 app-arch/bzip2/bzip2-1.0.6-r8.ebuild delete mode 100644 app-arch/bzip2/bzip2-1.0.6-r9.ebuild delete mode 100644 app-arch/bzip2/files/bzip2-1.0.3-no-test.patch delete mode 100644 app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch delete mode 100644 app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch delete mode 100644 app-arch/bzip2/files/bzip2-1.0.4-man-links.patch delete mode 100644 app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch delete mode 100644 app-arch/bzip2/files/bzip2-1.0.6-mingw.patch delete mode 100644 app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch delete mode 100644 app-arch/bzip2/files/bzip2-1.0.6-progress.patch delete mode 100644 app-arch/bzip2/files/bzip2-1.0.6-saneso.patch delete mode 100644 app-arch/bzip2/metadata.xml (limited to 'app-arch/bzip2') diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest deleted file mode 100644 index 5bc92764178b..000000000000 --- a/app-arch/bzip2/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX bzip2-1.0.3-no-test.patch 165 BLAKE2B 48f0f9393d1f7e6f56c93ecc53e80ea7507b7ac921e0d459082c9ac51eb98f9e89233c12975c2346b1c7e424e505116df881b1e57207a7ef325e0c55e2ce90ce SHA512 c6064aada01b9eebdaf5350bcc0f9b52dcc03fa8b5e361d5cb09260de0d301c190e406c5daa0edfb808bc2cb5061a4cd5361f920741024b750fa8e7570715e95 -AUX bzip2-1.0.4-POSIX-shell.patch 676 BLAKE2B f6ba04224ad924979221924dc81398455404a18b36754bc104ec67c4aa44e15512e51b84f5247f4737b1e242b5aa1497c76ebfd5cefa05d3ed4cfb2ee53c1781 SHA512 66e02e9422ecee1ae6e8e007eba95581313fcfa5703fa648470ff8975b5453e3d5323a4acf6264658612a6a2972e5c74cce061ce749e51d5e74769d068e4b365 -AUX bzip2-1.0.4-makefile-CFLAGS.patch 577 BLAKE2B adc265fbd71745e1f688c85386e48389c15569263861efa3aaa76a0328d71724fda22a23e95234cc13c90c95536b21e776bebffa79433d4f42e82d44c88588a7 SHA512 031780e77710619eb8c91350885a602b1cc1768e3776e46313a9535df6d8eb9502fa99624d81e5eccdebfaf97786148c3cd10fb2faed69c5a2ba24158915c0cd -AUX bzip2-1.0.4-man-links.patch 402 BLAKE2B 9a3cabc0e3964f75408445d7a2d94422ffa38e22d0869e4f97b252ef2947173ab9a504f0c1cd82fc7479494038f899f4a2429e39729d6f3d80e570ca8ef97797 SHA512 91abd3af9ffb339cbf85e28cc65b9193d8799d81281320d4709e234f3f40483b390fd9517ad3a8aab8d240f011786df8f17e9240104a43d1292bca983c1c22cc -AUX bzip2-1.0.6-CVE-2016-3189.patch 594 BLAKE2B b4a9f6e0267637d1f815e1b8cdbddfdd5e54fcc05cbd2f31c7e64494626b7531f2bb2b5ae8b288ce0ca116abc131235dbf31f32411b58b91e156a136adbc7ad1 SHA512 0b1d5814b93397c588c9b22a7bba57e2a7360ec30a781ca3c9236781089fb8e9f0393a9fd93c880517d084f54712b631302cffa4af81a91dff791717645ec81b -AUX bzip2-1.0.6-mingw.patch 556 BLAKE2B 1885f5fe9a895e365606fd48d616553a23aa40d381ee87de8f725ed39b936e778ab517d00807a3a84120802d23fc5b54df48b3d33bebb18c7f9ba1c9afa961cc SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8 -AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b352984e1037bbfa86857d90836994f306ddc375353c36a0afad15c58ad84021f1180bcdd10002c0ce546acc9426a68d263570b SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e -AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7 -AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab -DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 -EBUILD bzip2-1.0.6-r8.ebuild 3016 BLAKE2B 1f48f0161c93dabc18beeab6f064b5ec44b901ca474525c3159c7859cafe3fd6207bafeb7254e763c5a9261f9d4b59271af564771d9201c00ecc408928154388 SHA512 b969bde987920cd44a90c4b89efc90f35f71c988852e0c623c38b461d8ec5ab9e969963aaf7b2177e5dad1fa4d0e0da7c61092527a5aebf2a6d17d5d6949bc85 -EBUILD bzip2-1.0.6-r9.ebuild 3050 BLAKE2B fae48013f5b10e6dc5601cae339ee1f5fc9e23432eb4a007e2d14558443992a0df3bf24b575597d00e1caac6d2463b1bbb61c84f70888dbe7258794f30610a6e SHA512 04a09cb18999d5b6cc5736ca51ebc74acf4f146a804990aad92540b0be42edf88098e4cb2f405d5b6803064f44b5febfd1a8b66829f6e26941287d2fed9451d8 -MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0 diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild deleted file mode 100644 index 167f56e9bfd2..000000000000 --- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly -# (since we're building shared libs) ... - -EAPI=5 - -inherit eutils toolchain-funcs multilib multilib-minimal - -DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="http://www.bzip.org/" -SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz" - -LICENSE="BZIP2" -SLOT="0/1" # subslot = SONAME -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="static static-libs" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch - "${FILESDIR}"/${PN}-1.0.6-saneso.patch - "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 - "${FILESDIR}"/${PN}-1.0.6-progress.patch - "${FILESDIR}"/${PN}-1.0.3-no-test.patch - "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365 - "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573 - "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch - "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466 -) - -src_prepare() { - epatch "${PATCHES[@]}" - - # - Use right man path - # - Generate symlinks instead of hardlinks - # - pass custom variables to control libdir - sed -i \ - -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ - -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ - -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ - Makefile || die -} - -bemake() { - emake \ - VPATH="${S}" \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - "$@" -} - -multilib_src_compile() { - bemake -f "${S}"/Makefile-libbz2_so all - # Make sure we link against the shared lib #504648 - ln -sf libbz2.so.${PV} libbz2.so - bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" -} - -multilib_src_install() { - into /usr - - # Install the shared lib manually. We install: - # .x.x.x - standard shared lib behavior - # .x.x - SONAME some distros use #338321 - # .x - SONAME Gentoo uses - dolib.so libbz2.so.${PV} - local v - for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do - dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} - done - use static-libs && dolib.a libbz2.a - - if multilib_is_native_abi ; then - gen_usr_ldscript -a bz2 - - dobin bzip2recover - into / - dobin bzip2 - fi -} - -multilib_src_install_all() { - # `make install` doesn't cope with out-of-tree builds, nor with - # installing just non-binaries, so handle things ourselves. - insinto /usr/include - doins bzlib.h - into /usr - dobin bz{diff,grep,more} - doman *.1 - - dosym bzdiff /usr/bin/bzcmp - dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 - - dosym bzmore /usr/bin/bzless - dosym bzmore.1 /usr/share/man/man1/bzless.1 - - local x - for x in bunzip2 bzcat bzip2recover ; do - dosym bzip2.1 /usr/share/man/man1/${x}.1 - done - for x in bz{e,f}grep ; do - dosym bzgrep /usr/bin/${x} - dosym bzgrep.1 /usr/share/man/man1/${x}.1 - done - - dodoc README* CHANGES manual.pdf - dohtml manual.html - - # move "important" bzip2 binaries to /bin and use the shared libbz2.so - dosym bzip2 /bin/bzcat - dosym bzip2 /bin/bunzip2 -} diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild deleted file mode 100644 index 5200b0c3413e..000000000000 --- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly -# (since we're building shared libs) ... - -EAPI=6 - -inherit toolchain-funcs multilib-minimal - -DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="http://www.bzip.org/" -SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz" - -LICENSE="BZIP2" -SLOT="0/1" # subslot = SONAME -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="static static-libs" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch - "${FILESDIR}"/${PN}-1.0.6-saneso.patch - "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 - "${FILESDIR}"/${PN}-1.0.6-progress.patch - "${FILESDIR}"/${PN}-1.0.3-no-test.patch - "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365 - "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573 - "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch - "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466 -) - -DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) -HTML_DOCS=( manual.html ) - -src_prepare() { - default - - # - Use right man path - # - Generate symlinks instead of hardlinks - # - pass custom variables to control libdir - sed -i \ - -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ - -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ - -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ - Makefile || die -} - -bemake() { - emake \ - VPATH="${S}" \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - "$@" -} - -multilib_src_compile() { - bemake -f "${S}"/Makefile-libbz2_so all - # Make sure we link against the shared lib #504648 - ln -s libbz2.so.${PV} libbz2.so || die - bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" -} - -multilib_src_install() { - into /usr - - # Install the shared lib manually. We install: - # .x.x.x - standard shared lib behavior - # .x.x - SONAME some distros use #338321 - # .x - SONAME Gentoo uses - dolib.so libbz2.so.${PV} - local v - for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do - dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} - done - use static-libs && dolib.a libbz2.a - - if multilib_is_native_abi ; then - gen_usr_ldscript -a bz2 - - dobin bzip2recover - into / - dobin bzip2 - fi -} - -multilib_src_install_all() { - # `make install` doesn't cope with out-of-tree builds, nor with - # installing just non-binaries, so handle things ourselves. - insinto /usr/include - doins bzlib.h - into /usr - dobin bz{diff,grep,more} - doman *.1 - - dosym bzdiff /usr/bin/bzcmp - dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 - - dosym bzmore /usr/bin/bzless - dosym bzmore.1 /usr/share/man/man1/bzless.1 - - local x - for x in bunzip2 bzcat bzip2recover ; do - dosym bzip2.1 /usr/share/man/man1/${x}.1 - done - for x in bz{e,f}grep ; do - dosym bzgrep /usr/bin/${x} - dosym bzgrep.1 /usr/share/man/man1/${x}.1 - done - - einstalldocs - - # move "important" bzip2 binaries to /bin and use the shared libbz2.so - dosym bzip2 /bin/bzcat - dosym bzip2 /bin/bunzip2 -} diff --git a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch deleted file mode 100644 index 9e554f79515f..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -23,5 +23,5 @@ - bzlib.o - --all: libbz2.a bzip2 bzip2recover test -+all: libbz2.a bzip2 bzip2recover - - bzip2: libbz2.a bzip2.o diff --git a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch deleted file mode 100644 index 74f8df000b1a..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch +++ /dev/null @@ -1,21 +0,0 @@ -bzgrep uses !/bin/sh but then uses the bashism ${var//} so replace those -with calls to sed so POSIX shells work - -http://bugs.gentoo.org/193365 - ---- a/bzgrep -+++ b/bzgrep -@@ -63,10 +63,9 @@ - bzip2 -cdfq "$i" | $grep $opt "$pat" - r=$? - else -- j=${i//\\/\\\\} -- j=${j//|/\\|} -- j=${j//&/\\&} -- j=`printf "%s" "$j" | tr '\n' ' '` -+ # the backslashes here are doubled up as we have to escape each one for the -+ # shell and then escape each one for the sed expression -+ j=`printf "%s" "${i}" | sed -e 's:\\\\:\\\\\\\\:g' -e 's:[|]:\\\\|:g' -e 's:[&]:\\\\&:g' | tr '\n' ' '` - bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|" - r=$? - fi diff --git a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch deleted file mode 100644 index 04bd0d9abda7..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -18,10 +18,9 @@ - CC=gcc - AR=ar - RANLIB=ranlib --LDFLAGS= - - BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) -+CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS) - - # Where you want it installed when you do 'make install' - PREFIX=/usr/local ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -24,7 +24,7 @@ - SHELL=/bin/sh - CC=gcc - BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS) - - OBJS= blocksort.o \ - huffman.o \ diff --git a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch deleted file mode 100644 index deaa981adccb..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentoo.org/172986 - ---- a/Makefile -+++ b/Makefile -@@ -85,4 +85,7 @@ - cp -f bzip2.1 $(PREFIX)/share/man/man1 - chmod a+r $(PREFIX)/share/man/man1/bzip2.1 -+ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1 -+ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzcat.1 -+ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1 - cp -f bzlib.h $(PREFIX)/include - chmod a+r $(PREFIX)/include/bzlib.h diff --git a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch deleted file mode 100644 index b031c808fef3..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Backport -https://bugzilla.suse.com/attachment.cgi?id=681334 - -CVE: CVE-2016-3189 -Signed-off-by: Armin Kuster - -Index: bzip2-1.0.6/bzip2recover.c -=================================================================== ---- a/bzip2recover.c -+++ b/bzip2recover.c -@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) - bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); - bsPutUInt32 ( bsWr, blockCRC ); - bsClose ( bsWr ); -+ outFile = NULL; - } - if (wrBlock >= rbCtr) break; - wrBlock++; diff --git a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch deleted file mode 100644 index 51469ca4c96e..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch +++ /dev/null @@ -1,27 +0,0 @@ -make it build for mingw targets - -https://bugs.gentoo.org/393573 - ---- a/bzip2.c -+++ b/bzip2.c -@@ -129,7 +129,7 @@ - #if BZ_LCCWIN32 - # include - # include --# include -+# include - - # define NORETURN /**/ - # define PATH_SEP '\\' ---- a/bzlib.h -+++ b/bzlib.h -@@ -81,6 +81,9 @@ typedef - /* windows.h define small to char */ - # undef small - # endif -+# ifndef WINAPI -+# define WINAPI -+# endif - # ifdef BZ_EXPORT - # define BZ_API(func) WINAPI func - # define BZ_EXTERN extern diff --git a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch deleted file mode 100644 index 806339ebb6b4..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -53,7 +53,6 @@ libbz2.a: $(OBJS) - - check: test - test: bzip2 -- @cat words1 - ./bzip2 -1 < sample1.ref > sample1.rb2 - ./bzip2 -2 < sample2.ref > sample2.rb2 - ./bzip2 -3 < sample3.ref > sample3.rb2 -@@ -66,7 +65,6 @@ test: bzip2 - cmp sample1.tst sample1.ref - cmp sample2.tst sample2.ref - cmp sample3.tst sample3.ref -- @cat words3 - - install: bzip2 bzip2recover - if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi -@@ -115,25 +113,8 @@ clean: - sample1.rb2 sample2.rb2 sample3.rb2 \ - sample1.tst sample2.tst sample3.tst - --blocksort.o: blocksort.c -- @cat words0 -- $(CC) $(CFLAGS) -c blocksort.c --huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c --crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c --randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c --compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c --decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c --bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c --bzip2.o: bzip2.c -- $(CC) $(CFLAGS) -c bzip2.c --bzip2recover.o: bzip2recover.c -- $(CC) $(CFLAGS) -c bzip2recover.c -+%.o: %.c -+ $(CC) $(CFLAGS) -c $< - - - distclean: clean ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -36,9 +36,7 @@ OBJS= blocksort.o \ - - all: $(OBJS) - $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) -- $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 -- rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.6 libbz2.so.1.0 -+ ln -sf libbz2.so.1.0.6 libbz2.so.1.0 - - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared -@@ -43,17 +43,5 @@ all: $(OBJS) - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared - --blocksort.o: blocksort.c -- $(CC) $(CFLAGS) -c blocksort.c --huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c --crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c --randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c --compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c --decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c --bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c -+%.o: %.c -+ $(CC) $(CFLAGS) -c $< diff --git a/app-arch/bzip2/files/bzip2-1.0.6-progress.patch b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch deleted file mode 100644 index 8369597714b5..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-progress.patch +++ /dev/null @@ -1,163 +0,0 @@ -Ripped from Mandrake - -http://bugs.gentoo.org/82192 - ---- a/bzip2.1 -+++ b/bzip2.1 -@@ -235,6 +235,10 @@ - Suppress non-essential warning messages. Messages pertaining to - I/O errors and other critical events will not be suppressed. - .TP -+.B \-p \-\-show\-progress -+Show percentage of input\-file done and while compressing show the percentage -+of the original file the new file is. -+.TP - .B \-v --verbose - Verbose mode -- show the compression ratio for each file processed. - Further \-v's increase the verbosity level, spewing out lots of ---- a/bzip2.c -+++ b/bzip2.c -@@ -145,6 +145,7 @@ - #include - #include - #include -+#include - #include - #include "bzlib.h" - -@@ -301,6 +302,7 @@ - Char progNameReally[FILE_NAME_LEN]; - FILE *outputHandleJustInCase; - Int32 workFactor; -+Char showProgress; - - static void panic ( Char* ) NORETURN; - static void ioError ( void ) NORETURN; -@@ -425,6 +427,12 @@ - UInt32 nbytes_in_lo32, nbytes_in_hi32; - UInt32 nbytes_out_lo32, nbytes_out_hi32; - Int32 bzerr, bzerr_dummy, ret; -+ double fileSize = 0; /* initialized to make the compiler stop crying */ -+ /* double because big files might otherwhise give -+ * overflows. not long long since not all compilers -+ * support that one -+ */ -+ time_t startTime, currentTime; - - SET_BINARY_MODE(stream); - SET_BINARY_MODE(zStream); -@@ -432,12 +440,21 @@ - if (ferror(stream)) goto errhandler_io; - if (ferror(zStream)) goto errhandler_io; - -+ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { -+ (void)fseek(stream, 0, SEEK_END); -+ fileSize = ftello(stream); -+ rewind(stream); -+ if (verbosity >= 1) -+ fprintf(stderr, "Input-file size: %ld\n", (long)fileSize); -+ } -+ - bzf = BZ2_bzWriteOpen ( &bzerr, zStream, - blockSize100k, verbosity, workFactor ); - if (bzerr != BZ_OK) goto errhandler; - - if (verbosity >= 2) fprintf ( stderr, "\n" ); - -+ time(&startTime); - while (True) { - - if (myfeof(stream)) break; -@@ -446,6 +463,22 @@ - if (nIbuf > 0) BZ2_bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf ); - if (bzerr != BZ_OK) goto errhandler; - -+ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { -+ time(¤tTime); -+ -+ if ((currentTime - startTime) > 1) { /* show progress every 2 seconds */ -+ double curInPos = ftello(stream); -+ double curOutPos = ftello(zStream); -+ -+ startTime = currentTime; -+ -+ fprintf(stderr, "%.2f%% done", (curInPos * 100.0) / fileSize); -+ if (srcMode == SM_F2F) -+ fprintf(stderr, ", new size: %.2f%%", (curOutPos * 100.0) / curInPos); -+ -+ fprintf(stderr, " \r"); -+ } -+ } - } - - BZ2_bzWriteClose64 ( &bzerr, bzf, 0, -@@ -526,6 +559,8 @@ - UChar unused[BZ_MAX_UNUSED]; - Int32 nUnused; - UChar* unusedTmp; -+ double fileSize = 0; /* initialized to make the compiler stop crying */ -+ time_t startTime, currentTime; - - nUnused = 0; - streamNo = 0; -@@ -533,9 +568,19 @@ - SET_BINARY_MODE(stream); - SET_BINARY_MODE(zStream); - -+ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { -+ off_t dummy = ftello(zStream); -+ (void)fseeko(zStream, 0, SEEK_END); -+ fileSize = ftello(zStream); -+ (void)fseeko(zStream, dummy, SEEK_SET); -+ if (verbosity >= 1) -+ fprintf(stderr, "Input-file size: %ld\n", (long)fileSize); -+ } -+ - if (ferror(stream)) goto errhandler_io; - if (ferror(zStream)) goto errhandler_io; - -+ time(&startTime); - while (True) { - - bzf = BZ2_bzReadOpen ( -@@ -551,6 +596,16 @@ - if ((bzerr == BZ_OK || bzerr == BZ_STREAM_END) && nread > 0) - fwrite ( obuf, sizeof(UChar), nread, stream ); - if (ferror(stream)) goto errhandler_io; -+ -+ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { -+ time(¤tTime); -+ if ((currentTime - startTime) >= 2) { -+ double curInPos = ftello(zStream); -+ startTime = currentTime; -+ -+ fprintf(stderr, "%.2f%% done\r", (curInPos * 100.0) / fileSize); -+ } -+ } - } - if (bzerr != BZ_STREAM_END) goto errhandler; - -@@ -1872,6 +1927,7 @@ - deleteOutputOnInterrupt = False; - exitValue = 0; - i = j = 0; /* avoid bogus warning from egcs-1.1.X */ -+ showProgress = False; - - /*-- Set up signal handlers for mem access errors --*/ - signal (SIGSEGV, mySIGSEGVorSIGBUScatcher); -@@ -1949,6 +2005,7 @@ - case 'k': keepInputFiles = True; break; - case 's': smallMode = True; break; - case 'q': noisy = False; break; -+ case 'p': showProgress = True; break; - case '1': blockSize100k = 1; break; - case '2': blockSize100k = 2; break; - case '3': blockSize100k = 3; break; -@@ -1985,6 +2042,7 @@ - if (ISFLAG("--keep")) keepInputFiles = True; else - if (ISFLAG("--small")) smallMode = True; else - if (ISFLAG("--quiet")) noisy = False; else -+ if (ISFLAG("--show-progress")) showProgress = True; else - if (ISFLAG("--version")) license(); else - if (ISFLAG("--license")) license(); else - if (ISFLAG("--exponential")) workFactor = 1; else diff --git a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch deleted file mode 100644 index 52ea791ce34a..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -35,8 +35,8 @@ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 -+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 - diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml deleted file mode 100644 index 83d6d32d00a6..000000000000 --- a/app-arch/bzip2/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - base-system@gentoo.org - Gentoo Base System - - - cpe:/a:bzip:bzip2 - - -- cgit v1.2.3