diff options
Diffstat (limited to 'source')
23 files changed, 97 insertions, 31 deletions
diff --git a/source/a/kmod/kmod.SlackBuild b/source/a/kmod/kmod.SlackBuild index 5898846a..4a01bd78 100755 --- a/source/a/kmod/kmod.SlackBuild +++ b/source/a/kmod/kmod.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=kmod -VERSION=${VERSION:-28} -BUILD=${BUILD:-3} +VERSION=${VERSION:-29} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild index 6e750fc3..24674094 100755 --- a/source/a/logrotate/logrotate.SlackBuild +++ b/source/a/logrotate/logrotate.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=logrotate VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index f0eca658..c34f82f5 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.0 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-40} +BUILD=${BUILD:-41} # 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 diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index e7fa21c0..ee76cf13 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1994, 1998, 2000 Patrick Volkerding, Concord, CA, USA # Copyright 2001, 2003 Slackware Linux, Inc., Concord, CA, USA -# Copyright 2007, 2009, 2011, 2017, 2018, 2019, 2020 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2009, 2011, 2017, 2018, 2019, 2020, 2021 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,6 +21,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# Thu May 20 18:55:21 UTC 2021 +# Add support for the flag ALWAYS_RUN_INSTALL_SCRIPT in doinst.sh. If it +# appears, then the install script will always be run, even in the pre-install +# pass. +# +# Wed May 19 18:11:44 UTC 2021 +# Don't run the install script if this is a pre-install pass as indicated by +# upgradepkg setting PRE_INSTALL_PASS="true". Some of the install scripts can +# take a significant amount of time to process, and there aren't any known +# cases where they actually need to be run twice. +# # Wed Apr 1 21:59:41 UTC 2020 # If the package contains /install/douninst.sh, copy the uninstall script to # $ADM_DIR/douninst.sh/$shortname and add the filename to the package list @@ -667,7 +678,20 @@ EOF ) 9> $INSTLOCKDIR/ldconfig.lock fi + # If we see ALWAYS_RUN_INSTALL_SCRIPT in the install script, then we'll + # unset PRE_INSTALL_PASS to ensure that the install script will be run even + # in a pre-install pass. We haven't found any case yet where skipping the + # install script in the pre-install pass breaks a package upgrade, but we'll + # add the ability to not skip it so there's a workaround if any corner cases + # emerge. Sorry to violate YAGNI like this. ;-) if [ -f $ROOT/$INSTDIR/doinst.sh ]; then + if grep -q ALWAYS_RUN_INSTALL_SCRIPT $ROOT/$INSTDIR/doinst.sh ; then + unset PRE_INSTALL_PASS + fi + fi + + # Run the install script if one exists and this isn't a pre-install pass: + if [ -f $ROOT/$INSTDIR/doinst.sh -a ! "$PRE_INSTALL_PASS" = "true" ]; then if [ "$MODE" = "install" ]; then echo "Executing install script for $(basename $package)." fi diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg index d71ca4b0..9ae3ce20 100644 --- a/source/a/pkgtools/scripts/upgradepkg +++ b/source/a/pkgtools/scripts/upgradepkg @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999 Patrick Volkerding, Moorhead, Minnesota, USA # Copyright 2001, 2002, 2003 Slackware Linux, Inc., Concord, California, USA -# Copyright 2009, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2015, 2021 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2015 Michal Nazarewicz <mina86@mina86.com> # All rights reserved. # @@ -22,6 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# Wed May 19 04:46:53 UTC 2021 +# export PRE_INSTALL_PASS="true" if we'll be running installpkg a second time +# for each package. Perhaps then we could skip some expensive install script +# functions until the final pass. Thanks to Stuart Winter. +# # Mon Jun 4 21:17:58 UTC 2018 # Use /var/lib/pkgtools, not /var/log. # @@ -353,7 +358,14 @@ EOF +============================================================================== EOF fi + # Next, the new package is pre-installed: + + # Signal to the install script that this is a pre-install, in case it cares: + if [ ! "$NOT_PARANOID" = "true" ]; then + export PRE_INSTALL_PASS="true" + fi + if [ "$VERBOSE" = "verbose" ]; then if ! [ $TERSE ]; then /sbin/installpkg $INCOMINGDIR/$NNAME @@ -379,6 +391,17 @@ EOF RETCODE=$? fi fi + + # At this stage, if the operator supplied --no-paranoia, the package + # installation process (as far as unpacking content and running setup scripts + # is concerned) is complete. + # By default there will be a second and final installation pass, and to avoid + # executing expensive actions (such as re-generating data files or creating + # a large number of symlinks) installpkg skips running the install script on + # that first pass. Now we'll unset the PRE_INSTALL_PASS environment variable + # so that installpkg will run the install script. + unset PRE_INSTALL_PASS + # Make sure that worked: if [ ! $RETCODE = 0 ]; then echo "ERROR: Package $INCOMINGDIR/$NNAME did not install" diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild index 30a5055d..3e9e409b 100755 --- a/source/ap/texinfo/texinfo.SlackBuild +++ b/source/ap/texinfo/texinfo.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=texinfo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild index 8091411e..19d5060b 100755 --- a/source/ap/vim/vim-gvim.SlackBuild +++ b/source/ap/vim/vim-gvim.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -34,6 +34,11 @@ VIMBRANCH=8.2 VERSION=$(echo vim-${VIMBRANCH}*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BUILD=${BUILD:-1} +# The possible settings for this are yes/no/dynamic. We've been using dynamic, +# but that's not currently compiling against perl-5.34.0. So we'll use "yes" +# until "dynamic" works again, which probably won't take long. +PERLINTERP=${PERLINTERP:-yes} + # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -87,7 +92,7 @@ CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \ --prefix=/usr \ --with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \ --with-python3-config-dir=$(python3-config --configdir) \ - --enable-perlinterp=dynamic \ + --enable-perlinterp=$PERLINTERP \ --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ --enable-rubyinterp${RUBYDYNAMIC} \ diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild index 1ef6744b..437ab495 100755 --- a/source/ap/vim/vim.SlackBuild +++ b/source/ap/vim/vim.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,6 +27,11 @@ VIMBRANCH=8.2 CTAGSVER=5.8 BUILD=${BUILD:-1} +# The possible settings for this are yes/no/dynamic. We've been using dynamic, +# but that's not currently compiling against perl-5.34.0. So we'll use "yes" +# until "dynamic" works again, which probably won't take long. +PERLINTERP=${PERLINTERP:-yes} + if [ -r vim-${VIMBRANCH}*.tar.?z ]; then # if there's a source archive already, use the version number from it: VERSION=$(echo vim-${VIMBRANCH}*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) else # need to fetch the latest source archive for this branch: @@ -123,7 +128,7 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \ --with-python3-config-dir=$(python3-config --configdir) \ - --enable-perlinterp=dynamic \ + --enable-perlinterp=$PERLINTERP \ --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ --enable-rubyinterp${RUBYDYNAMIC} \ diff --git a/source/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild index 6b7899d4..01df02a1 100755 --- a/source/d/perl/perl.SlackBuild +++ b/source/d/perl/perl.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=perl -VERSION=5.32.1 -BUILD=${BUILD:-2} +VERSION=5.34.0 +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,7 +68,7 @@ GETTEXT=1.07 # https://metacpan.org/release/TermReadKey TERMREADKEY=2.38 # https://metacpan.org/release/URI -URI=5.06 +URI=5.09 # https://metacpan.org/release/XML-Parser XMLPARSER=2.46 # https://metacpan.org/release/XML-Simple @@ -78,7 +78,7 @@ AUTHENSASL=2.16 # https://metacpan.org/release/MIME-Base64 MIMEBASE64=3.16 # https://metacpan.org/release/IO-Socket-SSL -IOSOCKETSSL=2.069 +IOSOCKETSSL=2.070 # https://metacpan.org/release/Net-SSLeay NETSSLEAY=1.90 # https://metacpan.org/release/libnet @@ -86,11 +86,11 @@ LIBNET=3.13 # https://metacpan.org/release/Parse-Yapp PARSEYAPP=1.21 # https://metacpan.org/release/Path-Tiny (freecell-solver) -PATHTINY=0.116 +PATHTINY=0.118 # https://metacpan.org/release/Template-Toolkit (freecell-solver) TEMPLATETOOLKIT=3.009 # https://metacpan.org/release/Moo (freecell-solver) -MOO=2.004004 +MOO=2.005004 # https://metacpan.org/pod/Module::Runtime (freecell-solver) MODULERUNTIME=0.016 # https://metacpan.org/pod/Sub::Quote (freecell-solver) diff --git a/source/d/perl/slack-desc b/source/d/perl/slack-desc index cd05fa75..ebbe2956 100644 --- a/source/d/perl/slack-desc +++ b/source/d/perl/slack-desc @@ -15,5 +15,5 @@ perl: information. It's also a good language for many system management perl: tasks. The language is intended to be practical (easy to use, perl: efficient, complete) rather than beautiful (tiny, elegant, minimal). perl: -perl: Homepage: http://www.perl.org +perl: Homepage: https://www.perl.org perl: diff --git a/source/d/sassc/sassc.SlackBuild b/source/d/sassc/sassc.SlackBuild index 4ef8bf23..f32a0c18 100755 --- a/source/d/sassc/sassc.SlackBuild +++ b/source/d/sassc/sassc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sassc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index 8ccc268d..a3d59afd 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=subversion VERSION=${VERSION:-$(echo subversion-*.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/l/libsass/libsass.SlackBuild b/source/l/libsass/libsass.SlackBuild index d27dadf3..b5f0ce85 100755 --- a/source/l/libsass/libsass.SlackBuild +++ b/source/l/libsass/libsass.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libsass VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index 7a8943b4..777e424b 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=epic5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} EPICVER=5 HELPFILE=current -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} ## Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible. ## Patches to fix this are welcome, otherwise we'll keep an eye on upstream. diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild index db34640d..4437ed25 100755 --- a/source/n/irssi/irssi.SlackBuild +++ b/source/n/irssi/irssi.SlackBuild @@ -28,7 +28,7 @@ PKG=$TMP/package-irssi VERSION=${VERSION:-$(echo irssi-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DIRCD=${VERSION} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libndp/libndp.SlackBuild b/source/n/libndp/libndp.SlackBuild index 89a718c9..06688174 100755 --- a/source/n/libndp/libndp.SlackBuild +++ b/source/n/libndp/libndp.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libndp # Copyright 2014 Robby Workman, Northport, Alabama, USA -# Copyright 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2015, 2016, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libndp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -77,6 +77,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/n/libndp/libndp.url b/source/n/libndp/libndp.url new file mode 100644 index 00000000..b67f7297 --- /dev/null +++ b/source/n/libndp/libndp.url @@ -0,0 +1 @@ +https://github.com/jpirko/libndp diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild index 222ab0cf..2058700b 100755 --- a/source/n/net-snmp/net-snmp.SlackBuild +++ b/source/n/net-snmp/net-snmp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=net-snmp 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 diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild index 7f8be710..e68125b8 100755 --- a/source/n/ntp/ntp.SlackBuild +++ b/source/n/ntp/ntp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ntp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/openldap/openldap.SlackBuild b/source/n/openldap/openldap.SlackBuild index 3b6171c6..4c64439c 100755 --- a/source/n/openldap/openldap.SlackBuild +++ b/source/n/openldap/openldap.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openldap 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/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index f5c37a40..b64311c5 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mesa VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DEMOVERS=${DEMOVERS:-8.4.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} BUILD_DEMOS=${BUILD_DEMOS:-YES} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild index 2a59163b..22e43886 100755 --- a/source/xap/hexchat/hexchat.SlackBuild +++ b/source/xap/hexchat/hexchat.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hexchat VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild index fa213eaf..7bc90c33 100755 --- a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild +++ b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rxvt-unicode 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 |