diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-06-28 18:44:41 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-06-29 08:59:44 +0200 |
| commit | d633088070f3d6495885767f481bea76902f67a4 (patch) | |
| tree | 37b1e5686b755799272b5b05175ab77edc435f09 /source/a | |
| parent | 690121316c23986aed1479195d7c2c033995c554 (diff) | |
| download | current-d633088070f3d6495885767f481bea76902f67a4.tar.gz | |
Fri Jun 28 18:44:41 UTC 201920190628184441
a/bzip2-1.0.7-x86_64-1.txz: Upgraded.
a/kernel-firmware-20190628_70e4394-noarch-1.txz: Upgraded.
l/libssh-0.9.0-x86_64-1.txz: Upgraded.
n/dhcpcd-7.2.3-x86_64-1.txz: Upgraded.
n/nfs-utils-2.4.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a')
| -rwxr-xr-x | source/a/bzip2/bzip2.SlackBuild | 8 | ||||
| -rw-r--r-- | source/a/bzip2/bzip2.saneso.diff | 18 | ||||
| -rw-r--r-- | source/a/bzip2/bzip2.url | 1 |
3 files changed, 14 insertions, 13 deletions
diff --git a/source/a/bzip2/bzip2.SlackBuild b/source/a/bzip2/bzip2.SlackBuild index ce0c7ea7..41953070 100755 --- a/source/a/bzip2/bzip2.SlackBuild +++ b/source/a/bzip2/bzip2.SlackBuild @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bzip2 -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -SOLIB=1.0.6 -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +SOLIB=${VERSION} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -59,7 +59,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf bzip2-$VERSION -tar xzvf $CWD/bzip2-$VERSION.tar.gz || exit 1 +tar xvf $CWD/bzip2-$VERSION.tar.?z || exit 1 cd bzip2-$VERSION || exit 1 chown -R root:root . # This should be ok, since libbz2.so.1.0 will still exist. diff --git a/source/a/bzip2/bzip2.saneso.diff b/source/a/bzip2/bzip2.saneso.diff index 4f0acc6e..aac74867 100644 --- a/source/a/bzip2/bzip2.saneso.diff +++ b/source/a/bzip2/bzip2.saneso.diff @@ -1,20 +1,20 @@ ---- ./Makefile-libbz2_so.orig 2010-09-10 18:07:52.000000000 -0500 -+++ ./Makefile-libbz2_so 2010-09-20 12:30:10.475525363 -0500 +--- ./Makefile-libbz2_so.orig 2019-06-28 13:18:39.579977418 -0500 ++++ ./Makefile-libbz2_so 2019-06-28 13:20:04.753971278 -0500 @@ -35,13 +35,13 @@ bzlib.o all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS) ++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 - rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.6 libbz2.so.1.0 +- ln -s libbz2.so.1.0.7 libbz2.so.1.0 + rm -f libbz2.so.1 -+ ln -s libbz2.so.1.0.6 libbz2.so.1 ++ ln -s libbz2.so.1.0.7 libbz2.so.1 clean: -- rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared -+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1 bzip2-shared +- rm -f $(OBJS) bzip2.o libbz2.so.1.0.7 libbz2.so.1.0 bzip2-shared ++ rm -f $(OBJS) bzip2.o libbz2.so.1.0.7 libbz2.so.1 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c diff --git a/source/a/bzip2/bzip2.url b/source/a/bzip2/bzip2.url new file mode 100644 index 00000000..6eea1f66 --- /dev/null +++ b/source/a/bzip2/bzip2.url @@ -0,0 +1 @@ +ftp://sourceware.org/pub/bzip2/ |