diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/d/meson/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch | 48 | ||||
-rwxr-xr-x | source/d/meson/meson.SlackBuild | 5 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.78 (renamed from source/k/kernel-configs/config-generic-4.19.77) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.78.x64 (renamed from source/k/kernel-configs/config-generic-4.19.77.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-4.19.78-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.77-smp) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.78 (renamed from source/k/kernel-configs/config-huge-4.19.77) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.78.x64 (renamed from source/k/kernel-configs/config-huge-4.19.77.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-4.19.78-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.77-smp) | 2 | ||||
-rwxr-xr-x | source/n/autofs/autofs.SlackBuild | 9 |
9 files changed, 9 insertions, 65 deletions
diff --git a/source/d/meson/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch b/source/d/meson/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch deleted file mode 100644 index ee111cbe..00000000 --- a/source/d/meson/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 47bdea504067d00e9bed522e9575bd2416bfe4ee Mon Sep 17 00:00:00 2001 -From: Daniel Mensinger <daniel@mensinger-ka.de> -Date: Fri, 13 Sep 2019 12:23:06 +0200 -Subject: [PATCH] mconf: Fix meson configure crash (fixes #5909) - ---- - mesonbuild/mconf.py | 4 ++-- - run_unittests.py | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py -index cac9d61ce4..4f8014014d 100644 ---- a/mesonbuild/mconf.py -+++ b/mesonbuild/mconf.py -@@ -181,7 +181,7 @@ def print_default_values_warning(): - core_options = {k: o for k, o in self.coredata.builtins.items() if k in core_option_names} - - self.print_options('Core options', core_options) -- if self.build.environment.is_cross_build(): -+ if self.default_values_only or self.build.environment.is_cross_build(): - self.print_options('Core options (for host machine)', self.coredata.builtins_per_machine.host) - self.print_options( - 'Core options (for build machine)', -@@ -190,7 +190,7 @@ def print_default_values_warning(): - self.print_options('Core options', self.coredata.builtins_per_machine.host) - self.print_options('Backend options', self.coredata.backend_options) - self.print_options('Base options', self.coredata.base_options) -- if self.build.environment.is_cross_build(): -+ if self.default_values_only or self.build.environment.is_cross_build(): - self.print_options('Compiler options (for host machine)', self.coredata.compiler_options.host) - self.print_options( - 'Compiler options (for build machine)', -diff --git a/run_unittests.py b/run_unittests.py -index f06be23aef..8cc9811482 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -3624,6 +3624,10 @@ def test_introspect_buildoptions_without_configured_build(self): - self.maxDiff = None - self.assertListEqual(res_nb, res_wb) - -+ def test_meson_configure_from_source_does_not_crash(self): -+ testdir = os.path.join(self.unit_test_dir, '59 introspect buildoptions') -+ self._run(self.mconf_command + [testdir]) -+ - def test_introspect_json_dump(self): - testdir = os.path.join(self.unit_test_dir, '57 introspection') - self.init(testdir) - diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild index 42c5da47..6e0faba1 100755 --- a/source/d/meson/meson.SlackBuild +++ b/source/d/meson/meson.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=meson VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -60,9 +60,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# Fix meson configure crash: -zcat $CWD/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch.gz | patch -p1 --verbose || exit 1 - python3 setup.py install --root=$PKG || exit 1 mv $PKG/usr/share/man $PKG/usr/ diff --git a/source/k/kernel-configs/config-generic-4.19.77 b/source/k/kernel-configs/config-generic-4.19.78 index ab8e459e..f210842a 100644 --- a/source/k/kernel-configs/config-generic-4.19.77 +++ b/source/k/kernel-configs/config-generic-4.19.78 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.77 Kernel Configuration +# Linux/x86 4.19.78 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.77.x64 b/source/k/kernel-configs/config-generic-4.19.78.x64 index 9dd2a140..1c429e7c 100644 --- a/source/k/kernel-configs/config-generic-4.19.77.x64 +++ b/source/k/kernel-configs/config-generic-4.19.78.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.77 Kernel Configuration +# Linux/x86 4.19.78 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.77-smp b/source/k/kernel-configs/config-generic-smp-4.19.78-smp index 819f7932..872ccdb9 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.77-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.78-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.77 Kernel Configuration +# Linux/x86 4.19.78 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.77 b/source/k/kernel-configs/config-huge-4.19.78 index 7263c264..0a7240d5 100644 --- a/source/k/kernel-configs/config-huge-4.19.77 +++ b/source/k/kernel-configs/config-huge-4.19.78 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.77 Kernel Configuration +# Linux/x86 4.19.78 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.77.x64 b/source/k/kernel-configs/config-huge-4.19.78.x64 index 18e6af5a..457ff134 100644 --- a/source/k/kernel-configs/config-huge-4.19.77.x64 +++ b/source/k/kernel-configs/config-huge-4.19.78.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.77 Kernel Configuration +# Linux/x86 4.19.78 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.77-smp b/source/k/kernel-configs/config-huge-smp-4.19.78-smp index 58492a85..fa01af0d 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.77-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.78-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.77 Kernel Configuration +# Linux/x86 4.19.78 Kernel Configuration # # diff --git a/source/n/autofs/autofs.SlackBuild b/source/n/autofs/autofs.SlackBuild index 6ff85212..0b719058 100755 --- a/source/n/autofs/autofs.SlackBuild +++ b/source/n/autofs/autofs.SlackBuild @@ -109,7 +109,7 @@ chmod 644 $PKG/etc/rc.d/rc.autofs.new sed -i "s|/etc/sysconfig|/etc/default|g" $PKG/etc/rc.d/rc.autofs.new # Install sample config files: -for file in auto.master auto.misc auto.net auto.smb autofs_ldap_auth.conf default/autofs ; do +for file in auto.master auto.misc auto.net auto.smb autofs_ldap_auth.conf ; do cp -a samples/$file $PKG/etc/${file} chown root:root $PKG/etc/${file} chmod 644 $PKG/etc/${file} @@ -121,21 +121,16 @@ mkdir -p $PKG/etc/default cp -a samples/autofs.init.conf $PKG/etc/default/autofs.new chown root:root $PKG/etc/default/autofs.new chmod 644 $PKG/etc/default/autofs.new -# Fix typo: -sed -i "s/syatem/system/g" $PKG/etc/default/autofs.new # Fix perms on some config files: chmod 755 $PKG/etc/auto.smb $PKG/etc/auto.net chmod 600 $PKG/etc/autofs_ldap_auth.conf # Prep the config files: -for file in auto.master auto.misc autofs.conf autofs_ldap_auth.conf default/autofs ; do +for file in auto.master auto.misc autofs.conf autofs_ldap_auth.conf ; do mv $PKG/etc/$file $PKG/etc/${file}.new done -# Fix a typo that's harmless but ugly: -sed -i "s/syatem/system/g" $PKG/etc/default/autofs.new - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null |