diff options
Diffstat (limited to '')
-rwxr-xr-x | source/d/rinutils/rinutils.SlackBuild | 2 | ||||
-rw-r--r-- | source/installer/ChangeLog.txt | 6 | ||||
-rwxr-xr-x | source/installer/sources/initrd/etc/rc.d/rc.S | 10 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-6.1.46 (renamed from source/k/kernel-configs/config-generic-6.1.45) | 13 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-6.1.46.x64 (renamed from source/k/kernel-configs/config-generic-6.1.45.x64) | 13 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-6.1.46-smp (renamed from source/k/kernel-configs/config-generic-smp-6.1.45-smp) | 13 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-6.1.46 (renamed from source/k/kernel-configs/config-huge-6.1.45) | 13 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-6.1.46.x64 (renamed from source/k/kernel-configs/config-huge-6.1.45.x64) | 13 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-6.1.46-smp (renamed from source/k/kernel-configs/config-huge-smp-6.1.45-smp) | 13 | ||||
-rw-r--r-- | source/l/FTBFSlog | 4 | ||||
-rwxr-xr-x | source/n/httpd/httpd.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/httpd/rc.httpd | 25 | ||||
-rwxr-xr-x | source/n/net-snmp/net-snmp.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/php/fetch-php.sh | 4 |
14 files changed, 73 insertions, 60 deletions
diff --git a/source/d/rinutils/rinutils.SlackBuild b/source/d/rinutils/rinutils.SlackBuild index 3c699414e..6568bfec8 100755 --- a/source/d/rinutils/rinutils.SlackBuild +++ b/source/d/rinutils/rinutils.SlackBuild @@ -88,7 +88,7 @@ find . \ # Configure, build, and install: mkdir cmake-build cd cmake-build - cmake \ + unshare -n cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 32e5a932c..f44c31041 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,9 @@ +Tue Aug 15 19:15:38 UTC 2023 + Don't run rc.font unless a kernel command-line flag RCFONT is provided. + Legacy BIOS tends to get a correct sized font without it, as does recent + UEFI. Running it by default with a HiDPI screen can result in an + unreadably small font. ++--------------------------+ Tue Aug 1 09:09:59 UTC 2023 Added /usr/lib(64)/libatomic.so for 'lsusb' Thanks to William PC for the report. diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S index 133a7bf3b..ce8c32d5c 100755 --- a/source/installer/sources/initrd/etc/rc.d/rc.S +++ b/source/installer/sources/initrd/etc/rc.d/rc.S @@ -182,8 +182,14 @@ rm -f /tmp/foo echo "Activating LVM volumes:" vgchange -ay -if [ -x /etc/rc.d/rc.font ]; then - /bin/sh /etc/rc.d/rc.font +# In testing here the results of running rc.font with HiDPI screens has been +# rather unpredicable, sometimes resulting in an unreadably small font rather +# than increasing the size. Let's skip it unless RCFONT is passed as a kernel +# command-line flag: +if cat /proc/cmdline | grep -wq RCFONT ; then + if [ -x /etc/rc.d/rc.font ]; then + /bin/sh /etc/rc.d/rc.font + fi fi # Don't automatically blank the screen, or it will go black during the install diff --git a/source/k/kernel-configs/config-generic-6.1.45 b/source/k/kernel-configs/config-generic-6.1.46 index 780c7ca30..eedad35d7 100644 --- a/source/k/kernel-configs/config-generic-6.1.45 +++ b/source/k/kernel-configs/config-generic-6.1.46 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45 Kernel Configuration +# Linux/x86 6.1.46 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -521,12 +521,11 @@ CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y # CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -# CONFIG_ACPI_TINY_POWER_BUTTON is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m +CONFIG_ACPI_FAN=y CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_CPU_FREQ_PSS=y @@ -535,7 +534,7 @@ CONFIG_ACPI_PROCESSOR_IDLE=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_THERMAL=y CONFIG_ACPI_PLATFORM_PROFILE=m CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y diff --git a/source/k/kernel-configs/config-generic-6.1.45.x64 b/source/k/kernel-configs/config-generic-6.1.46.x64 index 465db908e..d55e5c3da 100644 --- a/source/k/kernel-configs/config-generic-6.1.45.x64 +++ b/source/k/kernel-configs/config-generic-6.1.46.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45 Kernel Configuration +# Linux/x86 6.1.46 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -555,12 +555,11 @@ CONFIG_ACPI_LPIT=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y # CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -# CONFIG_ACPI_TINY_POWER_BUTTON is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m +CONFIG_ACPI_FAN=y CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_CPU_FREQ_PSS=y @@ -571,7 +570,7 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_THERMAL=y CONFIG_ACPI_PLATFORM_PROFILE=m CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y diff --git a/source/k/kernel-configs/config-generic-smp-6.1.45-smp b/source/k/kernel-configs/config-generic-smp-6.1.46-smp index 1933656cd..358c5c275 100644 --- a/source/k/kernel-configs/config-generic-smp-6.1.45-smp +++ b/source/k/kernel-configs/config-generic-smp-6.1.46-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45 Kernel Configuration +# Linux/x86 6.1.46 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -546,12 +546,11 @@ CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y # CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -# CONFIG_ACPI_TINY_POWER_BUTTON is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m +CONFIG_ACPI_FAN=y CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_CPU_FREQ_PSS=y @@ -561,7 +560,7 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_THERMAL=y CONFIG_ACPI_PLATFORM_PROFILE=m CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y diff --git a/source/k/kernel-configs/config-huge-6.1.45 b/source/k/kernel-configs/config-huge-6.1.46 index bb549d705..d5bfc7c4e 100644 --- a/source/k/kernel-configs/config-huge-6.1.45 +++ b/source/k/kernel-configs/config-huge-6.1.46 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45 Kernel Configuration +# Linux/x86 6.1.46 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -521,12 +521,11 @@ CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y # CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -# CONFIG_ACPI_TINY_POWER_BUTTON is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m +CONFIG_ACPI_FAN=y CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_CPU_FREQ_PSS=y @@ -535,7 +534,7 @@ CONFIG_ACPI_PROCESSOR_IDLE=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_THERMAL=y CONFIG_ACPI_PLATFORM_PROFILE=m CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y diff --git a/source/k/kernel-configs/config-huge-6.1.45.x64 b/source/k/kernel-configs/config-huge-6.1.46.x64 index 9b56fd4f5..9533d5e7a 100644 --- a/source/k/kernel-configs/config-huge-6.1.45.x64 +++ b/source/k/kernel-configs/config-huge-6.1.46.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45 Kernel Configuration +# Linux/x86 6.1.46 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -555,12 +555,11 @@ CONFIG_ACPI_LPIT=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y # CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -# CONFIG_ACPI_TINY_POWER_BUTTON is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m +CONFIG_ACPI_FAN=y CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_CPU_FREQ_PSS=y @@ -571,7 +570,7 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_THERMAL=y CONFIG_ACPI_PLATFORM_PROFILE=m CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y diff --git a/source/k/kernel-configs/config-huge-smp-6.1.45-smp b/source/k/kernel-configs/config-huge-smp-6.1.46-smp index d68ecdaff..d0a154cf9 100644 --- a/source/k/kernel-configs/config-huge-smp-6.1.45-smp +++ b/source/k/kernel-configs/config-huge-smp-6.1.46-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45 Kernel Configuration +# Linux/x86 6.1.46 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -546,12 +546,11 @@ CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y # CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -# CONFIG_ACPI_TINY_POWER_BUTTON is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m +CONFIG_ACPI_FAN=y CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_CPU_FREQ_PSS=y @@ -561,7 +560,7 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_THERMAL=y CONFIG_ACPI_PLATFORM_PROFILE=m CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index 117f3cff5..7757fd4d9 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,7 @@ +Tue Aug 15 02:20:40 UTC 2023 + rinutils: use release tarball from github since tar.gz pull is missing needed + components. Thanks to lucabon. ++--------------------------+ Fri Aug 4 04:22:19 UTC 2023 ffmpeg: applied patch to build with binutils-2.41. Thanks to marav. +--------------------------+ diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 438525eef..36a3a91e3 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=httpd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | 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/httpd/rc.httpd b/source/n/httpd/rc.httpd index 6b251d90d..afacffb34 100644 --- a/source/n/httpd/rc.httpd +++ b/source/n/httpd/rc.httpd @@ -2,7 +2,7 @@ # # /etc/rc.d/rc.httpd # -# Start/stop/restart/graceful[ly restart]/graceful[ly]-stop +# Start/stop/force-restart/restart/graceful[ly restart]/graceful[ly]-stop # the Apache (httpd) web server. # # To make Apache start automatically at boot, make this @@ -15,17 +15,20 @@ case "$1" in /usr/sbin/apachectl -k start ;; 'stop') - /usr/sbin/apachectl -k stop - pkill -f /usr/sbin/httpd - # Remove both old and new .pid locations: - rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid + if [ ! -r /run/httpd.pid ]; then + pkill -f /usr/sbin/httpd + else + /usr/sbin/apachectl -k stop + fi + pwait -f /usr/sbin/httpd ;; 'force-restart') - # Because sometimes restarting through apachectl just doesn't do the trick... - /usr/sbin/apachectl -k stop - pkill -f /usr/sbin/httpd - # Remove both old and new .pid locations: - rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid + if [ ! -r /run/httpd.pid ]; then + pkill -f /usr/sbin/httpd + else + /usr/sbin/apachectl -k stop + fi + pwait -f /usr/sbin/httpd /usr/sbin/apachectl -k start ;; 'restart') @@ -38,7 +41,7 @@ case "$1" in /usr/sbin/apachectl -k graceful-stop ;; *) - echo "Usage: $0 {start|stop|restart|graceful|graceful-stop}" + echo "Usage: $0 {start|stop|force-restart|restart|graceful|graceful-stop}" ;; esac diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild index 55e7147eb..2de3dcef2 100755 --- a/source/n/net-snmp/net-snmp.SlackBuild +++ b/source/n/net-snmp/net-snmp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=net-snmp 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 diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index ac81a5958..c489937a2 100755 --- a/source/n/php/fetch-php.sh +++ b/source/n/php/fetch-php.sh @@ -1,2 +1,2 @@ -lftpget http://us.php.net/distributions/php-8.2.8.tar.xz.asc -lftpget http://us.php.net/distributions/php-8.2.8.tar.xz +lftpget http://us.php.net/distributions/php-8.2.9.tar.xz.asc +lftpget http://us.php.net/distributions/php-8.2.9.tar.xz |