diff options
Diffstat (limited to 'source')
22 files changed, 401 insertions, 30 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index 8df16ea1..7e7f2cd0 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_elflibs VERSION=${VERSION:-15.0} -BUILD=${BUILD:-20} +BUILD=${BUILD:-21} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index b8960c76..8b6d9b3a 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -11,6 +11,7 @@ /lib/libelf.so.1 /lib/libfuse.so.2 /lib/libgpm.so.2 +/lib/libkeyutils.so.1 /lib/libkrb5support.so.0 /lib/libkrb5.so.3 /lib/libk5crypto.so.3 diff --git a/source/a/shadow/HOME_MODE.xml b/source/a/shadow/HOME_MODE.xml new file mode 100644 index 00000000..c2926d31 --- /dev/null +++ b/source/a/shadow/HOME_MODE.xml @@ -0,0 +1,43 @@ +<!-- + Copyright (c) 1991 - 1993, Julianne Frances Haugh + Copyright (c) 1991 - 1993, Chip Rosenthal + Copyright (c) 2007 - 2009, Nicolas François + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the copyright holders or contributors may not be used to + endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``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 COPYRIGHT + HOLDERS OR CONTRIBUTORS 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. +--> +<varlistentry> + <term><option>HOME_MODE</option> (number)</term> + <listitem> + <para> + The mode for new home directories. If not specified, + the <option>UMASK</option> is used to create the mode. + </para> + <para> + <command>useradd</command> and <command>newusers</command> use this + to set the mode of the home directory they create. + </para> + </listitem> +</varlistentry> diff --git a/source/a/shadow/login.defs b/source/a/shadow/login.defs index 0e137a35..022dd36f 100644 --- a/source/a/shadow/login.defs +++ b/source/a/shadow/login.defs @@ -190,15 +190,23 @@ ERASECHAR 0177 KILLCHAR 025 #ULIMIT 2097152 -# Default initial "umask" value. -# UMASK is also used by useradd and newusers to set the mode of new home -# directories. +# +# Default initial "umask" value used by login(1) on non-PAM enabled systems. +# Default "umask" value for pam_umask(8) on PAM enabled systems. +# UMASK is also used by useradd(8) and newusers(8) to set the mode for new +# home directories if HOME_MODE is not set. # 022 is the default value, but 027, or even 077, could be considered -# better for privacy. There is no One True Answer here: each sysadmin -# must make up her mind. +# for increased privacy. There is no One True Answer here: each sysadmin +# must make up their mind. UMASK 022 # +# HOME_MODE is used by useradd(8) and newusers(8) to set the mode for new +# home directories. +# If HOME_MODE is not set, the value of UMASK is used to create the mode. +#HOME_MODE 0700 + +# # Password aging controls: # # PASS_MAX_DAYS Maximum number of days a password may be used. diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index d3fd6d14..4264a24d 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=shadow VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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 @@ -82,6 +82,11 @@ zcat $CWD/shadow.CVE-2005-4890.relax.diff.gz | patch -p1 --verbose || exit 1 # short version up to the first '.' on the login prompt: zcat $CWD/shadow.login.display.short.hostname.diff.gz | patch -p1 --verbose || exit 1 +# Add missing file: +if [ ! -r man/login.defs.d/HOME_MODE.xml ]; then + zcat $CWD/HOME_MODE.xml.gz > man/login.defs.d/HOME_MODE.xml +fi + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch b/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch new file mode 100644 index 00000000..6f44ae3f --- /dev/null +++ b/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch @@ -0,0 +1,170 @@ +From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 +From: Paul Smith <psmith@gnu.org> +Date: Sat, 3 Jun 2017 16:20:51 -0400 +Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. + +* posixos.c (set_blocking): Set blocking on a file descriptor. +(jobserver_setup): Set non-blocking on the jobserver read side. +(jobserver_parse_auth): Ditto. +(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. +(jobserver_acquire): If the non-blocking read() returns without +taking a token then try again. +--- + posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 71 insertions(+), 26 deletions(-) + +diff --git a/posixos.c b/posixos.c +index e642d7f..dbafa51 100644 +--- a/posixos.c ++++ b/posixos.c +@@ -62,6 +62,24 @@ make_job_rfd (void) + #endif + } + ++static void ++set_blocking (int fd, int blocking) ++{ ++ // If we're not using pselect() don't change the blocking ++#ifdef HAVE_PSELECT ++ int flags; ++ EINTRLOOP (flags, fcntl (fd, F_GETFL)); ++ if (flags >= 0) ++ { ++ int r; ++ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); ++ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); ++ if (r < 0) ++ pfatal_with_name ("fcntl(O_NONBLOCK)"); ++ } ++#endif ++} ++ + unsigned int + jobserver_setup (int slots) + { +@@ -86,6 +104,9 @@ jobserver_setup (int slots) + pfatal_with_name (_("init jobserver pipe")); + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) + return 0; + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -169,7 +193,10 @@ jobserver_acquire_all (void) + { + unsigned int tokens = 0; + +- /* Close the write side, so the read() won't hang. */ ++ /* Use blocking reads to wait for all outstanding jobs. */ ++ set_blocking (job_fds[0], 1); ++ ++ /* Close the write side, so the read() won't hang forever. */ + close (job_fds[1]); + job_fds[1] = -1; + +@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) + unsigned int + jobserver_acquire (int timeout) + { +- sigset_t empty; +- fd_set readfds; + struct timespec spec; + struct timespec *specp = NULL; +- int r; +- char intake; ++ sigset_t empty; + + sigemptyset (&empty); + +- FD_ZERO (&readfds); +- FD_SET (job_fds[0], &readfds); +- + if (timeout) + { + /* Alarm after one second (is this too granular?) */ +@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) + specp = &spec; + } + +- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); +- +- if (r == -1) ++ while (1) + { +- /* Better be SIGCHLD. */ +- if (errno != EINTR) +- pfatal_with_name (_("pselect jobs pipe")); +- return 0; +- } ++ fd_set readfds; ++ int r; ++ char intake; + +- if (r == 0) +- /* Timeout. */ +- return 0; ++ FD_ZERO (&readfds); ++ FD_SET (job_fds[0], &readfds); + +- /* The read FD is ready: read it! */ +- EINTRLOOP (r, read (job_fds[0], &intake, 1)); +- if (r < 0) +- pfatal_with_name (_("read jobs pipe")); ++ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); ++ if (r < 0) ++ switch (errno) ++ { ++ case EINTR: ++ /* SIGCHLD will show up as an EINTR. */ ++ return 0; ++ ++ case EBADF: ++ /* Someone closed the jobs pipe. ++ That shouldn't happen but if it does we're done. */ ++ O (fatal, NILF, _("job server shut down")); + +- /* What does it mean if read() returns 0? It shouldn't happen because only +- the master make can reap all the tokens and close the write side...?? */ +- return r > 0; ++ default: ++ pfatal_with_name (_("pselect jobs pipe")); ++ } ++ ++ if (r == 0) ++ /* Timeout. */ ++ return 0; ++ ++ /* The read FD is ready: read it! This is non-blocking. */ ++ EINTRLOOP (r, read (job_fds[0], &intake, 1)); ++ ++ if (r < 0) ++ { ++ /* Someone sniped our token! Try again. */ ++ if (errno == EAGAIN) ++ continue; ++ ++ pfatal_with_name (_("read jobs pipe")); ++ } ++ ++ /* read() should never return 0: only the master make can reap all the ++ tokens and close the write side...?? */ ++ return r > 0; ++ } + } + + #else +-- +cgit v1.0-41-gc330 + diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild index 770e972a..0ea16d1d 100755 --- a/source/d/make/make.SlackBuild +++ b/source/d/make/make.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=make -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,7 +68,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf make-$VERSION -tar xvf $CWD/make-$VERSION.tar.?z || exit 1 +tar xvf $CWD/make-$VERSION.tar.bz2 || exit 1 cd make-$VERSION || exit 1 chown -R root:root . find . \ @@ -77,6 +77,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/make.guile30.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/make.glibc-2.27.glob.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/b552b05251980f693c729e251f93f5225b400714.patch.gz | patch -p1 --verbose || exit 1 + +autoreconf -vif + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -127,7 +133,7 @@ fi mkdir -p $PKG/usr/doc/make-$VERSION cp -a \ - AUTHORS* COPYING* ChangeLog NEWS* README* \ + AUTHORS COPYING* ChangeLog NEWS README* \ $PKG/usr/doc/make-$VERSION/ # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/d/make/make.glibc-2.27.glob.diff b/source/d/make/make.glibc-2.27.glob.diff new file mode 100644 index 00000000..8d795f89 --- /dev/null +++ b/source/d/make/make.glibc-2.27.glob.diff @@ -0,0 +1,32 @@ +diff -u -r make-4.2.1.orig/glob/glob.c make-4.2.1/glob/glob.c +--- make-4.2.1.orig/glob/glob.c 2013-10-20 12:14:38.000000000 -0500 ++++ make-4.2.1/glob/glob.c 2018-02-16 14:41:18.956182332 -0600 +@@ -208,28 +208,9 @@ + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ +- +-# ifdef __GNUC__ +-# undef alloca +-# define alloca(n) __builtin_alloca (n) +-# else /* Not GCC. */ +-# ifdef HAVE_ALLOCA_H + # include <alloca.h> +-# else /* Not HAVE_ALLOCA_H. */ +-# ifndef _AIX +-# ifdef WINDOWS32 +-# include <malloc.h> +-# else +-extern char *alloca (); +-# endif /* WINDOWS32 */ +-# endif /* Not _AIX. */ +-# endif /* sparc or HAVE_ALLOCA_H. */ +-# endif /* GCC. */ +- + # define __alloca alloca + +-#endif + + #ifndef __GNU_LIBRARY__ + # define __stat stat diff --git a/source/d/make/make.guile30.diff b/source/d/make/make.guile30.diff new file mode 100644 index 00000000..8b13b14d --- /dev/null +++ b/source/d/make/make.guile30.diff @@ -0,0 +1,13 @@ +--- ./configure.ac.orig 2016-06-06 07:27:31.000000000 -0500 ++++ ./configure.ac 2017-12-02 12:21:41.682170019 -0600 +@@ -168,8 +168,8 @@ + # comes with it's own PC file so we have to specify them as individual + # packages. Ugh. + AS_IF([test "x$with_guile" != xno], +-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], +- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes], ++[ PKG_CHECK_MODULES([GUILE], [guile-3.0], [have_guile=yes], ++ [PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], + [have_guile=no])]) + ]) + diff --git a/source/d/make/slack-desc b/source/d/make/slack-desc index dd71f84a..883506fb 100644 --- a/source/d/make/slack-desc +++ b/source/d/make/slack-desc @@ -9,11 +9,11 @@ make: make (GNU make utility to maintain groups of programs) make: make: This is the GNU implementation of make, which was written by Richard -make: Stallman and Roland McGrath with later development handled by Paul D. -make: Smith. The purpose of the make utility is to determine automatically -make: which pieces of a large program need to be recompiled, and issue the -make: commands to recompile them. +make: Stallman and Roland McGrath. The purpose of the make utility is to +make: determine automatically which pieces of a large program need to be +make: recompiled, and issue the commands to recompile them. make: -make: Homepage: https://savannah.gnu.org/projects/make/ +make: This is needed to compile just about any major C program, including +make: the Linux kernel. make: make: diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index b38b7466..ca8ffa36 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,10 @@ +Mon Jan 27 00:09:05 UTC 2020 + Added libkeyutils.so.1, needed by the krb5 libraries. + Thanks to dodoLQ. + Added nano editor. See build script for additional options ;-) + Thanks to Didier Spaier. + Fix ldd shebang. ++--------------------------+ Fri Jan 24 00:35:26 UTC 2020 Added libraries: libgssapi_krb5, libk5crypto, libkrb5, libkrb5support. +--------------------------+ diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 95431da9..36ad5ed2 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -5,7 +5,7 @@ set +o posix # # Copyright 2005-2018 Stuart Winter, Surrey, England, UK # Copyright 2008, 2009, 2010, 2011, 2017 Eric Hameleers, Eindhoven, Netherlands -# Copyright 2011-2018 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2011-2020 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -106,6 +106,7 @@ case $ARCH in VERBOSE=1 # show a lot of additional output # The firmware we include by default is only for x86, but ADD_NETFIRMWARE=1 # we'll probably want to include some at some stage. For now supply -nf to this script. + ADD_NANO=1 ;; x86_64) ADD_NETMODS=1 @@ -121,6 +122,7 @@ case $ARCH in EFIBOOT=1 VERBOSE=1 ADD_NETFIRMWARE=1 # Include the network card firmware + ADD_NANO=1 ;; i586) ADD_NETMODS=1 @@ -136,6 +138,7 @@ case $ARCH in EFIBOOT=1 VERBOSE=1 ADD_NETFIRMWARE=1 # Include the network card firmware + ADD_NANO=1 ;; *) ADD_NETMODS=1 # add network modules @@ -150,6 +153,7 @@ case $ARCH in EFIBOOT=0 # do not build the EFI boot image VERBOSE=1 # show a lot of additional output ADD_NETFIRMWARE=1 # Include the network card firmware + ADD_NANO=1 ;; esac @@ -234,6 +238,10 @@ while [ ! -z "$1" ]; do COMPRESS_MODS=0 shift ;; + -ne|--no-nano) + ADD_NANO=0 + shift + ;; -nn|--no-netmods) ADD_NETMODS=0 shift @@ -367,6 +375,7 @@ Parameters: -m|--multiple Multiple initrd files (for SMP and non-SMP kernels) -n|--netmods Add network modules to the initrd -nc|--no-compressmods Do _not_ compress kernel modules + -ne|--no-nano Do _not_ add nano editor -nm|--no-multiple Do _not_ create multiple initrd files -nn|--no-netmods Do _not_ add network modules to the initrd -np|--no-pcmciamods Do _not_ add pcmcia modules to the initrd @@ -748,6 +757,70 @@ make $SILENTMAKE DESTDIR=$PKG/$ARCH-installer-filesystem/ MULTI="1" install || e } +############### Build nano ##################################################### + +build_nano() +{ +echo "--- Building nano editor ---" +# Extract source: +cd $TMP +if [ -d $CWD/sources/nano ]; then + echo "--- Using _your_ nano sources (not those in the Slacktree) ---" + NANOPATH=$CWD/sources/nano +elif [ -d $SRCDIR/sources/nano ]; then + echo "--- Using _your_ nano sources (not those in the Slacktree) ---" + NANOPATH=$SRCDIR/sources/nano +else + # Use the nano sources from the Slackware tree. + NANOPATH=$SLACKROOT/source/installer/nano +fi +[ ! -d $NANOPATH ] && ( echo "No directory '$NANOPATH'" ; exit 1 ) +NANOPKG=$(ls -1 $NANOPATH/nano-*.tar.?z | head -1) +NANOVER=$(echo $NANOPKG | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +tar x${VERBOSE2}f $NANOPKG + +echo "--- Compiling NANO version '$NANOVER' ---" +cd nano* || exit 1 +chown -R root:root . +chmod -R u+w,go+r-w,a-s . + +# Configure: +CFLAGS="$(echo $SLKCFLAGS | sed s/-O2/-Os/g)" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --docdir=/usr/doc/nano-$VERSION \ + --datadir=/usr/share \ + --program-prefix= \ + --program-suffix= \ + --disable-libmagic \ + --enable-color \ + --enable-multibuffer \ + --enable-nanorc \ + --enable-utf8 \ + --build=$ARCH-slackware-linux$ARCHQUADLET || exit 1 + +# Build: +make $NUMJOBS || make || exit 1 + +# Install into installer's filesystem: +mkdir -p $PKG/$ARCH-installer-filesystem/usr/bin +cp -a src/nano $PKG/$ARCH-installer-filesystem/usr/bin/nano +strip --strip-unneeded $PKG/$ARCH-installer-filesystem/usr/bin/nano +mkdir -p $PKG/$ARCH-installer-filesystem/usr/man/man1 +cat doc/nano.1 | gzip -9c > $PKG/$ARCH-installer-filesystem/usr/man/man1/nano.1.gz + +# Install locale files if I_AM_DIDIER is defined: +if [ ! -z $I_AM_DIDIER ]; then + ( cd po + make install DESTDIR=$PKG/$ARCH-installer-filesystem/ + ) +fi + +} + ############## Install binaries into installer filesystem ###################### # You can generate file-> package list in slackware-current @@ -836,6 +909,7 @@ d/gcc-g++ \ l/argon2 \ l/glibc \ l/json-c \ +l/keyutils \ l/libaio \ l/libcap \ l/libidn2 \ @@ -918,6 +992,8 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \ syslinux-nomtools \ strings \ $PKG/$ARCH-installer-filesystem/usr/bin/ +# Fix ldd shebang: +sed -i "s|/usr/bin/bash|/bin/bash|g" $PKG/$ARCH-installer-filesystem/usr/bin/ldd # Use syslinux-nomtools to avoid needing mtools on the installer: if [[ $ARCH = *86* ]]; then mv --verbose $PKG/$ARCH-installer-filesystem/usr/bin/syslinux-nomtools $PKG/$ARCH-installer-filesystem/usr/bin/syslinux || exit 1 @@ -1127,6 +1203,7 @@ cp -fa${VERBOSE1} \ libgpg-error*.so* \ libgssapi_krb5.so* \ libk5crypto.so* \ + libkeyutils.so* \ libkmod*so* \ libkrb5.so* \ libkrb5support.so* \ @@ -2122,6 +2199,7 @@ if [ -d usr/man ]; then man8/fstrim.8.bz2 \ man8/swaplabel.8.bz2 \ man8/ip.8.bz2 \ + man1/nano.1.bz2 \ ; do mkdir -p man/$(dirname $manpage) cp -a man.full/$manpage man/$manpage @@ -2185,6 +2263,11 @@ else unpack_oldinitrd fi + # Are we adding the nano editor? + if [ $ADD_NANO -eq 1 ]; then + build_nano + fi + # Are we adding network modules? if [ $ADD_NETMODS -eq 1 ]; then add_netmods diff --git a/source/k/kernel-configs/config-generic-5.4.14 b/source/k/kernel-configs/config-generic-5.4.15 index ae9ab263..dd6a8a91 100644 --- a/source/k/kernel-configs/config-generic-5.4.14 +++ b/source/k/kernel-configs/config-generic-5.4.15 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.14 Kernel Configuration +# Linux/x86 5.4.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-5.4.14.x64 b/source/k/kernel-configs/config-generic-5.4.15.x64 index 7b1eba8c..9db080df 100644 --- a/source/k/kernel-configs/config-generic-5.4.14.x64 +++ b/source/k/kernel-configs/config-generic-5.4.15.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.14 Kernel Configuration +# Linux/x86 5.4.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-5.4.14-smp b/source/k/kernel-configs/config-generic-smp-5.4.15-smp index 6148e4bc..43776351 100644 --- a/source/k/kernel-configs/config-generic-smp-5.4.14-smp +++ b/source/k/kernel-configs/config-generic-smp-5.4.15-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.14 Kernel Configuration +# Linux/x86 5.4.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.14 b/source/k/kernel-configs/config-huge-5.4.15 index 35691941..f6edd7d9 100644 --- a/source/k/kernel-configs/config-huge-5.4.14 +++ b/source/k/kernel-configs/config-huge-5.4.15 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.14 Kernel Configuration +# Linux/x86 5.4.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.14.x64 b/source/k/kernel-configs/config-huge-5.4.15.x64 index 9dc2f776..3e9df18f 100644 --- a/source/k/kernel-configs/config-huge-5.4.14.x64 +++ b/source/k/kernel-configs/config-huge-5.4.15.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.14 Kernel Configuration +# Linux/x86 5.4.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-5.4.14-smp b/source/k/kernel-configs/config-huge-smp-5.4.15-smp index a98fb4cb..e5571e5c 100644 --- a/source/k/kernel-configs/config-huge-smp-5.4.14-smp +++ b/source/k/kernel-configs/config-huge-smp-5.4.15-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.14 Kernel Configuration +# Linux/x86 5.4.15 Kernel Configuration # # diff --git a/source/l/dconf/dconf.SlackBuild b/source/l/dconf/dconf.SlackBuild index f27fd50f..731ac739 100755 --- a/source/l/dconf/dconf.SlackBuild +++ b/source/l/dconf/dconf.SlackBuild @@ -78,8 +78,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix duplicate symbols at link time with meson-0.52.{0,1}, 0.53.0: -if [ "$(meson --version)" = "0.52.0" -o "$(meson --version)" = "0.52.1" -o "$(meson --version)" = "0.53.0" ]; then +# Fix duplicate symbols at link time with meson-0.52.{0,1}, 0.53.{0,1}: +if [ "$(meson --version)" = "0.52.0" -o "$(meson --version)" = "0.52.1" -o "$(meson --version)" = "0.53.0" -o "$(meson --version)" = "0.53.1" ]; then sed -i 's|link_whole|link_with|' client/meson.build && sed -i 's/module/& | grep -v mangle_path/' gsettings/abicheck.sh fi diff --git a/source/l/python-packaging/packaging.url b/source/l/python-packaging/packaging.url new file mode 100644 index 00000000..5b56a8fd --- /dev/null +++ b/source/l/python-packaging/packaging.url @@ -0,0 +1 @@ +https://pypi.org/project/packaging/ diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index b46f9429..af2c2291 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=php VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ALPINE=2.22 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/php/php.ini-development.diff b/source/n/php/php.ini-development.diff index 38947441..b6b895b3 100644 --- a/source/n/php/php.ini-development.diff +++ b/source/n/php/php.ini-development.diff @@ -1,6 +1,6 @@ ---- ./php.ini-development.orig 2019-11-26 14:13:37.000000000 -0600 -+++ ./php.ini-development 2019-12-01 13:11:20.141848761 -0600 -@@ -899,7 +899,47 @@ +--- ./php.ini-development.orig 2020-01-21 05:35:21.000000000 -0600 ++++ ./php.ini-development 2020-01-26 12:55:22.614578322 -0600 +@@ -899,7 +899,49 @@ ; 'extension='php_<ext>.dll') is supported for legacy reasons and may be ; deprecated in a future PHP major version. So, when it is possible, please ; move to the new ('extension=<ext>) syntax. @@ -19,6 +19,7 @@ +extension=enchant +extension=exif +extension=ftp ++extension=gd +extension=gettext +extension=gmp +extension=iconv @@ -43,12 +44,13 @@ +extension=xmlreader +extension=xmlrpc +extension=xsl ++extension=zip +extension=zlib + ; Notes for Windows environments : ; ; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) -@@ -1334,7 +1374,7 @@ +@@ -1334,7 +1376,7 @@ ; where MODE is the octal representation of the mode. Note that this ; does not overwrite the process's umask. ; http://php.net/session.save-path |