From 086112c734c9b6018855be83798bcdaf61505c14 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 15 Jun 2018 00:03:49 +0000
Subject: Fri Jun 15 00:03:49 UTC 2018

a/dcron-4.5-x86_64-8.txz:  Rebuilt.
  rc.crond: match the running process more accurately.
a/glibc-zoneinfo-2018e-noarch-3.txz:  Rebuilt.
  Don't emit an error if the /etc/localtime-copied-from is not present when
  the package is initially installed.
a/libcgroup-0.41-x86_64-5.txz:  Rebuilt.
  Added /etc/cgconfig.d/ directory.
a/pkgtools-15.0-noarch-19.txz:  Rebuilt.
  installpkg, makebootdisk, removepkg, upgradepkg: don't try to remove admin
  directories (supposedly "in case" they are a symlink).
a/sysvinit-scripts-2.1-noarch-12.txz:  Rebuilt.
  rc.6: stop haveged
  rc.S: start rc.cgconfig and rc.cgred
ap/at-3.1.20-x86_64-5.txz:  Rebuilt.
  rc.atd: match the running process more accurately.
ap/slackpkg-2.83.0-noarch-2.txz:  Rebuilt.
  Patched to handle the case where /var/log/packages is a symlink.
l/gsl-2.5-x86_64-1.txz:  Upgraded.
---
 source/ap/amp/_amp/usr/bin/amp                     |  0
 source/ap/at/at.SlackBuild                         |  2 +-
 source/ap/at/rc.atd                                |  4 +-
 source/ap/seejpeg/_seejpeg/usr/bin/seejpeg         |  0
 ...-Fix-for-var_log_packages-being-a-symlink.patch | 73 ++++++++++++++++++++++
 source/ap/slackpkg/slackpkg.SlackBuild             |  7 ++-
 6 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100755 source/ap/amp/_amp/usr/bin/amp
 create mode 100755 source/ap/seejpeg/_seejpeg/usr/bin/seejpeg
 create mode 100644 source/ap/slackpkg/0001-Fix-for-var_log_packages-being-a-symlink.patch

(limited to 'source/ap')

