diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/installer/ChangeLog.txt | 5 | ||||
-rwxr-xr-x | source/installer/build_installer.sh | 16 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.37 (renamed from source/k/kernel-configs/config-generic-4.19.36) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.37.x64 (renamed from source/k/kernel-configs/config-generic-4.19.36.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-4.19.37-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.36-smp) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.37 (renamed from source/k/kernel-configs/config-huge-4.19.36) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.37.x64 (renamed from source/k/kernel-configs/config-huge-4.19.36.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-4.19.37-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.36-smp) | 2 | ||||
-rwxr-xr-x | source/l/python-requests/python-requests.SlackBuild | 5 | ||||
-rw-r--r-- | source/l/python-requests/requests.urllib3.version.diff | 11 |
10 files changed, 34 insertions, 15 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 7632f488..8feca152 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,8 @@ +Sat Apr 27 19:53:20 UTC 2019 + build_installer.sh: remove final dangling symlink check. This gets into + a filesystem loop that takes a bit of time, and has never turned up any + dangling symlinks that actually need attention. ++--------------------------+ Sun Mar 3 19:17:45 UTC 2019 Update busybox to 1.30.1. +--------------------------+ diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index de380a5f..e9bcac8c 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -1770,14 +1770,14 @@ EOF fi ldconfig -r. -# Find any remaining dangling symlinks. -echo "--- Finding any dangling symlinks ---" -echo " Expect to see:" -echo " ./boot ./var/log/scripts ./var/log/packages" -echo " ./var/adm/scripts ./var/adm/packages ./cdrom ./nfs" -echo "" -find -L . -type l -echo "-------------------------------------" +## Find any remaining dangling symlinks. +#echo "--- Finding any dangling symlinks ---" +#echo " Expect to see:" +#echo " ./boot ./var/log/scripts ./var/log/packages" +#echo " ./var/adm/scripts ./var/adm/packages ./cdrom ./nfs" +#echo "" +#find -L . -type l +#echo "-------------------------------------" # Do we have to split the initrd (separate initrd for each kernel version)? if [ $SPLIT_INITRD -eq 1 ]; then diff --git a/source/k/kernel-configs/config-generic-4.19.36 b/source/k/kernel-configs/config-generic-4.19.37 index 83053766..5f807c8f 100644 --- a/source/k/kernel-configs/config-generic-4.19.36 +++ b/source/k/kernel-configs/config-generic-4.19.37 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.36 Kernel Configuration +# Linux/x86 4.19.37 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.36.x64 b/source/k/kernel-configs/config-generic-4.19.37.x64 index b784fb1d..f7a4065e 100644 --- a/source/k/kernel-configs/config-generic-4.19.36.x64 +++ b/source/k/kernel-configs/config-generic-4.19.37.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.36 Kernel Configuration +# Linux/x86 4.19.37 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.36-smp b/source/k/kernel-configs/config-generic-smp-4.19.37-smp index d9fb16b6..6bfd5e6d 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.36-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.37-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.36 Kernel Configuration +# Linux/x86 4.19.37 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.36 b/source/k/kernel-configs/config-huge-4.19.37 index 7bd417f2..d577a6c1 100644 --- a/source/k/kernel-configs/config-huge-4.19.36 +++ b/source/k/kernel-configs/config-huge-4.19.37 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.36 Kernel Configuration +# Linux/x86 4.19.37 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.36.x64 b/source/k/kernel-configs/config-huge-4.19.37.x64 index f2b0156e..7c37080e 100644 --- a/source/k/kernel-configs/config-huge-4.19.36.x64 +++ b/source/k/kernel-configs/config-huge-4.19.37.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.36 Kernel Configuration +# Linux/x86 4.19.37 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.36-smp b/source/k/kernel-configs/config-huge-smp-4.19.37-smp index 64ce1f48..a15d27c2 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.36-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.37-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.36 Kernel Configuration +# Linux/x86 4.19.37 Kernel Configuration # # diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild index 27b8365a..b80fc33d 100755 --- a/source/l/python-requests/python-requests.SlackBuild +++ b/source/l/python-requests/python-requests.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-requests VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} SRCNAM=requests @@ -54,6 +54,9 @@ cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 + +zcat $CWD/requests.urllib3.version.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/source/l/python-requests/requests.urllib3.version.diff b/source/l/python-requests/requests.urllib3.version.diff new file mode 100644 index 00000000..48407b4a --- /dev/null +++ b/source/l/python-requests/requests.urllib3.version.diff @@ -0,0 +1,11 @@ +--- ./setup.py.orig 2018-12-10 00:13:32.000000000 -0600 ++++ ./setup.py 2019-04-27 14:15:41.124000032 -0500 +@@ -44,7 +44,7 @@ + requires = [ + 'chardet>=3.0.2,<3.1.0', + 'idna>=2.5,<2.9', +- 'urllib3>=1.21.1,<1.25', ++ 'urllib3>=1.21.1,<1.26', + 'certifi>=2017.4.17' + + ] |