Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

5 files changed, 77 insertions, 154 deletions

diff --git a/source/a/util-linux/net-tools.config.h b/source/a/util-linux/net-tools.config.h
deleted file mode 100644
index e271f863f..000000000
--- a/source/a/util-linux/net-tools.config.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* config.h	Automatically generated configuration includefile
-*
-* NET-TOOLS	A collection of programs that form the base set of the
-*		NET-3 Networking Distribution for the LINUX operating
-*		system.
-*
-*		DO  NOT  EDIT  DIRECTLY
-*
-*/
-
-/* 
- * 
- * Internationalization
- * 
- * The net-tools package has currently been translated to French,
- * German and Brazilian Portugese.  Other translations are, of
- * course, welcome.  Answer `n' here if you have no support for
- * internationalization on your system.
- * 
- */
-#define I18N 1
-
-/* 
- * 
- * Protocol Families.
- * 
- */
-#define HAVE_AFUNIX 1
-#define HAVE_AFINET 1
-#define HAVE_AFINET6 1
-#define HAVE_AFIPX 1
-#define HAVE_AFATALK 1
-#define HAVE_AFAX25 1
-#define HAVE_AFNETROM 1
-#define HAVE_AFROSE 0
-#define HAVE_AFX25 1
-#define HAVE_AFECONET 0
-#define HAVE_AFDECnet 0
-#define HAVE_AFASH 0
-#define HAVE_AFBLUETOOTH 1
-
-/* 
- * 
- * Device Hardware types.
- * 
- */
-#define HAVE_HWETHER 1
-#define HAVE_HWARC 1
-#define HAVE_HWSLIP 1
-#define HAVE_HWPPP 1
-#define HAVE_HWTUNNEL 1
-#define HAVE_HWSTRIP 1
-#define HAVE_HWTR 1
-#define HAVE_HWAX25 1
-#define HAVE_HWROSE 0
-#define HAVE_HWNETROM 1
-#define HAVE_HWX25 1
-#define HAVE_HWFR 1
-#define HAVE_HWSIT 0
-#define HAVE_HWFDDI 1
-#define HAVE_HWHIPPI 1
-#define HAVE_HWASH 0
-#define HAVE_HWHDLCLAPB 0
-#define HAVE_HWIRDA 1
-#define HAVE_HWEC 0
-#define HAVE_HWEUI64 1
-#define HAVE_HWIB 1
-
-/* 
- * 
- * Other Features.
- * 
- */
-#define HAVE_FW_MASQUERADE 1
-#define HAVE_IP_TOOLS 1
-#define HAVE_MII 1
-#define HAVE_SELINUX 0
diff --git a/source/a/util-linux/slack-desc b/source/a/util-linux/slack-desc
index efa70e344..5495296e9 100644
--- a/source/a/util-linux/slack-desc
+++ b/source/a/util-linux/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
           |-----handy-ruler------------------------------------------------|
@@ -11,7 +11,7 @@ util-linux:
 util-linux: The util-linux package is a huge collection of random utilities
 util-linux: that are essential to run a Linux system.
 util-linux:
-util-linux: http://kernel.org/~kzak/util-linux/
+util-linux: https://www.kernel.org/pub/linux/utils/util-linux/
 util-linux:
 util-linux:
 util-linux:
