From 427d7491f566babcbe8b6536574d502d7492ae89 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 24 Jun 2018 20:50:10 +0000
Subject: Sun Jun 24 20:50:10 UTC 2018

a/aaa_base-14.2-x86_64-5.txz:  Rebuilt.
  Don't include /var/log/{packages,scripts,removed_packages,removed_scripts}.
a/procps-ng-3.3.15-x86_64-2.txz:  Rebuilt.
  Upgraded to psmisc-23.1. This adds namespace support to killall, and makes
  the default behavior to match against the current PID's namespace, rather
  than all namespaces as it did previously.
ap/qpdf-8.1.0-x86_64-1.txz:  Upgraded.
ap/texinfo-6.5-x86_64-4.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
ap/vim-8.1.0113-x86_64-1.txz:  Upgraded.
  Compiled against perl-5.28.0.
d/perl-5.28.0-x86_64-1.txz:  Upgraded.
kde/perlkde-4.14.3-x86_64-6.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
kde/perlqt-4.14.3-x86_64-7.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
l/tango-icon-theme-0.8.90-noarch-4.txz:  Rebuilt.
  Made a couple of minor corrections to the slack-desc.
n/epic5-2.0.1-x86_64-6.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
n/irssi-1.1.1-x86_64-4.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
n/net-snmp-5.7.3-x86_64-9.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
n/ntp-4.2.8p11-x86_64-4.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
n/stunnel-5.47-x86_64-1.txz:  Upgraded.
xap/hexchat-2.14.1-x86_64-4.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
xap/vim-gvim-8.1.0113-x86_64-1.txz:  Upgraded.
  Compiled against perl-5.28.0.
---
 source/a/aaa_base/aaa_base.SlackBuild              |  2 +-
 source/a/haveged/haveged.SlackBuild                |  3 ++-
 source/a/procps-ng/procps-ng.SlackBuild            |  7 ++----
 ...c.3638cc55b4d08851faba46635d737b24d016665b.diff | 25 ----------------------
 4 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff

(limited to 'source/a')

diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild
index 4497e892..88448fe8 100755
--- a/source/a/aaa_base/aaa_base.SlackBuild
+++ b/source/a/aaa_base/aaa_base.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_base
 VERSION=14.2
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/haveged/haveged.SlackBuild b/source/a/haveged/haveged.SlackBuild
index 27838158..543893e5 100755
--- a/source/a/haveged/haveged.SlackBuild
+++ b/source/a/haveged/haveged.SlackBuild
@@ -21,6 +21,8 @@
 #  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=haveged
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
@@ -43,7 +45,6 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
diff --git a/source/a/procps-ng/procps-ng.SlackBuild b/source/a/procps-ng/procps-ng.SlackBuild
index c3ebf38f..456d38e3 100755
--- a/source/a/procps-ng/procps-ng.SlackBuild
+++ b/source/a/procps-ng/procps-ng.SlackBuild
@@ -24,10 +24,10 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=procps-ng
 VERSION=${VERSION:-3.3.15}
-PSMISCVER=${PSMISCVER:-22.21}
+PSMISCVER=${PSMISCVER:-23.1}
 PROCINFONGVER=${PROCINFONGVER:-2.0.304}
 PROCINFOVER=${PROCINFOVER:-18}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -156,9 +156,6 @@ mkdir -p $PKG/etc/sysctl.d
 
 cd psmisc-$PSMISCVER || exit 1
 
-# Fix fuser -s:
-zcat $CWD/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff.gz | patch -p1 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff b/source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff
deleted file mode 100644
index d930f6f2..00000000
--- a/source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-index fd1cccf..e5f784c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+Changes in 22.22
-+================
-+	* Fixed typo in fuser which has -M on Debian #740275
-+
- Changes in 22.21
- ================
- 	* Missing comma in fuser(1) added Debian #702391
-diff --git a/src/fuser.c b/src/fuser.c
-index b485f65..389b302 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
- 		usage(_("No process specification given"));
- 
- 	/* Check if -M flag was used and if so check mounts */
--	if (opts * OPT_ISMOUNTPOINT) {
-+	if (opts & OPT_ISMOUNTPOINT) {
- 	    check_mountpoints(&mounts, &names_head, &names_tail);
- 	}
- 
-- 
cgit v1.2.3