diff options
Diffstat (limited to 'source')
23 files changed, 184 insertions, 42 deletions
diff --git a/source/a/libcgroup/libcgroup.SlackBuild b/source/a/libcgroup/libcgroup.SlackBuild index e5ff9b4cc..32d00ea93 100755 --- a/source/a/libcgroup/libcgroup.SlackBuild +++ b/source/a/libcgroup/libcgroup.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcgroup VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -82,7 +82,7 @@ zcat $CWD/libcgroup.loop.diff.gz | patch -p1 --verbose || exit 1 # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then - PAM_OPTIONS="--enable-pam --enable-pam-module-dir=/lib/security" + PAM_OPTIONS="--enable-pam --enable-pam-module-dir=/lib${LIBDIRSUFFIX}/security" unset SHADOW_OPTIONS else unset PAM_OPTIONS @@ -118,6 +118,9 @@ make install DESTDIR=$PKG || exit 1 # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# The ones in /lib${LIBDIRSUFFIX}/security can also go: +rm -f $PKG/lib${LIBDIRSUFFIX}/security/*.la + # This directory is needed by cgrulesengd: mkdir -p $PKG/etc/cgconfig.d diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index a16f6cfdf..9aefaca01 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2011, 2012, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mariadb VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # To reduce the package size, the embedded server may be omitted. Currently # only amarok uses this. To build without embedded support, set this to NO. @@ -181,6 +181,15 @@ if [ "$KEEPTESTS" = "NO" ]; then rm -rf $PKG/usr/mysql-test fi +# Locate PAM module(s) correctly: +if [ -d $PKG/lib/security ]; then + if [ ! "lib" = "lib${LIBDIRSUFFIX}" ]; then + mkdir -p $PKG/lib${LIBDIRSUFFIX} + mv $PKG/lib/security $PKG/lib${LIBDIRSUFFIX}/security + rmdir $PKG/lib 2> /dev/null + fi +fi + # The ./configure option to omit this has gone away, so we'll omit it # the old-fashioned way. It's all in the source tarball if you need it. rm -rf $PKG/usr/sql-bench diff --git a/source/d/Cython/Cython.SlackBuild b/source/d/Cython/Cython.SlackBuild index 27f269a8d..326cc7525 100755 --- a/source/d/Cython/Cython.SlackBuild +++ b/source/d/Cython/Cython.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=Cython VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild index 7b8c62ab9..a7dbeb6a6 100755 --- a/source/d/cmake/cmake.SlackBuild +++ b/source/d/cmake/cmake.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cmake VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild index 5ee6003bb..000f42f11 100755 --- a/source/d/doxygen/doxygen.SlackBuild +++ b/source/d/doxygen/doxygen.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=doxygen VERSION=${VERSION:-$(basename $(echo doxygen-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) .src)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild index 73a13404c..bb0d80524 100755 --- a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild +++ b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ConsoleKit2 VERSION=${VERSION:-1.2.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Maximum storage quota for XDG_RUNTIME_DIR: XDG_RUNTIME_QUOTA=${XDG_RUNTIME_QUOTA:-size=100M} @@ -103,7 +103,7 @@ find . \ # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then - PAM_OPTIONS="--enable-pam-module=yes --disable-libcgmanager" + PAM_OPTIONS="--enable-pam-module=yes --with-pam-module-dir=/lib${LIBDIRSUFFIX}/security --disable-libcgmanager" unset SHADOW_OPTIONS else unset PAM_OPTIONS @@ -135,6 +135,9 @@ make install DESTDIR=$PKG || exit 1 # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# The ones in /lib${LIBDIRSUFFIX}/security can also go: +rm -f $PKG/lib${LIBDIRSUFFIX}/security/*.la + # Let's not clobber config files mv $PKG/etc/ConsoleKit/seats.d/00-primary.seat \ $PKG/etc/ConsoleKit/seats.d/00-primary.seat.new diff --git a/source/l/gnome-keyring/gnome-keyring.SlackBuild b/source/l/gnome-keyring/gnome-keyring.SlackBuild index ea20ec8b1..ffda50439 100755 --- a/source/l/gnome-keyring/gnome-keyring.SlackBuild +++ b/source/l/gnome-keyring/gnome-keyring.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gnome-keyring VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -87,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-nls \ --disable-debug \ --enable-ssh-agent \ - --with-pam-dir=/lib/security \ + --with-pam-dir=/lib${LIBDIRSUFFIX}/security \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 @@ -96,6 +96,12 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# The ones in /lib${LIBDIRSUFFIX}/security can also go: +rm -f $PKG/lib${LIBDIRSUFFIX}/security/*.la + # Compress manual pages: find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do diff --git a/source/l/openal-soft/.deps b/source/l/openal-soft/.deps deleted file mode 100644 index b787fd165..000000000 --- a/source/l/openal-soft/.deps +++ /dev/null @@ -1 +0,0 @@ -SDL_sound diff --git a/source/l/openal-soft/.url b/source/l/openal-soft/.url deleted file mode 100644 index 51a72d92e..000000000 --- a/source/l/openal-soft/.url +++ /dev/null @@ -1,2 +0,0 @@ -http://kcat.strangesoft.net/openal-releases/openal-soft-1.19.1.tar.bz2 - diff --git a/source/l/openal-soft/openal-soft.url b/source/l/openal-soft/openal-soft.url new file mode 100644 index 000000000..618d53c78 --- /dev/null +++ b/source/l/openal-soft/openal-soft.url @@ -0,0 +1 @@ +https://openal-soft.org/openal-releases diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index a9a215763..0a01494c9 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=polkit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -91,7 +91,7 @@ fi # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then - PAM_OPTIONS="--with-authfw=pam --with-pam-module-dir=/lib/security" + PAM_OPTIONS="--with-authfw=pam --with-pam-module-dir=/lib${LIBDIRSUFFIX}/security" unset SHADOW_OPTIONS else unset PAM_OPTIONS diff --git a/source/l/python-future/python-future.SlackBuild b/source/l/python-future/python-future.SlackBuild new file mode 100755 index 000000000..80a1c8d47 --- /dev/null +++ b/source/l/python-future/python-future.SlackBuild @@ -0,0 +1,92 @@ +#!/bin/bash + +# Copyright 2020 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 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=python-future +SRCNAM=future +VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +# 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 + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$VERSION || 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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ + +python setup.py install --root=$PKG || exit 1 + +# Move the python2 versions: +mv $PKG/usr/bin/futurize $PKG/usr/bin/futurize2 +mv $PKG/usr/bin/pasteurize $PKG/usr/bin/pasteurize2 + +# Clear the build folder: +rm -rf build + +python3 setup.py install --root=$PKG || exit 1 + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a *.rst LICENSE* NOTICE PKG-INFO \ + $PKG/usr/doc/$PKGNAM-$VERSION +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ + +# If there's a HISTORY.rst, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r HISTORY.rst ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat HISTORY.rst | head -n 1000 > $DOCSDIR/HISTORY.rst + touch -r HISTORY.rst $DOCSDIR/HISTORY.rst +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/python-future/python-future.url b/source/l/python-future/python-future.url new file mode 100644 index 000000000..b0aec8af3 --- /dev/null +++ b/source/l/python-future/python-future.url @@ -0,0 +1 @@ +https://pypi.org/project/future/ diff --git a/source/l/python-future/slack-desc b/source/l/python-future/slack-desc new file mode 100644 index 000000000..bc547a652 --- /dev/null +++ b/source/l/python-future/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python-future: python-future (Easy, clean, reliable Python 2/3 compatibility) +python-future: +python-future: python-future allows you to use a single, clean Python 3.x-compatible +python-future: codebase to support both Python 2 and Python 3 with minimal overhead. +python-future: It provides future and past packages with backports and forward ports +python-future: of features from Python 3 and 2. It also comes with futurize and +python-future: pasteurize, customized 2to3-based scripts that help you to convert +python-future: either Py2 or Py3 code easily to support both Python 2 and 3 in a +python-future: single clean Py3-style codebase, module by module. +python-future: +python-future: Homepage: https://python-future.org diff --git a/source/l/qt5/.deps b/source/l/qt5/.deps deleted file mode 100644 index d1eaacd08..000000000 --- a/source/l/qt5/.deps +++ /dev/null @@ -1,2 +0,0 @@ -OpenAL -libxkbcommon diff --git a/source/l/qt5/.url b/source/l/qt5/.url deleted file mode 100644 index cc9f30beb..000000000 --- a/source/l/qt5/.url +++ /dev/null @@ -1 +0,0 @@ -https://download.qt.io/official_releases/qt/5.13/5.13.2/single/qt-everywhere-src-5.13.2.tar.xz diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild index 143da77fe..47b6cc513 100755 --- a/source/l/v4l-utils/v4l-utils.SlackBuild +++ b/source/l/v4l-utils/v4l-utils.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010, 2011, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=v4l-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -79,9 +79,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# qvidcap requires Qt5 - quit disabling it once we have that. -# qv4l2 requires Qt5 - quit disabling it once we have that. - # Configure: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -92,8 +89,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --disable-static \ - --disable-qvidcap \ - --disable-qv4l2 \ --build=$ARCH-slackware-linux || exit 1 # Build and install: @@ -141,4 +136,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild index 58a2c8a4e..dbf860edf 100755 --- a/source/n/cifs-utils/cifs-utils.SlackBuild +++ b/source/n/cifs-utils/cifs-utils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cifs-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -90,6 +90,13 @@ find . \ autoreconf -vif +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--enable-pam --with-pamdir=/lib${LIBDIRSUFFIX}/security" +else + PAM_OPTIONS="" +fi + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -97,6 +104,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ + $PAM_OPTIONS \ --build=$ARCH-slackware-linux || exit 1 # Build and install: diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild index c60bcad93..81a0fb70d 100755 --- a/source/n/fetchmail/fetchmail.SlackBuild +++ b/source/n/fetchmail/fetchmail.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fetchmail -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -64,14 +64,12 @@ mkdir -p $TMP $PKG cd $TMP rm -rf fetchmail-$VERSION -tar xvf $CWD/fetchmail-$VERSION.tar.xz || exit 1 +tar xvf $CWD/fetchmail-$VERSION.tar.?z || exit 1 cd fetchmail-$VERSION || exit 1 # Patch for OpenSSL 1.1.1 compatibility: zcat $CWD/fetchmail.openssl111.diff.gz | patch -p1 --verbose || exit 1 -# this is the sloppiest source tarball ever -# [NOTE: *was*... the new maintainers are much better] chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -79,12 +77,16 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +export PYTHON=python3 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ --enable-nls \ --with-ssl \ + --with-kerberos5 \ + --with-gssapi \ --program-prefix="" \ --program-suffix="" \ --build=$ARCH-slackware-linux @@ -116,4 +118,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/fetchmail-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/pinentry/pinentry.SlackBuild b/source/n/pinentry/pinentry.SlackBuild index e2bd5722b..421b3d070 100755 --- a/source/n/pinentry/pinentry.SlackBuild +++ b/source/n/pinentry/pinentry.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pinentry VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index c7e364d4f..8c09f50cf 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=samba VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -e $CWD/machine.conf ]; then . $CWD/machine.conf ] @@ -102,7 +102,7 @@ find . \ # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then - PAM_OPTIONS="--with-pam --with-pammodulesdir=/lib/security --with-system-mitkrb5 --with-experimental-mit-ad-dc" + PAM_OPTIONS="--with-pam --with-pammodulesdir=/lib${LIBDIRSUFFIX}/security --with-system-mitkrb5 --with-experimental-mit-ad-dc" unset SHADOW_OPTIONS else unset PAM_OPTIONS diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index 2e3181dd0..61b993f81 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2004-2008 Eric Hameleers, Eindhoven, NL -# Copyright 2008-2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008-2020 Patrick J. Volkerding, Sebeka, MN, USA # 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 @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wpa_supplicant VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCVERSION=$(printf $VERSION | tr _ -) @@ -103,12 +103,23 @@ make $NUMJOBS \ BINDIR=/usr/sbin \ LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1 -# Build the Qt4 GUI client +# Build the Qt5 GUI client + + + +#The following directory name is labelled qt4, but is compatible with qt5. +#pushd wpa_gui-qt4 && +#qmake wpa_gui.pro && +#make && +#popd + +pushd wpa_gui-qt4 +qmake-qt5 wpa_gui.pro CFLAGS="$SLKCFLAGS" \ make $NUMJOBS \ - wpa_gui-qt4 \ BINDIR=/usr/sbin \ LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1 +popd # Make sure man pages are built make -C doc/docbook man diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild index a6bee8ee7..a9a76b8d4 100755 --- a/source/xap/xpdf/xpdf.SlackBuild +++ b/source/xap/xpdf/xpdf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xpdf VERSION=4.02 PATCHLEVEL= -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |