Mon Jun 26 19:44:44 UTC 202320230626194444

ap/vim-9.0.1667-x86_64-1.txz:  Upgraded.
  This fixes a rare divide-by-zero bug that could cause vim to crash. In an
  interactive program such as vim, I can't really see this qualifying as a
  security issue, but since it was brought up as such on LQ we'll just go
  along with it this time. :)
  Thanks to marav for the heads-up.
  (* Security fix *)
l/freetype-2.13.1-x86_64-2.txz:  Rebuilt.
  The profile scripts still mentioned three options to choose from when there
  are now only two. This has been fixed.
  Thanks to burdi01.
l/gegl-0.4.46-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.1_12-x86_64-1.txz:  Upgraded.
l/librsvg-2.56.1-x86_64-1.txz:  Upgraded.
l/openexr-3.1.9-x86_64-1.txz:  Upgraded.
l/pipewire-0.3.72-x86_64-1.txz:  Upgraded.
n/network-scripts-15.0-noarch-19.txz:  Rebuilt.
  This update fixes a bug and adds a new feature:
  Re-add support for the DHCP_IPADDR parameter from rc.inet1.conf.
  Expand the help text for DHCP_IPADDR in rc.inet1.conf.
  Add support for a DHCP_OPTS parameter.
  Thanks to ljb643 and Darren 'Tadgy' Austin.
xap/vim-gvim-9.0.1667-x86_64-1.txz:  Upgraded.

8 files changed, 135 insertions, 5 deletions

diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild
index 1e6b04318..066f48ab8 100755
--- a/source/l/freetype/freetype.SlackBuild
+++ b/source/l/freetype/freetype.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=freetype
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/freetype/freetype.csh b/source/l/freetype/freetype.csh
index bbaf71518..ca10b5138 100644
--- a/source/l/freetype/freetype.csh
+++ b/source/l/freetype/freetype.csh
@@ -3,7 +3,7 @@
 # for font hinting. Other controllable properties are listed in the section
 # 'Controlling FreeType Modules' in the reference's table of contents.
 #
-# Three hinting settings are available:
+# Two hinting settings are available:
 
 # This is the classic hinting mode used in Freetype 2.6.x:
 #setenv FREETYPE_PROPERTIES "truetype:interpreter-version=35"
diff --git a/source/l/freetype/freetype.sh b/source/l/freetype/freetype.sh
index 290b2bcaf..68bfc804e 100644
--- a/source/l/freetype/freetype.sh
+++ b/source/l/freetype/freetype.sh
@@ -3,7 +3,7 @@
 # for font hinting. Other controllable properties are listed in the section
 # 'Controlling FreeType Modules' in the reference's table of contents.
 #
-# Three hinting settings are available:
+# Two hinting settings are available:
 
 # This is the classic hinting mode used in Freetype 2.6.x:
 #export FREETYPE_PROPERTIES="truetype:interpreter-version=35"
diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild
index 254d9c7ea..21e77f538 100755
--- a/source/l/imagemagick/imagemagick.SlackBuild
+++ b/source/l/imagemagick/imagemagick.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=imagemagick
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # NOTE:  This is to cope with ImageMagick version numbers such as 5.4.7-4,
 # which occur fairly often (but not always).  If these numbers are all the same,
diff --git a/source/n/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch b/source/n/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch
new file mode 100644
index 000000000..7be077718
--- /dev/null
+++ b/source/n/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch
@@ -0,0 +1,30 @@
+From 76218fa6e7c097c875af2a29cc7670995bef2ae4 Mon Sep 17 00:00:00 2001
+From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
+Date: Wed, 21 Jun 2023 14:36:55 +0100
+Subject: Re-add support for the DHCP_IPADDR parameter from rc.inet1.conf.
+
+During the last major updates, somehow the DHCP_IPADDR option
+got missed while I re-implemented the options handling.
+This commit re-adds the support for that option.
+
+Note that this commit changes the previously used '-s' dhcpcd
+option with the '-r' option as this seems more appropriate.
+---
+ rc.inet1 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rc.inet1 b/rc.inet1
+index dc853fb..f998a21 100644
+--- a/rc.inet1
++++ b/rc.inet1
+@@ -398,6 +398,7 @@ if_up() {
+         [ "${DHCP_KEEPRESOLV[$i]}" = "yes" ] && DHCP_OPTIONS+=("-C" "resolv.conf")
+         [ "${DHCP_KEEPNTP[$i]}" = "yes" ] && DHCP_OPTIONS+=("-C" "ntp.conf")
+         [ "${DHCP_KEEPGW[$i]}" = "yes" ] && DHCP_OPTIONS+=("-G")
++        [ -n "${DHCP_IPADDR[$i]}" ] && DHCP_OPTIONS+=("-r" "${DHCP_IPADDR[$i]}")
+         [ "${DHCP_DEBUG[$i]}" = "yes" ] && DHCP_OPTIONS+=("-d")
+         # The -L option used to be hard coded into the dhcpcd command line in -current.  It was added to assist ARM users
+         # get networking up and running.  Previous versions of Slackware did not have -L hard coded - the code here keeps
+-- 
+cgit v1.2.3
+
diff --git a/source/n/network-scripts/0004-8f43a741a36e59b8a9560ff2c4f3e5da2b8dd72b.patch b/source/n/network-scripts/0004-8f43a741a36e59b8a9560ff2c4f3e5da2b8dd72b.patch
new file mode 100644
index 000000000..caeaf875d
--- /dev/null
+++ b/source/n/network-scripts/0004-8f43a741a36e59b8a9560ff2c4f3e5da2b8dd72b.patch
@@ -0,0 +1,26 @@
+From 8f43a741a36e59b8a9560ff2c4f3e5da2b8dd72b Mon Sep 17 00:00:00 2001
+From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
+Date: Wed, 21 Jun 2023 14:50:20 +0100
+Subject: Expand the help text for DHCP_IPADDR in rc.inet1.conf.
+
+---
+ rc.inet1.conf | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rc.inet1.conf b/rc.inet1.conf
+index e952498..54d0d3e 100644
+--- a/rc.inet1.conf
++++ b/rc.inet1.conf
+@@ -189,7 +189,8 @@ GATEWAY6=""
+ #DHCP_KEEPGW[4]="yes"           # If you don't want the DHCP server to change
+                                 # your default gateway
+ #DHCP_IPADDR[4]=""              # Request a specific IP address from the DHCP
+-                                # server
++                                # server. There is no guarantee the server
++                                # will honour the request for this IP address
+ #DHCP_DEBUG[4]="yes"            # Make dhcpcd show verbose diagnostics
+ #DHCP_NOIPV4LL[4]="yes"         # Do not assign an ipv4ll address when a DHCP
+                                 # server is not found (ipv4ll link-local
+-- 
+cgit v1.2.3
+
diff --git a/source/n/network-scripts/0005-5925f2bcc500f5198b5c00ab4e635a59bef7a413.patch b/source/n/network-scripts/0005-5925f2bcc500f5198b5c00ab4e635a59bef7a413.patch
new file mode 100644
index 000000000..a2494d885
--- /dev/null
+++ b/source/n/network-scripts/0005-5925f2bcc500f5198b5c00ab4e635a59bef7a413.patch
@@ -0,0 +1,48 @@
+From 5925f2bcc500f5198b5c00ab4e635a59bef7a413 Mon Sep 17 00:00:00 2001
+From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
+Date: Wed, 21 Jun 2023 14:55:41 +0100
+Subject: Add support for a DHCP_OPTS parameter.
+
+This commit allows an interface specific DHCP_OPTS parameter to set
+additional dhcpcd command line options where they may be required
+on a local network.  It is still recommended to use the supported
+DHCP_* options in preference to this option, but it is being added
+to aid customisations.
+
+Thanks to ljb643 on LQ for the bug report regarding DHCP_IPADDR
+and the suggestion of a DHCP_OPTS parameter.
+---
+ rc.inet1      | 1 +
+ rc.inet1.conf | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/rc.inet1 b/rc.inet1
+index f998a21..8b03fb7 100644
+--- a/rc.inet1
++++ b/rc.inet1
+@@ -400,6 +400,7 @@ if_up() {
+         [ "${DHCP_KEEPGW[$i]}" = "yes" ] && DHCP_OPTIONS+=("-G")
+         [ -n "${DHCP_IPADDR[$i]}" ] && DHCP_OPTIONS+=("-r" "${DHCP_IPADDR[$i]}")
+         [ "${DHCP_DEBUG[$i]}" = "yes" ] && DHCP_OPTIONS+=("-d")
++        [ -n "${DHCP_OPTS[$i]}" ] && DHCP_OPTIONS+=(${DHCP_OPTS[$i]})
+         # The -L option used to be hard coded into the dhcpcd command line in -current.  It was added to assist ARM users
+         # get networking up and running.  Previous versions of Slackware did not have -L hard coded - the code here keeps
+         # the 14.2 behaviour, but can be altered to make the use of -L default as in -current.  To change the behaviour,
+diff --git a/rc.inet1.conf b/rc.inet1.conf
+index 54d0d3e..b3f7cdd 100644
+--- a/rc.inet1.conf
++++ b/rc.inet1.conf
+@@ -196,6 +196,10 @@ GATEWAY6=""
+                                 # server is not found (ipv4ll link-local
+                                 # adresses in the IP range 169.254.0.0/16 are
+                                 # also known as "zeroconf" addresses)
++#DHCP_OPTS[4]=""                # Add these options to the dhcpcd command line.
++                                # Use this only if extra options are required
++                                # on your local network and there is a no more
++                                # specific DHCP_* option detailed above
+ #SLAAC_TIMEOUT[4]="15"          # The default timeout for auto configuration to
+                                 # wait for the interface to come up is 15 sec.
+                                 # Increase the timeout if required.
+-- 
+cgit v1.2.3
+
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index 585374dae..71c0b7000 100755
--- a/source/n/network-scripts/network-scripts.SlackBuild
+++ b/source/n/network-scripts/network-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=network-scripts
 VERSION=${VERSION:-15.0}
 ARCH=noarch
-BUILD=${BUILD:-18}
+BUILD=${BUILD:-19}
 
 # 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
@@ -104,5 +104,31 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
   rm -f sbin/netconfig.orig
 ) || exit 1
 
+# Temporarily rename these files so that we can patch them:
+mv $PKG/etc/rc.d/rc.inet1.new $PKG/etc/rc.d/rc.inet1
+mv $PKG/etc/rc.d/rc.inet1.conf.new $PKG/etc/rc.d/rc.inet1.conf
+
+# Re-add support for the DHCP_IPADDR parameter from rc.inet1.conf:
+( cd $PKG/etc/rc.d
+  cat $CWD/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch | patch -p1 --verbose || exit 1
+  rm -f etc/rc.d/rc.inet1.orig
+) || exit 1
+
+# Expand the help text for DHCP_IPADDR in rc.inet1.conf:
+( cd $PKG/etc/rc.d
+  cat $CWD/0004-8f43a741a36e59b8a9560ff2c4f3e5da2b8dd72b.patch | patch -p1 --verbose || exit 1
+  rm -f etc/rc.d/rc.inet1.conf.orig
+) || exit 1
+
+# Add support for a DHCP_OPTS parameter:
+( cd $PKG/etc/rc.d
+  cat $CWD/0005-5925f2bcc500f5198b5c00ab4e635a59bef7a413.patch | patch -p1 --verbose || exit 1
+  rm -f etc/rc.d/rc.inet1.orig
+) || exit 1
+
+# Rename the files back to .new:
+mv $PKG/etc/rc.d/rc.inet1 $PKG/etc/rc.d/rc.inet1.new
+mv $PKG/etc/rc.d/rc.inet1.conf $PKG/etc/rc.d/rc.inet1.conf.new
+
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz