summaryrefslogtreecommitdiff
path: root/source/n
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2022-09-26 19:43:54 +0000
committerEric Hameleers <alien@slackware.com>2022-09-27 06:59:45 +0200
commit98175558d7a0dcd6e001ae887a44c05cf7955d63 (patch)
tree234639cf4c451359a2e1378954d53ce601bba068 /source/n
parentc1abff4356b1c0bde79b73b1c88adec821b09872 (diff)
downloadcurrent-98175558d7a0dcd6e001ae887a44c05cf7955d63.tar.gz
Mon Sep 26 19:43:54 UTC 202220220926194354
a/bash-5.2.000-x86_64-1.txz: Upgraded. ap/vim-9.0.0594-x86_64-1.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 *) l/fluidsynth-2.3.0-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_49-x86_64-1.txz: Upgraded. l/libcap-2.66-x86_64-1.txz: Upgraded. l/netpbm-10.99.03-x86_64-1.txz: Upgraded. l/readline-8.2.000-x86_64-1.txz: Upgraded. l/xapian-core-1.4.21-x86_64-1.txz: Upgraded. n/dnsmasq-2.87-x86_64-1.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 *) x/xterm-373-x86_64-1.txz: Upgraded. xap/vim-gvim-9.0.0594-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n')
-rw-r--r--source/n/dnsmasq/dnsmasq-2.80-SIOCGSTAMP.patch60
-rwxr-xr-xsource/n/dnsmasq/dnsmasq.SlackBuild5
2 files changed, 1 insertions, 64 deletions
diff --git a/source/n/dnsmasq/dnsmasq-2.80-SIOCGSTAMP.patch b/source/n/dnsmasq/dnsmasq-2.80-SIOCGSTAMP.patch
deleted file mode 100644
index 3a32bb82..00000000
--- a/source/n/dnsmasq/dnsmasq-2.80-SIOCGSTAMP.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 31e14f6e52677c675ee4683f9daab5bf21c07dd6 Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Wed, 31 Jul 2019 20:35:35 +0200
-Subject: [PATCH] Recent kernel no longer supports SIOCGSTAMP
-
-Build without it defined by kernel headers. Do not try SO_TIMESTAMP
-until fixed properly.
----
- src/dhcp.c | 32 ++++++++++++++++++--------------
- 1 file changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/src/dhcp.c b/src/dhcp.c
-index f8d323b..9afdccf 100644
---- a/src/dhcp.c
-+++ b/src/dhcp.c
-@@ -178,23 +178,27 @@ void dhcp_packet(time_t now, int pxe_fd)
- (sz < (ssize_t)(sizeof(*mess) - sizeof(mess->options))))
- return;
-
-- #if defined (HAVE_LINUX_NETWORK)
-- if (ioctl(fd, SIOCGSTAMP, &tv) == 0)
-+#if defined (HAVE_LINUX_NETWORK)
-+#ifdef SIOCGSTAMP
-+ if (tv.tv_sec == 0 && ioctl(fd, SIOCGSTAMP, &tv) == 0)
- recvtime = tv.tv_sec;
-+#endif
-
- if (msg.msg_controllen >= sizeof(struct cmsghdr))
-- for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
-- if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_PKTINFO)
-- {
-- union {
-- unsigned char *c;
-- struct in_pktinfo *p;
-- } p;
-- p.c = CMSG_DATA(cmptr);
-- iface_index = p.p->ipi_ifindex;
-- if (p.p->ipi_addr.s_addr != INADDR_BROADCAST)
-- unicast_dest = 1;
-- }
-+ {
-+ for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
-+ if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_PKTINFO)
-+ {
-+ union {
-+ unsigned char *c;
-+ struct in_pktinfo *p;
-+ } p;
-+ p.c = CMSG_DATA(cmptr);
-+ iface_index = p.p->ipi_ifindex;
-+ if (p.p->ipi_addr.s_addr != INADDR_BROADCAST)
-+ unicast_dest = 1;
-+ }
-+ }
-
- #elif defined(HAVE_BSD_NETWORK)
- if (msg.msg_controllen >= sizeof(struct cmsghdr))
---
-2.20.1
-
diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild
index 29a79927..99160f38 100755
--- a/source/n/dnsmasq/dnsmasq.SlackBuild
+++ b/source/n/dnsmasq/dnsmasq.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2015, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
+# 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
@@ -69,9 +69,6 @@ zcat $CWD/dnsmasq.leasedir.diff.gz | patch -p1 --verbose --backup --suffix=.orig
# Use libidn2:
zcat $CWD/dnsmasq.libidn2.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-# Fix build with Linux 5.4.x:
-zcat $CWD/dnsmasq-2.80-SIOCGSTAMP.patch.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