diff options
Diffstat (limited to 'slackware64-current/source/a')
21 files changed, 50 insertions, 20 deletions
diff --git a/slackware64-current/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/slackware64-current/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index 055a259ac..07b3f3562 100755 --- a/slackware64-current/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/slackware64-current/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -22,7 +22,7 @@ PKGNAM=aaa_elflibs VERSION=${VERSION:-14.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -46,6 +46,10 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG +if [ -x /sbin/ldconfig ]; then + /sbin/ldconfig +fi + cd $PKG cat $CWD/symlinks-to-tracked-libs \ | grep -v "^#" | grep -v "^$" \ diff --git a/slackware64-current/source/a/aaa_elflibs/symlinks-to-tracked-libs b/slackware64-current/source/a/aaa_elflibs/symlinks-to-tracked-libs index 3879126c9..e0ac2a50a 100644 --- a/slackware64-current/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/slackware64-current/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -24,6 +24,7 @@ /usr/lib/libformw.so.5 /usr/lib/libfreetype.so.6 /usr/lib/libgdbm.so.3 +/usr/lib/libgdbm.so.4 /usr/lib/libglib-2.0.so.0 /usr/lib/libgmodule-2.0.so.0 /usr/lib/libgmp.so.10 @@ -55,6 +56,7 @@ /usr/lib/libsigsegv.so.2 /usr/lib/libslang.so.1 /usr/lib/libslang.so.2 +/usr/lib/libssh2.so.1 /usr/lib/libstdc++.so.6 /usr/lib/libtiff.so.3 /usr/lib/libtiffxx.so.3 diff --git a/slackware64-current/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/slackware64-current/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp index 3d098f4ce..1a56acce8 100644 --- a/slackware64-current/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp +++ b/slackware64-current/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp @@ -4,3 +4,5 @@ # be dropped from this package. /usr/lib/libelf.so.0 +/lib/libudev.so.0 +/lib/libgudev-1.0.so.0 diff --git a/slackware64-current/source/a/btrfs-progs/btrfs-progs-v4.2.3.tar.sign b/slackware64-current/source/a/btrfs-progs/btrfs-progs-v4.2.3.tar.sign new file mode 100644 index 000000000..02ffdd34c --- /dev/null +++ b/slackware64-current/source/a/btrfs-progs/btrfs-progs-v4.2.3.tar.sign @@ -0,0 +1 @@ +4c6896ee310749f26d2fa2582de13e521803970a diff --git a/slackware64-current/source/a/btrfs-progs/btrfs-progs-v4.2.3.tar.xz b/slackware64-current/source/a/btrfs-progs/btrfs-progs-v4.2.3.tar.xz new file mode 100644 index 000000000..77672d8ca --- /dev/null +++ b/slackware64-current/source/a/btrfs-progs/btrfs-progs-v4.2.3.tar.xz @@ -0,0 +1 @@ +f807ae696e52d8beec365bae7ad96b3556f64376 diff --git a/slackware64-current/source/a/btrfs-progs/btrfs-progs.SlackBuild b/slackware64-current/source/a/btrfs-progs/btrfs-progs.SlackBuild index 12ae1bb9e..fb901dbaf 100755 --- a/slackware64-current/source/a/btrfs-progs/btrfs-progs.SlackBuild +++ b/slackware64-current/source/a/btrfs-progs/btrfs-progs.SlackBuild @@ -41,7 +41,7 @@ VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -56,7 +56,7 @@ rm -rf $PKG mkdir -p $PKG cd $TMP -rm -rf btrfs-progs +rm -rf btrfs-progs btrfs-progs-$VERSION tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd btrfs-progs-$VERSION || cd btrfs-progs || exit 1 @@ -74,11 +74,21 @@ find . -perm 511 -exec chmod 755 {} \; find . -perm 711 -exec chmod 755 {} \; find . -perm 555 -exec chmod 755 {} \; -# Build: -make prefix=/usr bindir=/sbin $NUMJOBS || make prefix=/usr bindir=/sbin || exit 1 - -# Install: -make install prefix=/usr bindir=/sbin DESTDIR=$PKG || exit 1 +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --bindir=/sbin \ + --sysconfdir=/etc \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --build=$ARCH-slackware-linux + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 # Strip binaries: ( cd $PKG @@ -88,7 +98,7 @@ make install prefix=/usr bindir=/sbin DESTDIR=$PKG || exit 1 # Move manpages: mv $PKG/usr/share/man $PKG/usr/man -rmdir $PKG/share +rmdir $PKG/usr/share # Do not ship libraries. # If there becomes a use for these outside of btrfs-progs, let me know. diff --git a/slackware64-current/source/a/cryptsetup/cryptsetup-1.6.8.tar.sign b/slackware64-current/source/a/cryptsetup/cryptsetup-1.6.8.tar.sign new file mode 100644 index 000000000..ce889d882 --- /dev/null +++ b/slackware64-current/source/a/cryptsetup/cryptsetup-1.6.8.tar.sign @@ -0,0 +1 @@ +6a657bba34761df1b8b5aa08816e331f6d15f936 diff --git a/slackware64-current/source/a/cryptsetup/cryptsetup-1.6.8.tar.xz b/slackware64-current/source/a/cryptsetup/cryptsetup-1.6.8.tar.xz new file mode 100644 index 000000000..49d114a6d --- /dev/null +++ b/slackware64-current/source/a/cryptsetup/cryptsetup-1.6.8.tar.xz @@ -0,0 +1 @@ +fbcf5bee3396ea8004a9f08217a11cc4aea25052 diff --git a/slackware64-current/source/a/dbus/dbus-1.10.0.tar.xz b/slackware64-current/source/a/dbus/dbus-1.10.0.tar.xz new file mode 100644 index 000000000..dbd657a81 --- /dev/null +++ b/slackware64-current/source/a/dbus/dbus-1.10.0.tar.xz @@ -0,0 +1 @@ +bd318e6a69e5e5aac345f7c9b64f60338eb4968d diff --git a/slackware64-current/source/a/dbus/dbus-1.10.x-allow_root_globally.diff.gz b/slackware64-current/source/a/dbus/dbus-1.10.x-allow_root_globally.diff.gz new file mode 100644 index 000000000..168b1ee4c --- /dev/null +++ b/slackware64-current/source/a/dbus/dbus-1.10.x-allow_root_globally.diff.gz @@ -0,0 +1 @@ +959fdbfe1260d80408e022aa2e62537aa1555dc4 diff --git a/slackware64-current/source/a/dbus/dbus.SlackBuild b/slackware64-current/source/a/dbus/dbus.SlackBuild index 4acb4fe31..49a367164 100755 --- a/slackware64-current/source/a/dbus/dbus.SlackBuild +++ b/slackware64-current/source/a/dbus/dbus.SlackBuild @@ -68,7 +68,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/dbus-1.6.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/dbus-1.10.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/slackware64-current/source/a/e2fsprogs/e2fsprogs-1.42.13.tar.sign b/slackware64-current/source/a/e2fsprogs/e2fsprogs-1.42.13.tar.sign new file mode 100644 index 000000000..2e463b244 --- /dev/null +++ b/slackware64-current/source/a/e2fsprogs/e2fsprogs-1.42.13.tar.sign @@ -0,0 +1 @@ +c10ddf5031976daf2bce46d0c93921d40cda8591 diff --git a/slackware64-current/source/a/e2fsprogs/e2fsprogs-1.42.13.tar.xz b/slackware64-current/source/a/e2fsprogs/e2fsprogs-1.42.13.tar.xz new file mode 100644 index 000000000..eb947ba05 --- /dev/null +++ b/slackware64-current/source/a/e2fsprogs/e2fsprogs-1.42.13.tar.xz @@ -0,0 +1 @@ +2d008b9902a169bd6767058ba98fce334328c763 diff --git a/slackware64-current/source/a/etc/_etc.tar.gz b/slackware64-current/source/a/etc/_etc.tar.gz index f91296849..fab4a108a 100644 --- a/slackware64-current/source/a/etc/_etc.tar.gz +++ b/slackware64-current/source/a/etc/_etc.tar.gz @@ -1 +1 @@ -6cbc80252eacf320e2c3daa9ab9191cf865a9da1 +3ded6a03536eee8eece383439785a2c522843f27 diff --git a/slackware64-current/source/a/etc/etc.SlackBuild b/slackware64-current/source/a/etc/etc.SlackBuild index c02255338..1c3a1caf8 100755 --- a/slackware64-current/source/a/etc/etc.SlackBuild +++ b/slackware64-current/source/a/etc/etc.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=14.2 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/slackware64-current/source/a/hdparm/hdparm-9.48.tar.xz b/slackware64-current/source/a/hdparm/hdparm-9.48.tar.xz new file mode 100644 index 000000000..4b0d87170 --- /dev/null +++ b/slackware64-current/source/a/hdparm/hdparm-9.48.tar.xz @@ -0,0 +1 @@ +c95033daf0f4f4980e8845369d39a6c9a7ea50e4 diff --git a/slackware64-current/source/a/hdparm/hdparm.SlackBuild b/slackware64-current/source/a/hdparm/hdparm.SlackBuild index 951436d16..3f39ca278 100755 --- a/slackware64-current/source/a/hdparm/hdparm.SlackBuild +++ b/slackware64-current/source/a/hdparm/hdparm.SlackBuild @@ -27,7 +27,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; diff --git a/slackware64-current/source/a/less/less-481.tar.xz b/slackware64-current/source/a/less/less-481.tar.xz new file mode 100644 index 000000000..83ccf4fca --- /dev/null +++ b/slackware64-current/source/a/less/less-481.tar.xz @@ -0,0 +1 @@ +142661e75d6276a14c49a43b07df6560e9033ab1 diff --git a/slackware64-current/source/a/less/less.SlackBuild b/slackware64-current/source/a/less/less.SlackBuild index 49a15eed4..3e6908daf 100755 --- a/slackware64-current/source/a/less/less.SlackBuild +++ b/slackware64-current/source/a/less/less.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -36,8 +36,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then @@ -63,7 +63,9 @@ cd $TMP rm -rf less-$VERSION tar xvf $CWD/less-$VERSION.tar.?z* || exit 1 cd less-$VERSION -zcat $CWD/less.sysconfdir.diff.gz | patch -p1 --verbose || exit 1 + +# Fix path in manpage: +sed -i "s,/usr/local/etc,/etc,g" less.nro chown -R root:root . find . \ diff --git a/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild b/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild index 083e17eef..41f0d4529 100755 --- a/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild +++ b/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild @@ -29,7 +29,7 @@ PKG=$TMP/package-pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=14.2 ARCH=${ARCH:-noarch} -BUILD=1 +BUILD=2 if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source diff --git a/slackware64-current/source/a/pkgtools/scripts/installpkg b/slackware64-current/source/a/pkgtools/scripts/installpkg index 88ca204f7..8ca164eb7 100644 --- a/slackware64-current/source/a/pkgtools/scripts/installpkg +++ b/slackware64-current/source/a/pkgtools/scripts/installpkg @@ -505,7 +505,7 @@ EOF grep "^$shortname:" $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null fi echo "FILE LIST:" >> $ADM_DIR/packages/$shortname - ( cd $ROOT/ ; $packagecompression -dc | $TAR -xlUpvf - ) < $package >> $TMP/$shortname 2> /dev/null + ( cd $ROOT/ ; $packagecompression -dc | $TAR -xlUpvf - | sort ) < $package >> $TMP/$shortname 2> /dev/null if [ "$( grep '^\./' $TMP/$shortname | wc -l | tr -d ' ')" = "1" ]; then # Good. We have a package that meets the Slackware spec. cat $TMP/$shortname >> $ADM_DIR/packages/$shortname |