diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-03-19 20:06:28 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-03-20 08:59:45 +0100 |
commit | 277ffd7057bb55a4cc893fd4fe41be0c695444b7 (patch) | |
tree | 65d3944a501e080f276d27ff7c167747444121cf /source | |
parent | d0ac7419a9ebbbcc934641909bca18f194ab1cb2 (diff) | |
download | current-277ffd7057bb55a4cc893fd4fe41be0c695444b7.tar.gz |
Tue Mar 19 20:06:28 UTC 201920190319200628
a/bash-5.0.003-x86_64-1.txz: Upgraded.
a/kernel-firmware-20190314_7bc2464-noarch-1.txz: Upgraded.
a/kernel-generic-4.19.30-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.30-x86_64-1.txz: Upgraded.
a/kernel-modules-4.19.30-x86_64-1.txz: Upgraded.
d/help2man-1.47.9-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.30-x86-1.txz: Upgraded.
d/strace-5.0-x86_64-1.txz: Upgraded.
k/kernel-source-4.19.30-noarch-1.txz: Upgraded.
n/gnupg2-2.2.14-x86_64-1.txz: Upgraded.
n/libgpg-error-1.36-x86_64-1.txz: Upgraded.
n/samba-4.10.0-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rw-r--r-- | source/a/bash/bash-5.0-patches/bash50-003 | 239 | ||||
-rwxr-xr-x | source/a/bash/bash.SlackBuild | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.30 (renamed from source/k/kernel-configs/config-generic-4.19.29) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.30.x64 (renamed from source/k/kernel-configs/config-generic-4.19.29.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-4.19.30-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.29-smp) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.30 (renamed from source/k/kernel-configs/config-huge-4.19.29) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.30.x64 (renamed from source/k/kernel-configs/config-huge-4.19.29.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-4.19.30-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.29-smp) | 2 | ||||
-rwxr-xr-x | source/n/libgpg-error/libgpg-error.SlackBuild | 4 | ||||
-rwxr-xr-x | source/n/samba/samba.SlackBuild | 1 | ||||
-rw-r--r-- | source/n/samba/samba.url | 4 |
11 files changed, 251 insertions, 11 deletions
diff --git a/source/a/bash/bash-5.0-patches/bash50-003 b/source/a/bash/bash-5.0-patches/bash50-003 new file mode 100644 index 00000000..f7e5677e --- /dev/null +++ b/source/a/bash/bash-5.0-patches/bash50-003 @@ -0,0 +1,239 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-003 + +Bug-Reported-by: Andrew Church <achurch+bash@achurch.org> +Bug-Reference-ID: <5c534aa2.04371@msgid.achurch.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00276.html + +Bug-Description: + +There are several incompatibilities in how bash-5.0 processes pathname +expansion (globbing) of filename arguments that have backslashes in the +directory portion. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/lib/glob/glob_loop.c 2019-01-16 16:13:21.000000000 -0500 +--- lib/glob/glob_loop.c 2019-02-01 09:45:11.000000000 -0500 +*************** +*** 27,34 **** + register const GCHAR *p; + register GCHAR c; +! int bopen; + + p = pattern; +! bopen = 0; + + while ((c = *p++) != L('\0')) +--- 27,34 ---- + register const GCHAR *p; + register GCHAR c; +! int bopen, bsquote; + + p = pattern; +! bopen = bsquote = 0; + + while ((c = *p++) != L('\0')) +*************** +*** 56,66 **** + case L('\\'): + /* Don't let the pattern end in a backslash (GMATCH returns no match +! if the pattern ends in a backslash anyway), but otherwise return 1, +! since the matching engine uses backslash as an escape character +! and it can be removed. */ +! return (*p != L('\0')); + } + +! return 0; + } + +--- 56,75 ---- + case L('\\'): + /* Don't let the pattern end in a backslash (GMATCH returns no match +! if the pattern ends in a backslash anyway), but otherwise note that +! we have seen this, since the matching engine uses backslash as an +! escape character and it can be removed. We return 2 later if we +! have seen only backslash-escaped characters, so interested callers +! know they can shortcut and just dequote the pathname. */ +! if (*p != L('\0')) +! { +! p++; +! bsquote = 1; +! continue; +! } +! else /* (*p == L('\0')) */ +! return 0; + } + +! return bsquote ? 2 : 0; + } + +*** ../bash-5.0-patched/lib/glob/glob.h 2013-10-28 14:46:12.000000000 -0400 +--- lib/glob/glob.h 2019-03-07 11:06:47.000000000 -0500 +*************** +*** 31,34 **** +--- 31,35 ---- + #define GX_ADDCURDIR 0x200 /* internal -- add passed directory name */ + #define GX_GLOBSTAR 0x400 /* turn on special handling of ** */ ++ #define GX_RECURSE 0x800 /* internal -- glob_filename called recursively */ + + extern int glob_pattern_p __P((const char *)); +*** ../bash-5.0-patched/lib/glob/glob.c 2018-09-20 10:53:23.000000000 -0400 +--- lib/glob/glob.c 2019-03-07 14:23:43.000000000 -0500 +*************** +*** 1062,1066 **** + unsigned int directory_len; + int free_dirname; /* flag */ +! int dflags; + + result = (char **) malloc (sizeof (char *)); +--- 1078,1082 ---- + unsigned int directory_len; + int free_dirname; /* flag */ +! int dflags, hasglob; + + result = (char **) malloc (sizeof (char *)); +*************** +*** 1111,1117 **** + } + + /* If directory_name contains globbing characters, then we +! have to expand the previous levels. Just recurse. */ +! if (directory_len > 0 && glob_pattern_p (directory_name)) + { + char **directories, *d, *p; +--- 1127,1136 ---- + } + ++ hasglob = 0; + /* If directory_name contains globbing characters, then we +! have to expand the previous levels. Just recurse. +! If glob_pattern_p returns != [0,1] we have a pattern that has backslash +! quotes but no unquoted glob pattern characters. We dequote it below. */ +! if (directory_len > 0 && (hasglob = glob_pattern_p (directory_name)) == 1) + { + char **directories, *d, *p; +*************** +*** 1176,1180 **** + d[directory_len - 1] = '\0'; + +! directories = glob_filename (d, dflags); + + if (free_dirname) +--- 1195,1199 ---- + d[directory_len - 1] = '\0'; + +! directories = glob_filename (d, dflags|GX_RECURSE); + + if (free_dirname) +*************** +*** 1333,1336 **** +--- 1352,1369 ---- + return (NULL); + } ++ /* If we have a directory name with quoted characters, and we are ++ being called recursively to glob the directory portion of a pathname, ++ we need to dequote the directory name before returning it so the ++ caller can read the directory */ ++ if (directory_len > 0 && hasglob == 2 && (flags & GX_RECURSE) != 0) ++ { ++ dequote_pathname (directory_name); ++ directory_len = strlen (directory_name); ++ } ++ ++ /* We could check whether or not the dequoted directory_name is a ++ directory and return it here, returning the original directory_name ++ if not, but we don't do that yet. I'm not sure it matters. */ ++ + /* Handle GX_MARKDIRS here. */ + result[0] = (char *) malloc (directory_len + 1); +*** ../bash-5.0-patched/pathexp.c 2018-04-29 17:44:48.000000000 -0400 +--- pathexp.c 2019-01-31 20:19:41.000000000 -0500 +*************** +*** 66,74 **** + register int c; + char *send; +! int open; + + DECLARE_MBSTATE; + +! open = 0; + send = string + strlen (string); + +--- 66,74 ---- + register int c; + char *send; +! int open, bsquote; + + DECLARE_MBSTATE; + +! open = bsquote = 0; + send = string + strlen (string); + +*************** +*** 101,105 **** + globbing. */ + case '\\': +! return (*string != 0); + + case CTLESC: +--- 101,112 ---- + globbing. */ + case '\\': +! if (*string != '\0' && *string != '/') +! { +! bsquote = 1; +! string++; +! continue; +! } +! else if (*string == 0) +! return (0); + + case CTLESC: +*************** +*** 118,122 **** + #endif + } +! return (0); + } + +--- 125,130 ---- + #endif + } +! +! return (bsquote ? 2 : 0); + } + +*** ../bash-5.0-patched/bashline.c 2019-01-16 16:13:21.000000000 -0500 +--- bashline.c 2019-02-22 09:29:08.000000000 -0500 +*************** +*** 3753,3757 **** + + case '\\': +! if (*string == 0) + return (0); + } +--- 3766,3770 ---- + + case '\\': +! if (*string++ == 0) + return (0); + } +*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash.SlackBuild b/source/a/bash/bash.SlackBuild index a393e87c..0277ac15 100755 --- a/source/a/bash/bash.SlackBuild +++ b/source/a/bash/bash.SlackBuild @@ -31,7 +31,7 @@ PKG=$TMP/package-bash PKGNAM=bash VERSION=${VERSION:-$(echo bash-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/k/kernel-configs/config-generic-4.19.29 b/source/k/kernel-configs/config-generic-4.19.30 index 52d5ac72..c05e417b 100644 --- a/source/k/kernel-configs/config-generic-4.19.29 +++ b/source/k/kernel-configs/config-generic-4.19.30 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.29 Kernel Configuration +# Linux/x86 4.19.30 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.29.x64 b/source/k/kernel-configs/config-generic-4.19.30.x64 index 0ec52b8f..2f6dcf34 100644 --- a/source/k/kernel-configs/config-generic-4.19.29.x64 +++ b/source/k/kernel-configs/config-generic-4.19.30.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.29 Kernel Configuration +# Linux/x86 4.19.30 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.29-smp b/source/k/kernel-configs/config-generic-smp-4.19.30-smp index b57a8535..d6aca29c 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.29-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.30-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.29 Kernel Configuration +# Linux/x86 4.19.30 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.29 b/source/k/kernel-configs/config-huge-4.19.30 index dcce19d6..c628df58 100644 --- a/source/k/kernel-configs/config-huge-4.19.29 +++ b/source/k/kernel-configs/config-huge-4.19.30 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.29 Kernel Configuration +# Linux/x86 4.19.30 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.29.x64 b/source/k/kernel-configs/config-huge-4.19.30.x64 index 26c8a7c7..e0c0d8ef 100644 --- a/source/k/kernel-configs/config-huge-4.19.29.x64 +++ b/source/k/kernel-configs/config-huge-4.19.30.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.29 Kernel Configuration +# Linux/x86 4.19.30 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.29-smp b/source/k/kernel-configs/config-huge-smp-4.19.30-smp index 5b624e6f..1ca2b373 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.29-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.30-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.29 Kernel Configuration +# Linux/x86 4.19.30 Kernel Configuration # # diff --git a/source/n/libgpg-error/libgpg-error.SlackBuild b/source/n/libgpg-error/libgpg-error.SlackBuild index a2134275..87caab51 100755 --- a/source/n/libgpg-error/libgpg-error.SlackBuild +++ b/source/n/libgpg-error/libgpg-error.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libgpg-error -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -68,7 +68,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 118c933c..e90ef341 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -134,6 +134,7 @@ CFLAGS="$SLKCFLAGS" \ --with-ldap \ --with-ads \ --without-pam \ + --extra-python=/usr/bin/python2 \ --build=$TARGET || exit 1 # Gives errors: #--builtin-libraries=replace,ccan \ diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index df8aa683..49584279 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.9.5.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.9.5.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.10.0.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.10.0.tar.asc |