13 files changed, 235 insertions, 9 deletions
diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild
index fdb4017e0..84ca46a6e 100755
--- a/source/n/ModemManager/ModemManager.SlackBuild
+++ b/source/n/ModemManager/ModemManager.SlackBuild
@@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ModemManager
 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
diff --git a/source/n/dhcpcd/dhcpcd-8.1.9.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-8.1.9.tar.xz.distinfo
deleted file mode 100644
index 395b1162b..000000000
--- a/source/n/dhcpcd/dhcpcd-8.1.9.tar.xz.distinfo
+++ /dev/null
@@ -1 +0,0 @@
-SHA256 (dhcpcd-8.1.9.tar.xz) = 8e2a505eb2bd8007d7c6fd855fcb4dd28cced8fc28886c7ce41fb4fc5630fbcf
diff --git a/source/n/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo
new file mode 100644
index 000000000..fa1cbf654
--- /dev/null
+++ b/source/n/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo
@@ -0,0 +1 @@
+SHA256 (dhcpcd-9.4.0.tar.xz) = 41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513
diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild
index 1a7e15261..2027e5b6d 100755
--- a/source/n/dhcpcd/dhcpcd.SlackBuild
+++ b/source/n/dhcpcd/dhcpcd.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dhcpcd
 VERSION=${VERSION:-$(echo dhcpcd-*.tar.?z | 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/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch b/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch
index 077aa17be..75322ad8f 100644
--- a/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch
+++ b/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch
@@ -1,11 +1,10 @@
-diff -Nur dhcpcd-7.0.0.orig/src/dhcpcd.conf dhcpcd-7.0.0/src/dhcpcd.conf
---- dhcpcd-7.0.0.orig/src/dhcpcd.conf	2018-01-01 05:17:56.000000000 -0600
-+++ dhcpcd-7.0.0/src/dhcpcd.conf	2018-01-02 04:14:37.026484155 -0600
+--- ./src/dhcpcd.conf.orig	2021-08-09 22:58:29.034640117 -0500
++++ ./src/dhcpcd.conf	2021-08-09 23:00:11.296642405 -0500
 @@ -5,7 +5,7 @@
  #controlgroup wheel
  
  # Inform the DHCP server of our hostname for DDNS.
--hostname
+-#hostname
 +hostname_short
  
  # Use the hardware address of the interface for the Client ID.
diff --git a/source/n/nmap/nmap.SlackBuild b/source/n/nmap/nmap.SlackBuild
index c2ba46ab9..b35e41337 100755
--- a/source/n/nmap/nmap.SlackBuild
+++ b/source/n/nmap/nmap.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=nmap
 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/openresolv/doinst.sh b/source/n/openresolv/doinst.sh
new file mode 100644
index 000000000..810b1c10c
--- /dev/null
+++ b/source/n/openresolv/doinst.sh
@@ -0,0 +1,18 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/resolvconf.conf.new
+# This file is optional (added with OPENVPN=yes); let's make sure it exists
+if [ -e etc/openvpn/update-resolv-conf.new ]; then
+  config etc/openvpn/update-resolv-conf.new
+fi
diff --git a/source/n/openresolv/openresolv-3.12.0.tar.xz.distinfo b/source/n/openresolv/openresolv-3.12.0.tar.xz.distinfo
new file mode 100644
index 000000000..c2f8e4a16
--- /dev/null
+++ b/source/n/openresolv/openresolv-3.12.0.tar.xz.distinfo
@@ -0,0 +1 @@
+SHA256 (openresolv-3.12.0.tar.xz) = 42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
diff --git a/source/n/openresolv/openresolv.SlackBuild b/source/n/openresolv/openresolv.SlackBuild
new file mode 100755
index 000000000..85c340e9d
--- /dev/null
+++ b/source/n/openresolv/openresolv.SlackBuild
@@ -0,0 +1,134 @@
+#!/bin/bash
+
+# Copyright 2012-2013  synbq Bucharest
+# Copyright 2017-2021  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  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=openresolv
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Set this option to yes to add an optional config script for OpenVPN:
+OPENVPN=${OPENVPN:-no}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+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-noarch-$BUILD.txz"
+  exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libexecdir=/usr/libexec/openresolv \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mv $PKG/etc/resolvconf.conf $PKG/etc/resolvconf.conf.new
+if [ "${OPENVPN}" = "yes" ]; then
+  mkdir -p $PKG/etc/openvpn
+  install -m 0755 $CWD/update-resolv-conf $PKG/etc/openvpn/update-resolv-conf.new
+fi
+
+## There are no ELF objects in this package...
+## Strip binaries:
+#find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  LICENSE* COPYING* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-noarch-$BUILD.txz
diff --git a/source/n/openresolv/openresolv.url b/source/n/openresolv/openresolv.url
new file mode 100644
index 000000000..1ca437331
--- /dev/null
+++ b/source/n/openresolv/openresolv.url
@@ -0,0 +1 @@
+https://roy.marples.name/downloads/openresolv/
diff --git a/source/n/openresolv/slack-desc b/source/n/openresolv/slack-desc
new file mode 100644
index 000000000..c4d8a7329
--- /dev/null
+++ b/source/n/openresolv/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# 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
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+openresolv: openresolv (management framework for resolv.conf)
+openresolv:
+openresolv: Allows multiple daemons to manage resolv.conf and configures local
+openresolv: resolvers such as dnsmasq and unbound.
+openresolv: This package may require some manual configuration.
+openresolv: Please read resolvconf(8) and resolvconf.conf(5) for detailed
+openresolv: instructions.
+openresolv:
+openresolv: Homepage: https://roy.marples.name/projects/openresolv
+openresolv:
+openresolv:
diff --git a/source/n/openresolv/update-resolv-conf b/source/n/openresolv/update-resolv-conf
new file mode 100644
index 000000000..a20260576
--- /dev/null
+++ b/source/n/openresolv/update-resolv-conf
@@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Parses DHCP options from openvpn to update resolv.conf
+# To use set as 'up' and 'down' script in your openvpn *.conf:
+# up /etc/openvpn/update-resolv-conf
+# down /etc/openvpn/update-resolv-conf
+#
+# Used snippets of resolvconf script by Thomas Hood <jdthood@yahoo.co.uk>
+# and Chris Hanson
+# Licensed under the GNU GPL.  See /usr/share/common-licenses/GPL.
+#
+# 05/2006 chlauber@bnc.ch
+#
+# Example envs set from openvpn:
+# foreign_option_1='dhcp-option DNS 193.43.27.132'
+# foreign_option_2='dhcp-option DNS 193.43.27.133'
+# foreign_option_3='dhcp-option DOMAIN be.bnc.ch'
+
+[ -x /usr/sbin/resolvconf ] || exit 0
+
+case $script_type in
+
+up)
+	for optionname in ${!foreign_option_*} ; do
+		option="${!optionname}"
+		echo $option
+		part1=$(echo "$option" | cut -d " " -f 1)
+		if [ "$part1" == "dhcp-option" ] ; then
+			part2=$(echo "$option" | cut -d " " -f 2)
+			part3=$(echo "$option" | cut -d " " -f 3)
+			if [ "$part2" == "DNS" ] ; then
+				IF_DNS_NAMESERVERS="$IF_DNS_NAMESERVERS $part3"
+			fi
+			if [ "$part2" == "DOMAIN" ] ; then
+				IF_DNS_SEARCH="$IF_DNS_SEARCH $part3"
+			fi
+		fi
+	done
+	R=""
+	for SS in $IF_DNS_SEARCH ; do
+        	R="${R}search $SS
+"
+	done
+	for NS in $IF_DNS_NAMESERVERS ; do
+        	R="${R}nameserver $NS
+"
+	done
+	echo -n "$R" | /usr/sbin/resolvconf -x -a "${dev}.inet"
+	;;
+down)
+	/usr/sbin/resolvconf -d "${dev}.inet"
+	;;
+esac
+
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 9b7cde933..9e03145a9 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -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.24
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then