diff options
Diffstat (limited to 'app-arch/bzip2')
-rw-r--r-- | app-arch/bzip2/Manifest | 3 | ||||
-rw-r--r-- | app-arch/bzip2/bzip2-1.0.6-r11.ebuild | 118 | ||||
-rw-r--r-- | app-arch/bzip2/bzip2-1.0.7-r1.ebuild | 115 | ||||
-rw-r--r-- | app-arch/bzip2/bzip2-1.0.8-r5.ebuild (renamed from app-arch/bzip2/bzip2-1.0.8-r1.ebuild) | 53 | ||||
-rw-r--r-- | app-arch/bzip2/bzip2-9999.ebuild | 47 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch | 21 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch | 18 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.6-mingw.patch | 27 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch | 30 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch | 79 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.6-saneso.patch | 13 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch | 24 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch | 76 | ||||
-rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.7-saneso.patch | 13 | ||||
-rw-r--r-- | app-arch/bzip2/metadata.xml | 3 |
15 files changed, 55 insertions, 585 deletions
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 697d1445ac9e..099151807c27 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -1,3 +1,2 @@ -DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 -DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 +DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild deleted file mode 100644 index b867474e5570..000000000000 --- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 usr-ldscript - -DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="https://sourceware.org/bzip2/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="BZIP2" -SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -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 - "${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch - "${FILESDIR}"/${PN}-1.0.6-nselectors-upper-bound-check.patch -) - -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/bzip2-1.0.7-r1.ebuild b/app-arch/bzip2/bzip2-1.0.7-r1.ebuild deleted file mode 100644 index 37ab7244dad5..000000000000 --- a/app-arch/bzip2/bzip2-1.0.7-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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=7 - -inherit toolchain-funcs multilib-minimal usr-ldscript - -DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="https://sourceware.org/bzip2/" -SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="BZIP2" -SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="static static-libs" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch - "${FILESDIR}"/${PN}-1.0.7-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.7-out-of-tree-build.patch -) - -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/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild index 34b92d2ea541..8b2111a2bfcb 100644 --- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild +++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly @@ -6,17 +6,26 @@ EAPI=7 -inherit toolchain-funcs multilib-minimal usr-ldscript +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bzip2.gpg +inherit toolchain-funcs multilib multilib-minimal verify-sig DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" HOMEPAGE="https://sourceware.org/bzip2/" SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz" +SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )" LICENSE="BZIP2" SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos" IUSE="static static-libs" +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-bzip2 ) +" +PDEPEND=" + app-alternatives/bzip2 +" + PATCHES=( "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch "${FILESDIR}"/${PN}-1.0.8-saneso.patch @@ -59,6 +68,11 @@ multilib_src_compile() { bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" } +multilib_src_test() { + cp "${S}"/sample* "${BUILD_DIR}" || die + bemake -f "${S}"/Makefile check +} + multilib_src_install() { into /usr @@ -72,21 +86,12 @@ multilib_src_install() { dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} done - # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. - # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. - # OK to remove one year after 2020-04-11. - if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then - dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0" - fi - use static-libs && dolib.a libbz2.a if multilib_is_native_abi ; then - gen_usr_ldscript -a bz2 - - dobin bzip2recover + dobin bzip2recover$(get_exeext) into / - dobin bzip2 + newbin bzip2$(get_exeext) bzip2-reference$(get_exeext) fi } @@ -97,7 +102,8 @@ multilib_src_install_all() { doins bzlib.h into /usr dobin bz{diff,grep,more} - doman *.1 + doman bz{diff,grep,more}.1 + newman bzip2.1 bzip2-reference.1 dosym bzdiff /usr/bin/bzcmp dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 @@ -105,18 +111,23 @@ multilib_src_install_all() { dosym bzmore /usr/bin/bzless dosym bzmore.1 /usr/share/man/man1/bzless.1 + dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.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 +pkg_postinst() { + # ensure to preserve the symlinks before app-alternatives/bzip2 + # is installed + local x + for x in bzip2 bunzip2 bzcat; do + if [[ ! -h ${EROOT}/bin/${x} ]]; then + ln -s bzip2-reference$(get_exeext) "${EROOT}/bin/${x}$(get_exeext)" || die + fi + done } diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild index 579f0b8f44dd..e8b4774ac56e 100644 --- a/app-arch/bzip2/bzip2-9999.ebuild +++ b/app-arch/bzip2/bzip2-9999.ebuild @@ -1,24 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit meson multilib-minimal usr-ldscript +inherit meson-multilib usr-ldscript DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="https://gitlab.com/federicomenaquintero/bzip2" -if [[ "${PV}" == 9999 ]] ; then +HOMEPAGE="https://gitlab.com/bzip2/bzip2" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/bzip2/bzip2" inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git" else - SRC_URI="" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" fi + LICENSE="BZIP2" SLOT="0/1" # subslot = SONAME IUSE="static-libs" +PDEPEND=" + app-alternatives/bzip2 +" + multilib_src_configure() { local emesonargs=( -Ddefault_library=$(usex static-libs both shared) @@ -29,32 +33,22 @@ multilib_src_configure() { meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - multilib_src_install() { meson_src_install - # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. - # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. - # OK to remove one year after 2020-04-11. - if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then - dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0" - fi - if multilib_is_native_abi ; then gen_usr_ldscript -a bz2 - - dodir /bin - mv "${ED}"/usr/bin/bzip2 "${ED}"/bin || die fi } multilib_src_install_all() { - # move "important" bzip2 binaries to /bin and use the shared libbz2.so - dosym bzip2 /bin/bzcat - dosym bzip2 /bin/bunzip2 + dodir /bin + mv "${ED}"/usr/bin/bzip2 "${ED}"/bin/bzip2-reference || die + mv "${ED}"/usr/share/man/man1/bzip2{,-reference}.1 || die + + # moved to app-alternatives/bzip2 + rm "${ED}"/usr/bin/{bzcat,bunzip2} || die + rm "${ED}"/usr/share/man/man1/{bzcat,bunzip2.1} || die dosym bzdiff /usr/bin/bzcmp dosym bzmore /usr/bin/bzless @@ -63,8 +57,7 @@ multilib_src_install_all() { dosym bzgrep /usr/bin/${x} done - dosym bzip2.1 /usr/share/man/man1/bzip2recover.1 + dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1 - local DOCS=( AUTHORS NEWS{,-pre-1.0.7} README.md ) einstalldocs } 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.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 <akuster@mvista.com> - -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 <io.h> - # include <fcntl.h> --# include <sys\stat.h> -+# include <sys/stat.h> - - # 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-nselectors-upper-bound-check.patch b/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch deleted file mode 100644 index a7731f7de8f7..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 13ca8fee0c897121ae79ae644a212418398dfea7 Mon Sep 17 00:00:00 2001 -From: Amin Hassani <ahassani@chromium.org> -Date: Fri, 8 Mar 2019 09:58:20 -0800 -Subject: [PATCH] Check for upper bounds of nselectors. - -Currently there is no check for the upper bounds of the -nselectors. Hence, a corrupt input can cause a segfault. - -This issue was discovered by one of our fuzzers. The actual error was: - -../bzip2-1.0.6/decompress.c:299:10: runtime error: index 18002 out of bounds for type 'UChar [18002]' ---- - decompress.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/decompress.c b/decompress.c -index 311f566..391552d 100644 ---- a/decompress.c -+++ b/decompress.c -@@ -288,6 +288,7 @@ Int32 BZ2_decompress ( DState* s ) - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); - if (nSelectors < 1) RETURN(BZ_DATA_ERROR); -+ if (nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { --- -2.21.0.360.g471c308f928-goog - 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-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/files/bzip2-1.0.6-ubsan-error.patch b/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch deleted file mode 100644 index 84b811177ed5..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Manoj Gupta <manojgupta@google.com> - -Use unsigned 1 for shifting instead of signed 1. - -This fixed an issue with shift caught by undefined behavior -sanitizer in clang. -bzip2-1.0.6/blocksort.c:255:7 -runtime error: left shift of 1 by 31 places cannot be represented in type 'int' - ---- a/blocksort.c -+++ b/blocksort.c -@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap, - bhtab [ 0 .. 2+(nblock/32) ] destroyed - */ - --#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) --#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) --#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) -+#define SET_BH(zz) bhtab[(zz) >> 5] |= (1u << ((zz) & 31)) -+#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1u << ((zz) & 31)) -+#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1u << ((zz) & 31))) - #define WORD_BH(zz) bhtab[(zz) >> 5] - #define UNALIGNED_BH(zz) ((zz) & 0x01f) - diff --git a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch deleted file mode 100644 index 64cca58eac34..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- bzip2-1.0.7/Makefile -+++ bzip2-1.0.7/Makefile -@@ -54,7 +54,6 @@ - - check: test - test: bzip2 -- @cat words1 - ./bzip2 -1 < sample1.ref > sample1.rb2 - ./bzip2 -2 < sample2.ref > sample2.rb2 - ./bzip2 -3 < sample3.ref > sample3.rb2 -@@ -67,7 +66,6 @@ - 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 -@@ -113,25 +111,8 @@ - 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 ---- bzip2-1.0.7/Makefile-libbz2_so -+++ bzip2-1.0.7/Makefile-libbz2_so -@@ -36,24 +36,10 @@ - - all: $(OBJS) - $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS) -- $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 -- rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.7 libbz2.so.1.0 -+ ln -sf libbz2.so.1.0.7 libbz2.so.1.0 - - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.7 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.7-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch deleted file mode 100644 index d63226684f66..000000000000 --- a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- bzip2-1.0.7/Makefile-libbz2_so -+++ bzip2-1.0.7/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.7 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 -+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.7 libbz2.so.1.0 - diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml index 83d6d32d00a6..e3880e673f7f 100644 --- a/app-arch/bzip2/metadata.xml +++ b/app-arch/bzip2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>base-system@gentoo.org</email> @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="cpe">cpe:/a:bzip:bzip2</remote-id> + <remote-id type="gitlab">bzip2/bzip2</remote-id> </upstream> </pkgmetadata> |