diff --git a/source/ap/amp/_amp/usr/bin/amp b/source/ap/amp/_amp/usr/bin/amp
new file mode 100755
index 000000000..e69de29bb
diff --git a/source/ap/at/at.SlackBuild b/source/ap/at/at.SlackBuild
index dac04f7fd..032d4f873 100755
--- a/source/ap/at/at.SlackBuild
+++ b/source/ap/at/at.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=at
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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/at/rc.atd b/source/ap/at/rc.atd
index fdc42d70b..d91990897 100644
--- a/source/ap/at/rc.atd
+++ b/source/ap/at/rc.atd
@@ -7,7 +7,7 @@ if [ -r /etc/default/atd ]; then
 fi
 
 start_atd() {
-  if ! /usr/bin/pgrep --ns $$ --exact atd 1> /dev/null 2> /dev/null ; then
+  if ! /usr/bin/pgrep --ns $$ --euid daemon -f "^/usr/sbin/atd" 1> /dev/null 2> /dev/null ; then
     echo "Starting atd:  /usr/sbin/atd $ATD_OPTS"
     /usr/sbin/atd $ATD_OPTS
   fi
@@ -15,7 +15,7 @@ start_atd() {
 
 stop_atd() {
   echo "Stopping atd."
-  /usr/bin/pkill --ns $$ --exact atd 2> /dev/null
+  /usr/bin/pkill --ns $$ --euid daemon -f "^/usr/sbin/atd" 2> /dev/null
 }
 
 restart_atd() {
diff --git a/source/ap/seejpeg/_seejpeg/usr/bin/seejpeg b/source/ap/seejpeg/_seejpeg/usr/bin/seejpeg
new file mode 100755
index 000000000..e69de29bb
diff --git a/source/ap/slackpkg/0001-Fix-for-var_log_packages-being-a-symlink.patch b/source/ap/slackpkg/0001-Fix-for-var_log_packages-being-a-symlink.patch
new file mode 100644
index 000000000..5a81e7ab4
--- /dev/null
+++ b/source/ap/slackpkg/0001-Fix-for-var_log_packages-being-a-symlink.patch
@@ -0,0 +1,73 @@
+From 10b2f7d493a7ded620cdc20ab582b25f58e45c62 Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Thu, 7 Jun 2018 23:00:02 -0500
+Subject: Fix for /var/log/packages/ possibly being a symlink to elsewhere
+
+---
+ files/core-functions.sh   | 12 ++++++------
+ files/dialog-functions.sh |  2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+--- ./core-functions.sh.orig	2018-01-06 23:23:14.000000000 -0600
++++ ./core-functions.sh	2018-06-14 16:34:51.741000083 -0500
+@@ -805,7 +805,7 @@
+ 	    # First is the package already installed?
+ 	    # Amazing what a little sleep will do
+ 	    # exclusion is so much nicer :)
+-	    INSTPKG=$(ls -1 $ROOT/var/log/packages | \
++	    INSTPKG=$(ls -1 $ROOT/var/log/packages/ | \
+ 		grep -e "^${BASENAME}-[^-]\+-\(${ARCH}\|fw\|noarch\)-[^-]\+")
+ 
+ 		# INSTPKG is local version
+@@ -1172,14 +1172,14 @@
+ 
+ 	[ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
+ 
+-	for i in $(ls -1 $ROOT/var/log/packages | \
++	for i in $(ls -1 $ROOT/var/log/packages/ | \
+ 		egrep -- "^.*-(${ARCH}|fw|noarch)-[^-]+-upgraded"); do
+ 		REVNAME=$(echo ${i} | awk -F'-upgraded' '{ print $1 }')
+ 		mv $ROOT/var/log/packages/${i} $ROOT/var/log/packages/${REVNAME}
+ 		mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME}
+ 	done
+ 	
+-	ls -1 $ROOT/var/log/packages | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \
++	ls -1 $ROOT/var/log/packages/ | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \
+ 				  batchcutpkg | sort > $TMPDIR/list1 
+ 	cat $TMPDIR/list1 | uniq > $TMPDIR/list2
+ 	FILES="$(diff $TMPDIR/list1 $TMPDIR/list2 | grep '<' | cut -f2 -d\ )"
+@@ -1196,12 +1196,12 @@
+ 
+ 	if [ "$DOUBLEFILES" != "" ]; then
+ 		echo -e "\
+-You have a broken $ROOT/var/log/packages - with two versions of the same package.\n\
++You have a broken $ROOT/var/log/packages/ - with two versions of the same package.\n\
+ The list of packages duplicated in your machine are shown below, but don't\n\
+ worry about this list - when you select your action, slackpkg will show a\n\
+ better list:\n"
+ 		for i in $DOUBLEFILES ; do
+-			ls -1 $ROOT/var/log/packages |\
++			ls -1 $ROOT/var/log/packages/ |\
+ 				egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-"
+ 		done
+ 		echo -ne "\n\
+@@ -1216,7 +1216,7 @@
+ 			;;
+ 			R|r)
+ 				for i in $DOUBLEFILES ; do
+-					FILE=$(ls -1 $ROOT/var/log/packages |\
++					FILE=$(ls -1 $ROOT/var/log/packages/ |\
+ 						egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-")
+ 					FILES="$FILES $FILE"
+ 				done
+--- ./functions.d/dialog-functions.sh.orig	2014-07-10 17:41:29.000000000 -0500
++++ ./functions.d/dialog-functions.sh	2018-06-14 16:34:59.185000084 -0500
+@@ -20,7 +20,7 @@
+ 		rm -f $TMPDIR/dialog.tmp
+ 		
+ 		if [ "$2" = "upgrade" ]; then
+-			ls -1 $ROOT/var/log/packages > $TMPDIR/tmplist
++			ls -1 $ROOT/var/log/packages/ > $TMPDIR/tmplist
+ 			for i in $1; do
+ 				BASENAME=$(cutpkg $i)
+ 				PKGFOUND=$(grep -m1 -e "^${BASENAME}-[^-]\+-\(noarch\|fw\|${ARCH}\)" $TMPDIR/tmplist)
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index e9a4bb385..7dc1949d5 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=slackpkg
 VERSION=${VERSION:-2.83.0}
 ARCH="noarch"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # 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
@@ -76,6 +76,11 @@ gzip -d $PKG/usr/libexec/slackpkg/functions.d/*
 chmod 755 $PKG/usr/libexec/slackpkg/functions.d/*
 chown root:root $PKG/usr/libexec/slackpkg/functions.d/*
 
+# Apply patch in case /var/log/packages is a symlink:
+( cd $PKG/usr/libexec/slackpkg
+  zcat $CWD/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz | patch -p1 || exit 1
+) || exit 1
+
 # Install man pages:
 mkdir -pv $PKG/usr/man/man5
 cp -av slackpkg.conf.5.gz $PKG/usr/man/man5
-- 
cgit v1.2.3