summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-05-08 00:24:32 +0000
committer Eric Hameleers <alien@slackware.com>2021-05-08 08:59:55 +0200
commit83868622a733d0511241fe4bac84516caf3319db (patch)
treeca723c36434dd2df0356289ed50e25df43e53a70 /source
parent33a4866bfe2f2c0cb2798db73596ce9cd43f523a (diff)
downloadcurrent-83868622a733d0511241fe4bac84516caf3319db.tar.gz
current-83868622a733d0511241fe4bac84516caf3319db.tar.xz
Sat May 8 00:24:32 UTC 202120210508002432
a/kernel-generic-5.10.35-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.35-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.35-x86_64-1.txz: Upgraded. a/lvm2-2.03.12-x86_64-1.txz: Upgraded. ap/mariadb-10.5.10-x86_64-1.txz: Upgraded. ap/mpg123-1.27.0-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.35-x86-1.txz: Upgraded. k/kernel-source-5.10.35-noarch-1.txz: Upgraded. n/httpd-2.4.46-x86_64-3.txz: Rebuilt. Reverted to httpd-2.4.46. Apparently 2.4.47 isn't actually released yet. Sorry for any problems this caused. xfce/thunar-4.16.8-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/linux-5.12.x/kernel-generic-5.12.2-x86_64-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-headers-5.12.2-x86-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-huge-5.12.2-x86_64-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-modules-5.12.2-x86_64-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-source-5.12.2-noarch-1.txz: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/lvm2/lvm2.SlackBuild2
-rw-r--r--source/ap/mariadb/mariadb.ConnectorName.cmake.diff12
-rwxr-xr-xsource/ap/mariadb/mariadb.SlackBuild5
-rw-r--r--source/k/kernel-configs/config-generic-5.10.35 (renamed from source/k/kernel-configs/config-generic-5.10.34)2
-rw-r--r--source/k/kernel-configs/config-generic-5.10.35.x64 (renamed from source/k/kernel-configs/config-generic-5.10.34.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.10.35-smp (renamed from source/k/kernel-configs/config-generic-smp-5.10.34-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.10.35 (renamed from source/k/kernel-configs/config-huge-5.10.34)2
-rw-r--r--source/k/kernel-configs/config-huge-5.10.35.x64 (renamed from source/k/kernel-configs/config-huge-5.10.34.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.10.35-smp (renamed from source/k/kernel-configs/config-huge-smp-5.10.34-smp)2
-rwxr-xr-xsource/n/httpd/httpd.SlackBuild2
-rw-r--r--source/n/httpd/httpd.url4
-rw-r--r--source/xfce/thunar/thunar.url2
12 files changed, 12 insertions, 27 deletions
diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild
index 4e311f555..d33fe8101 100755
--- a/source/a/lvm2/lvm2.SlackBuild
+++ b/source/a/lvm2/lvm2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=lvm2
VERSION=$(echo LVM2.*.tar.?z | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
deleted file mode 100644
index 75da7d993..000000000
--- a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r --new-file mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
---- mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake 2021-02-16 08:50:36.000000000 -0600
-+++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake 2021-04-03 12:41:14.858993480 -0500
-@@ -22,7 +22,7 @@
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index b83511e95..634280605 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
# Copyright 2011, 2012, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
@@ -97,9 +97,6 @@ if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1
fi
-# Fix a CMake syntax error:
-zcat $CWD/mariadb.ConnectorName.cmake.diff.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/k/kernel-configs/config-generic-5.10.34 b/source/k/kernel-configs/config-generic-5.10.35
index 230aabb8f..13922f14e 100644
--- a/source/k/kernel-configs/config-generic-5.10.34
+++ b/source/k/kernel-configs/config-generic-5.10.35
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.34 Kernel Configuration
+# Linux/x86 5.10.35 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-5.10.34.x64 b/source/k/kernel-configs/config-generic-5.10.35.x64
index 261674db1..a03dc8a25 100644
--- a/source/k/kernel-configs/config-generic-5.10.34.x64
+++ b/source/k/kernel-configs/config-generic-5.10.35.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.34 Kernel Configuration
+# Linux/x86 5.10.35 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-5.10.34-smp b/source/k/kernel-configs/config-generic-smp-5.10.35-smp
index ac79b047b..a3a774b8d 100644
--- a/source/k/kernel-configs/config-generic-smp-5.10.34-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.10.35-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.34 Kernel Configuration
+# Linux/x86 5.10.35 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.10.34 b/source/k/kernel-configs/config-huge-5.10.35
index 265776718..aaf75ebe0 100644
--- a/source/k/kernel-configs/config-huge-5.10.34
+++ b/source/k/kernel-configs/config-huge-5.10.35
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.34 Kernel Configuration
+# Linux/x86 5.10.35 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.10.34.x64 b/source/k/kernel-configs/config-huge-5.10.35.x64
index 690fd3d7f..7d078e1b9 100644
--- a/source/k/kernel-configs/config-huge-5.10.34.x64
+++ b/source/k/kernel-configs/config-huge-5.10.35.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.34 Kernel Configuration
+# Linux/x86 5.10.35 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-5.10.34-smp b/source/k/kernel-configs/config-huge-smp-5.10.35-smp
index 768dc1681..348b8c53f 100644
--- a/source/k/kernel-configs/config-huge-smp-5.10.34-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.10.35-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.34 Kernel Configuration
+# Linux/x86 5.10.35 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild
index 36a3a91e3..ea6dce9a2 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:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url
index 9bbf941bc..d8812b9c1 100644
--- a/source/n/httpd/httpd.url
+++ b/source/n/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.4.47.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.4.47.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.46.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.46.tar.bz2.asc
diff --git a/source/xfce/thunar/thunar.url b/source/xfce/thunar/thunar.url
index 26552a579..7fcf74b90 100644
--- a/source/xfce/thunar/thunar.url
+++ b/source/xfce/thunar/thunar.url
@@ -1 +1 @@
-https://archive.xfce.org/src/xfce/thunar/4.16/thunar-4.16.6.tar.bz2
+https://archive.xfce.org/src/xfce/thunar/4.16/thunar-4.16.8.tar.bz2