From f4068844f52695d4abcf3735126936308afa2b5e Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 1 Mar 2023 21:21:21 +0000 Subject: Wed Mar 1 21:21:21 UTC 2023 a/btrfs-progs-6.2-x86_64-2.txz: Rebuilt. Rebuilt to link btrfs-convert to libreiserfscore. Thanks to Didier Spaier. a/reiserfsprogs-3.6.27-x86_64-5.txz: Rebuilt. Add shared library and devel files. Thanks to Didier Spaier. --- ChangeLog.rss | 18 +++++++- ChangeLog.txt | 6 +++ FILELIST.TXT | 58 ++++++++++++------------- source/a/btrfs-progs/btrfs-progs.SlackBuild | 2 +- source/a/reiserfsprogs/reiserfsprogs.SlackBuild | 23 +++++++--- source/installer/ChangeLog.txt | 3 ++ source/installer/build_installer.sh | 1 + 7 files changed, 73 insertions(+), 38 deletions(-) diff --git a/ChangeLog.rss b/ChangeLog.rss index 5b8c8dabc..29de8b8a1 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,23 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Wed, 1 Mar 2023 20:18:13 GMT - Wed, 1 Mar 2023 21:33:14 GMT + Wed, 1 Mar 2023 21:21:21 GMT + Wed, 1 Mar 2023 22:40:16 GMT maintain_current_git.sh v 1.17 + + Wed, 1 Mar 2023 21:21:21 GMT + Wed, 1 Mar 2023 21:21:21 GMT + https://git.slackware.nl/current/tag/?h=20230301212121 + 20230301212121 + + +a/btrfs-progs-6.2-x86_64-2.txz: Rebuilt. + Rebuilt to link btrfs-convert to libreiserfscore. Thanks to Didier Spaier. +a/reiserfsprogs-3.6.27-x86_64-5.txz: Rebuilt. + Add shared library and devel files. Thanks to Didier Spaier. + ]]> + + Wed, 1 Mar 2023 20:18:13 GMT Wed, 1 Mar 2023 20:18:13 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 3d68a17e3..505744baf 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +Wed Mar 1 21:21:21 UTC 2023 +a/btrfs-progs-6.2-x86_64-2.txz: Rebuilt. + Rebuilt to link btrfs-convert to libreiserfscore. Thanks to Didier Spaier. +a/reiserfsprogs-3.6.27-x86_64-5.txz: Rebuilt. + Add shared library and devel files. Thanks to Didier Spaier. ++--------------------------+ Wed Mar 1 20:18:13 UTC 2023 a/btrfs-progs-6.2-x86_64-1.txz: Upgraded. l/libdiscid-0.6.3-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index d8b972c98..acea639f1 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Wed Mar 1 20:21:21 UTC 2023 +Wed Mar 1 21:24:27 UTC 2023 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2023-03-01 20:18 . +drwxr-xr-x 12 root root 4096 2023-03-01 21:21 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1109036 2023-02-28 21:54 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-02-28 21:54 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1109026 2023-03-01 20:21 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-03-01 20:21 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 522811 2023-03-01 20:18 ./ChangeLog.txt +-rw-r--r-- 1 root root 523098 2023-03-01 21:21 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2023-02-25 20:32 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2023-02-25 20:32 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1447399 2023-02-28 21:53 ./FILELIST.TXT +-rw-r--r-- 1 root root 1447391 2023-03-01 20:21 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 863305 2023-03-01 20:20 ./PACKAGES.TXT +-rw-r--r-- 1 root root 863304 2023-03-01 21:24 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3629 2023-02-25 20:18 ./README.initrd -rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT @@ -746,13 +746,13 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches -rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2023-03-01 20:21 ./slackware64 --rw-r--r-- 1 root root 336925 2023-03-01 20:21 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-03-01 20:21 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 417835 2023-03-01 20:20 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4334380 2023-03-01 20:20 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2023-03-01 21:24 ./slackware64 +-rw-r--r-- 1 root root 336925 2023-03-01 21:24 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-03-01 21:24 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 417835 2023-03-01 21:23 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4337644 2023-03-01 21:23 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 32768 2023-03-01 20:20 ./slackware64/a +drwxr-xr-x 2 root root 32768 2023-03-01 21:23 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt -rw-r--r-- 1 root root 10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc @@ -780,9 +780,9 @@ drwxr-xr-x 2 root root 32768 2023-03-01 20:20 ./slackware64/a -rw-r--r-- 1 root root 226 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txt -rw-r--r-- 1 root root 39244 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txz -rw-r--r-- 1 root root 163 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txz.asc --rw-r--r-- 1 root root 482 2023-03-01 19:50 ./slackware64/a/btrfs-progs-6.2-x86_64-1.txt --rw-r--r-- 1 root root 842324 2023-03-01 19:50 ./slackware64/a/btrfs-progs-6.2-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-03-01 19:50 ./slackware64/a/btrfs-progs-6.2-x86_64-1.txz.asc +-rw-r--r-- 1 root root 482 2023-03-01 21:16 ./slackware64/a/btrfs-progs-6.2-x86_64-2.txt +-rw-r--r-- 1 root root 847100 2023-03-01 21:16 ./slackware64/a/btrfs-progs-6.2-x86_64-2.txz +-rw-r--r-- 1 root root 163 2023-03-01 21:16 ./slackware64/a/btrfs-progs-6.2-x86_64-2.txz.asc -rw-r--r-- 1 root root 477 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txt -rw-r--r-- 1 root root 92456 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txz.asc @@ -1039,9 +1039,9 @@ drwxr-xr-x 2 root root 32768 2023-03-01 20:20 ./slackware64/a -rw-r--r-- 1 root root 577 2022-09-22 18:48 ./slackware64/a/quota-4.09-x86_64-1.txt -rw-r--r-- 1 root root 209080 2022-09-22 18:48 ./slackware64/a/quota-4.09-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-09-22 18:48 ./slackware64/a/quota-4.09-x86_64-1.txz.asc --rw-r--r-- 1 root root 421 2021-02-13 11:14 ./slackware64/a/reiserfsprogs-3.6.27-x86_64-4.txt --rw-r--r-- 1 root root 221668 2021-02-13 11:14 ./slackware64/a/reiserfsprogs-3.6.27-x86_64-4.txz --rw-r--r-- 1 root root 163 2021-02-13 11:14 ./slackware64/a/reiserfsprogs-3.6.27-x86_64-4.txz.asc +-rw-r--r-- 1 root root 421 2023-03-01 21:13 ./slackware64/a/reiserfsprogs-3.6.27-x86_64-5.txt +-rw-r--r-- 1 root root 219704 2023-03-01 21:13 ./slackware64/a/reiserfsprogs-3.6.27-x86_64-5.txz +-rw-r--r-- 1 root root 163 2023-03-01 21:13 ./slackware64/a/reiserfsprogs-3.6.27-x86_64-5.txz.asc -rw-r--r-- 1 root root 396 2022-11-23 19:19 ./slackware64/a/rpm2tgz-1.2.2-x86_64-7.txt -rw-r--r-- 1 root root 6196 2022-11-23 19:19 ./slackware64/a/rpm2tgz-1.2.2-x86_64-7.txz -rw-r--r-- 1 root root 163 2022-11-23 19:19 ./slackware64/a/rpm2tgz-1.2.2-x86_64-7.txz.asc @@ -5603,13 +5603,13 @@ drwxr-xr-x 2 root root 4096 2023-02-19 20:13 ./slackware64/y -rw-r--r-- 1 root root 1491108 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2023-03-01 20:21 ./source --rw-r--r-- 1 root root 594863 2023-03-01 20:21 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-03-01 20:21 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 827586 2023-03-01 20:21 ./source/FILE_LIST --rw-r--r-- 1 root root 24374491 2023-03-01 20:21 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2023-03-01 21:24 ./source +-rw-r--r-- 1 root root 594863 2023-03-01 21:24 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-03-01 21:24 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 827586 2023-03-01 21:24 ./source/FILE_LIST +-rw-r--r-- 1 root root 24368160 2023-03-01 21:24 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT -drwxr-xr-x 123 root root 4096 2023-01-19 20:13 ./source/a +drwxr-xr-x 123 root root 4096 2023-03-01 21:07 ./source/a -rw-r--r-- 1 root root 234 2022-10-16 18:39 ./source/a/FTBFSlog drwxr-xr-x 2 root root 4096 2022-02-15 18:15 ./source/a/aaa_base -rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./source/a/aaa_base/_aaa_base.tar.gz @@ -5704,7 +5704,7 @@ drwxr-xr-x 2 root root 4096 2006-12-23 06:28 ./source/a/bin/scripts drwxr-xr-x 2 root root 4096 2023-03-01 19:45 ./source/a/btrfs-progs -rw-r--r-- 1 root root 566 2023-02-28 19:28 ./source/a/btrfs-progs/btrfs-progs-v6.2.tar.sign -rw-r--r-- 1 root root 2346460 2023-02-28 19:28 ./source/a/btrfs-progs/btrfs-progs-v6.2.tar.xz --rwxr-xr-x 1 root root 5254 2023-03-01 19:50 ./source/a/btrfs-progs/btrfs-progs.SlackBuild +-rwxr-xr-x 1 root root 5254 2023-03-01 21:08 ./source/a/btrfs-progs/btrfs-progs.SlackBuild -rw-r--r-- 1 root root 66 2017-04-23 04:56 ./source/a/btrfs-progs/btrfs-progs.url -rw-r--r-- 1 root root 942 2018-11-04 19:06 ./source/a/btrfs-progs/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/a/bzip2 @@ -6444,7 +6444,7 @@ drwxr-xr-x 2 root root 4096 2022-09-22 18:48 ./source/a/quota -rw-r--r-- 1 root root 1030 2018-02-27 06:13 ./source/a/quota/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/a/reiserfsprogs -rw-r--r-- 1 root root 449176 2017-07-25 13:19 ./source/a/reiserfsprogs/reiserfsprogs-3.6.27.tar.xz --rwxr-xr-x 1 root root 4316 2021-02-13 05:31 ./source/a/reiserfsprogs/reiserfsprogs.SlackBuild +-rwxr-xr-x 1 root root 4542 2023-03-01 21:13 ./source/a/reiserfsprogs/reiserfsprogs.SlackBuild -rw-r--r-- 1 root root 460 2018-09-19 00:00 ./source/a/reiserfsprogs/reiserfsprogs.glibc228.diff.gz -rw-r--r-- 1 root root 882 2018-02-27 06:13 ./source/a/reiserfsprogs/slack-desc drwxr-xr-x 3 root root 4096 2022-11-23 19:19 ./source/a/rpm2tgz @@ -7783,9 +7783,9 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:13 ./source/f -rw-r--r-- 1 root root 960 2018-02-27 06:13 ./source/f/slack-desc.linux-faqs -rw-r--r-- 1 root root 801 2018-02-27 06:13 ./source/f/slack-desc.linux-howtos drwxr-xr-x 3 root root 4096 2023-01-19 20:42 ./source/installer --rw-r--r-- 1 root root 44093 2023-01-24 20:27 ./source/installer/ChangeLog.txt +-rw-r--r-- 1 root root 44183 2023-03-01 21:15 ./source/installer/ChangeLog.txt -rw-r--r-- 1 root root 6849 2018-03-11 00:53 ./source/installer/README --rwxr-xr-x 1 root root 79167 2023-01-24 20:26 ./source/installer/build_installer.sh +-rwxr-xr-x 1 root root 79197 2023-03-01 21:15 ./source/installer/build_installer.sh -rwxr-xr-x 1 root root 2252 2022-09-06 18:27 ./source/installer/installer.SlackBuild -rw-r--r-- 1 root root 1376 2020-02-29 06:16 ./source/installer/module-blacklist -rwxr-xr-x 1 root root 5289 2022-09-06 18:27 ./source/installer/repack_installer.SlackBuild diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild index 3266e03ed..22c224cf9 100755 --- a/source/a/btrfs-progs/btrfs-progs.SlackBuild +++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild @@ -22,7 +22,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=btrfs-progs -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild index 0e0888cc0..117e65e8e 100755 --- a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild +++ b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2015, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=reiserfsprogs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -84,7 +84,6 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sbindir=/sbin \ --mandir=/usr/man \ - --disable-shared \ --build=$ARCH-slackware-linux || exit 1 if [ "$ARCH" = "x86_64" ]; then @@ -95,9 +94,21 @@ fi make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# We're building without the shared libreiserfs so that we don't have to -# ship the libraries or headers: -rm -rf $PKG/usr/lib${LIBDIRSUFFIX} $PKG/usr/include +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# No thanks on static library: +rm $PKG/usr/lib${LIBDIRSUFFIX}/libreiserfscore.a + +# Move shared library: +mkdir $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) 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/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 090700973..62e5e9659 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Wed Mar 1 21:15:12 UTC 2023 + Add libreiserfscore.so.0.0.0. ++--------------------------+ Tue Jan 24 20:26:12 UTC 2023 build_installer.sh: when compressing the completed installer with xz, use option -vv instead of -v, since the change of default verbosity level seems diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 763bec949..70980b7b1 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -1344,6 +1344,7 @@ cp -fa${VERBOSE1} \ libpam*.so* \ libpcre2-8.so* \ libpopt*.so* \ + libreiserfscore.so* \ libsmartcols.so* \ libssl*so* \ libtirpc*so* \ -- cgit v1.2.3-79-gdb01