diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-04-13 01:10:11 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-04-13 04:37:52 +0200 |
commit | 701cf3165a2eaae89658ea8ba070e344d8f24385 (patch) | |
tree | b1768c92eb1c3445b5ade6bb5a62a482d3b98d1c /source | |
parent | 59f80800c2ed60cbc51060bdfc90eb56292d41d0 (diff) | |
download | current-701cf3165a2eaae89658ea8ba070e344d8f24385.tar.gz current-701cf3165a2eaae89658ea8ba070e344d8f24385.tar.xz |
Thu Apr 13 01:10:11 UTC 202320230413011011
a/f2fs-tools-1.16.0-x86_64-1.txz: Upgraded.
a/upower-1.90.0-x86_64-1.txz: Upgraded.
kde/breeze-gtk-5.27.4-x86_64-3.txz: Rebuilt.
[PATCH] gtk3: restore old icon size for titlebutton
Thanks to marav.
kde/kwin-5.27.4.1-x86_64-1.txz: Upgraded.
l/at-spi2-core-2.48.0-x86_64-1.txz: Upgraded.
l/gjs-1.76.0-x86_64-1.txz: Upgraded.
l/glib-networking-2.76.0-x86_64-1.txz: Upgraded.
l/glib2-2.76.1-x86_64-1.txz: Upgraded.
l/gst-plugins-bad-free-1.22.2-x86_64-1.txz: Upgraded.
l/gst-plugins-base-1.22.2-x86_64-1.txz: Upgraded.
l/gst-plugins-good-1.22.2-x86_64-1.txz: Upgraded.
l/gst-plugins-libav-1.22.2-x86_64-1.txz: Upgraded.
l/gstreamer-1.22.2-x86_64-1.txz: Upgraded.
l/librsvg-2.56.0-x86_64-1.txz: Upgraded.
l/libsoup3-3.4.0-x86_64-1.txz: Upgraded.
l/libwnck3-43.0-x86_64-1.txz: Upgraded.
l/openal-soft-1.23.1-x86_64-1.txz: Upgraded.
l/pygobject3-3.44.1-x86_64-1.txz: Upgraded.
l/vte-0.72.0-x86_64-1.txz: Upgraded.
n/dhcpcd-9.5.0-x86_64-1.txz: Upgraded.
xap/mozilla-thunderbird-102.10.0-x86_64-1.txz: Upgraded.
This release contains security fixes and improvements.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/102.10.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2023-15/
https://www.mozilla.org/en-US/security/advisories/mfsa2023-15/#MFSA-TMP-2023-0001
https://www.cve.org/CVERecord?id=CVE-2023-29531
https://www.cve.org/CVERecord?id=CVE-2023-29532
https://www.cve.org/CVERecord?id=CVE-2023-29533
https://www.cve.org/CVERecord?id=CVE-2023-29535
https://www.cve.org/CVERecord?id=CVE-2023-29536
https://www.cve.org/CVERecord?id=CVE-2023-0547
https://www.cve.org/CVERecord?id=CVE-2023-29479
https://www.cve.org/CVERecord?id=CVE-2023-29539
https://www.cve.org/CVERecord?id=CVE-2023-29541
https://www.cve.org/CVERecord?id=CVE-2023-29542
https://www.cve.org/CVERecord?id=CVE-2023-29545
https://www.cve.org/CVERecord?id=CVE-2023-1945
https://www.cve.org/CVERecord?id=CVE-2023-29548
https://www.cve.org/CVERecord?id=CVE-2023-29550
(* Security fix *)
Diffstat (limited to 'source')
19 files changed, 127 insertions, 114 deletions
diff --git a/source/a/f2fs-tools/f2fs-tools.SlackBuild b/source/a/f2fs-tools/f2fs-tools.SlackBuild index 2587f8f3c..6c5a64273 100755 --- a/source/a/f2fs-tools/f2fs-tools.SlackBuild +++ b/source/a/f2fs-tools/f2fs-tools.SlackBuild @@ -85,8 +85,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/f2fs.ftbfs.diff.gz | patch -p1 --verbose || exit 1 - NOCONFIGURE=1 sh ./autogen.sh # Configure, build, and install: diff --git a/source/a/f2fs-tools/f2fs.ftbfs.diff b/source/a/f2fs-tools/f2fs.ftbfs.diff deleted file mode 100644 index b628e962e..000000000 --- a/source/a/f2fs-tools/f2fs.ftbfs.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff -aurN f2fs-tools-1.15.0/fsck/compress.c f2fs-tools-1.15.0-mod/fsck/compress.c ---- f2fs-tools-1.15.0/fsck/compress.c 2022-05-13 19:50:41.000000000 +0200 -+++ f2fs-tools-1.15.0-mod/fsck/compress.c 2022-08-19 12:15:48.037589094 +0200 -@@ -32,10 +32,10 @@ - #ifdef HAVE_LIBLZ4 - #define LZ4_MEMORY_USAGE 14 - #define LZ4_MAX_INPUT_SIZE 0x7E000000 /* 2 113 929 216 bytes */ --#ifndef LZ4_STREAMSIZE --#define LZ4_STREAMSIZE (LZ4_STREAMSIZE_U64 * sizeof(long long)) -+#ifndef LZ4_STREAM_MINSIZE -+#define LZ4_STREAM_MINSIZE ((1UL << LZ4_MEMORY_USAGE) + 32) /* static size, for inter-version compatibility */ - #endif --#define LZ4_MEM_COMPRESS LZ4_STREAMSIZE -+#define LZ4_MEM_COMPRESS LZ4_STREAM_MINSIZE - #define LZ4_ACCELERATION_DEFAULT 1 - #define LZ4_WORK_SIZE ALIGN_UP(LZ4_MEM_COMPRESS, 8) - #endif diff --git a/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch b/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch new file mode 100644 index 000000000..ff80079ea --- /dev/null +++ b/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch @@ -0,0 +1,43 @@ +From 81a89385a45d3de1028bcd86b3688fb465b4035c Mon Sep 17 00:00:00 2001 +From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> +Date: Fri, 21 Oct 2022 00:14:18 +0200 +Subject: [PATCH] enumerator-udev: actually check for an idevice + +up-enumerator-udev.c forgot to include the build config file, resulting in +HAVE_IDEVICE macro always being undefined. + +This meant that the idevice backend was never actually instantiated - as +evidenced by the file not even compiling when this was fixed, due to +missing "up-device-idevice.h" include. + +Fix both of these issues. +--- + src/linux/up-enumerator-udev.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/linux/up-enumerator-udev.c b/src/linux/up-enumerator-udev.c +index 9e52d153..1182bdfd 100644 +--- a/src/linux/up-enumerator-udev.c ++++ b/src/linux/up-enumerator-udev.c +@@ -18,6 +18,8 @@ + * + */ + ++#include "config.h" ++ + #include <string.h> + + #include <gudev/gudev.h> +@@ -29,6 +31,9 @@ + #include "up-device-supply-battery.h" + #include "up-device-hid.h" + #include "up-device-wup.h" ++#ifdef HAVE_IDEVICE ++#include "up-device-idevice.h" ++#endif /* HAVE_IDEVICE */ + + struct _UpEnumeratorUdev { + UpEnumerator parent; +-- +GitLab + diff --git a/source/a/upower/upower.SlackBuild b/source/a/upower/upower.SlackBuild index 22dcb2cca..dfcc52113 100755 --- a/source/a/upower/upower.SlackBuild +++ b/source/a/upower/upower.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for upower # Copyright 2010, 2011, 2015 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -48,7 +49,7 @@ fi # 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" + echo "$PKGNAM-$(echo $VERSION | sed "s/v//g")-$ARCH-$BUILD.txz" exit 0 fi @@ -90,21 +91,31 @@ find . \ \( -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 \ +# Fix libimobiledevice support: +zcat $CWD/81a89385a45d3de1028bcd86b3688fb465b4035c.patch.gz | patch -p1 --verbose || exit 1 + +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-static \ - --enable-man-pages \ - --build=$TARGET || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --buildtype=release \ + -Dsystemdsystemunitdir=no \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. # Add upower policy allowing users in the 'power' group # to suspend/hibernate the computer: @@ -113,9 +124,6 @@ install -m 0644 -o root \ $CWD/10-enable-upower-suspend.rules \ $PKG/usr/share/polkit-1/rules.d/10-enable-upower-suspend.rules.new -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -125,14 +133,14 @@ mv $PKG/etc/UPower/UPower.conf $PKG/etc/UPower/UPower.conf.new 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 -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$(echo $VERSION | sed "s/v//g") cp -a \ AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$(echo $VERSION | sed "s/v//g") 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/$PKGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | sed "s/v//g")-$ARCH-$BUILD.txz diff --git a/source/kde/kde/build/breeze-gtk b/source/kde/kde/build/breeze-gtk index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/breeze-gtk +++ b/source/kde/kde/build/breeze-gtk @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/patch/breeze-gtk.patch b/source/kde/kde/patch/breeze-gtk.patch index 3e8bb036c..1a9f4d910 100644 --- a/source/kde/kde/patch/breeze-gtk.patch +++ b/source/kde/kde/patch/breeze-gtk.patch @@ -1 +1,2 @@ cat $CWD/patch/breeze-gtk/49a595aaed62ce08cf6e173fa85165b1e847802d.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/breeze-gtk/bfe2ce620d395c943bb13a646295948b5bffbcc3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/breeze-gtk/bfe2ce620d395c943bb13a646295948b5bffbcc3.patch b/source/kde/kde/patch/breeze-gtk/bfe2ce620d395c943bb13a646295948b5bffbcc3.patch new file mode 100644 index 000000000..8a8b343ec --- /dev/null +++ b/source/kde/kde/patch/breeze-gtk/bfe2ce620d395c943bb13a646295948b5bffbcc3.patch @@ -0,0 +1,35 @@ +From bfe2ce620d395c943bb13a646295948b5bffbcc3 Mon Sep 17 00:00:00 2001 +From: Fushan Wen <qydwhotmail@gmail.com> +Date: Fri, 7 Apr 2023 22:02:11 +0800 +Subject: [PATCH] gtk3: restore old icon size for titlebutton + +`background-size` results in different sizes on X11 and Wayland. + +BUG: 468203 +FIXED-IN: 5.27.5 +--- + src/gtk3/widgets/_window_decorations.scss | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/gtk3/widgets/_window_decorations.scss b/src/gtk3/widgets/_window_decorations.scss +index aef28cac..6568e6bf 100644 +--- a/src/gtk3/widgets/_window_decorations.scss ++++ b/src/gtk3/widgets/_window_decorations.scss +@@ -74,11 +74,11 @@ window { + .titlebar { + &.default-decoration button.titlebutton { + padding: 1px; +- min-height: 24px; +- min-width: 24px; ++ min-height: 18px; ++ min-width: 18px; + margin: 0; + } +- $titlebutton-size: 24px 24px; ++ $titlebutton-size: 18px 18px; + button.titlebutton { + &:hover, + &:active, +-- +GitLab + diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index 1c7f98e7b..739578e0f 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2015, 2017, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2015, 2017, 2018, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -103,13 +103,15 @@ meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - # Since meson isn't listening to options: rm -rf $PKG/usr/libexec/installed-tests rmdir $PKG/usr/libexec +# Relocate some docs: +mkdir -p $PKG/usr/doc/glib-$VERSION +mv $PKG/usr/share/doc/glib-2.0 $PKG/usr/doc/glib-$VERSION +rmdir $PKG/usr/share/doc + # Install profile scripts: mkdir -p $PKG/etc/profile.d/ cp -a $CWD/libglib2.{csh,sh} $PKG/etc/profile.d/ diff --git a/source/l/gst-plugins-bad-free/fetch-sources.sh b/source/l/gst-plugins-bad-free/fetch-sources.sh index 267242d00..33d6f90a9 100755 --- a/source/l/gst-plugins-bad-free/fetch-sources.sh +++ b/source/l/gst-plugins-bad-free/fetch-sources.sh @@ -26,7 +26,7 @@ # # Example: VERSION=1.18.5 ./fetch-sources.sh -VERSION=${VERSION:-1.22.1} +VERSION=${VERSION:-1.22.2} rm -rf rm -rf gst-plugins-bad-free-$VERSION gst-plugins-bad-$VERSION diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild index f6e40311b..17d9735ba 100755 --- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild +++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gst-plugins-bad-free VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/librsvg/librsvg.SlackBuild b/source/l/librsvg/librsvg.SlackBuild index 6a41c9daa..37f0c37a9 100755 --- a/source/l/librsvg/librsvg.SlackBuild +++ b/source/l/librsvg/librsvg.SlackBuild @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2016, 2018, 2022 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2016, 2018, 2022, 2023 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -77,7 +77,7 @@ find . \ -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ -./configure \ +unshare -n ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ @@ -88,7 +88,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-static=no \ --build=$ARCH-slackware-linux || exit 1 -make $NUMJOBS || make || exit 1 +unshare -n make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 # Don't ship .la files: diff --git a/source/l/libsoup3/libsoup3.SlackBuild b/source/l/libsoup3/libsoup3.SlackBuild index cc481f050..5c60e14f8 100755 --- a/source/l/libsoup3/libsoup3.SlackBuild +++ b/source/l/libsoup3/libsoup3.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libsoup # # Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA -# Copyright 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -79,7 +79,7 @@ export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" mkdir meson-build cd meson-build -meson setup \ +unshare -n meson setup \ --prefix=/usr \ --libdir=lib${LIBDIRSUFFIX} \ --libexecdir=/usr/libexec \ @@ -98,9 +98,6 @@ meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a COPYING* AUTHORS NEWS README* $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/l/libwnck3/libwnck3.SlackBuild b/source/l/libwnck3/libwnck3.SlackBuild index 0078039f5..10e60ff20 100755 --- a/source/l/libwnck3/libwnck3.SlackBuild +++ b/source/l/libwnck3/libwnck3.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libwnck3 -VERSION=${VERSION:-$(echo libwnck-*.tar.lz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo libwnck-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -69,7 +69,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf libwnck-$VERSION -tar xvf $CWD/libwnck-${VERSION}.tar.lz || exit 1 +tar xvf $CWD/libwnck-${VERSION}.tar.?z || exit 1 cd libwnck-$VERSION # Make sure ownerships and permissions are sane: diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index 40b5aa99e..e3b156cb7 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2018, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -101,9 +101,6 @@ meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - # 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 diff --git a/source/n/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo deleted file mode 100644 index 40b2f7bff..000000000 --- a/source/n/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo +++ /dev/null @@ -1 +0,0 @@ -SHA256 (dhcpcd-9.4.1.tar.xz) = 819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild index 3baf677d0..82a9b44fb 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:-2} +BUILD=${BUILD:-1} # By default, Slackware builds dhcpcd with privilege separation, which improves # security by ensuring that any security vulnerabilies such as buffer overflows @@ -85,8 +85,6 @@ find . \ patch -p1 --verbose < $CWD/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch || exit 1 patch -p1 --verbose < $CWD/patches/use-hostname_short-in-dhcpcd.conf.patch || exit 1 patch -p1 --verbose < $CWD/patches/dhcpcd.conf-request_ntp_server_by_default.patch || exit 1 -patch -p1 --verbose < $CWD/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch || exit 1 -patch -p1 --verbose < $CWD/patches/38befd4e867583002b96ec39df733585d74c4ff5.patch || exit 1 # At this point, it should be safe to assume that /var will be mounted by the # time dhcpcd is called, as all non-root local filesystems are mounted from diff --git a/source/n/dhcpcd/dhcpcd.url b/source/n/dhcpcd/dhcpcd.url index e4372dd4d..62618708f 100644 --- a/source/n/dhcpcd/dhcpcd.url +++ b/source/n/dhcpcd/dhcpcd.url @@ -1 +1,2 @@ -https://roy.marples.name/downloads/dhcpcd +https://github.com/NetworkConfiguration/dhcpcd +#https://roy.marples.name/downloads/dhcpcd diff --git a/source/n/dhcpcd/patches/38befd4e867583002b96ec39df733585d74c4ff5.patch b/source/n/dhcpcd/patches/38befd4e867583002b96ec39df733585d74c4ff5.patch deleted file mode 100644 index 93f6d1b86..000000000 --- a/source/n/dhcpcd/patches/38befd4e867583002b96ec39df733585d74c4ff5.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 38befd4e867583002b96ec39df733585d74c4ff5 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Fri, 26 Aug 2022 09:24:50 +0100 -Subject: [PATCH] privsep: Allow newfstatat syscall as well - -Allows newer glibc variants to work apparently. -As reported in #84 and #89. ---- - src/privsep-linux.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index 4d5c195d..66aeb490 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -353,6 +353,9 @@ static struct sock_filter ps_seccomp_filter[] = { - #ifdef __NR_nanosleep - SECCOMP_ALLOW(__NR_nanosleep), /* XXX should use ppoll instead */ - #endif -+#ifdef __NR_newfstatat -+ SECCOMP_ALLOW(__NR_newfstatat), -+#endif - #ifdef __NR_ppoll - SECCOMP_ALLOW(__NR_ppoll), - #endif diff --git a/source/n/dhcpcd/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch b/source/n/dhcpcd/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch deleted file mode 100644 index c61920309..000000000 --- a/source/n/dhcpcd/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 645c32dd1a511527b7eb88443a28dfe7704d5f52 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Fri, 26 Aug 2022 09:08:36 +0100 -Subject: [PATCH] privsep: Allow getrandom sysctl for newer glibc - -Fixes #120 ---- - src/privsep-linux.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index c2de54ba..4d5c195d 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -325,6 +325,9 @@ static struct sock_filter ps_seccomp_filter[] = { - #ifdef __NR_getpid - SECCOMP_ALLOW(__NR_getpid), - #endif -+#ifdef __NR_getrandom -+ SECCOMP_ALLOW(__NR_getrandom), -+#endif - #ifdef __NR_getsockopt - /* For route socket overflow */ - SECCOMP_ALLOW_ARG(__NR_getsockopt, 1, SOL_SOCKET), |