Wed Jan 22 22:53:32 UTC 202020200122225332

a/kernel-firmware-20200122_1eb2408-noarch-1.txz:  Upgraded.
a/pciutils-3.6.3-x86_64-1.txz:  Upgraded.
a/pkgtools-15.0-noarch-30.txz:  Rebuilt.
  removepkg: prevent upgradepkg noise when a directory turns into a symlink.
  setup.vi-ex: don't make symlinks if the targets don't exist.
d/cmake-3.16.3-x86_64-1.txz:  Upgraded.
d/distcc-3.3.3-x86_64-3.txz:  Rebuilt.
  Move symlink tree into /usr/lib/distcc/, and make a link in /usr/lib64/ if
  needed. Seems like this is how everyone else sets it up. Thanks to hpfeil.
  Recompiled against krb5-1.17.1 (--with-auth).
d/parallel-20200122-noarch-1.txz:  Upgraded.
l/python-urllib3-1.25.8-x86_64-1.txz:  Upgraded.
n/bind-9.14.10-x86_64-1.txz:  Upgraded.
  This is a bugfix release:
  With some libmaxminddb versions, named could erroneously match an IP address
  not belonging to any subnet defined in a given GeoIP2 database to one of the
  existing entries in that database. [GL #1552]
  Fix line spacing in `rndc secroots`. Thanks to Tony Finch. [GL #2478]
  Recompiled against krb5-1.17.1 (--with-gssapi).
n/dhcp-4.4.2-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.19-x86_64-1.txz:  Upgraded.
n/php-7.4.2-x86_64-2.txz:  Rebuilt.
  Patched for c-client library API change. Thanks to ecd102.
  Recompiled against krb5-1.17.1 (--with-kerberos).

11 files changed, 158 insertions, 29 deletions

diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index 8c7d9b60a..f0bf5c780 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:-29}
+BUILD=${BUILD:-30}
 
 # 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/removepkg b/source/a/pkgtools/scripts/removepkg
index b033eebf2..d94031dc8 100644
--- a/source/a/pkgtools/scripts/removepkg
+++ b/source/a/pkgtools/scripts/removepkg
@@ -276,7 +276,7 @@ delete_dirs() {
     if [ ! "$WARN" = "true" ]; then
       if [ $(ls -a "$ROOT/$DIR" | wc -l) -eq 2 ]; then
         ! [ $TERSE ] && echo "  --> Deleting empty directory $ROOT/$DIR"
-        rmdir "$ROOT/$DIR"
+        rmdir "$ROOT/$DIR" 2> /dev/null # Using 2> /dev/null to prevent noise from upgradepkg when a directory changes to a symlink.
       else
         ! [ $TERSE ] && echo "WARNING: Unique directory $ROOT/$DIR contains new files"
       fi
diff --git a/source/a/pkgtools/scripts/setup.vi-ex b/source/a/pkgtools/scripts/setup.vi-ex
index f58c15e0c..f79ad91ee 100644
--- a/source/a/pkgtools/scripts/setup.vi-ex
+++ b/source/a/pkgtools/scripts/setup.vi-ex
@@ -11,7 +11,7 @@ as it is lightweight and supports UTF8. You may choose a different default \
 if you prefer, but please note that elvis does not support UTF8." 14 76 3 \
 "elvis" "Slackware's traditional ex/vi, no UTF8 support" \
 "nvi" "Classic BSD ex/vi, supports UTF8" \
-"vim" "VI Improved - top rated ex/vi clone, supports UTF8" \
+"vim" "Vi IMproved - top rated ex/vi clone, supports UTF8" \
 2> $TMP/exvitype
 if [ ! $? = 0 ]; then
  rm -f $TMP/exvitype
@@ -22,10 +22,29 @@ if [ -f $TMP/exvitype ]; then
 else
  exit 0
 fi
+# Only make the symlinks if the targets actually exist.
 if [ "$DEFAULT_VI" = "elvis" ]; then
-  ( cd $T_PX/usr/bin ; rm -f ex vi ; ln -sf elvis ex ; ln -sf elvis vi )
+  ( cd $T_PX/usr/bin
+    if [ -e elvis ]; then
+      rm -f ex vi
+      ln -sf elvis ex
+      ln -sf elvis vi
+    fi
+  )
 elif [ "$DEFAULT_VI" = "nvi" ]; then
-  ( cd $T_PX/usr/bin ; rm -f ex vi ; ln -sf nex ex ; ln -sf nvi vi )
+  ( cd $T_PX/usr/bin
+    if [ -e nex -a -e nvi ]; then
+      rm -f ex vi
+      ln -sf nex ex
+      ln -sf nvi vi
+    fi
+  )
 elif [ "$DEFAULT_VI" = "vim" ]; then
-  ( cd $T_PX/usr/bin ; rm -f ex vi ; ln -sf vim ex ; ln -sf vim vi )
+  ( cd $T_PX/usr/bin
+    if [ -e vim ]; then
+      rm -f ex vi
+      ln -sf vim ex
+      ln -sf vim vi
+    fi
+  )
 fi
diff --git a/source/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild
index 454eeb835..4be74e109 100755
--- a/source/d/distcc/distcc.SlackBuild
+++ b/source/d/distcc/distcc.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=distcc
 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
@@ -77,14 +77,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Make sure we change code/docs to use lib64 if needed:
-if [ ! "$LIBDIRSUFFIX" = "" ]; then
-  grep -l -r usr/lib/distcc | while read file ; do
-    sed -i "s|usr/lib/distcc|usr/lib${LIBDIRSUFFIX}/distcc|g" $file
-  done
-fi
-sed -i "s|usr/lib/gcc|usr/lib${LIBDIRSUFFIX}/gcc|g" update-distcc-symlinks.py
-
 if [ ! -r configure ]; then
   ./autogen.sh
 fi
@@ -95,6 +87,7 @@ fi
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --with-gtk \
+  --with-auth \
   --without-gnome \
   --without-avahi \
   --disable-Werror \
@@ -103,10 +96,10 @@ fi
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG docdir=/usr/doc/distcc-$VERSION || exit 1
 
-# Make a masquarade directory in /usr/lib${LIBDIRSUFFIX}:
+# Make a masquarade directory in /usr/lib/distcc:
 GCCVER=$(gcc -dumpversion)
-mkdir -p $PKG//usr/lib${LIBDIRSUFFIX}/distcc
-( cd $PKG//usr/lib${LIBDIRSUFFIX}/distcc 
+mkdir -p $PKG//usr/lib/distcc
+( cd $PKG//usr/lib/distcc 
   ln -sf ../../bin/distcc c++
   ln -sf ../../bin/distcc c89
   ln -sf ../../bin/distcc c99
@@ -121,6 +114,14 @@ mkdir -p $PKG//usr/lib${LIBDIRSUFFIX}/distcc
   ln -sf ../../bin/distcc $ARCH-slackware-linux-gcc-$GCCVER
 )
 
+# If needed, make a symlink from /usr/lib${LIBDIRSUFFIX}/distcc -> /usr/lib/distcc:
+if [ ! "$LIBDIRSUFFIX" = "" ]; then
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+  ( cd $PKG/usr/lib${LIBDIRSUFFIX}
+    ln -sf ../lib/distcc .
+  )
+fi
+
 # pkgdocdir=/usr/doc/distcc-$VERSION
 mkdir -p $PKG/usr/share/applications
 ( cd $PKG/usr/share/applications
@@ -154,4 +155,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 # Build the package:
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/distcc-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/python-urllib3/python-urllib3.SlackBuild b/source/l/python-urllib3/python-urllib3.SlackBuild
index c1673bd83..52d338723 100755
--- a/source/l/python-urllib3/python-urllib3.SlackBuild
+++ b/source/l/python-urllib3/python-urllib3.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=python-urllib3
 VERSION=${VERSION:-$(echo urllib3-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 SRCNAM=urllib3
 
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index eccd97507..118c8068f 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019, 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=bind
-VERSION=${VERSION:-9.14.9}
+VERSION=${VERSION:-9.14.10}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -75,6 +75,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
+# Detect krb5:
+if ls /lib*/libgssapi_krb5* 1> /dev/null 2> /dev/null ; then
+  GSSAPI=" --with-gssapi "
+else
+  GSSAPI=" "
+fi
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -87,8 +94,8 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --enable-shared \
   --disable-static \
-  --enable-filter-aaaa \
   --with-openssl=/usr \
+  $GSSAPI \
   --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
diff --git a/source/n/dhcp/dhcp.SlackBuild b/source/n/dhcp/dhcp.SlackBuild
index 398a967f7..54f44fb5d 100755
--- a/source/n/dhcp/dhcp.SlackBuild
+++ b/source/n/dhcp/dhcp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ PKGNAM=dhcp
 # Leave this one .gz as other compressors do not help much and we can keep
 # the original upstream .asc
 VERSION=${VERSION:-$(basename $(echo $PKGNAM-*.tar.gz | cut -f 2- -d -) .tar.gz)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 PKG_VERSION=$(echo $VERSION | tr - _)
 
diff --git a/source/n/dhcp/dhcp.url b/source/n/dhcp/dhcp.url
new file mode 100644
index 000000000..5f7e5e1e3
--- /dev/null
+++ b/source/n/dhcp/dhcp.url
@@ -0,0 +1 @@
+ftp://ftp.isc.org:/isc/dhcp
diff --git a/source/n/p11-kit/p11-kit.SlackBuild b/source/n/p11-kit/p11-kit.SlackBuild
index cfd002ae0..d07499414 100755
--- a/source/n/p11-kit/p11-kit.SlackBuild
+++ b/source/n/p11-kit/p11-kit.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=p11-kit
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index e61f021e4..b46f94290 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -3,7 +3,7 @@
 # Build and package mod_php on Slackware.
 # by:  David Cantrell <david@slackware.com>
 # Modified for PHP 4-5 by volkerdi@slackware.com
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2019  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2019, 2020  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=php
 VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 ALPINE=2.22
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -75,6 +75,19 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Look for Kerberos on the machine and in any precompiled c-client.a:
+if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then
+  # Remove the c-client library if it doesn't contain Kerberos support:
+  if ! grep -q krb5_ /usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}/c-client.a 2> /dev/null ; then
+    rm -rf /usr/local/lib${LIBDIRSUFFIX}/c-client
+  fi
+else
+  # Remove the c-client library if it contains Kerberos support:
+  if grep -q krb5_ /usr/local/lib${LIBDIRSUFFIX}/c-client/lib${LIBDIRSUFFIX}/c-client.a 2> /dev/null ; then
+    rm -rf /usr/local/lib${LIBDIRSUFFIX}/c-client
+  fi
+fi
+
 # we need to compile alpine to get c-client.a for IMAP support:
 IMAPLIBDIR=/usr/local/lib${LIBDIRSUFFIX}/c-client
 if [ -r $IMAPLIBDIR/lib${LIBDIRSUFFIX}/c-client.a ]; then
@@ -92,6 +105,13 @@ else
   )
 fi
 
+# Set Kerberos build option:
+if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then
+  KRB5_OPTION="--with-kerberos"
+else
+  unset KRB5_OPTION
+fi
+
 mkdir -p $PKG/etc/httpd
 mkdir -p $PKG/etc/php.d
 # A trick from DaMouse to enable building php into $PKG.
@@ -132,6 +152,9 @@ zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/php.ini-development.diff.gz | patch -p1 --verbose php.ini-production || exit 1
 zcat $CWD/php-fpm.conf.diff.gz | patch -p1 --verbose || exit 1
 
+# Fix for imap API change:
+zcat $CWD/php.imap.api.diff.gz | patch -p1 --verbose || exit 1
+
 # Install the build folder into /usr/lib$LIBDIRSUFFIX/php/build
 # and adapt phpize accordingly:
 sed -i "s|build$|php/build|" scripts/Makefile.frag
@@ -177,6 +200,7 @@ CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
   --enable-filter \
   --disable-debug \
   --with-openssl=shared \
+  $KRB5_OPTION \
   --with-external-pcre \
   --with-zlib=shared,/usr \
   --enable-bcmath=shared \
diff --git a/source/n/php/php.imap.api.diff b/source/n/php/php.imap.api.diff
new file mode 100644
index 000000000..836375205
--- /dev/null
+++ b/source/n/php/php.imap.api.diff
@@ -0,0 +1,78 @@
+--- ./configure.orig	2020-01-21 05:35:20.000000000 -0600
++++ ./configure	2020-01-22 16:13:05.664626321 -0600
+@@ -39925,6 +39925,7 @@
+     PHP_IMAP_EXPORT void mm_nocritical(void){}
+     PHP_IMAP_EXPORT void mm_notify(void){}
+     PHP_IMAP_EXPORT void mm_login(void){}
++    PHP_IMAP_EXPORT void mm_login_method(void){}
+     PHP_IMAP_EXPORT void mm_diskerror(void){}
+     PHP_IMAP_EXPORT void mm_status(void){}
+     PHP_IMAP_EXPORT void mm_lsub(void){}
+@@ -39992,6 +39993,7 @@
+     PHP_IMAP_EXPORT void mm_nocritical(void){}
+     PHP_IMAP_EXPORT void mm_notify(void){}
+     PHP_IMAP_EXPORT void mm_login(void){}
++    PHP_IMAP_EXPORT void mm_login_method(void){}
+     PHP_IMAP_EXPORT void mm_diskerror(void){}
+     PHP_IMAP_EXPORT void mm_status(void){}
+     PHP_IMAP_EXPORT void mm_lsub(void){}
+@@ -40059,6 +40061,7 @@
+       PHP_IMAP_EXPORT void mm_nocritical(void){}
+       PHP_IMAP_EXPORT void mm_notify(void){}
+       PHP_IMAP_EXPORT void mm_login(void){}
++      PHP_IMAP_EXPORT void mm_login_method(void){}
+       PHP_IMAP_EXPORT void mm_diskerror(void){}
+       PHP_IMAP_EXPORT void mm_status(void){}
+       PHP_IMAP_EXPORT void mm_lsub(void){}
+@@ -40133,6 +40136,7 @@
+     PHP_IMAP_EXPORT void mm_nocritical(void){}
+     PHP_IMAP_EXPORT void mm_notify(void){}
+     PHP_IMAP_EXPORT void mm_login(void){}
++    PHP_IMAP_EXPORT void mm_login_method(void){}
+     PHP_IMAP_EXPORT void mm_diskerror(void){}
+     PHP_IMAP_EXPORT void mm_status(void){}
+     PHP_IMAP_EXPORT void mm_lsub(void){}
+--- ./ext/imap/config.m4.orig	2020-01-21 05:35:24.000000000 -0600
++++ ./ext/imap/config.m4	2020-01-22 16:13:05.665626321 -0600
+@@ -34,6 +34,7 @@
+     PHP_IMAP_EXPORT void mm_nocritical(void){}
+     PHP_IMAP_EXPORT void mm_notify(void){}
+     PHP_IMAP_EXPORT void mm_login(void){}
++    PHP_IMAP_EXPORT void mm_login_method(void){}
+     PHP_IMAP_EXPORT void mm_diskerror(void){}
+     PHP_IMAP_EXPORT void mm_status(void){}
+     PHP_IMAP_EXPORT void mm_lsub(void){}
+@@ -262,6 +263,7 @@
+       PHP_IMAP_EXPORT void mm_nocritical(void){}
+       PHP_IMAP_EXPORT void mm_notify(void){}
+       PHP_IMAP_EXPORT void mm_login(void){}
++      PHP_IMAP_EXPORT void mm_login_method(void){}
+       PHP_IMAP_EXPORT void mm_diskerror(void){}
+       PHP_IMAP_EXPORT void mm_status(void){}
+       PHP_IMAP_EXPORT void mm_lsub(void){}
+--- ./ext/imap/php_imap.c.orig	2020-01-21 05:35:24.000000000 -0600
++++ ./ext/imap/php_imap.c	2020-01-22 16:15:25.545614746 -0600
+@@ -5081,7 +5081,7 @@
+ 	   php debugger? */
+ }
+ 
+-PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial)
++PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char **pwd, long trial)
+ {
+ 
+ 	if (*mb->user) {
+@@ -5089,7 +5089,13 @@
+ 	} else {
+ 		strlcpy (user, IMAPG(imap_user), MAILTMPLEN);
+ 	}
+-	strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN);
++	*pwd = cpystr(IMAPG(imap_password));	/* alpine-2.22 c-client.a */
++}
++
++/* alpine-2.22 c-client.a workaround */
++PHP_IMAP_EXPORT void mm_login_method(NETMBX *mb, char *user, void *pwd, long trial, char *method)
++{
++   pwd = NULL;
+ }
+ 
+ PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream)