summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.rss33
-rw-r--r--ChangeLog.txt21
-rw-r--r--FILELIST.TXT125
-rw-r--r--patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txt11
-rw-r--r--patches/packages/vim-9.0.0594-x86_64-1_slack15.0.txt (renamed from patches/packages/vim-9.0.0558-x86_64-1_slack15.0.txt)0
-rw-r--r--patches/packages/vim-gvim-9.0.0594-x86_64-1_slack15.0.txt (renamed from patches/packages/vim-gvim-9.0.0558-x86_64-1_slack15.0.txt)0
-rwxr-xr-xpatches/source/dnsmasq/dnsmasq.SlackBuild121
-rw-r--r--patches/source/dnsmasq/dnsmasq.leasedir.diff24
-rw-r--r--patches/source/dnsmasq/dnsmasq.libidn2.diff13
-rw-r--r--patches/source/dnsmasq/doinst.sh23
-rw-r--r--patches/source/dnsmasq/rc.dnsmasq43
-rw-r--r--patches/source/dnsmasq/slack-desc19
-rw-r--r--patches/source/vim/doinst.sh25
-rwxr-xr-xpatches/source/vim/vim.SlackBuild18
-rwxr-xr-xrecompress.sh5
15 files changed, 407 insertions, 74 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index 4ddea4ea2..e7f1d5868 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,39 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
- <pubDate>Fri, 23 Sep 2022 23:51:02 GMT</pubDate>
- <lastBuildDate>Sat, 24 Sep 2022 11:30:16 GMT</lastBuildDate>
+ <pubDate>Mon, 26 Sep 2022 19:43:54 GMT</pubDate>
+ <lastBuildDate>Tue, 27 Sep 2022 11:30:17 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.17</generator>
<item>
+ <title>Mon, 26 Sep 2022 19:43:54 GMT</title>
+ <pubDate>Mon, 26 Sep 2022 19:43:54 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20220926194354</link>
+ <guid isPermaLink="false">20220926194354</guid>
+ <description>
+ <![CDATA[<pre>
+patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txz: Upgraded.
+ Fix write-after-free error in DHCPv6 server code.
+ For more information, see:
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0934
+ (* Security fix *)
+patches/packages/vim-9.0.0594-x86_64-1_slack15.0.txz: Upgraded.
+ Fixed stack-based buffer overflow.
+ Thanks to marav for the heads-up.
+ In addition, Mig21 pointed out an issue where the defaults.vim file might
+ need to be edited for some purposes as its contents will override the
+ settings in the system-wide vimrc. Usually this file is replaced whenever
+ vim is upgraded, which in those situations would be inconvenient for the
+ admin. So, I've added support for a file named defaults.vim.custom which
+ (if it exists) will be used instead of the defaults.vim file shipped in
+ the package and will persist through upgrades.
+ For more information, see:
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3296
+ (* Security fix *)
+patches/packages/vim-gvim-9.0.0594-x86_64-1_slack15.0.txz: Upgraded.
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Fri, 23 Sep 2022 23:51:02 GMT</title>
<pubDate>Fri, 23 Sep 2022 23:51:02 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20220923235102</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4928cf509..bfad9b156 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,24 @@
+Mon Sep 26 19:43:54 UTC 2022
+patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txz: Upgraded.
+ Fix write-after-free error in DHCPv6 server code.
+ For more information, see:
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0934
+ (* Security fix *)
+patches/packages/vim-9.0.0594-x86_64-1_slack15.0.txz: Upgraded.
+ Fixed stack-based buffer overflow.
+ Thanks to marav for the heads-up.
+ In addition, Mig21 pointed out an issue where the defaults.vim file might
+ need to be edited for some purposes as its contents will override the
+ settings in the system-wide vimrc. Usually this file is replaced whenever
+ vim is upgraded, which in those situations would be inconvenient for the
+ admin. So, I've added support for a file named defaults.vim.custom which
+ (if it exists) will be used instead of the defaults.vim file shipped in
+ the package and will persist through upgrades.
+ For more information, see:
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3296
+ (* Security fix *)
+patches/packages/vim-gvim-9.0.0594-x86_64-1_slack15.0.txz: Upgraded.
++--------------------------+
Fri Sep 23 23:51:02 UTC 2022
patches/packages/vim-9.0.0558-x86_64-1_slack15.0.txz: Upgraded.
Fixed use after free.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index ee134cfc7..de06761c6 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Fri Sep 23 23:53:22 UTC 2022
+Mon Sep 26 19:48:49 UTC 2022
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
-drwxr-xr-x 12 root root 4096 2022-09-23 23:51 .
+drwxr-xr-x 12 root root 4096 2022-09-26 19:43 .
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
-rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 1151535 2022-09-23 23:36 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2022-09-23 23:36 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 1151535 2022-09-23 23:53 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2022-09-23 23:53 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
--rw-r--r-- 1 root root 1932893 2022-09-23 23:51 ./ChangeLog.txt
+-rw-r--r-- 1 root root 1934003 2022-09-26 19:43 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT
-rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi
@@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r-- 1 root root 1503236 2022-09-23 23:35 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1503236 2022-09-23 23:53 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
-rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
@@ -738,13 +738,13 @@ drwxr-xr-x 2 root root 4096 2008-05-07 05:21 ./pasture/source/php/pear
-rwxr-xr-x 1 root root 9448 2018-05-16 22:38 ./pasture/source/php/php.SlackBuild
-rw-r--r-- 1 root root 775 2017-07-07 19:25 ./pasture/source/php/php.ini-development.diff.gz
-rw-r--r-- 1 root root 830 2005-12-09 05:18 ./pasture/source/php/slack-desc
-drwxr-xr-x 4 root root 4096 2022-09-23 23:35 ./patches
--rw-r--r-- 1 root root 47479 2022-09-23 23:35 ./patches/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2022-09-23 23:35 ./patches/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 63539 2022-09-23 23:35 ./patches/FILE_LIST
--rw-r--r-- 1 root root 11626313 2022-09-23 23:35 ./patches/MANIFEST.bz2
--rw-r--r-- 1 root root 34859 2022-09-23 23:35 ./patches/PACKAGES.TXT
-drwxr-xr-x 3 root root 16384 2022-09-23 23:35 ./patches/packages
+drwxr-xr-x 4 root root 4096 2022-09-26 19:48 ./patches
+-rw-r--r-- 1 root root 48344 2022-09-26 19:48 ./patches/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2022-09-26 19:48 ./patches/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 64676 2022-09-26 19:48 ./patches/FILE_LIST
+-rw-r--r-- 1 root root 11627021 2022-09-26 19:48 ./patches/MANIFEST.bz2
+-rw-r--r-- 1 root root 35483 2022-09-26 19:48 ./patches/PACKAGES.TXT
+drwxr-xr-x 3 root root 16384 2022-09-26 19:48 ./patches/packages
-rw-r--r-- 1 root root 327 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txt
-rw-r--r-- 1 root root 10716 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz.asc
@@ -772,6 +772,9 @@ drwxr-xr-x 3 root root 16384 2022-09-23 23:35 ./patches/packages
-rw-r--r-- 1 root root 373 2022-02-24 19:12 ./patches/packages/cyrus-sasl-2.1.28-x86_64-1_slack15.0.txt
-rw-r--r-- 1 root root 993108 2022-02-24 19:12 ./patches/packages/cyrus-sasl-2.1.28-x86_64-1_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-02-24 19:12 ./patches/packages/cyrus-sasl-2.1.28-x86_64-1_slack15.0.txz.asc
+-rw-r--r-- 1 root root 443 2022-09-26 18:15 ./patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txt
+-rw-r--r-- 1 root root 389100 2022-09-26 18:15 ./patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txz
+-rw-r--r-- 1 root root 163 2022-09-26 18:15 ./patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txz.asc
-rw-r--r-- 1 root root 301 2022-09-20 19:26 ./patches/packages/expat-2.4.9-x86_64-1_slack15.0.txt
-rw-r--r-- 1 root root 130928 2022-09-20 19:26 ./patches/packages/expat-2.4.9-x86_64-1_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-09-20 19:26 ./patches/packages/expat-2.4.9-x86_64-1_slack15.0.txz.asc
@@ -881,12 +884,12 @@ drwxr-xr-x 2 root root 4096 2022-08-26 04:06 ./patches/packages/linux-5.15
-rw-r--r-- 1 root root 354 2022-02-15 18:37 ./patches/packages/util-linux-2.37.4-x86_64-1_slack15.0.txt
-rw-r--r-- 1 root root 2805300 2022-02-15 18:37 ./patches/packages/util-linux-2.37.4-x86_64-1_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-02-15 18:37 ./patches/packages/util-linux-2.37.4-x86_64-1_slack15.0.txz.asc
--rw-r--r-- 1 root root 383 2022-09-23 19:00 ./patches/packages/vim-9.0.0558-x86_64-1_slack15.0.txt
--rw-r--r-- 1 root root 8444760 2022-09-23 19:00 ./patches/packages/vim-9.0.0558-x86_64-1_slack15.0.txz
--rw-r--r-- 1 root root 163 2022-09-23 19:00 ./patches/packages/vim-9.0.0558-x86_64-1_slack15.0.txz.asc
--rw-r--r-- 1 root root 503 2022-09-23 19:01 ./patches/packages/vim-gvim-9.0.0558-x86_64-1_slack15.0.txt
--rw-r--r-- 1 root root 1690836 2022-09-23 19:01 ./patches/packages/vim-gvim-9.0.0558-x86_64-1_slack15.0.txz
--rw-r--r-- 1 root root 163 2022-09-23 19:01 ./patches/packages/vim-gvim-9.0.0558-x86_64-1_slack15.0.txz.asc
+-rw-r--r-- 1 root root 383 2022-09-26 18:48 ./patches/packages/vim-9.0.0594-x86_64-1_slack15.0.txt
+-rw-r--r-- 1 root root 8447732 2022-09-26 18:48 ./patches/packages/vim-9.0.0594-x86_64-1_slack15.0.txz
+-rw-r--r-- 1 root root 163 2022-09-26 18:48 ./patches/packages/vim-9.0.0594-x86_64-1_slack15.0.txz.asc
+-rw-r--r-- 1 root root 503 2022-09-26 18:49 ./patches/packages/vim-gvim-9.0.0594-x86_64-1_slack15.0.txt
+-rw-r--r-- 1 root root 1691016 2022-09-26 18:49 ./patches/packages/vim-gvim-9.0.0594-x86_64-1_slack15.0.txz
+-rw-r--r-- 1 root root 163 2022-09-26 18:49 ./patches/packages/vim-gvim-9.0.0594-x86_64-1_slack15.0.txz.asc
-rw-r--r-- 1 root root 507 2022-07-10 18:40 ./patches/packages/wavpack-5.5.0-x86_64-1_slack15.0.txt
-rw-r--r-- 1 root root 185936 2022-07-10 18:40 ./patches/packages/wavpack-5.5.0-x86_64-1_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-07-10 18:40 ./patches/packages/wavpack-5.5.0-x86_64-1_slack15.0.txz.asc
@@ -911,7 +914,7 @@ drwxr-xr-x 2 root root 4096 2022-08-26 04:06 ./patches/packages/linux-5.15
-rw-r--r-- 1 root root 388 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txt
-rw-r--r-- 1 root root 105196 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz.asc
-drwxr-xr-x 48 root root 4096 2022-09-23 22:36 ./patches/source
+drwxr-xr-x 49 root root 4096 2022-09-26 19:41 ./patches/source
drwxr-xr-x 2 root root 4096 2022-01-16 05:07 ./patches/source/aaa_base
-rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./patches/source/aaa_base/_aaa_base.tar.gz
-rwxr-xr-x 1 root root 3894 2022-02-15 05:07 ./patches/source/aaa_base/aaa_base.SlackBuild
@@ -995,6 +998,15 @@ drwxr-xr-x 2 root root 4096 2022-02-24 19:09 ./patches/source/cyrus-sasl
-rw-r--r-- 1 root root 275 2005-07-24 22:43 ./patches/source/cyrus-sasl/doinst.sh.gz
-rw-r--r-- 1 root root 584 2020-11-30 19:09 ./patches/source/cyrus-sasl/rc.saslauthd.gz
-rw-r--r-- 1 root root 831 2018-02-27 06:13 ./patches/source/cyrus-sasl/slack-desc
+drwxr-xr-x 2 root root 4096 2022-09-26 18:09 ./patches/source/dnsmasq
+-rw-r--r-- 1 root root 540528 2022-09-25 21:58 ./patches/source/dnsmasq/dnsmasq-2.87.tar.xz
+-rw-r--r-- 1 root root 833 2022-09-25 21:58 ./patches/source/dnsmasq/dnsmasq-2.87.tar.xz.asc
+-rwxr-xr-x 1 root root 4155 2022-09-26 18:13 ./patches/source/dnsmasq/dnsmasq.SlackBuild
+-rw-r--r-- 1 root root 543 2010-01-22 21:33 ./patches/source/dnsmasq/dnsmasq.leasedir.diff.gz
+-rw-r--r-- 1 root root 246 2017-07-07 18:28 ./patches/source/dnsmasq/dnsmasq.libidn2.diff.gz
+-rw-r--r-- 1 root root 345 2021-04-25 18:48 ./patches/source/dnsmasq/doinst.sh.gz
+-rw-r--r-- 1 root root 383 2021-04-25 18:44 ./patches/source/dnsmasq/rc.dnsmasq.gz
+-rw-r--r-- 1 root root 898 2018-02-27 06:13 ./patches/source/dnsmasq/slack-desc
drwxr-xr-x 2 root root 4096 2022-09-20 19:25 ./patches/source/expat
-rw-r--r-- 1 root root 457785 2022-09-20 15:11 ./patches/source/expat/expat-2.4.9.tar.lz
-rw-r--r-- 1 root root 833 2022-09-20 15:11 ./patches/source/expat/expat-2.4.9.tar.lz.asc
@@ -1346,15 +1358,16 @@ drwxr-xr-x 2 root root 4096 2020-05-08 19:39 ./patches/source/util-linux/p
-rw-r--r-- 1 root root 335 2014-07-03 08:34 ./patches/source/util-linux/util-linux.fdisk-no-solaris.diff.gz
-rw-r--r-- 1 root root 10292 2009-05-30 01:25 ./patches/source/util-linux/ziptool-1.4.0.tar.xz
-rw-r--r-- 1 root root 386 2009-05-30 01:25 ./patches/source/util-linux/ziptool-fix_build.patch.gz
-drwxr-xr-x 2 root root 4096 2022-09-23 18:59 ./patches/source/vim
+drwxr-xr-x 2 root root 4096 2022-09-26 18:37 ./patches/source/vim
-rw-r--r-- 1 root root 299348 2009-07-09 22:03 ./patches/source/vim/ctags-5.8.tar.xz
-rw-r--r-- 1 root root 2768 2022-02-12 08:11 ./patches/source/vim/ctags.use-conventional-unused-marker.patch.gz
+-rw-r--r-- 1 root root 505 2022-09-26 18:00 ./patches/source/vim/doinst.sh.gz
-rw-r--r-- 1 root root 8249 2006-01-19 17:01 ./patches/source/vim/gvim.png
-rw-r--r-- 1 root root 834 2018-02-27 06:13 ./patches/source/vim/slack-desc.vim
-rw-r--r-- 1 root root 959 2018-03-15 02:41 ./patches/source/vim/slack-desc.vim-gvim
--rw-r--r-- 1 root root 10676701 2022-09-23 18:56 ./patches/source/vim/vim-9.0.0558.tar.lz
--rwxr-xr-x 1 root root 6370 2022-08-24 18:49 ./patches/source/vim/vim-gvim.SlackBuild
--rwxr-xr-x 1 root root 7934 2022-08-24 18:49 ./patches/source/vim/vim.SlackBuild
+-rw-r--r-- 1 root root 10679763 2022-09-26 18:37 ./patches/source/vim/vim-9.0.0594.tar.lz
+-rwxr-xr-x 1 root root 6370 2022-09-26 18:39 ./patches/source/vim/vim-gvim.SlackBuild
+-rwxr-xr-x 1 root root 7549 2022-09-26 18:39 ./patches/source/vim/vim.SlackBuild
-rw-r--r-- 1 root root 283 2019-01-11 20:43 ./patches/source/vim/vim.vimrc.diff.gz
drwxr-xr-x 2 root root 4096 2022-07-10 18:34 ./patches/source/wavpack
-rw-r--r-- 1 root root 963 2019-12-19 18:54 ./patches/source/wavpack/slack-desc
@@ -2716,17 +2729,17 @@ drwxr-xr-x 2 root root 69632 2022-02-01 08:29 ./slackware64/kde
-rw-r--r-- 1 root root 163 2022-01-06 22:33 ./slackware64/kde/kfourinline-21.12.1-x86_64-1.txz.asc
-rw-r--r-- 1 root root 194 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txt
-rw-r--r-- 1 root root 149612 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txz
--rw-r--r-- 1 root root 163 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txz.asc
--rw-r--r-- 1 root root 475 2022-01-06 22:42 ./slackware64/kde/kgeography-21.12.1-x86_64-1.txt
--rw-r--r-- 1 root root 9647764 2022-01-06 22:42 ./slackware64/kde/kgeography-21.12.1-x86_64-1.txz
--rw-r--r-- 1 root root 163 2022-01-06 22:42 ./slackware64/kde/kgeography-21.12.1-x86_64-1.txz.asc
--rw-r--r-- 1 root root 134 2022-01-06 22:20 ./slackware64/kde/kget-21.12.1-x86_64-1.txt
--rw-r--r-- 1 root root 5808100 2022-01-06 22:20 ./slackware64/kde/kget-21.12.1-x86_64-1.txz
--rw-r--r-- 1 root root 163 2022-01-06 22:20 ./slackware64/kde/kget-21.12.1-x86_64-1.txz.asc
--rw-r--r-- 1 root root 396 2022-01-16 05:02 ./slackware64/kde/kglobalaccel-5.90.0-x86_64-2.txt
--rw-r--r-- 1 root root 125044 2022-01-16 05:02 ./slackware64/kde/kglobalaccel-5.90.0-x86_64-2.txz
--rw-r--r-- 1 root root 163 2022-01-16 05:02 ./slackware64/kde/kglobalaccel-5.90.0-x86_64-2.txz.asc
--rw-r--r-- 1 root root 354 2022-01-06 22:32 ./slackware64/kde/kgoldrunner-21.12.1-x86_64-1.txt
+-rw-r--r-- 1 root root 163 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 475 2022-01-06 22:42 ./slackware64/kde/kgeography-21.12.1-x86_64-1.txt
+-rw-r--r-- 1 root root 9647764 2022-01-06 22:42 ./slackware64/kde/kgeography-21.12.1-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2022-01-06 22:42 ./slackware64/kde/kgeography-21.12.1-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 134 2022-01-06 22:20 ./slackware64/kde/kget-21.12.1-x86_64-1.txt
+-rw-r--r-- 1 root root 5808100 2022-01-06 22:20 ./slackware64/kde/kget-21.12.1-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2022-01-06 22:20 ./slackware64/kde/kget-21.12.1-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 396 2022-01-16 05:02 ./slackware64/kde/kglobalaccel-5.90.0-x86_64-2.txt
+-rw-r--r-- 1 root root 125044 2022-01-16 05:02 ./slackware64/kde/kglobalaccel-5.90.0-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2022-01-16 05:02 ./slackware64/kde/kglobalaccel-5.90.0-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 354 2022-01-06 22:32 ./slackware64/kde/kgoldrunner-21.12.1-x86_64-1.txt
-rw-r--r-- 1 root root 4840408 2022-01-06 22:32 ./slackware64/kde/kgoldrunner-21.12.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-01-06 22:32 ./slackware64/kde/kgoldrunner-21.12.1-x86_64-1.txz.asc
-rw-r--r-- 1 root root 205 2022-01-06 22:04 ./slackware64/kde/kgpg-21.12.1-x86_64-1.txt
@@ -5466,17 +5479,17 @@ drwxr-xr-x 2 root root 65536 2022-02-01 04:47 ./slackware64/x
-rw-r--r-- 1 root root 201316 2021-02-13 12:53 ./slackware64/x/libmypaint-1.6.1-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 12:53 ./slackware64/x/libmypaint-1.6.1-x86_64-4.txz.asc
-rw-r--r-- 1 root root 377 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txt
--rw-r--r-- 1 root root 34816 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txz
--rw-r--r-- 1 root root 163 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txz.asc
--rw-r--r-- 1 root root 330 2021-09-17 03:16 ./slackware64/x/libpinyin-2.6.1-x86_64-1.txt
--rw-r--r-- 1 root root 11326792 2021-09-17 03:16 ./slackware64/x/libpinyin-2.6.1-x86_64-1.txz
--rw-r--r-- 1 root root 163 2021-09-17 03:16 ./slackware64/x/libpinyin-2.6.1-x86_64-1.txz.asc
--rw-r--r-- 1 root root 536 2021-02-13 13:05 ./slackware64/x/libpthread-stubs-0.4-x86_64-5.txt
--rw-r--r-- 1 root root 3160 2021-02-13 13:05 ./slackware64/x/libpthread-stubs-0.4-x86_64-5.txz
--rw-r--r-- 1 root root 163 2021-02-13 13:05 ./slackware64/x/libpthread-stubs-0.4-x86_64-5.txz.asc
--rw-r--r-- 1 root root 423 2021-09-21 02:16 ./slackware64/x/libva-2.13.0-x86_64-2.txt
--rw-r--r-- 1 root root 174396 2021-09-21 02:16 ./slackware64/x/libva-2.13.0-x86_64-2.txz
--rw-r--r-- 1 root root 163 2021-09-21 02:16 ./slackware64/x/libva-2.13.0-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 34816 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 330 2021-09-17 03:16 ./slackware64/x/libpinyin-2.6.1-x86_64-1.txt
+-rw-r--r-- 1 root root 11326792 2021-09-17 03:16 ./slackware64/x/libpinyin-2.6.1-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2021-09-17 03:16 ./slackware64/x/libpinyin-2.6.1-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 536 2021-02-13 13:05 ./slackware64/x/libpthread-stubs-0.4-x86_64-5.txt
+-rw-r--r-- 1 root root 3160 2021-02-13 13:05 ./slackware64/x/libpthread-stubs-0.4-x86_64-5.txz
+-rw-r--r-- 1 root root 163 2021-02-13 13:05 ./slackware64/x/libpthread-stubs-0.4-x86_64-5.txz.asc
+-rw-r--r-- 1 root root 423 2021-09-21 02:16 ./slackware64/x/libva-2.13.0-x86_64-2.txt
+-rw-r--r-- 1 root root 174396 2021-09-21 02:16 ./slackware64/x/libva-2.13.0-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2021-09-21 02:16 ./slackware64/x/libva-2.13.0-x86_64-2.txz.asc
-rw-r--r-- 1 root root 294 2021-10-01 03:29 ./slackware64/x/libva-utils-2.13.0-x86_64-1.txt
-rw-r--r-- 1 root root 453036 2021-10-01 03:29 ./slackware64/x/libva-utils-2.13.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-01 03:29 ./slackware64/x/libva-utils-2.13.0-x86_64-1.txz.asc
@@ -15081,16 +15094,16 @@ drwxr-xr-x 2 root root 4096 2020-08-09 17:46 ./source/x/x11/src/font
-rw-r--r-- 1 root root 719756 2010-11-15 22:21 ./source/x/x11/src/font/font-isas-misc-1.0.3.tar.xz
-rw-r--r-- 1 root root 517868 2010-11-15 22:34 ./source/x/x11/src/font/font-jis-misc-1.0.3.tar.xz
-rw-r--r-- 1 root root 91408 2010-11-15 22:38 ./source/x/x11/src/font/font-micro-misc-1.0.3.tar.xz
--rw-r--r-- 1 root root 121968 2010-11-15 22:42 ./source/x/x11/src/font/font-misc-cyrillic-1.0.3.tar.xz
--rw-r--r-- 1 root root 233864 2020-08-06 21:25 ./source/x/x11/src/font/font-misc-ethiopic-1.0.4.tar.xz
--rw-r--r-- 1 root root 828248 2010-11-15 22:52 ./source/x/x11/src/font/font-misc-meltho-1.0.3.tar.xz
--rw-r--r-- 1 root root 1423336 2010-11-15 23:06 ./source/x/x11/src/font/font-misc-misc-1.1.2.tar.xz
--rw-r--r-- 1 root root 217292 2010-11-15 23:09 ./source/x/x11/src/font/font-mutt-misc-1.0.3.tar.xz
--rw-r--r-- 1 root root 128096 2010-11-15 23:12 ./source/x/x11/src/font/font-schumacher-misc-1.1.2.tar.xz
--rw-r--r-- 1 root root 95876 2010-11-15 23:14 ./source/x/x11/src/font/font-screen-cyrillic-1.0.4.tar.xz
--rw-r--r-- 1 root root 99540 2010-11-15 23:18 ./source/x/x11/src/font/font-sony-misc-1.0.3.tar.xz
--rw-r--r-- 1 root root 106568 2010-11-15 23:20 ./source/x/x11/src/font/font-sun-misc-1.0.3.tar.xz
--rw-r--r-- 1 root root 138692 2019-08-25 22:27 ./source/x/x11/src/font/font-util-1.3.2.tar.xz
+-rw-r--r-- 1 root root 121968 2010-11-15 22:42 ./source/x/x11/src/font/font-misc-cyrillic-1.0.3.tar.xz
+-rw-r--r-- 1 root root 233864 2020-08-06 21:25 ./source/x/x11/src/font/font-misc-ethiopic-1.0.4.tar.xz
+-rw-r--r-- 1 root root 828248 2010-11-15 22:52 ./source/x/x11/src/font/font-misc-meltho-1.0.3.tar.xz
+-rw-r--r-- 1 root root 1423336 2010-11-15 23:06 ./source/x/x11/src/font/font-misc-misc-1.1.2.tar.xz
+-rw-r--r-- 1 root root 217292 2010-11-15 23:09 ./source/x/x11/src/font/font-mutt-misc-1.0.3.tar.xz
+-rw-r--r-- 1 root root 128096 2010-11-15 23:12 ./source/x/x11/src/font/font-schumacher-misc-1.1.2.tar.xz
+-rw-r--r-- 1 root root 95876 2010-11-15 23:14 ./source/x/x11/src/font/font-screen-cyrillic-1.0.4.tar.xz
+-rw-r--r-- 1 root root 99540 2010-11-15 23:18 ./source/x/x11/src/font/font-sony-misc-1.0.3.tar.xz
+-rw-r--r-- 1 root root 106568 2010-11-15 23:20 ./source/x/x11/src/font/font-sun-misc-1.0.3.tar.xz
+-rw-r--r-- 1 root root 138692 2019-08-25 22:27 ./source/x/x11/src/font/font-util-1.3.2.tar.xz
-rw-r--r-- 1 root root 93740 2010-11-15 23:21 ./source/x/x11/src/font/font-winitzki-cyrillic-1.0.3.tar.xz
-rw-r--r-- 1 root root 117928 2010-11-15 23:23 ./source/x/x11/src/font/font-xfree86-type1-1.0.4.tar.xz
-rwxr-xr-x 1 root root 2154 2020-07-09 18:37 ./source/x/x11/src/get-xf86-video-ati.sh
diff --git a/patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txt b/patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txt
new file mode 100644
index 000000000..ed64e8267
--- /dev/null
+++ b/patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txt
@@ -0,0 +1,11 @@
+dnsmasq: dnsmasq (small DNS and DHCP server)
+dnsmasq:
+dnsmasq: Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP
+dnsmasq: server. It is designed to provide DNS (and optionally DHCP) to a
+dnsmasq: small network, and can serve the names of local machines which are not
+dnsmasq: in the global DNS.
+dnsmasq:
+dnsmasq: Dnsmasq was written by Simon Kelley.
+dnsmasq:
+dnsmasq: Homepage: http://www.thekelleys.org.uk/dnsmasq/
+dnsmasq:
diff --git a/patches/packages/vim-9.0.0558-x86_64-1_slack15.0.txt b/patches/packages/vim-9.0.0594-x86_64-1_slack15.0.txt
index 4a843388d..4a843388d 100644
--- a/patches/packages/vim-9.0.0558-x86_64-1_slack15.0.txt
+++ b/patches/packages/vim-9.0.0594-x86_64-1_slack15.0.txt
diff --git a/patches/packages/vim-gvim-9.0.0558-x86_64-1_slack15.0.txt b/patches/packages/vim-gvim-9.0.0594-x86_64-1_slack15.0.txt
index 3b81553b1..3b81553b1 100644
--- a/patches/packages/vim-gvim-9.0.0558-x86_64-1_slack15.0.txt
+++ b/patches/packages/vim-gvim-9.0.0594-x86_64-1_slack15.0.txt
diff --git a/patches/source/dnsmasq/dnsmasq.SlackBuild b/patches/source/dnsmasq/dnsmasq.SlackBuild
new file mode 100755
index 000000000..13db7ab0e
--- /dev/null
+++ b/patches/source/dnsmasq/dnsmasq.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+# Copyright 2008, 2009, 2010, 2015, 2017, 2018, 2020, 2022 Patrick J. Volkerding, Sebeka, MN, 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=dnsmasq
+VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1_slack15.0}
+
+EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-"-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"}
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i586 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ 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
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-dnsmasq
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf dnsmasq-$VERSION
+tar xvf $CWD/dnsmasq-$VERSION.tar.xz || exit 1
+cd dnsmasq-$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 {} \+
+
+zcat $CWD/dnsmasq.leasedir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+# Use libidn2:
+zcat $CWD/dnsmasq.libidn2.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+make $NUMJOBS all-i18n PREFIX=/usr MANDIR=/usr/man COPTS="$EXTRA_BUILD_OPTS" || exit 1
+make install-i18n PREFIX=/usr DESTDIR=$PKG MANDIR=/usr/man COPTS="$EXTRA_BUILD_OPTS" || exit 1
+chmod 0755 $PKG/usr/sbin/dnsmasq
+
+mkdir -p $PKG/etc/dnsmasq.d
+
+if [ -d $PKG/usr/man ]; then
+ ( cd $PKG/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd $manpagedir
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink $eachpage ).gz $eachpage.gz
+ rm $eachpage
+ done
+ gzip -9 *.?
+ )
+ done
+ )
+fi
+
+mkdir -p $PKG/var/state/dnsmasq
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/etc
+cat dnsmasq.conf.example > $PKG/etc/dnsmasq.conf.new
+mkdir -p $PKG/etc/rc.d
+zcat $CWD/rc.dnsmasq.gz > $PKG/etc/rc.d/rc.dnsmasq.new
+
+mkdir -p $PKG/usr/doc/dnsmasq-$VERSION
+cp -a \
+ COPYING FAQ doc.html setup.html \
+ $PKG/usr/doc/dnsmasq-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGELOG ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+ cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG
+ touch -r CHANGELOG $DOCSDIR/CHANGELOG
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/dnsmasq-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/patches/source/dnsmasq/dnsmasq.leasedir.diff b/patches/source/dnsmasq/dnsmasq.leasedir.diff
new file mode 100644
index 000000000..9fec6b439
--- /dev/null
+++ b/patches/source/dnsmasq/dnsmasq.leasedir.diff
@@ -0,0 +1,24 @@
+diff -Nur dnsmasq-2.52.orig/dnsmasq.conf.example dnsmasq-2.52/dnsmasq.conf.example
+--- dnsmasq-2.52.orig/dnsmasq.conf.example 2009-11-25 06:55:16.000000000 -0600
++++ dnsmasq-2.52/dnsmasq.conf.example 2010-01-22 15:32:41.137807274 -0600
+@@ -415,7 +415,7 @@
+ # The DHCP server needs somewhere on disk to keep its lease database.
+ # This defaults to a sane location, but if you want to change it, use
+ # the line below.
+-#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
++#dhcp-leasefile=/var/state/dnsmasq/dnsmasq.leases
+
+ # Set the DHCP server to authoritative mode. In this mode it will barge in
+ # and take over the lease for any client which broadcasts on the network,
+diff -Nur dnsmasq-2.52.orig/src/config.h dnsmasq-2.52/src/config.h
+--- dnsmasq-2.52.orig/src/config.h 2010-01-21 08:22:06.000000000 -0600
++++ dnsmasq-2.52/src/config.h 2010-01-22 15:32:41.136833058 -0600
+@@ -47,7 +47,7 @@
+ # elif defined(__sun__) || defined (__sun)
+ # define LEASEFILE "/var/cache/dnsmasq.leases"
+ # else
+-# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
++# define LEASEFILE "/var/state/dnsmasq/dnsmasq.leases"
+ # endif
+ #endif
+
diff --git a/patches/source/dnsmasq/dnsmasq.libidn2.diff b/patches/source/dnsmasq/dnsmasq.libidn2.diff
new file mode 100644
index 000000000..d99e556bc
--- /dev/null
+++ b/patches/source/dnsmasq/dnsmasq.libidn2.diff
@@ -0,0 +1,13 @@
+--- ./Makefile.orig 2017-05-22 16:58:46.000000000 -0500
++++ ./Makefile 2017-07-07 13:28:14.124402827 -0500
+@@ -24,8 +24,8 @@
+ LOCALEDIR = $(PREFIX)/share/locale
+ BUILDDIR = $(SRC)
+ DESTDIR =
+-CFLAGS = -Wall -W -O2
+-LDFLAGS =
++CFLAGS = -Wall -W -O2 -DHAVE_LIBIDN2
++LDFLAGS = -lidn2
+ COPTS =
+ RPM_OPT_FLAGS =
+ LIBS =
diff --git a/patches/source/dnsmasq/doinst.sh b/patches/source/dnsmasq/doinst.sh
new file mode 100644
index 000000000..92914eb3e
--- /dev/null
+++ b/patches/source/dnsmasq/doinst.sh
@@ -0,0 +1,23 @@
+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...
+}
+preserve_perms() {
+ NEW="$1"
+ OLD="$(dirname ${NEW})/$(basename ${NEW} .new)"
+ if [ -e ${OLD} ]; then
+ cp -a ${OLD} ${NEW}.incoming
+ cat ${NEW} > ${NEW}.incoming
+ mv ${NEW}.incoming ${NEW}
+ fi
+ config ${NEW}
+}
+config etc/dnsmasq.conf.new
+preserve_perms etc/rc.d/rc.dnsmasq.new
diff --git a/patches/source/dnsmasq/rc.dnsmasq b/patches/source/dnsmasq/rc.dnsmasq
new file mode 100644
index 000000000..f19a17239
--- /dev/null
+++ b/patches/source/dnsmasq/rc.dnsmasq
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Start/stop/restart dnsmasq (a small DNS/DHCP server):
+
+# Start dnsmasq:
+dnsmasq_start() {
+ if [ -x /usr/sbin/dnsmasq ]; then
+ echo "Starting dnsmasq: /usr/sbin/dnsmasq"
+ /usr/sbin/dnsmasq
+ fi
+}
+
+# Stop dnsmasq:
+dnsmasq_stop() {
+ # Try to use the .pid file first:
+ if pgrep -l -F /var/run/dnsmasq.pid 2> /dev/null | grep -q dnsmasq ; then
+ echo "Stopping dnsmasq."
+ pkill -F /var/run/dnsmasq.pid 2> /dev/null
+ else # kill any dnsmasq processes in this namespace:
+ echo "Stopping dnsmasq."
+ killall --ns $$ dnsmasq 2> /dev/null
+ fi
+}
+
+# Restart dnsmasq:
+dnsmasq_restart() {
+ dnsmasq_stop
+ sleep 1
+ dnsmasq_start
+}
+
+case "$1" in
+'start')
+ dnsmasq_start
+ ;;
+'stop')
+ dnsmasq_stop
+ ;;
+'restart')
+ dnsmasq_restart
+ ;;
+*)
+ echo "usage rc.dnsmasq: start|stop|restart"
+esac
diff --git a/patches/source/dnsmasq/slack-desc b/patches/source/dnsmasq/slack-desc
new file mode 100644
index 000000000..be34433f5
--- /dev/null
+++ b/patches/source/dnsmasq/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 ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+dnsmasq: dnsmasq (small DNS and DHCP server)
+dnsmasq:
+dnsmasq: Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP
+dnsmasq: server. It is designed to provide DNS (and optionally DHCP) to a
+dnsmasq: small network, and can serve the names of local machines which are not
+dnsmasq: in the global DNS.
+dnsmasq:
+dnsmasq: Dnsmasq was written by Simon Kelley.
+dnsmasq:
+dnsmasq: Homepage: http://www.thekelleys.org.uk/dnsmasq/
+dnsmasq:
diff --git a/patches/source/vim/doinst.sh b/patches/source/vim/doinst.sh
new file mode 100644
index 000000000..ebb76cc20
--- /dev/null
+++ b/patches/source/vim/doinst.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+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 usr/share/vim/vimrc.new
+
+# Responding to a report that in some cases the file
+# /usr/share/vim/vim90/defaults.vim must be edited in order to change settings
+# (some settings in the file will otherwise override those in
+# /usr/share/vim/vimrc), we will support a file in the same directory named
+# defaults.vim.custom. If this file exists, then it will replace the shipped
+# version of defaults.vim. The original file will be preserved as
+# defaults.vim.orig.
+if [ -r usr/share/vim/vim90/defaults.vim.custom ]; then
+ cp -a usr/share/vim/vim90/defaults.vim usr/share/vim/vim90/defaults.vim.orig
+ cp -a usr/share/vim/vim90/defaults.vim.custom usr/share/vim/vim90/defaults.vim
+fi
diff --git a/patches/source/vim/vim.SlackBuild b/patches/source/vim/vim.SlackBuild
index 2d2cbe5b3..c1676707b 100755
--- a/patches/source/vim/vim.SlackBuild
+++ b/patches/source/vim/vim.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -216,22 +216,8 @@ find $PKG/usr/doc/vim-$VERSION -type f | xargs chmod 644
( cd $PKG/usr/doc/vim-$VERSION ; ln -sf /usr/share/vim/vim$(echo $VIMBRANCH | tr -d .) doc )
mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc.vim > $PKG/install/slack-desc
-cat << EOF > $PKG/install/doinst.sh
-#!/bin/bash
-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 usr/share/vim/vimrc.new
-EOF
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/recompress.sh b/recompress.sh
index 11d7423bc..18228c6a8 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -1186,6 +1186,7 @@ gzip ./patches/source/seamonkey/doinst.sh
gzip ./patches/source/seamonkey/sm.ui.scrollToClick.diff
gzip ./patches/source/vim/ctags.use-conventional-unused-marker.patch
gzip ./patches/source/vim/vim.vimrc.diff
+gzip ./patches/source/vim/doinst.sh
gzip ./patches/source/poppler/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch
gzip ./patches/source/libxslt/libxslt.xsltMaxDepth.diff
gzip ./patches/source/net-snmp/net-snmp-5.7.2-cert-path.patch
@@ -1254,6 +1255,10 @@ gzip ./patches/source/mozilla-firefox/mimeTypes.rdf
gzip ./patches/source/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff
gzip ./patches/source/mozilla-firefox/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
gzip ./patches/source/mozilla-firefox/gkrust.a.no.networking.check.diff
+gzip ./patches/source/dnsmasq/rc.dnsmasq
+gzip ./patches/source/dnsmasq/dnsmasq.leasedir.diff
+gzip ./patches/source/dnsmasq/doinst.sh
+gzip ./patches/source/dnsmasq/dnsmasq.libidn2.diff
gzip ./patches/source/cyrus-sasl/rc.saslauthd
gzip ./patches/source/cyrus-sasl/doinst.sh
gzip ./patches/source/qt5/patches/qt5-qtbase-gcc11.patch