diff --git a/source/a/util-linux/util-linux-2.27.1.tar.sign b/source/a/util-linux/util-linux-2.27.1.tar.sign
deleted file mode 100644
index 671c7f6ff..000000000
--- a/source/a/util-linux/util-linux-2.27.1.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJWN0FGAAoJEOS3HV7sOcKEwYIP/0eA52LeAeSVAb3hATWA0TMg
-N0zfKyRECDxRuwdQW3yyjtypd4Cir6QlgyBrqLyXSskVuIj0dq7S1mlI/Xa94IFU
-Fa2lmzyAcxvl33Bv/Fljh/GeVSqqmUHk8q1ecRh7DYR1Lda6xzfCFs2Dl3Q5JXK/
-k2tTgNug0+f8E6LT/5qrrXeDS+O7/hAtRqqA6yHkAHGqYV2RgBJ9NDAanaGYXDeB
-abrduP2xRIvJ9oYOrayG5WH/wAY/sKT433zx20J9ZZvtutTV4VF2ML9zfeQiYitY
-hoQOGt5tJW/CfvU2DUaBlTlrXW/MnMQE8KDWn64NbokA3HOxrW+7wJ/gJCp+7e7v
-gLELeLLTnMq3NX++SR5I2I2fvqBejYykcaOQMHi9DK+UZed/CBJKR+6SF1WKOndI
-GRYJSs9DAXL3dJCSCp6V4fqf+Lfr2Vv4z+Jo8EzIIIlfly1cZx2Blx7C0Y6CNETA
-fYPYYKW7qKHsdS5J2Axf8vNIHQsRhkpiUltjQHQ+rIAmx1hl/10a7Fd9KkqFEJV2
-R0zLPaJK8d9gEWHRdzQNozABZVeR8PV3WXuDD2XjC2T30ldlFNlbzyWhDiPf6DNk
-tIEi3f+RTTltIvCobChq+Ri2dKM0+wAV/FwwR31E/YgJIpUWfJNKRwWT8Ja887JN
-j5aNV18qjet7TUosKYqm
-=BMBT
------END PGP SIGNATURE-----
diff --git a/source/a/util-linux/util-linux-2.32.tar.sign b/source/a/util-linux/util-linux-2.32.tar.sign
new file mode 100644
index 000000000..306061c78
--- /dev/null
+++ b/source/a/util-linux/util-linux-2.32.tar.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAlqycA4ACgkQ5LcdXuw5
+woRdWRAAmnmE1HbhxMrnN1ETwGGs9mKcoNqN6lVA7E60IC1Bi1nbNM0X+m2KITUF
+gdvr/gtOOU/ynshBCJue2fXAb4Aee0obCtIPzDe420KBREHe62cTFFxWEmqdrsVq
+i7TfbpzUCg11N9D5iFcQMrgsUczkQXt2dc4Owl/T+GgbrNIOTMhj8B+JVW6Cotl1
+KiFE6XJmTv/yx69w35fiV7yaEv3rG8OzCQqIOkbqMge0ohyeTaNfJ6yrSbAI2r4K
+K/yEyTPyOh9A2CIF1G3Jzj6JZG1dz4s1xtrMm1i9sR6kVaxQc0GCOcZyJV7x91PV
+Vs1Y0g36+CxLOPMEmJchC83eMmPDZ3yn1svF4sPWq4AZgzWf5Ld8NMwhiRR/w95G
+dRN8yuf17WZKIPIjpbXWjH44KiKyP3ho+dMjQ88YDcCEzUznaxHCMEQJ8o0308Y3
+nvzCIZUeIUIC24DsSVYj4Z7tdVQEBt8rRp7LfedDa/AvFh3w+eJHAuKftQgQ/tIK
+KHmZbnqGyXzYdImyUUvJNlRV0RfwQ8ScOvo8XZhrdtL904688HkREKjDP4EQrMPi
+y7sHxIrj7+IdYH1s9ijEsp5RXCoKo2xr5Y+J1uNaLpz+8TUWgzObI0Qj/OgHcy29
+3C4CsI9n2YIjX+kboIKTS43puBD3i7uWB6VNv4RjK+Ecnbw8Lrw=
+=c0wb
+-----END PGP SIGNATURE-----
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index 4d6046024..0d6f9bf70 100755
--- a/source/a/util-linux/util-linux.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,17 @@
 
 # Slackware build script for util-linux
 
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=util-linux
 VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3  | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 ADJTIMEXVERS=1.29
 SETSERIALVERS=2.17
 ZIPTOOLVERS=1.4.0
 
-NUMJOBS=${--j8}
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -41,6 +44,14 @@ if [ -z "$ARCH" ]; then
   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
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -55,7 +66,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-util-linux
 
@@ -77,7 +87,15 @@ find . \
 # 83 back to "Linux swap":
 zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1
 
-CFLAGS="$SLKCFLAGS" \
+# This just call the configure script with $1 either being 2 for python2
+# or 3 for python3.
+#
+# The releasenotes say to use --runstatedir, but it doesn't work and the
+# configure script fails. So we'll leave things using localstatedir, but
+# check again later:
+#
+#   --runstatedir=/run
+configure_with_python(){
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -88,15 +106,15 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/util-linux-$VERSION \
   --disable-static \
   --enable-agetty \
-  --disable-eject \
   --enable-kill \
   --disable-last \
+  --enable-libmount-support-mtab \
   --enable-line \
   --enable-mesg \
   --enable-partx \
+  --enable-pg \
   --enable-raw \
   --enable-rename \
-  --enable-reset \
   --disable-login \
   --enable-schedutils \
   --enable-wall \
@@ -106,19 +124,24 @@ CFLAGS="$SLKCFLAGS" \
   --enable-libmount \
   --enable-libuuid \
   --disable-uuidd \
-  --with-python=2 \
-  --without-readline \
-  --build=$ARCH-slackware-linux \
-  || exit 1
+  --with-python=$1 \
+  --build=$ARCH-slackware-linux
+}
 
-# UNUSED, but maybe needed if we enable readline here:
-#
-# Yet another project that doesn't seem to get that -readline requires either
-# -ltermcap or -lncurses on systems that don't make assumptions...
-#sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile
+CFLAGS="$SLKCFLAGS" \
+  configure_with_python 2 || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
 
-make $NUMBJOBS || make || exit 1
-make install DESTDIR=$PKG || make install DESTDIR=$PKG
+# Build python3 bindings for libmount:
+make clean
+CFLAGS="$SLKCFLAGS" \
+  configure_with_python 3 || exit 1
+make \
+  install-pylibmountexecLTLIBRARIES \
+  install-pylibmountexecPYTHON \
+  DESTDIR=$PKG || exit 1
 
 # Remove all overlap with the shadow package, since --disable-login doesn't quite do that:
 rm $PKG/sbin/nologin $PKG/usr/man/man8/nologin.8 $PKG/sbin/sulogin $PKG/usr/man/man8/sulogin.8
@@ -161,7 +184,7 @@ cp -a ddate $PKG/usr/bin
 cat ddate.1 > $PKG/usr/man/man1/ddate.1
 chown root:root $PKG/usr/bin/ddate
 
-# Build ziptool
+# Build ziptool (install as jaztool to avoid conflict with libzip):
 cd $TMP || exit 1
 rm -rf ziptool-$ZIPTOOLVERS
 tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.xz || exit 1
@@ -172,12 +195,12 @@ cat $CWD/scsi_ioctl.h > scsi/scsi_ioctl.h
 chown -R root:root .
 make || exit 1
 strip ziptool
-cat ziptool > $PKG/sbin/ziptool
-chmod 0755 $PKG/sbin/ziptool
+cat ziptool > $PKG/sbin/jaztool
+chmod 0755 $PKG/sbin/jaztool
 mkdir -p $PKG/usr/doc/ziptool-$ZIPTOOLVERS
 cp -a README $PKG/usr/doc/ziptool-$ZIPTOOLVERS
 chmod 644 $PKG/usr/doc/ziptool-$ZIPTOOLVERS/*
-cat ziptool.1.gz > $PKG/usr/man/man1/ziptool.1.gz
+cat ziptool.1.gz > $PKG/usr/man/man1/jaztool.1.gz
 
 # Build bsdstrings
 cd $TMP || exit 1
@@ -187,34 +210,9 @@ cd bsdstrings || exit 1
 zcat $CWD/bsdstrings-util-linux_overflow.diff.gz | patch -p1 --verbose || exit 1
 make || exit 1
 strip strings
-cat strings > $PKG/usr/bin/strings
-chmod 0755 $PKG/usr/bin/strings
-cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings.1.gz
-
-# Add just the hostname utilities from net-tools, so that anyone
-# installing just the A series will not have a hostname (null):
-cd $TMP || exit 1
-rm -rf net-tools-1.60.20120726git
-tar xvf $CWD/net-tools-1.60.20120726git.tar.xz
-cd net-tools-1.60.20120726git
-zcat $CWD/net-tools.config.h.gz > config.h
-make
-make hostname
-strip hostname
-cat hostname > $PKG/bin/hostname
-chmod 755 $PKG/bin/hostname
-chown root:root $PKG/bin/hostname
-( cd $PKG/bin
-  ln -sf hostname dnsdomainname
-  ln -sf hostname nisdomainname
-  ln -sf hostname ypdomainname
-  ln -sf hostname domainname
-)
-cd man/en_US
-for page in hostname.1 dnsdomainname.1 nisdomainname.1 ypdomainname.1 \
-domainname.1 ; do
-  cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
-done
+cat strings > $PKG/usr/bin/strings-BSD
+chmod 0755 $PKG/usr/bin/strings-BSD
+cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings-BSD.1.gz
 
 # Build adjtimex
 cd $TMP || exit 1
@@ -268,7 +266,7 @@ cd $TMP/util-linux-$VERSION # Go back home :)
 ( cd $PKG/sbin
   ln -s ../bin/mount .
   ln -s ../bin/umount .
-  ln -s ziptool jaztool
+  #ln -s ziptool jaztool
   ln -s hwclock clock
   cd $PKG/usr/sbin
   ln -s ../../sbin/cfdisk .
@@ -281,7 +279,7 @@ cd $TMP/util-linux-$VERSION # Go back home :)
   ln -s ../../bin/more .
   ln -s ../../sbin/raw .
   cd $PKG/usr/man/man1
-  ln -s ziptool.1 jaztool.1
+  #ln -s ziptool.1 jaztool.1
   cd $PKG/usr/man/man8
   ln -s hwclock.8 clock.8
 )
@@ -289,6 +287,9 @@ cd $TMP/util-linux-$VERSION # Go back home :)
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Compress and if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
@@ -309,8 +310,9 @@ rm $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/util-linux-$VERSION
-cp -a AUTHORS COPYING DEPRECATED NEWS README* TODO \
-  docs/v${VERSION}-ReleaseNotes \
+cp -a AUTHORS COPYING* DEPRECATED NEWS README* \
+  Documentation/v${VERSION}-ReleaseNotes \
+  Documentation/licenses/* Documentation/{TODO,*.txt} \
   $PKG/usr/doc/util-linux-$VERSION
 
 mkdir $PKG/install