diff options
Diffstat (limited to 'source')
15 files changed, 48 insertions, 25 deletions
diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild index 74c773be..8707648e 100755 --- a/source/a/gzip/gzip.SlackBuild +++ b/source/a/gzip/gzip.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gzip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 03fd62b4..45384884 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,8 @@ +Fri Sep 3 18:06:38 UTC 2021 + Added dhcpcd user/group to passwd/group/shadow. + Added /var/lib/dhcpcd directory. + Thanks to Stuart Winter. ++--------------------------+ Wed May 26 19:51:53 UTC 2021 Keep PCI controller kernel modules. Thanks to andygoth. +--------------------------+ diff --git a/source/installer/sources/initrd/etc/group b/source/installer/sources/initrd/etc/group index 8e9154a1..9e5dc196 100644 --- a/source/installer/sources/initrd/etc/group +++ b/source/installer/sources/initrd/etc/group @@ -30,6 +30,7 @@ gdm:x:42: shadow:x:43: ftp:x:50: oprofile:x:51: +dhcpcd:x:68: apache:x:80: messagebus:x:81: haldaemon:x:82: diff --git a/source/installer/sources/initrd/etc/passwd b/source/installer/sources/initrd/etc/passwd index d89e1ba5..b682ea06 100644 --- a/source/installer/sources/initrd/etc/passwd +++ b/source/installer/sources/initrd/etc/passwd @@ -17,5 +17,6 @@ mysql:x:27:27:MySQL:/var/lib/mysql:/bin/bash rpc:x:32:32:RPC portmap user:/:/bin/false sshd:x:33:33:sshd:/: gdm:x:42:42:GDM:/var/state/gdm:/bin/bash +dhcpcd:x:68:68:User for dhcpcd:/var/lib/dhcpcd:/bin/false pop:x:90:90:POP:/: nobody:x:99:99:nobody:/: diff --git a/source/installer/sources/initrd/etc/shadow b/source/installer/sources/initrd/etc/shadow index 577b5d0f..8699e217 100644 --- a/source/installer/sources/initrd/etc/shadow +++ b/source/installer/sources/initrd/etc/shadow @@ -12,6 +12,7 @@ mail:*:9797:0::::: news:*:9797:0::::: uucp:*:9797:0::::: man:*:9797:0::::: +dhcpcd:*:9797:0::::: games:*:9797:0::::: guest:*:9797:0::::: nobody:*:9797:0::::: diff --git a/source/k/kernel-configs/config-generic-5.14 b/source/k/kernel-configs/config-generic-5.14.1 index 963d597b..876930a9 100644 --- a/source/k/kernel-configs/config-generic-5.14 +++ b/source/k/kernel-configs/config-generic-5.14.1 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.14.0 Kernel Configuration +# Linux/x86 5.14.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-5.14.x64 b/source/k/kernel-configs/config-generic-5.14.1.x64 index 34154337..d997fd9a 100644 --- a/source/k/kernel-configs/config-generic-5.14.x64 +++ b/source/k/kernel-configs/config-generic-5.14.1.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.14.0 Kernel Configuration +# Linux/x86 5.14.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-smp-5.14-smp b/source/k/kernel-configs/config-generic-smp-5.14.1-smp index bdf9e79e..fd61e470 100644 --- a/source/k/kernel-configs/config-generic-smp-5.14-smp +++ b/source/k/kernel-configs/config-generic-smp-5.14.1-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.14.0 Kernel Configuration +# Linux/x86 5.14.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.14 b/source/k/kernel-configs/config-huge-5.14.1 index db8a3b94..8d8aff12 100644 --- a/source/k/kernel-configs/config-huge-5.14 +++ b/source/k/kernel-configs/config-huge-5.14.1 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.14.0 Kernel Configuration +# Linux/x86 5.14.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.14.x64 b/source/k/kernel-configs/config-huge-5.14.1.x64 index f269d185..43039386 100644 --- a/source/k/kernel-configs/config-huge-5.14.x64 +++ b/source/k/kernel-configs/config-huge-5.14.1.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.14.0 Kernel Configuration +# Linux/x86 5.14.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-smp-5.14-smp b/source/k/kernel-configs/config-huge-smp-5.14.1-smp index 826cce5e..ac64d884 100644 --- a/source/k/kernel-configs/config-huge-smp-5.14-smp +++ b/source/k/kernel-configs/config-huge-smp-5.14.1-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.14.0 Kernel Configuration +# Linux/x86 5.14.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/patch/kstars.patch b/source/kde/kde/patch/kstars.patch new file mode 100644 index 00000000..bc1dec63 --- /dev/null +++ b/source/kde/kde/patch/kstars.patch @@ -0,0 +1,4 @@ +# Fix kstars-3.5.4 not building due to a docbook error: +if [ "${MODULAR_PACKAGE_VERSION}" = "3.5.4" ]; then + rm -f po/de/docs/kstars/index.docbook +fi diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index 1b7af895..783ef548 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bind VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/bind/rc.bind b/source/n/bind/rc.bind index f7a68776..cab75163 100644 --- a/source/n/bind/rc.bind +++ b/source/n/bind/rc.bind @@ -91,26 +91,37 @@ bind_start() { # Stop all running copies of BIND (/usr/sbin/named): bind_stop() { - echo "Stopping BIND: /usr/sbin/rndc $RDNC_OPTIONS stop" - /usr/sbin/rndc $RDNC_OPTIONS stop - # A problem with using "/usr/sbin/rndc stop" is that if you - # managed to get multiple copies of named running it will - # only stop one of them and then can't stop the others even - # if you run it again. So, after doing things the nice way - # we'll do them the old-fashioned way. If you don't like - # it you can comment it out, but unless you have a lot of - # other programs you run called "named" this is unlikely - # to have any ill effects: - sleep 1 - if ps axc | grep -q named ; then - echo "Stopping all named processes in this namespace: /bin/killall --ns \$\$ named" - /bin/killall --ns $$ named 2> /dev/null + # If you've set up rndc, we can use this to make shutting down BIND faster. + # If you have /etc/rndc.conf, or you have /etc/rndc.key, or $RNDC_OPTIONS is + # not empty, we'll try it. + if [ -r /etc/rndc.conf -o -r /etc/rndc.key -o ! -z "$RNDC_OPTIONS" ]; then + if [ -z "$RNDC_OPTIONS" ]; then + echo "Stopping BIND: /usr/sbin/rndc stop" + else + echo "Stopping BIND: /usr/sbin/rndc $RNDC_OPTIONS stop" + fi + /usr/sbin/rndc $RNDC_OPTIONS stop + # Wait for up to $TIMEOUT seconds before moving on to try killall: + TIMEOUT=${TIMEOUT:-10} + while [ "$TIMEOUT" -gt "0" ]; do + # Exit the timeout loop if there are no named processes: + if ! ps axco command | grep -q -e "^named$"; then + break + fi + sleep 1 + TIMEOUT=$(expr $TIMEOUT - 1) + done + fi + # Kill named processes if there are any running: + if ps axco command | grep -q -e "^named$"; then + echo "Stopping all named processes in this namespace: /bin/killall -SIGTERM --ns \$\$ named" + /bin/killall -SIGTERM --ns $$ named 2> /dev/null fi } # Reload BIND: bind_reload() { - /usr/sbin/rndc $RDNC_OPTIONS reload + /usr/sbin/rndc $RNDC_OPTIONS reload } # Restart BIND: @@ -121,7 +132,7 @@ bind_restart() { # Get BIND status: bind_status() { - /usr/sbin/rndc $RDNC_OPTIONS status + /usr/sbin/rndc $RNDC_OPTIONS status } case "$1" in diff --git a/source/xap/ssr/ssr.SlackBuild b/source/xap/ssr/ssr.SlackBuild index 23d3aaa0..26b5dfc4 100755 --- a/source/xap/ssr/ssr.SlackBuild +++ b/source/xap/ssr/ssr.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ssr VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |