Mercurial > vanilla
changeset 577:137f5b5c5ce3
compression/bzip2: rename from lib/bzip2
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 08 Jul 2019 20:21:00 +0200 |
parents | 9eadb49b7fbf |
children | 1f4a109d4122 |
files | compression/bzip2/CVE-2016-3189.patch compression/bzip2/bzip2.sh compression/unzip/unzip.sh compression/zip/zip.sh core/bzip2/CVE-2016-3189.patch core/bzip2/bzip2.sh core/libarchive/libarchive.sh dev/cmake/cmake.sh fonts/freetype/freetype.sh perl/perl/perl.sh x11/libxfont2/libxfont2.sh x11/mkfontscale/mkfontscale.sh |
diffstat | 12 files changed, 70 insertions(+), 70 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compression/bzip2/CVE-2016-3189.patch Mon Jul 08 20:21:00 2019 +0200 @@ -0,0 +1,12 @@ +diff --git a/bzip2recover.c b/bzip2recover.c +index f9de049..d159c92 100644 +--- 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++;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compression/bzip2/bzip2.sh Mon Jul 08 20:21:00 2019 +0200 @@ -0,0 +1,50 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +PKGNAME=bzip2 +PKGVERSION=1.0.6 +PKGREVISION=1 +PKGLICENSE="BSD" +PKGSUMMARY="data compression program and library" +PKGDOWNLOAD="https://downloads.sourceforge.net/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" + +: ${CC:=clang} +: ${CFLAGS:=-O2} + +if [ "$(uname -m)" = "x86_64" ]; then + CFLAGS="-fPIC $CFLAGS" +fi + +build() +{ + rm -rf $PKGNAME-$PKGVERSION + tar xvaf $PKGNAME-$PKGVERSION.tar.gz + pushd $PKGNAME-$PKGVERSION + + sed -i -e 's/$(PREFIX)/$(DESTDIR)$(PREFIX)/g' Makefile + patch -p1 < ../CVE-2016-3189.patch + make CC="$CC" CFLAGS="$CFLAGS" -f Makefile-libbz2_so all + make install DESTDIR=$DESTDIR PREFIX=/ + install -D libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.$PKGVERSION + ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so + ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%.*} + ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%%.*} + rm -f $DESTDIR/lib/libbz2.a + + popd + rm -rf $PKGNAME-$PKGVERSION +}
--- a/compression/unzip/unzip.sh Mon Jul 08 20:20:00 2019 +0200 +++ b/compression/unzip/unzip.sh Mon Jul 08 20:21:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="CUSTOM" PKGSUMMARY="utility to decompress zip files" PKGDOWNLOAD="https://downloads.sourceforge.net/infozip/${PKGNAME}60.tar.gz" -PKGDEPENDS="core/bzip2" +PKGDEPENDS="compression/bzip2" : ${CC:=clang}
--- a/compression/zip/zip.sh Mon Jul 08 20:20:00 2019 +0200 +++ b/compression/zip/zip.sh Mon Jul 08 20:21:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="CUSTOM" PKGSUMMARY="utility to compress and archive zip files" PKGDOWNLOAD="https://downloads.sourceforge.net/infozip/${PKGNAME}30.tar.gz" -PKGDEPENDS="core/bzip2" +PKGDEPENDS="compression/bzip2" : ${CC:=clang}
--- a/core/bzip2/CVE-2016-3189.patch Mon Jul 08 20:20:00 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff --git a/bzip2recover.c b/bzip2recover.c -index f9de049..d159c92 100644 ---- 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++;
--- a/core/bzip2/bzip2.sh Mon Jul 08 20:20:00 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 David Demelier <markand@malikania.fr> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# - -PKGNAME=bzip2 -PKGVERSION=1.0.6 -PKGREVISION=1 -PKGLICENSE="BSD" -PKGSUMMARY="data compression program and library" -PKGDOWNLOAD="https://downloads.sourceforge.net/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" - -: ${CC:=clang} -: ${CFLAGS:=-O2} - -if [ "$(uname -m)" = "x86_64" ]; then - CFLAGS="-fPIC $CFLAGS" -fi - -build() -{ - rm -rf $PKGNAME-$PKGVERSION - tar xvaf $PKGNAME-$PKGVERSION.tar.gz - pushd $PKGNAME-$PKGVERSION - - sed -i -e 's/$(PREFIX)/$(DESTDIR)$(PREFIX)/g' Makefile - patch -p1 < ../CVE-2016-3189.patch - make CC="$CC" CFLAGS="$CFLAGS" -f Makefile-libbz2_so all - make install DESTDIR=$DESTDIR PREFIX=/ - install -D libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.$PKGVERSION - ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so - ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%.*} - ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%%.*} - rm -f $DESTDIR/lib/libbz2.a - - popd - rm -rf $PKGNAME-$PKGVERSION -}
--- a/core/libarchive/libarchive.sh Mon Jul 08 20:20:00 2019 +0200 +++ b/core/libarchive/libarchive.sh Mon Jul 08 20:21:00 2019 +0200 @@ -49,7 +49,7 @@ fi if [ "$BZIP2" = "yes" ]; then - PKGDEPENDS="core/bzip2 $PKGDEPENDS" + PKGDEPENDS="compression/bzip2 $PKGDEPENDS" with_bzip2="--with-bz2lib" else with_bzip2="--without-bz2lib"
--- a/dev/cmake/cmake.sh Mon Jul 08 20:20:00 2019 +0200 +++ b/dev/cmake/cmake.sh Mon Jul 08 20:21:00 2019 +0200 @@ -26,7 +26,7 @@ lib/jsoncpp lib/libuv core/rhash - core/bzip2 + compression/bzip2 core/xz core/libarchive" PKGOPTIONS="QT5"
--- a/fonts/freetype/freetype.sh Mon Jul 08 20:20:00 2019 +0200 +++ b/fonts/freetype/freetype.sh Mon Jul 08 20:21:00 2019 +0200 @@ -34,7 +34,7 @@ : ${ZLIB:=yes} if [ "$BZIP2" = "yes" ]; then - PKGDEPENDS="core/bzip2 $PKGDEPENDS" + PKGDEPENDS="compression/bzip2 $PKGDEPENDS" with_bzip2="--with-bzip2" else with_bzip2="--without-bzip2"
--- a/perl/perl/perl.sh Mon Jul 08 20:20:00 2019 +0200 +++ b/perl/perl/perl.sh Mon Jul 08 20:21:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv1 CUSTOM" PKGSUMMARY="perl programming language" PKGDOWNLOAD="https://www.cpan.org/src/5.0/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="compression/zlib core/bzip2" +PKGDEPENDS="compression/zlib compression/bzip2" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxfont2/libxfont2.sh Mon Jul 08 20:20:00 2019 +0200 +++ b/x11/libxfont2/libxfont2.sh Mon Jul 08 20:21:00 2019 +0200 @@ -34,7 +34,7 @@ : ${FREETYPE:=yes} if [ "$BZIP2" = "yes" ]; then - PKGDEPENDS="core/bzip2 $PKGDEPENDS" + PKGDEPENDS="compression/bzip2 $PKGDEPENDS" with_bzip2="--with-bzip2" else with_bzip2="--without-bzip2"
--- a/x11/mkfontscale/mkfontscale.sh Mon Jul 08 20:20:00 2019 +0200 +++ b/x11/mkfontscale/mkfontscale.sh Mon Jul 08 20:21:00 2019 +0200 @@ -37,7 +37,7 @@ : ${BZIP2:=no} if [ "$BZIP2" = "yes" ]; then - PKGDEPENDS="core/bzip2 $PKGDEPENDS" + PKGDEPENDS="compression/bzip2 $PKGDEPENDS" with_bzip2="--with-bzip2" else with_bzip2="--without-bzip2"