diff options
Diffstat (limited to 'source')
67 files changed, 601 insertions, 600 deletions
diff --git a/source/a/grub/0001-00_header-add-GRUB_COLOR_-variables.patch b/source/a/grub/0001-00_header-add-GRUB_COLOR_-variables.patch new file mode 100644 index 000000000..867e8feeb --- /dev/null +++ b/source/a/grub/0001-00_header-add-GRUB_COLOR_-variables.patch @@ -0,0 +1,41 @@ +From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Wed, 10 Mar 2021 18:42:25 +0100 +Subject: [PATCH] 00_header: add GRUB_COLOR_* variables +--- + util/grub-mkconfig.in | 2 ++ + util/grub.d/00_header.in | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index f8cbb8d7a..1189d95f9 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -246,6 +246,8 @@ export GRUB_DEFAULT \ + GRUB_BACKGROUND \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 93a90233e..c5955df00 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -125,6 +125,14 @@ cat <<EOF + + EOF + ++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then ++ cat << EOF ++set menu_color_normal=$GRUB_COLOR_NORMAL ++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT ++ ++EOF ++fi ++ + serial=0; + gfxterm=0; + for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do diff --git a/source/a/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch b/source/a/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch new file mode 100644 index 000000000..601a05b9a --- /dev/null +++ b/source/a/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch @@ -0,0 +1,10 @@ +--- ./util/grub-mkconfig_lib.in.orig 2023-12-05 08:46:53.000000000 -0600 ++++ ./util/grub-mkconfig_lib.in 2024-01-02 13:44:41.164913702 -0600 +@@ -191,6 +191,7 @@ + case "$1" in + *.dpkg-*) return 1 ;; # debian dpkg + *.rpmsave|*.rpmnew) return 1 ;; ++ *.new|*.orig) return 1 ;; # slackware incoming or backed up config file + README*|*/README*) return 1 ;; # documentation + *.sig) return 1 ;; # signatures + esac diff --git a/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch b/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch deleted file mode 100644 index e1b4b8dcc..000000000 --- a/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./util/grub-mkconfig.in.orig 2021-03-10 07:42:22.000000000 -0600 -+++ ./util/grub-mkconfig.in 2021-09-10 13:33:17.602163090 -0500 -@@ -278,6 +278,8 @@ - *~) ;; - # emacsen autosave files. FIXME: support other editors - */\#*\#) ;; -+ # Slackware incoming config files should be skipped as well: -+ *.new) ;; - *) - if grub_file_is_not_garbage "$i" && test -x "$i" ; then - echo diff --git a/source/a/grub/0003-support-dropins-for-default-configuration.patch b/source/a/grub/0003-support-dropins-for-default-configuration.patch new file mode 100644 index 000000000..4840487a1 --- /dev/null +++ b/source/a/grub/0003-support-dropins-for-default-configuration.patch @@ -0,0 +1,28 @@ +From ac560966d09295663fa9516d8d137e0c0fd04c06 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Mon, 12 Jun 2023 07:42:01 +0200 +Subject: [PATCH 1/1] support dropins for default configuration + +--- + util/grub-mkconfig.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 1a945085c..4338dceef 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -160,6 +160,11 @@ fi + if test -f ${sysconfdir}/default/grub ; then + . ${sysconfdir}/default/grub + fi ++for dropin in ${sysconfdir}/default/grub.d/*.cfg ; do ++ if test -f "${dropin}" ; then ++ . "${dropin}" ++ fi ++done + + if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then + if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then +-- +2.41.0 + diff --git a/source/a/grub/0004-add-GRUB_DISABLE_KERNEL_SYMLINKS-variable.patch b/source/a/grub/0004-add-GRUB_DISABLE_KERNEL_SYMLINKS-variable.patch new file mode 100644 index 000000000..d49925ae1 --- /dev/null +++ b/source/a/grub/0004-add-GRUB_DISABLE_KERNEL_SYMLINKS-variable.patch @@ -0,0 +1,12 @@ +--- ./util/grub-mkconfig.in.orig 2022-11-14 09:52:54.000000000 -0600 ++++ ./util/grub-mkconfig.in 2024-06-26 12:44:00.986119802 -0500 +@@ -255,7 +255,8 @@ + GRUB_ENABLE_CRYPTODISK \ + GRUB_BADRAM \ + GRUB_OS_PROBER_SKIP_LIST \ +- GRUB_DISABLE_SUBMENU ++ GRUB_DISABLE_SUBMENU \ ++ GRUB_DISABLE_KERNEL_SYMLINKS + + if test "x${grub_cfg}" != "x"; then + rm -f "${grub_cfg}.new" diff --git a/source/a/grub/09_slackware_linux b/source/a/grub/09_slackware_linux new file mode 100644 index 000000000..b3a2499a0 --- /dev/null +++ b/source/a/grub/09_slackware_linux @@ -0,0 +1,196 @@ +#! /bin/sh +set -e +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see <http://www.gnu.org/licenses/>. +# +# Save this file in /etc/grub.d/09_slackware_linux + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="${prefix}/share" + +. "${datarootdir}/grub/grub-mkconfig_lib" + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class gnu-linux --class gnu --class os" + +if [ "${GRUB_DISTRIBUTOR}" = "" ] ; then + OS=Linux +else + OS="${GRUB_DISTRIBUTOR} Linux" + CLASS="--class $(echo "${GRUB_DISTRIBUTOR}" | tr '[:upper:]' '[:lower:]') ${CLASS}" +fi + +# loop-AES arranges things so that /dev/loop/X can be our root device, but +# the initrds that Linux uses don't like that. +case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=$(losetup "${GRUB_DEVICE}" | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/") + ;; +esac + +if [ "${GRUB_DEVICE_UUID}" = "" ] || [ "${GRUB_DISABLE_LINUX_UUID}" = "true" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} +else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +fi + +linux_entry () +{ + os="$1" + tag="$2" + version="$3" + recovery="$4" + args="$5" + if ${recovery} ; then + title="$(gettext "%s, with Linux %s [%s] (recovery mode)")" + else + title="$(gettext "%s, with Linux %s [%s]")" + fi + printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}" "${tag}" + save_default_entry | sed -e "s/^/\t/" + + # Use ELILO's generic "efifb" when it's known to be available. + # FIXME: We need an interface to select vesafb in case efifb can't be used. + if [ "$GRUB_GFXPAYLOAD_LINUX" = "" ]; then + if grep -qx "CONFIG_FB_EFI=y" /boot/config-"${version}" 2> /dev/null \ + && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" /boot/config-"${version}" 2> /dev/null; then + cat << EOF + set gfxpayload=keep +EOF + fi + else + cat << EOF + set gfxpayload=$GRUB_GFXPAYLOAD_LINUX +EOF + fi + + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/")" + fi + printf '%s\n' "${prepare_boot_cache}" + cat << EOF + echo $(printf "$(gettext "Loading Linux %s ...")" "${version}") + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +EOF + if test -n "${initrd}" ; then + cat << EOF + echo $(gettext "Loading initial ramdisk ...") + initrd ${initrd} +EOF + fi + cat << EOF +} +EOF +} + +process_list() { + mylist="$1" + tag="$2" + initrd_allowed="$3" + + # Version-sort the kernels + sorted_kernels=$(echo "$mylist" | tr ' ' '\n' | version_sort -r) + + # Use portable command substitution + kernels=$(echo "$sorted_kernels" | tr ' ' '\n') + + for kernel in $kernels; do + + # Skip symbolic links to kernels if requested: + if [ -L "$kernel" -a "$GRUB_DISABLE_KERNEL_SYMLINKS" = "true" ]; then + continue + fi + + printf "Found linux image: %s\n" "$kernel" >&2 + basename=$(basename "$kernel") + dirname=$(dirname "$kernel") + rel_dirname=$(make_system_path_relative_to_its_root "$dirname") + version=$(echo "$basename" | sed -e "s,^[^0-9]*-,,g") + alt_version=$(echo "$version" | sed -e "s,\.old$,,g") + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + initrd= + actual_initrd= + + if [ "${initrd_allowed}" = "true" ]; then + for i in ${GRUB_EARLY_INITRD_LINUX_STOCK} \ + ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do + if [ -e "${dirname}/${i}" ]; then + if [ -z "$initrd" ]; then + initrd="$rel_dirname/$i" + else + initrd="$initrd $rel_dirname/$i" + fi + fi + done + for i in "initrd-${tag}-${version}.gz" "initrd-${tag}.gz" \ + "initrd-${version}.gz" "initrd.gz" \ + "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${version}" "initrd.img-${alt_version}" \ + "initrd-${alt_version}.img" "initrd-${alt_version}"; do + if [ -e "${dirname}/${i}" ]; then + actual_initrd="true" + if [ -z "$initrd" ]; then + initrd="$rel_dirname/$i" + else + initrd="$initrd $rel_dirname/$i" + fi + break + fi + done + + if [ -n "${initrd}" ]; then + printf "Found initrd image: %s\n" "${initrd}" >&2 + fi + if [ -z "$actual_initrd" ]; then + # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. + linux_root_device_thisversion=${GRUB_DEVICE} + fi + else + # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. + linux_root_device_thisversion=${GRUB_DEVICE} + fi + + linux_entry "${OS}" "${tag}" "${version}" false \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${tag}" "${version}" true \ + "single ${GRUB_CMDLINE_LINUX}" + fi + done +} + +prepare_boot_cache= + +list=$(for i in /boot/vmlinu[xz]-generic-* /boot/vmlinu[xz]-generic /vmlinu[xz]-generic-* ; do + if grub_file_is_not_garbage "$i" ; then printf "%s " "$i"; fi + done) + +process_list "${list}" "generic" "true" + +list=$(for i in /boot/vmlinu[xz]-custom-* /boot/vmlinu[xz]-custom /vmlinu[xz]-custom-* ; do + if grub_file_is_not_garbage "$i" ; then printf "%s " "$i"; fi + done) +process_list "${list}" "custom" "true" + +list=$(for i in /boot/vmlinu[xz]-huge-* /boot/vmlinu[xz]-huge /vmlinu[xz]-huge-* ; do + if grub_file_is_not_garbage "$i" ; then printf "%s " "$i"; fi + done) +process_list "${list}" "huge" "false" diff --git a/source/a/grub/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch b/source/a/grub/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch deleted file mode 100644 index 27b2277c4..000000000 --- a/source/a/grub/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas <javierm@redhat.com> -Date: Fri, 11 Jun 2021 21:36:16 +0200 -Subject: fs/ext2: Ignore checksum seed incompat feature - -This incompat feature is used to denote that the filesystem stored its -metadata checksum seed in the superblock. This is used to allow tune2fs -changing the UUID on a mounted metdata_csum filesystem without having -to rewrite all the disk metadata. However, the GRUB doesn't use the -metadata checksum at all. So, it can just ignore this feature if it -is enabled. This is consistent with the GRUB filesystem code in general -which just does a best effort to access the filesystem's data. - -The checksum seed incompat feature has to be removed from the ignore -list if the support for metadata checksum verification is added to the -GRUB ext2 driver later. - -Suggested-by: Eric Sandeen <esandeen@redhat.com> -Suggested-by: Lukas Czerner <lczerner@redhat.com> -Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> -Reviewed-by: Lukas Czerner <lczerner@redhat.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/fs/ext2.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index e7dd78e..4953a15 100644 ---- a/grub-core/fs/ext2.c -+++ b/grub-core/fs/ext2.c -@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); - #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 - #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 - #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 -+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000 - #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000 - - /* The set of back-incompatible features this driver DOES support. Add (OR) -@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+"); - * mmp: Not really back-incompatible - was added as such to - * avoid multiple read-write mounts. Safe to ignore for this - * RO driver. -+ * checksum seed: Not really back-incompatible - was added to allow tools -+ * such as tune2fs to change the UUID on a mounted metadata -+ * checksummed filesystem. Safe to ignore for now since the -+ * driver doesn't support checksum verification. However, it -+ * has to be removed from this list if the support is added later. - */ - #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \ -- | EXT4_FEATURE_INCOMPAT_MMP) -- -+ | EXT4_FEATURE_INCOMPAT_MMP \ -+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED) - - #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U - --- -cgit v1.1 - diff --git a/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch b/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch deleted file mode 100644 index 5abc747af..000000000 --- a/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch +++ /dev/null @@ -1,121 +0,0 @@ -From a4b495520e4dc41a896a8b916a64eda9970c50ea Mon Sep 17 00:00:00 2001 -From: Erwan Velu <erwanaliasr1@gmail.com> -Date: Wed, 25 Aug 2021 15:31:52 +0200 -Subject: fs/xfs: Fix unreadable filesystem with v4 superblock - -The commit 8b1e5d193 (fs/xfs: Add bigtime incompat feature support) -introduced the bigtime support by adding some features in v3 inodes. -This change extended grub_xfs_inode struct by 76 bytes but also changed -the computation of XFS_V2_INODE_SIZE and XFS_V3_INODE_SIZE. Prior this -commit, XFS_V2_INODE_SIZE was 100 bytes. After the commit it's 84 bytes -XFS_V2_INODE_SIZE becomes 16 bytes too small. - -As a result, the data structures aren't properly aligned and the GRUB -generates "attempt to read or write outside of partition" errors when -trying to read the XFS filesystem: - - GNU GRUB version 2.11 - .... - grub> set debug=efi,gpt,xfs - grub> insmod part_gpt - grub> ls (hd0,gpt1)/ - partmap/gpt.c:93: Read a valid GPT header - partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125 - fs/xfs.c:931: Reading sb - fs/xfs.c:270: Validating superblock - fs/xfs.c:295: XFS v4 superblock detected - fs/xfs.c:962: Reading root ino 128 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (739521961424144223) - 344365866970255880, 3840 - error: attempt to read or write outside of partition. - -This commit change the XFS_V2_INODE_SIZE computation by subtracting 76 -bytes instead of 92 bytes from the actual size of grub_xfs_inode struct. -This 76 bytes value comes from added members: - 20 grub_uint8_t unused5 - 1 grub_uint64_t flags2 - 48 grub_uint8_t unused6 - -This patch explicitly splits the v2 and v3 parts of the structure. -The unused4 is still ending of the v2 structures and the v3 starts -at unused5. Thanks to this we will avoid future corruptions of v2 -or v3 inodes. - -The XFS_V2_INODE_SIZE is returning to its expected size and the -filesystem is back to a readable state: - - GNU GRUB version 2.11 - .... - grub> set debug=efi,gpt,xfs - grub> insmod part_gpt - grub> ls (hd0,gpt1)/ - partmap/gpt.c:93: Read a valid GPT header - partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125 - fs/xfs.c:931: Reading sb - fs/xfs.c:270: Validating superblock - fs/xfs.c:295: XFS v4 superblock detected - fs/xfs.c:962: Reading root ino 128 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:931: Reading sb - fs/xfs.c:270: Validating superblock - fs/xfs.c:295: XFS v4 superblock detected - fs/xfs.c:962: Reading root ino 128 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (131) - 64, 768 - efi/ fs/xfs.c:515: Reading inode (3145856) - 1464904, 0 - grub2/ fs/xfs.c:515: Reading inode (132) - 64, 1024 - grub/ fs/xfs.c:515: Reading inode (139) - 64, 2816 - grub> - -Fixes: 8b1e5d193 (fs/xfs: Add bigtime incompat feature support) - -Signed-off-by: Erwan Velu <e.velu@criteo.com> -Tested-by: Carlos Maiolino <cmaiolino@redhat.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/fs/xfs.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index 0f524c3a8..e3816d1ec 100644 ---- a/grub-core/fs/xfs.c -+++ b/grub-core/fs/xfs.c -@@ -192,6 +192,11 @@ struct grub_xfs_time_legacy - grub_uint32_t nanosec; - } GRUB_PACKED; - -+/* -+ * The struct grub_xfs_inode layout was taken from the -+ * struct xfs_dinode_core which is described here: -+ * https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/docs/xfs_filesystem_structure.pdf -+ */ - struct grub_xfs_inode - { - grub_uint8_t magic[2]; -@@ -208,14 +213,15 @@ struct grub_xfs_inode - grub_uint32_t nextents; - grub_uint16_t unused3; - grub_uint8_t fork_offset; -- grub_uint8_t unused4[37]; -+ grub_uint8_t unused4[17]; /* Last member of inode v2. */ -+ grub_uint8_t unused5[20]; /* First member of inode v3. */ - grub_uint64_t flags2; -- grub_uint8_t unused5[48]; -+ grub_uint8_t unused6[48]; /* Last member of inode v3. */ - } GRUB_PACKED; - - #define XFS_V3_INODE_SIZE sizeof(struct grub_xfs_inode) --/* Size of struct grub_xfs_inode until fork_offset (included). */ --#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 92) -+/* Size of struct grub_xfs_inode v2, up to unused4 member included. */ -+#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 76) - - struct grub_xfs_dirblock_tail - { --- -cgit v1.2.1 - - diff --git a/source/a/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch b/source/a/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch new file mode 100644 index 000000000..6670f7677 --- /dev/null +++ b/source/a/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch @@ -0,0 +1,34 @@ +From b835601c7639ed1890f2d3db91900a8506011a8e Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen <xxc3ncoredxx@gmail.com> +Date: Thu, 21 Dec 2023 01:17:35 -0600 +Subject: build: Include grub-core/extra_deps.lst in dist + +Fixes build failure due to the extra_deps.lst file not existing in the +tarball. Found while trying to package GRUB 2.12 for Gentoo. + + make[3]: *** No rule to make target '/var/tmp/portage/sys-boot/grub-2.12/work/grub-2.12/grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop. + +Fixes: 89fbe0cac (grub-core/Makefile.am: Make path to extra_deps.lst relative to $(top_srcdir)/grub-core) +Fixes: 154dcb1ae (build: Allow explicit module dependencies) + +Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + conf/Makefile.extra-dist | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist +index 5e7126f..d9e2b8c 100644 +--- a/conf/Makefile.extra-dist ++++ b/conf/Makefile.extra-dist +@@ -21,6 +21,7 @@ EXTRA_DIST += conf/i386-cygwin-img-ld.sc + EXTRA_DIST += grub-core/Makefile.core.def + EXTRA_DIST += grub-core/Makefile.gcry.def + ++EXTRA_DIST += grub-core/extra_deps.lst + EXTRA_DIST += grub-core/genmoddep.awk + EXTRA_DIST += grub-core/genmod.sh.in + EXTRA_DIST += grub-core/gensyminfo.sh.in +-- +cgit v1.1 + diff --git a/source/a/grub/doinst.sh b/source/a/grub/doinst.sh index 54c06904f..fea6117d2 100644 --- a/source/a/grub/doinst.sh +++ b/source/a/grub/doinst.sh @@ -11,8 +11,19 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + # Process config files in etc/grub.d/: for file in etc/grub.d/*.new ; do - config $file + preserve_perms $file done config etc/default/grub.new diff --git a/source/a/grub/etc.default.grub b/source/a/grub/etc.default.grub index b2d4080a0..363eda767 100644 --- a/source/a/grub/etc.default.grub +++ b/source/a/grub/etc.default.grub @@ -9,20 +9,36 @@ GRUB_DISTRIBUTOR=$( sed 's/Slackware /Slackware-/' /etc/slackware-version ) GRUB_CMDLINE_LINUX_DEFAULT="" GRUB_CMDLINE_LINUX="" -# Uncomment to disable graphical terminal (grub-pc only) +# Uncomment to disable graphical terminal (grub-pc only): #GRUB_TERMINAL=console -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' +# The resolution used on graphical terminal. +# Note that you can use only modes which your graphic card supports via VBE. +# You can see them in real GRUB with the command `vbeinfo'. #GRUB_GFXMODE=640x480 #GRUB_GFXMODE=1024x768x32 # Font used on the graphical terminal: #GRUB_FONT=/usr/share/grub/dejavusansmono.pf2 -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux: #GRUB_DISABLE_LINUX_UUID=true -# Uncomment to disable generation of recovery mode menu entries -#GRUB_DISABLE_RECOVERY="true" +# Uncomment to disable generation of recovery mode menu entries: +GRUB_DISABLE_RECOVERY="true" + +# Search for other operating systems with os-prober. +# If you don't want this, you can do any of these things to disable it: +# - change to "true" +# - comment it out, since disabled is the default +# - remove the executable bit from /etc/grub.d/30_os-prober +GRUB_DISABLE_OS_PROBER="false" + +# Disable the submenus: +GRUB_DISABLE_SUBMENU="true" + +# When using 09_slackware_linux, this option skips making menu entries for the +# symbolic links to kernels. Some folks don't like the extra (redundant) menu +# entries, while others like having an unversioned menu entry that doesn't +# require "update-grub" after installing new kernels. Your call. +#GRUB_DISABLE_KERNEL_SYMLINKS="true" diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index b2bbb7223..5740a983c 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2013, 2016, 2017, 2018, 2019, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2013, 2016, 2017, 2018, 2019, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,10 @@ PKGNAM=grub VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # Better to use _ than ~ in the package filenames version: PKGVER=$(echo $VERSION | tr '~' '_') -BUILD=${BUILD:-5} +BUILD=${BUILD:-10} + +# If you use stack-protector, then grub will not work with legacy BIOS: +STACKPROTECT=${STACKPROTECT:---enable-stack-protector=no} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -104,23 +107,32 @@ find . \ -exec chmod 644 {} \+ # Use /boot/initrd.gz as a valid initrd name: -zcat $CWD/initrd_naming.patch | patch -p1 --verbose || exit 1 +cat $CWD/initrd_naming.patch | patch -p1 --verbose || exit 1 # Support DejaVuSansMono font (dejavusansmono.pf2) by default: -zcat $CWD/grub.dejavusansmono.gfxterm.font.diff.gz | patch -p1 --verbose || exit 1 +cat $CWD/grub.dejavusansmono.gfxterm.font.diff | patch -p1 --verbose || exit 1 # Fix alignment error with gcc8: -zcat $CWD/0198-align-struct-efi_variable-better.patch.gz | patch -p1 --verbose || exit 1 +cat $CWD/0198-align-struct-efi_variable-better.patch | patch -p1 --verbose || exit 1 + +# Skip processing any files in /etc/grub.d/ that end in .new or .orig: +cat $CWD/0001-skip-new-and-orig-files-in-etc-grub.d.patch | patch -p1 --verbose || exit 1 + +# From Arch, add a couple more GRUB_COLOR options: +cat $CWD/0001-00_header-add-GRUB_COLOR_-variables.patch | patch -p1 --verbose || exit 1 + +# Also from Arch, support drop-in config bits in /etc/default/grub.d/: +cat $CWD/0003-support-dropins-for-default-configuration.patch | patch -p1 --verbose || exit 1 -# Fix unreadable XFS filesystem with v4 superblock: -zcat $CWD/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch.gz | patch -p1 --verbose || exit 1 +# Support GRUB_DISABLE_KERNEL_SYMLINKS variable in /etc/default/grub. +# If this is not defined, it is assumed to be false. +cat $CWD/0004-add-GRUB_DISABLE_KERNEL_SYMLINKS-variable.patch | patch -p1 --verbose || exit 1 -# Skip processing any files in /etc/grub.d/ that end in .new: -zcat $CWD/0001-skip-new-files-in-etc-grub.d.patch.gz | patch -p1 --verbose || exit 1 +# Fix 2.12 release with upstream commit (won't compile otherwise): +cat $CWD/b835601c7639ed1890f2d3db91900a8506011a8e.patch | patch -p1 --verbose || exit 1 -# Since upstream apparently can't be bothered, let's fix using ext* filesystems -# created with what are now the default options: -zcat $CWD/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch.gz | patch -p1 --verbose || exit 1 +# Still won't compile. Someday they'll remember how to cut a new release. +touch grub-core/extra_deps.lst # Regenerate build system to fix dependency on outdated automake: autoreconf -vif @@ -137,6 +149,7 @@ build_grub() { --infodir=/usr/info \ --mandir=/usr/man \ --disable-werror \ + $STACKPROTECT \ $EFI_DO || exit 1 # Build and install: @@ -158,11 +171,26 @@ fi # Always end with regular build: build_grub || exit 1 +# Add custom 09_slackware_linux config. Thanks to Richard Cranium for the +# initial version, and Daedra for making it POSIX compliant: +cp -a $CWD/09_slackware_linux $PKG/etc/grub.d/09_slackware_linux +chown root:root $PKG/etc/grub.d/09_slackware_linux +chmod 755 $PKG/etc/grub.d/09_slackware_linux + # Preserve files in /etc/grub.d/: for file in $PKG/etc/grub.d/*_* ; do mv ${file} ${file}.new done +# Add an update-grub script ala Ubuntu: +cp -a $CWD/update-grub $PKG/usr/sbin/update-grub +chown root:root $PKG/usr/sbin/update-grub +chmod 755 $PKG/usr/sbin/update-grub + +# Since every other grub command is of the form "grub-{command}", add a symlink +# so that "grub-update" also works: +ln -sf update-grub $PKG/usr/sbin/grub-update + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -176,8 +204,10 @@ mv $PKG/etc/bash_completion.d/grub \ rmdir --parents $PKG/etc/bash_completion.d 2>/dev/null # Install default options file: -mkdir -p $PKG/etc/default +mkdir -p $PKG/etc/default/grub.d cat $CWD/etc.default.grub > $PKG/etc/default/grub.new +# Add a hint: +echo "Files in this directory must end in .cfg to be processed." > $PKG/etc/default/grub.d/README # Create a directory for grub.cfg: mkdir -p $PKG/boot/grub @@ -231,7 +261,7 @@ if [ -r ChangeLog ]; then fi mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/source/a/grub/slack-desc b/source/a/grub/slack-desc index 1f7a31e09..b07c8a3b2 100644 --- a/source/a/grub/slack-desc +++ b/source/a/grub/slack-desc @@ -8,10 +8,10 @@ |-----handy-ruler------------------------------------------------------| grub: grub (the GRand Unified Bootloader) grub: -grub: GNU GRUB is a multiboot boot loader. -grub: -grub: Website: http://www.gnu.org/software/grub/ +grub: GNU GRUB, the GRand Unified Bootloader, is a flexible and powerful +grub: boot loader program for a wide range of architectures. grub: +grub: Homepage: https://www.gnu.org/software/grub/ grub: grub: grub: diff --git a/source/a/grub/update-grub b/source/a/grub/update-grub new file mode 100644 index 000000000..fef55d9b8 --- /dev/null +++ b/source/a/grub/update-grub @@ -0,0 +1,10 @@ +#!/bin/sh +# This is a simple script to update grub from the configuration file. +# Please note that after upgrading to a new grub version, you should +# first use "grub-install" to reinstall the bootloader, similar to this: +# grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=GRUB --recheck +# or this: +# grub-install --target=i386-pc --recheck /dev/sdX + +set -e +exec grub-mkconfig -o /boot/grub/grub.cfg "$@" diff --git a/source/a/shadow/shadow.url b/source/a/shadow/shadow.url index b49486f5a..c102daba3 100644 --- a/source/a/shadow/shadow.url +++ b/source/a/shadow/shadow.url @@ -1,2 +1,2 @@ https://github.com/shadow-maint/shadow -https://github.com/shadow-maint/shadow/releases/download/4.15.1/shadow-4.15.1.tar.xz +https://github.com/shadow-maint/shadow/releases/download/4.16.0/shadow-4.16.0.tar.xz diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index d101aa268..78cea118a 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -403,8 +403,8 @@ if [ -x /etc/rc.d/rc.openldap ]; then fi # Start local LDAP name service daemon (from nss-pam-ldapd): -if [ -x /etc/rc.d/rc.nss-pam-ldap ]; then - /etc/rc.d/rc.nss-pam-ldap start +if [ -x /etc/rc.d/rc.nss-pam-ldapd ]; then + /etc/rc.d/rc.nss-pam-ldapd start fi # Start Dovecot: diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 85c6fed9c..4460d6316 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-15.1} ARCH=noarch -BUILD=${BUILD:-19} +BUILD=${BUILD:-20} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/ap/inxi/fetch-inxi.sh b/source/ap/inxi/fetch-inxi.sh index 8750c0bd5..cf75d93f7 100755 --- a/source/ap/inxi/fetch-inxi.sh +++ b/source/ap/inxi/fetch-inxi.sh @@ -24,7 +24,7 @@ PKGNAM=inxi # Pull a stable branch + patches -BRANCH=${1:-3.3.34-1} +BRANCH=${1:-3.3.35-1} # Clear download area: rm -rf ${PKGNAM} diff --git a/source/ap/lxc/lxc-slackware.in b/source/ap/lxc/lxc-slackware.in index 422fa1d82..a3d53f889 100644 --- a/source/ap/lxc/lxc-slackware.in +++ b/source/ap/lxc/lxc-slackware.in @@ -146,6 +146,11 @@ sed -i "s,pg::powerokwait:/sbin/genpowerfail stop,pg::powerokwait:/sbin/shutdown # create the library symlinks chroot $rootfs ldconfig +# Make sure that the certificate links are updated: +if [ -x $rootfs/usr/sbin/update-ca-certificates ]; then + chroot $rootfs /bin/bash -c "LC_ALL=C /usr/sbin/update-ca-certificates" +fi + # set a default combination for the luggage echo "root:root" | chroot $rootfs chpasswd 2> /dev/null echo "Root default password is 'root', please change it!" @@ -238,6 +243,7 @@ bash bin bridge-utils bzip2 +ca-certificates coreutils cracklib cyrus-sasl @@ -255,18 +261,24 @@ etc eudev findutils gawk +glibc-zoneinfo gnupg2 gnutls grep gzip hostname +icu4c iproute2 iptables iputils kmod less +libassuan libcap-ng libffi +libgcrypt +libgpg-error +libksba libmnl libnl3 libpcap @@ -280,16 +292,20 @@ net-tools nettle network-scripts ncurses +npth pam openssh +openssl openssl-solibs p11-kit +perl pkgtools procps-ng sed shadow sharutils slackpkg +sqlite sysklogd sysvinit sysvinit-functions diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild index 69951be5f..5ff884502 100755 --- a/source/ap/lxc/lxc.SlackBuild +++ b/source/ap/lxc/lxc.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lxc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -81,45 +81,38 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Our python package is not split: -#sed -i "s|PKG_CHECK_MODULES(\[PYTHONDEV.*||" configure.ac || exit 1 - -if [ ! -r configure ]; then - NOCONFIGURE=1 ./autogen.sh -fi - -# Enable python stuff only if python3 is installed. -python="" -# Python bindings don't seem to be part of the standard package at this time, -# so we'll comment this next line out for now: -#[ -x /usr/bin/python3 ] && export PYTHON=/usr/bin/python3 && python="--enable-python" - -# Configure: -# lua is autodetected -CFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --infodir=/usr/info \ - --with-global-conf=/etc/lxc/lxc.conf \ - --with-rootfs-path=/var/lib/rootfs-lxc \ - --disable-werror \ - --disable-apparmor \ - --disable-static \ - $python \ - --enable-pam \ - --build=$ARCH-slackware-linux || exit 1 - -# Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + --buildtype=release \ + -Ddoc-path=/usr/doc/$PKGNAM-$VERSION \ + -Dglobal-config-path=/etc/lxc \ + -Drootfs-mount-path=/var/lib/rootfs-lxc \ + -Dapparmor=false \ + -Dpam-cgroup=true \ + -Dinit-script=sysvinit \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# The PAM module gets installed in the wrong location and there's no config +# option to put it in the right place, so we'll do it ourselves: +mkdir -p $PKG/lib${LIBDIRSUFFIX} +mv $PKG/usr/lib${LIBDIRSUFFIX}/security $PKG/lib${LIBDIRSUFFIX} # Add the template file: cat $CWD/lxc-slackware.in > $PKG/usr/share/lxc/templates/lxc-slackware @@ -138,10 +131,11 @@ mv $PKG/etc/default/lxc $PKG/etc/default/lxc.new # Install an init script (non executable by default): install -D -m 0644 $CWD/rc.lxc $PKG/etc/rc.d/rc.lxc.new -# Put bash completion files in system directory: -mkdir -p $PKG/usr/share/bash-completion/completions -mv $PKG/etc/bash_completion.d/* $PKG/usr/share/bash-completion/completions -rm -r $PKG/etc/bash_completion.d +# Remove init scripts that we do not use: +rm -r $PKG/etc/init.d + +# --disable-static +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a # Strip binaries: ( cd $PKG @@ -152,7 +146,7 @@ rm -r $PKG/etc/bash_completion.d # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS* CONTRIBUTING* COPYING* INSTALL* MAINTAINERS* NEWS* README* TODO* \ + AUTHORS* CODING_STYLE* CONTRIBUTING* COPYING* LICENSE* MAINTAINERS* README* \ doc/FAQ.txt \ $PKG/usr/doc/${PKGNAM}-$VERSION diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild index 24e9b9be3..7a0fe620a 100755 --- a/source/d/binutils/binutils.SlackBuild +++ b/source/d/binutils/binutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2005-2022 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=binutils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -153,6 +153,7 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ --mandir=/usr/man \ --infodir=/usr/info \ --with-docdir=/usr/doc/binutils-$VERSION \ diff --git a/source/d/cmake/cmake.url b/source/d/cmake/cmake.url index e51e13e09..a15c4f61b 100644 --- a/source/d/cmake/cmake.url +++ b/source/d/cmake/cmake.url @@ -1,2 +1,2 @@ https://github.com/Kitware/CMake/releases -https://github.com/Kitware/CMake/releases/download/v3.29.5/cmake-3.29.5.tar.gz +https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6.tar.gz diff --git a/source/l/libclc/libclc.SlackBuild b/source/d/llvm/libclc.SlackBuild index ba739d762..1af560e2d 100755 --- a/source/l/libclc/libclc.SlackBuild +++ b/source/d/llvm/libclc.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libclc # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2017, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2018, 2021, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libclc -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 4- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +VERSION=${VERSION:-$(echo llvmorg-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -69,14 +69,23 @@ else fi TMP=${TMP:-/tmp} -PKG=$TMP/package-libclc - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf libclc-${VERSION}.src -tar xvf $CWD/libclc-$VERSION.src.tar.?z || exit 1 -cd libclc-${VERSION}.src || exit 1 +PKG=$TMP/package-$PKGNAM +BUILDDIR=${TMP}/libclc-build-${VERSION} + +rm -rf $PKG $BUILDDIR +mkdir -p $TMP $PKG $BUILDDIR +cd $BUILDDIR + +# Add a fake configure script so the cleanup script used here at Slackware +# knows to delete this stuff later. Other folks can just ignore this... it +# doesn't have any other purpose. +touch configure +chmod 755 configure + +echo "Extracting $CWD/llvmorg-$VERSION.tar.?z..." +tar xf $CWD/llvmorg-$VERSION.tar.?z llvm-project-llvmorg-$VERSION/libclc || tar xf $CWD/llvmorg-$VERSION.tar.?z llvmorg-$VERSION/libclc || exit 1 +cd llvm-project-llvmorg-$VERSION/libclc || cd llvmorg-$VERSION/libclc || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -103,10 +112,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a *.TXT $PKG/usr/doc/$PKGNAM-$VERSION +cp -a *.{txt,md,TXT,rst} $PKG/usr/doc/$PKGNAM-$VERSION +rm -f $PKG/usr/doc/$PKGNAM-$VERSION/CMakeLists.txt mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/slack-desc.libclc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/d/llvm/lldb.32-bit.link.libatomic.diff b/source/d/llvm/lldb.32-bit.link.libatomic.diff deleted file mode 100644 index 234bcdc72..000000000 --- a/source/d/llvm/lldb.32-bit.link.libatomic.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- ./tools/lldb/source/Utility/CMakeLists.txt.orig 2022-06-22 11:46:24.000000000 -0500 -+++ ./tools/lldb/source/Utility/CMakeLists.txt 2022-06-27 22:33:56.715179825 -0500 -@@ -19,9 +19,9 @@ - list(APPEND LLDB_SYSTEM_LIBS ws2_32 rpcrt4) - endif () - --if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB ) -+#if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB ) - list(APPEND LLDB_SYSTEM_LIBS atomic) --endif() -+#endif() - - add_lldb_library(lldbUtility - ArchSpec.cpp diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild index aab67ce71..dc9c1484e 100755 --- a/source/d/llvm/llvm.SlackBuild +++ b/source/d/llvm/llvm.SlackBuild @@ -26,21 +26,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=llvm -VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo llvmorg-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -# For the two options below, either set both to OFF or *only one* to ON: - -# Build using -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON: -# This is the upstream recommended way to build LLVM with shared libraries and -# seems to be the way to go these days. -LLVM_BUILD_LLVM_DYLIB=${LLVM_BUILD_LLVM_DYLIB:=ON} - -# Build using -DBUILD_SHARED_LIBS=ON. -# We used this for years here to get a smaller LLVM package, but it no longer -# works. Feel free to try it, but expect breakage. -BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:=OFF} - NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then @@ -51,6 +39,17 @@ if [ -z "$ARCH" ]; then esac fi +# Select projects to build: +if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then + # bolt and flang are not available on 32-bit + LLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS:-"clang;clang-tools-extra;compiler-rt;lld;lldb;llvm;mlir;openmp;polly"} +else + LLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS:-"bolt;clang;clang-tools-extra;compiler-rt;flang;lld;lldb;llvm;mlir;openmp;polly"} +fi + +# Select runtimes to build: +LLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES:-"libcxx;libcxxabi"} + # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information # could be useful to other scripts. @@ -81,19 +80,6 @@ else LIBDIRSUFFIX="" fi -# Building clangd will be determined automatically unless BUILD_CLANG is -# preset to YES or NO: -if [ -z $BUILD_CLANGD ]; then - if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then - BUILD_CLANGD=NO - else - BUILD_CLANGD=YES - fi -fi -if [ "$BUILD_CLANGD" = "NO" ]; then - CLANGD="-DCLANG_ENABLE_CLANGD=OFF" -fi - # Python3 short version: PY3=$(python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' | cut -f 2 -d n | cut -f 1 -d /) @@ -107,83 +93,12 @@ cd $BUILDDIR touch configure chmod 755 configure -# Extract and rename some support files: -echo "Extracting $CWD/cmake-$VERSION.src.tar.xz..." -tar xf $CWD/cmake-$VERSION.src.tar.xz || exit 1 -mv cmake-$VERSION.src cmake -echo "Extracting $CWD/third-party-$VERSION.src.tar.xz..." -tar xf $CWD/third-party-$VERSION.src.tar.xz || exit 1 -mv third-party-$VERSION.src third-party -echo "Extracting $CWD/runtimes-$VERSION.src.tar.xz..." -tar xf $CWD/runtimes-$VERSION.src.tar.xz || exit 1 -mv runtimes-${VERSION}.src/cmake/Modules/* cmake/Modules || exit 1 -rm -r runtimes-${VERSION}.src - -rm -rf $PKGNAM-${VERSION}.src $PKGNAM-${VERSION} -echo "Extracting $CWD/$PKGNAM-$VERSION.src.tar.xz..." -tar xf $CWD/$PKGNAM-$VERSION.src.tar.xz || exit 1 - -cd $PKGNAM-${VERSION}.src/tools || cd $PKGNAM-${VERSION}/tools || exit 1 - echo "Extracting $CWD/clang-$VERSION.src.tar.xz..." - tar xf $CWD/clang-$VERSION.src.tar.xz || exit 1 - mv clang-${VERSION} clang 2>/dev/null || mv clang-${VERSION}.src clang || exit 1 - #echo "Extracting $CWD/flang-$VERSION.src.tar.xz..." - #tar xf $CWD/flang-$VERSION.src.tar.xz || exit 1 - #mv flang-${VERSION} flang 2>/dev/null || mv flang-${VERSION}.src flang || exit 1 - echo "Extracting $CWD/lldb-$VERSION.src.tar.xz..." - tar xf $CWD/lldb-$VERSION.src.tar.xz || exit 1 - mv lldb-${VERSION} lldb 2>/dev/null || mv lldb-${VERSION}.src lldb || exit 1 - echo "Extracting $CWD/lld-$VERSION.src.tar.xz..." - tar xf $CWD/lld-$VERSION.src.tar.xz || exit 1 - mv lld-${VERSION} lld 2>/dev/null || mv lld-${VERSION}.src lld || exit 1 -cd ../ - -cd tools/clang/tools || exit 1 - echo "Extracting $CWD/clang-tools-extra-$VERSION.src.tar.xz..." - tar xf $CWD/clang-tools-extra-$VERSION.src.tar.xz || exit 1 - mv clang-tools-extra-${VERSION} extra 2>/dev/null \ - || mv clang-tools-extra-${VERSION}.src extra || exit 1 -cd ../../../ - -cd projects || exit 1 - echo "Extracting $CWD/compiler-rt-$VERSION.src.tar.xz..." - tar xf $CWD/compiler-rt-$VERSION.src.tar.xz || exit 1 - mv compiler-rt-${VERSION} compiler-rt 2>/dev/null || mv compiler-rt-${VERSION}.src compiler-rt || exit 1 - echo "Extracting $CWD/openmp-$VERSION.src.tar.xz..." - tar xf $CWD/openmp-$VERSION.src.tar.xz || exit 1 - mv openmp-${VERSION} openmp 2>/dev/null || mv openmp-${VERSION}.src openmp || exit 1 - echo "Extracting $CWD/libcxx-${VERSION}.src.tar.xz..." - tar xf $CWD/libcxx-${VERSION}.src.tar.xz || exit 1 - mv libcxx-${VERSION} libcxx 2>/dev/null || mv libcxx-${VERSION}.src libcxx || exit 1 - echo "Extracting $CWD/libcxxabi-${VERSION}.src.tar.xz..." - tar xf $CWD/libcxxabi-${VERSION}.src.tar.xz || exit 1 - mv libcxxabi-${VERSION} libcxxabi 2>/dev/null || mv libcxxabi-${VERSION}.src libcxxabi || exit 1 - echo "Extracting $CWD/polly-$VERSION.src.tar.xz..." - tar xf $CWD/polly-$VERSION.src.tar.xz || exit 1 - mv polly-${VERSION} polly 2>/dev/null || mv polly-${VERSION}.src polly || exit 1 - # We just need a header file from this... - echo "Extracting $CWD/libunwind-${VERSION}.src.tar.xz..." - tar xf $CWD/libunwind-${VERSION}.src.tar.xz || exit 1 - mv libunwind-${VERSION}.src libunwind || mv libunwind-${VERSION} libunwind || exit 1 -cd ../ +echo "Extracting $CWD/llvmorg-$VERSION.tar.?z..." +tar xf $CWD/llvmorg-$VERSION.tar.?z || exit 1 +cd llvm-project-llvmorg-$VERSION || cd llvmorg-$VERSION || exit 1 # Support GCC built for i586-slackware-linux: -zcat $CWD/clang.toolchains.i586.triple.diff.gz | patch -p1 --verbose || exit 1 - -# We require libatomic on 32-bit platforms: -if [ -f ./tools/lldb/source/Utility/CMakeLists.txt ]; then - if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then - zcat $CWD/lldb.32-bit.link.libatomic.diff.gz | patch -p1 --verbose || exit 1 - fi -fi - -# These hackish links seem to be required... -cd .. -ln -sf */runtimes . -cd - -cd projects -ln -sf ../../cmake . -cd - +zcat $CWD/clang.toolchains.i586.triple.diff.gz | patch -p2 --verbose || exit 1 chown -R root:root . find . \ @@ -192,22 +107,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Collect shared library options. If both of the configurable options are set -# to ON, the last one we check will be the one we use. -if [ "$BUILD_SHARED_LIBS" = "ON" ]; then - SHARED_LIBRARY_OPTIONS="-DBUILD_SHARED_LIBS=ON" -fi -if [ "$LLVM_BUILD_LLVM_DYLIB" = "ON" ]; then - SHARED_LIBRARY_OPTIONS="-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON" -fi - mkdir build cd build - mkdir include - # Copy this LLVM libunwind header or it won't be found: - cp -a ../projects/libunwind/include/mach-o include - # Nuke LLVM libunwind as it conflicts with the one already on the system: - rm -r ../projects/libunwind cmake -GNinja \ -DCMAKE_C_COMPILER="clang" \ -DCMAKE_CXX_COMPILER="clang++" \ @@ -215,11 +116,13 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLLVM_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ - -DLIBCXX_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ - -DLIBCXXABI_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release \ - $SHARED_LIBRARY_OPTIONS \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DCLANG_LINK_CLANG_DYLIB=ON \ -DLLVM_USE_LINKER=lld \ + -DLLVM_ENABLE_PROJECTS="$LLVM_ENABLE_PROJECTS" \ + -DLLVM_ENABLE_RUNTIMES="$LLVM_ENABLE_RUNTIMES" \ -DLLVM_ENABLE_RTTI=ON \ -DLLVM_ENABLE_FFI=ON \ -DLLVM_ENABLE_ZLIB=ON \ @@ -230,14 +133,14 @@ cd build -DCLANG_RESOURCE_DIR="../lib${LIBDIRSUFFIX}/clang/$(echo $VERSION | cut -f 1 -d .)" \ -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ - -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ -DCLANG_DEFAULT_PIE_ON_LINUX=ON \ + -DLIBCXX_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ + -DLIBCXXABI_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ + -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=ON \ -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \ - $CLANGD \ - .. || exit 1 - + ../llvm || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG "$NINJA" install || exit 1 cd .. @@ -267,7 +170,7 @@ rm -f $PKG/usr/lib$LIBDIRSUFFIX/libgomp.so # Install Python bindings: for pyver in ${PY3}; do mkdir -p "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages" - cp -a tools/clang/bindings/python/clang "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages/" + cp -a clang/bindings/python/clang "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages/" done # Remove bundled python-six: @@ -302,22 +205,14 @@ for i in $( find $PKG/usr/man -type l ) ; do rm $i done -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/{clang,lldb,clang-tools-extra,compiler-rt,openmp,polly} -cp -a CREDITS* LICENSE* README* $PKG/usr/doc/$PKGNAM-$VERSION -cp -a tools/clang/{INSTALL,LICENSE,NOTES,README}* \ - $PKG/usr/doc/$PKGNAM-$VERSION/clang -cp -a tools/lldb/{CODE_OWNERS,INSTALL,LICENSE}* \ - $PKG/usr/doc/$PKGNAM-$VERSION/lldb -cp -a tools/clang/tools/extra/{CODE_OWNERS,LICENSE,README}* \ - $PKG/usr/doc/$PKGNAM-$VERSION/clang-tools-extra -cp -a projects/compiler-rt/{CODE_OWNERS,CREDITS,LICENSE,README}* \ - $PKG/usr/doc/$PKGNAM-$VERSION/compiler-rt -cp -a projects/openmp/{CREDITS,LICENSE}* \ - $PKG/usr/doc/$PKGNAM-$VERSION/openmp -cp -a projects/polly/{CREDITS,LICENSE,README}* \ - $PKG/usr/doc/$PKGNAM-$VERSION/polly -mv $PKG/usr/docs/llvm/* $PKG/usr/doc/$PKGNAM-$VERSION -rm -rf $PKG/usr/docs +# Just copy anything top or next level that looks like it might be docs. +# Maybe we'll include it someday. ;-) +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a *.{txt,md,TXT,rst} $PKG/usr/doc/$PKGNAM-$VERSION +cp -a --parents */*.{txt,md,TXT,rst} $PKG/usr/doc/$PKGNAM-$VERSION +cp -a --parents */README* $PKG/usr/doc/$PKGNAM-$VERSION +find $PKG/usr/doc/$PKGNAM-$VERSION -name CMakeLists.txt -exec rm -f "{}" \; +rmdir $PKG/usr/doc/$PKGNAM-$VERSION/* 2> /dev/null mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url index ddc576f2d..0ad8ed9f4 100644 --- a/source/d/llvm/llvm.url +++ b/source/d/llvm/llvm.url @@ -1,18 +1 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/clang-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/clang-tools-extra-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/compiler-rt-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/flang-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/lldb-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/openmp-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/polly-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/libcxx-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/libcxxabi-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/lld-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/libunwind-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/cmake-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/third-party-18.1.7.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/runtimes-18.1.7.src.tar.xz -# -# Also look for spirv-llvm-translator and libclc! -# +https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-18.1.8.tar.gz diff --git a/source/l/libclc/slack-desc b/source/d/llvm/slack-desc.libclc index 12a032243..12a032243 100644 --- a/source/l/libclc/slack-desc +++ b/source/d/llvm/slack-desc.libclc diff --git a/source/d/python-pip/python-pip.SlackBuild b/source/d/python-pip/python-pip.SlackBuild index deaefdbbe..54797f37b 100755 --- a/source/d/python-pip/python-pip.SlackBuild +++ b/source/d/python-pip/python-pip.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-pip VERSION=${VERSION:-$(echo pip-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} SRCNAM=pip @@ -62,12 +62,12 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ # Sticking with setup.py while it exists to make it easier to bootstrap a -# new Python version: -python3 setup.py build install --root=$PKG || exit 1 +# new Python version: (24.0 was the last to support this) +#python3 setup.py build install --root=$PKG || exit 1 # Don't use this. ;-) -#unshare -n python3 -m build --wheel --no-isolation || exit 1 -#python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 +unshare -n python3 -m build --wheel --no-isolation || exit 1 +python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 # Remove Windows garbage: find $PKG . -name "*.exe" -exec rm -f "{}" \; diff --git a/source/k/kernel-configs/config-generic-6.9.5 b/source/k/kernel-configs/config-generic-6.9.7 index 0783691e1..70252ad31 100644 --- a/source/k/kernel-configs/config-generic-6.9.5 +++ b/source/k/kernel-configs/config-generic-6.9.7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.9.5 Kernel Configuration +# Linux/x86 6.9.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-6.9.5.x64 b/source/k/kernel-configs/config-generic-6.9.7.x64 index dd0f6194b..2ee0815d4 100644 --- a/source/k/kernel-configs/config-generic-6.9.5.x64 +++ b/source/k/kernel-configs/config-generic-6.9.7.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.9.5 Kernel Configuration +# Linux/x86 6.9.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-6.9.5 b/source/k/kernel-configs/config-huge-6.9.7 index ff16fe329..95fd0544e 100644 --- a/source/k/kernel-configs/config-huge-6.9.5 +++ b/source/k/kernel-configs/config-huge-6.9.7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.9.5 Kernel Configuration +# Linux/x86 6.9.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-6.9.5.x64 b/source/k/kernel-configs/config-huge-6.9.7.x64 index d2aada9a9..b5fbd5015 100644 --- a/source/k/kernel-configs/config-huge-6.9.5.x64 +++ b/source/k/kernel-configs/config-huge-6.9.7.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.9.5 Kernel Configuration +# Linux/x86 6.9.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/kdeconnect-kde b/source/kde/kde/build/kdeconnect-kde index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kdeconnect-kde +++ b/source/kde/kde/build/kdeconnect-kde @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index b4de39476..d00491fd7 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -11 +1 diff --git a/source/l/SDL2/SDL2.url b/source/l/SDL2/SDL2.url index 7b211cb48..b998de6e4 100644 --- a/source/l/SDL2/SDL2.url +++ b/source/l/SDL2/SDL2.url @@ -1,2 +1,2 @@ https://github.com/libsdl-org/SDL -https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-2.30.3.tar.gz +https://github.com/libsdl-org/SDL/releases/download/release-2.30.4/SDL2-2.30.4.tar.gz diff --git a/source/l/gmime/gmime.SlackBuild b/source/l/gmime/gmime.SlackBuild index 2429c3033..5d84ecd29 100755 --- a/source/l/gmime/gmime.SlackBuild +++ b/source/l/gmime/gmime.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2018, 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -92,7 +92,8 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --sysconfdir=/etc \ --mandir=/usr/man \ - --disable-gtk-doc \ + --enable-gtk-doc=no \ + --enable-gtk-doc-html=no \ --disable-static \ --program-prefix= \ --program-suffix= \ @@ -105,6 +106,9 @@ make install DESTDIR=$PKG || exit 1 # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# This thing just won't listen. +rm -rf $PKG/usr/share/gtk-doc + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/l/gmime/gmime.url b/source/l/gmime/gmime.url index 92b3e8877..907c3097c 100644 --- a/source/l/gmime/gmime.url +++ b/source/l/gmime/gmime.url @@ -1,2 +1,2 @@ https://github.com/jstedfast/gmime -https://github.com/jstedfast/gmime/releases/download/3.2.14/gmime-3.2.14.tar.xz +https://github.com/jstedfast/gmime/releases/download/3.2.15/gmime-3.2.15.tar.xz diff --git a/source/l/gst-plugins-bad-free/fetch-sources.sh b/source/l/gst-plugins-bad-free/fetch-sources.sh index 44ad88f3e..5057228f7 100755 --- a/source/l/gst-plugins-bad-free/fetch-sources.sh +++ b/source/l/gst-plugins-bad-free/fetch-sources.sh @@ -26,7 +26,7 @@ # # Example: VERSION=1.18.5 ./fetch-sources.sh -VERSION=${VERSION:-1.24.4} +VERSION=${VERSION:-1.24.5} rm -rf rm -rf gst-plugins-bad-free-$VERSION gst-plugins-bad-$VERSION diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild index f6e40311b..17d9735ba 100755 --- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild +++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gst-plugins-bad-free VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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 diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild index 5390ca1e4..3c3e9e46d 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=imagemagick -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4, # which occur fairly often (but not always). If these numbers are all the same, diff --git a/source/l/libclc b/source/l/libclc new file mode 120000 index 000000000..d6c3969ca --- /dev/null +++ b/source/l/libclc @@ -0,0 +1 @@ +../d/llvm
\ No newline at end of file diff --git a/source/l/libclc/fetch-libclc.sh b/source/l/libclc/fetch-libclc.sh deleted file mode 100755 index 54023cbdf..000000000 --- a/source/l/libclc/fetch-libclc.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -# Copyright 2017 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - -# Pull a stable branch + patches -BRANCH=${1:-master} - -# Clear download area: -rm -rf libclc - -# Clone repository: -git clone http://llvm.org/git/libclc.git - -# checkout $BRANCH: -( cd libclc - git checkout $BRANCH || exit 1 -) - -HEADISAT="$( cd libclc && git log -1 --format=%h )" -DATE="$( cd libclc && git log -1 --format=%cd --date=format:%Y%m%d )" -LONGDATE="$( cd libclc && git log -1 --format=%cd --date=format:%c )" -# Cleanup. We're not packing up the whole git repo. -( cd libclc && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) -mv libclc libclc-${DATE}_${HEADISAT} -tar cf libclc-${DATE}_${HEADISAT}.tar libclc-${DATE}_${HEADISAT} -xz -9 -f libclc-${DATE}_${HEADISAT}.tar -rm -rf libclc-${DATE}_${HEADISAT} -touch -d "$LONGDATE" libclc-${DATE}_${HEADISAT}.tar.xz -echo -echo "libclc branch $BRANCH with HEAD at $HEADISAT packaged as libclc-${DATE}_${HEADISAT}.tar.xz" -echo diff --git a/source/l/libclc/libclc.url b/source/l/libclc/libclc.url deleted file mode 100644 index bc8324d85..000000000 --- a/source/l/libclc/libclc.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/libclc-18.1.7.src.tar.xz diff --git a/source/l/libxslt/0001-runtest-Print-output-causing-failure.patch b/source/l/libxslt/0001-runtest-Print-output-causing-failure.patch deleted file mode 100644 index 1fd87b732..000000000 --- a/source/l/libxslt/0001-runtest-Print-output-causing-failure.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Sat, 15 Jun 2024 00:22:58 +0200 -Subject: [PATCH] runtest: Print output causing failure - ---- - tests/runtest.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/runtest.c b/tests/runtest.c -index 56eb31f1dc8c..fea4bd3c61f4 100644 ---- a/tests/runtest.c -+++ b/tests/runtest.c -@@ -668,17 +668,17 @@ xsltTest(const char *filename, int options) { - res = compareFileMem(outFilename, (char *) out, outSize); - if (res != 0) { - fprintf(stderr, "Result for %s failed\n", filename); -- /* printf("####\n%s####\n", out); */ -+ printf("####\n%s####\n", out); - ret = -1; - } - free(outFilename); - xmlFree(out); - - errFilename = changeSuffix(filename, errSuffix); - res = compareFileMem(errFilename, testErrors, testErrorsSize); - if (res != 0) { - fprintf(stderr, "Error for %s failed\n", filename); -- /* printf("####\n%s####\n", testErrors); */ -+ printf("####\n%s####\n", testErrors); - ret = -1; - } - free(errFilename); diff --git a/source/l/libxslt/0002-tests-Fix-tests-for-libxml2-fix.patch b/source/l/libxslt/0002-tests-Fix-tests-for-libxml2-fix.patch deleted file mode 100644 index 6df3a2ee1..000000000 --- a/source/l/libxslt/0002-tests-Fix-tests-for-libxml2-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Sat, 15 Jun 2024 00:23:04 +0200 -Subject: [PATCH] tests: Fix tests for libxml2 fix - -See: https://gitlab.gnome.org/GNOME/libxml2/-/commit/aa90cb0c578bd189089cd1fe195faf85040ac98b ---- - tests/documents/test_bad.err | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/documents/test_bad.err b/tests/documents/test_bad.err -index 91e5f4c79381..e6dd598716a1 100644 ---- a/tests/documents/test_bad.err -+++ b/tests/documents/test_bad.err -@@ -1,2 +1,2 @@ --I/O error : failed to load "foofile.xml": No such file or directory --I/O error : failed to load "foo_file.xml": No such file or directory -+I/O warning : failed to load "foofile.xml": No such file or directory -+I/O warning : failed to load "foo_file.xml": No such file or directory diff --git a/source/l/libxslt/libxslt.SlackBuild b/source/l/libxslt/libxslt.SlackBuild index e9463fbe8..3ee74f2d5 100755 --- a/source/l/libxslt/libxslt.SlackBuild +++ b/source/l/libxslt/libxslt.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxslt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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 @@ -73,10 +73,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Upstream patches: -cat $CWD/0001-runtest-Print-output-causing-failure.patch | patch -p1 --verbose || exit 1 -cat $CWD/0002-tests-Fix-tests-for-libxml2-fix.patch | patch -p1 --verbose || exit 1 - # Be a bit more generous with xsltMaxDepth to avoid false positive # on infinite recursion: zcat $CWD/libxslt.xsltMaxDepth.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild index 79f1988d9..97f80df12 100755 --- a/source/l/pipewire/pipewire.SlackBuild +++ b/source/l/pipewire/pipewire.SlackBuild @@ -103,6 +103,7 @@ cd meson-build --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ + -Dudevrulesdir=/lib/udev/rules.d \ -Dman=enabled \ -Dffmpeg=enabled \ -Dvulkan=enabled \ diff --git a/source/l/pipewire/pipewire.url b/source/l/pipewire/pipewire.url index 74aa879fd..fd95bfc9c 100644 --- a/source/l/pipewire/pipewire.url +++ b/source/l/pipewire/pipewire.url @@ -1,2 +1,2 @@ https://gitlab.freedesktop.org/pipewire/pipewire -https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/1.0.7/pipewire-1.0.7.tar.gz +https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/1.2.0/pipewire-1.2.0.tar.gz diff --git a/source/l/protobuf/protobuf.SlackBuild b/source/l/protobuf/protobuf.SlackBuild index fb799d078..f738656f8 100755 --- a/source/l/protobuf/protobuf.SlackBuild +++ b/source/l/protobuf/protobuf.SlackBuild @@ -105,13 +105,26 @@ cd cmake-build make install DESTDIR=$PKG || exit 1 cd .. -# Install the python bindings: -cd python -cp -a dist/setup.py . +# Don't use the python bindings included in the main tarball, as they are +# incomplete without further processing. Use the ones fetched from +# https://pypi.python.org/pypi/protobuf that are ready to go: +PYBINDING=${PYBINDING:-$(echo $CWD/python-protobuf/protobuf-*.tar.?z | rev | cut -f 1 -d - | cut -f 3- -d . | rev)} +tar xf $CWD/python-protobuf/protobuf-${PYBINDING}.tar.?z || exit 1 +cd protobuf-${PYBINDING} +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ LDFLAGS+=" -L$TMP/$PKGNAM-$VERSION/build" \ PROTOC="$TMP/$PKGNAM-$VERSION/build/protoc" \ python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl +mkdir -p $PKG/usr/doc/python-protobuf-${PYBINDING} +cp -a \ + *.md *.rst *.txt LICENSE PKG-INFO \ + $PKG/usr/doc/python-protobuf-${PYBINDING} cd .. # Strip binaries: diff --git a/source/l/protobuf/python-protobuf/protobuf.url b/source/l/protobuf/python-protobuf/protobuf.url new file mode 100644 index 000000000..56c2c3337 --- /dev/null +++ b/source/l/protobuf/python-protobuf/protobuf.url @@ -0,0 +1 @@ +https://pypi.python.org/pypi/protobuf diff --git a/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild index 830fe5490..0c7a71020 100755 --- a/source/l/pycairo/pycairo.SlackBuild +++ b/source/l/pycairo/pycairo.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycairo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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/l/python-importlib_metadata/python-importlib_metadata.SlackBuild b/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild index f55c5a8af..3e9159842 100755 --- a/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild +++ b/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-importlib_metadata SRCNAM=importlib_metadata VERSION=${VERSION:-$(echo ${SRCNAM}-*.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 diff --git a/source/l/python-psutil/python-psutil.SlackBuild b/source/l/python-psutil/python-psutil.SlackBuild index baeeb2111..870f86765 100755 --- a/source/l/python-psutil/python-psutil.SlackBuild +++ b/source/l/python-psutil/python-psutil.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-psutil SRCNAM=psutil VERSION=${VERSION:-$(echo ${SRCNAM}-*.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 diff --git a/source/l/qt6/fetch_sources.sh b/source/l/qt6/fetch_sources.sh index c10d9b688..a0ee2dc3f 100755 --- a/source/l/qt6/fetch_sources.sh +++ b/source/l/qt6/fetch_sources.sh @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="6.7.1" +BRANCH="6.7.2" rm -f qt-everywhere-src-*.tar* diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild index e219ab49f..646eeada3 100755 --- a/source/l/qt6/qt6.SlackBuild +++ b/source/l/qt6/qt6.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt6 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index 0e48ea774..2d8ddf112 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com> -# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2019, 2023 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2019, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -89,7 +89,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - LICENSE* COPYING* ChangeLog NEWS README TODO doc/* \ + LICENSE* COPYING* ChangeLog NEWS* PKG-INFO* README* TODO \ $PKG/usr/doc/$PKGNAM-$VERSION chown -R root:root $PKG/usr/doc diff --git a/source/l/wireplumber/wireplumber.url b/source/l/wireplumber/wireplumber.url index 666c242d0..74a18027e 100644 --- a/source/l/wireplumber/wireplumber.url +++ b/source/l/wireplumber/wireplumber.url @@ -1,2 +1,2 @@ https://gitlab.freedesktop.org/pipewire/wireplumber -https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.5.3/wireplumber-0.5.3.tar.gz +https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.5.5/wireplumber-0.5.5.tar.gz diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild index 5a09ccc2e..c4a6a8164 100755 --- a/source/n/ntp/ntp.SlackBuild +++ b/source/n/ntp/ntp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ntp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/ntp/ntp.conf b/source/n/ntp/ntp.conf index a9c0ce6d0..65123564b 100644 --- a/source/n/ntp/ntp.conf +++ b/source/n/ntp/ntp.conf @@ -28,9 +28,11 @@ fudge 127.127.1.0 stratum 10 statsdir /var/lib/ntp/stats # -# Location of an alternate log file to be used instead of the default system syslog(3) facility +# Location of an alternate log file to be used instead of the default system syslog(3) facility. +# This is not enabled by default, because ntpd has to be restarted when the logs are rotated +# which causes unnecessary network traffic as ntpd resynchronizes. # -logfile /var/log/ntp +#logfile /var/log/ntp # # Drift file. Put this in a directory which the daemon can write to. diff --git a/source/n/s-nail/s-nail.SlackBuild b/source/n/s-nail/s-nail.SlackBuild index 02a018f85..de726a34c 100755 --- a/source/n/s-nail/s-nail.SlackBuild +++ b/source/n/s-nail/s-nail.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=s-nail 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 diff --git a/source/n/s-nail/s-nail.url b/source/n/s-nail/s-nail.url index 60f9597b5..27f4fe1fd 100644 --- a/source/n/s-nail/s-nail.url +++ b/source/n/s-nail/s-nail.url @@ -1,2 +1,2 @@ -http://ftp.sdaoden.eu/s-nail-14.9.24.tar.xz -http://ftp.sdaoden.eu/s-nail-14.9.24.tar.xz.asc +http://ftp.sdaoden.eu/s-nail-14.9.25.tar.xz +http://ftp.sdaoden.eu/s-nail-14.9.25.tar.xz.asc diff --git a/source/x/ibus-table/ibus-table.SlackBuild b/source/x/ibus-table/ibus-table.SlackBuild index d2b813197..08ca1dc1d 100755 --- a/source/x/ibus-table/ibus-table.SlackBuild +++ b/source/x/ibus-table/ibus-table.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus-table VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/libinput/libinput.url b/source/x/libinput/libinput.url index c750bb50b..9368cd7e9 100644 --- a/source/x/libinput/libinput.url +++ b/source/x/libinput/libinput.url @@ -1,2 +1,2 @@ https://gitlab.freedesktop.org/libinput/libinput -https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.26.0/libinput-1.26.0.tar.gz +https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.26.1/libinput-1.26.1.tar.gz diff --git a/source/x/libva-utils/libva-utils.url b/source/x/libva-utils/libva-utils.url index 1ee8c3ac3..0b9042411 100644 --- a/source/x/libva-utils/libva-utils.url +++ b/source/x/libva-utils/libva-utils.url @@ -1 +1 @@ -https://github.com/intel/libva-utils/tags +https://github.com/intel/libva-utils diff --git a/source/x/libwacom/libwacom.url b/source/x/libwacom/libwacom.url index c9cefda83..8cbf05e00 100644 --- a/source/x/libwacom/libwacom.url +++ b/source/x/libwacom/libwacom.url @@ -1,2 +1,2 @@ https://github.com/linuxwacom/libwacom -https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.12.1/libwacom-2.12.1.tar.xz +https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.12.2/libwacom-2.12.2.tar.xz diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index f47cc7de1..693cadd88 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=mesa VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} AMBERVERS=${AMBERVERS:-21.3.9} DEMOVERS=${DEMOVERS:-8.5.0} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} BUILD_AMBER=${BUILD_AMBER:-YES} BUILD_DEMOS=${BUILD_DEMOS:-YES} CODECS=${CODECS:-h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec} @@ -79,6 +79,9 @@ cd ${PKGNAM}-$VERSION || exit 1 # Let's kill the warning about operating on a dangling symlink: rm -f src/gallium/state_trackers/d3d1x/w32api +# Don't use the system DirectX headers: +rm -f /usr/lib${LIBDIRSUFFIX}/pkgconfig/DirectX-Headers.pc + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/xap/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/source/xap/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild index a4659ac80..d68ec3f66 100755 --- a/source/xap/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild +++ b/source/xap/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=NetworkManager-openvpn VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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 |