From dc2a88ab5240d35a9e891c743e2a5abd4a53e864 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 13 Oct 2019 17:58:11 +0200 Subject: Update the deps - cracklib, phonon and phonon-vlc --- deps/cracklib/.url | 3 +- deps/cracklib/cracklib-words-2.9.7.bz2 | Bin 0 -> 6951761 bytes deps/cracklib/cracklib.SlackBuild | 197 ++++++++++++++++----------------- deps/phonon-vlc/.url | 2 +- deps/phonon-vlc/phonon-vlc.SlackBuild | 2 +- deps/phonon/.url | 2 +- deps/phonon/phonon.SlackBuild | 2 +- 7 files changed, 101 insertions(+), 107 deletions(-) create mode 100644 deps/cracklib/cracklib-words-2.9.7.bz2 (limited to 'deps') diff --git a/deps/cracklib/.url b/deps/cracklib/.url index ef871d8..257cdea 100644 --- a/deps/cracklib/.url +++ b/deps/cracklib/.url @@ -1 +1,2 @@ -https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-2.9.6.tar.gz +https://github.com/cracklib/cracklib/releases/download/v2.9.7/cracklib-2.9.7.tar.bz2 +https://github.com/cracklib/cracklib/releases/download/v2.9.7/cracklib-words-2.9.7.bz2 diff --git a/deps/cracklib/cracklib-words-2.9.7.bz2 b/deps/cracklib/cracklib-words-2.9.7.bz2 new file mode 100644 index 0000000..b29dbf1 Binary files /dev/null and b/deps/cracklib/cracklib-words-2.9.7.bz2 differ diff --git a/deps/cracklib/cracklib.SlackBuild b/deps/cracklib/cracklib.SlackBuild index 20fcd55..f1825a7 100755 --- a/deps/cracklib/cracklib.SlackBuild +++ b/deps/cracklib/cracklib.SlackBuild @@ -1,142 +1,135 @@ #!/bin/sh -# Copyright 2017 Eric Hameleers, Eindhoven, NL -# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010,2011 Vincent Batts, Vienna, VA, USA +# Copyright 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # -# Permission to use, copy, modify, and 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. +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ----------------------------------------------------------------------------- - +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cracklib -VERSION=${VERSION:-2.9.6} +VERSION=${VERSION:-2.9.7} BUILD=${BUILD:-1} -DICTPATH=/usr/share/cracklib/pw_dict - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; + *) export ARCH=$( uname -m ) ;; esac - export ARCH fi -case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - x86_64) SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" - ;; - armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - *) SLKCFLAGS=${SLKCFLAGS:-"O2"} - SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} - ;; -esac - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 +tar xf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 cd $PKGNAM-$VERSION || exit 1 - -# CVE-2016-6318 - avoid overflows in GECOS handling and mangling password: -cat $CWD/patches/cracklib-2.9.6-cve-2016-6318.patch \ - | patch -p2 --verbose || exit 1 - chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -[ ! -x configure ] && ./autogen.sh + -exec chmod 644 {} \+ -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --sbindir=/sbin \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --program-prefix= \ - --program-suffix= \ --disable-static \ - --without-python \ - --with-default-dict=${DICTPATH} \ - --build=$TARGET - -# Build and install: -make || exit 1 -make DESTDIR=$PKG install || exit 1 - -# Generate a dictionary from the included 'cracklib-small'; -# If you want, you can download a larger file from the project web site: -mkdir -p $PKG/usr/share/dict -ln -sf /usr/share/cracklib/cracklib-small $PKG/usr/share/dict/cracklib-small -sh util/cracklib-format dicts/cracklib-small \ - | ./util/cracklib-packer $PKG/${DICTPATH} - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS INSTALL NEWS README* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +mkdir -p $PKG/usr/share/cracklib + +# If there's a large word list in the source directory, use it. +# Otherwise go with the bundled list. +if [ -r $CWD/cracklib-words-$VERSION.bz2 ]; then + bzcat $CWD/cracklib-words-$VERSION.bz2 | gzip -c > words.gz + PATH=$(pwd)/util:$PATH \ + ./util/create-cracklib-dict \ + -o $PKG/usr/share/cracklib/pw_dict \ + dicts/cracklib-small words.gz +else + PATH=$(pwd)/util:$PATH \ + ./util/create-cracklib-dict \ + -o $PKG/usr/share/cracklib/pw_dict \ + dicts/cracklib-small fi -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +mkdir -p $PKG/var/cache/cracklib +( cd $PKG/var/cache/cracklib +ln -s /usr/share/cracklib/pw_dict.pwd cracklib_dict.pwd +ln -s /usr/share/cracklib/pw_dict.pwi cracklib_dict.pwi +) + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Add a package description: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -# Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/phonon-vlc/.url b/deps/phonon-vlc/.url index fab73be..3011dd7 100644 --- a/deps/phonon-vlc/.url +++ b/deps/phonon-vlc/.url @@ -1,2 +1,2 @@ -https://download.kde.org/stable/phonon/phonon-backend-vlc/0.11.0/phonon-backend-vlc-0.11.0.tar.xz +https://download.kde.org/stable/phonon/phonon-backend-vlc/0.11.1/phonon-backend-vlc-0.11.1.tar.xz diff --git a/deps/phonon-vlc/phonon-vlc.SlackBuild b/deps/phonon-vlc/phonon-vlc.SlackBuild index 6c84cff..4e57ed8 100755 --- a/deps/phonon-vlc/phonon-vlc.SlackBuild +++ b/deps/phonon-vlc/phonon-vlc.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=phonon-vlc SRCNAM=phonon-backend-vlc -VERSION=${VERSION:-0.11.0} +VERSION=${VERSION:-0.11.1} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/deps/phonon/.url b/deps/phonon/.url index ae5d0bf..601658e 100644 --- a/deps/phonon/.url +++ b/deps/phonon/.url @@ -1 +1 @@ -https://download.kde.org/stable/phonon/4.11.0/phonon-4.11.0.tar.xz +https://download.kde.org/stable/phonon/4.11.1/phonon-4.11.1.tar.xz diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild index 07f8f93..3a79ea5 100755 --- a/deps/phonon/phonon.SlackBuild +++ b/deps/phonon/phonon.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=phonon -VERSION=${VERSION:-4.11.0} +VERSION=${VERSION:-4.11.1} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: -- cgit v1.2.3