diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-12-18 20:28:03 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-12-19 13:30:36 +0100 |
commit | 3c02d6f8a110df5d7d8cf042fb9b09711284fec9 (patch) | |
tree | d5a2bb54fbe76c3238460509cb4a9a869ed65c1c | |
parent | 373b059753b761e52363e4975eaf3ee60d9abe2a (diff) | |
download | current-3c02d6f8a110df5d7d8cf042fb9b09711284fec9.tar.gz current-3c02d6f8a110df5d7d8cf042fb9b09711284fec9.tar.xz |
Sun Dec 18 20:28:03 UTC 202220221218202803_15.0
patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txz: Rebuilt.
This update fixes a regression causing a failure to compile against
libarchive: don't include iconv in libarchive.pc.
-rw-r--r-- | ChangeLog.rss | 17 | ||||
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | FILELIST.TXT | 36 | ||||
-rw-r--r-- | patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txt (renamed from patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txt) | 0 | ||||
-rwxr-xr-x | patches/source/libarchive/libarchive.SlackBuild | 5 |
5 files changed, 42 insertions, 21 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index adde38e79..8a6440aab 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,23 @@ <description>Tracking Slackware development in git.</description> <language>en-us</language> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> - <pubDate>Sat, 17 Dec 2022 21:14:11 GMT</pubDate> - <lastBuildDate>Sun, 18 Dec 2022 12:29:56 GMT</lastBuildDate> + <pubDate>Sun, 18 Dec 2022 20:28:03 GMT</pubDate> + <lastBuildDate>Mon, 19 Dec 2022 12:30:23 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.17</generator> <item> + <title>Sun, 18 Dec 2022 20:28:03 GMT</title> + <pubDate>Sun, 18 Dec 2022 20:28:03 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20221218202803</link> + <guid isPermaLink="false">20221218202803</guid> + <description> + <![CDATA[<pre> +patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txz: Rebuilt. + This update fixes a regression causing a failure to compile against + libarchive: don't include iconv in libarchive.pc. + </pre>]]> + </description> + </item> + <item> <title>Sat, 17 Dec 2022 21:14:11 GMT</title> <pubDate>Sat, 17 Dec 2022 21:14:11 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20221217211411</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index 91e0f8606..580a82238 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Sun Dec 18 20:28:03 UTC 2022 +patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txz: Rebuilt. + This update fixes a regression causing a failure to compile against + libarchive: don't include iconv in libarchive.pc. ++--------------------------+ Sat Dec 17 21:14:11 UTC 2022 patches/packages/samba-4.15.13-x86_64-1_slack15.0.txz: Upgraded. This update fixes security issues: diff --git a/FILELIST.TXT b/FILELIST.TXT index 0a53331b2..d5a97cfbf 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Sat Dec 17 21:16:44 UTC 2022 +Sun Dec 18 20:32:09 UTC 2022 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 2022-12-17 21:14 . +drwxr-xr-x 12 root root 4096 2022-12-18 20:28 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1163940 2022-12-14 21:24 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-12-14 21:24 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1163940 2022-12-17 21:17 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-12-17 21:17 ./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 1968131 2022-12-17 21:14 ./ChangeLog.txt +-rw-r--r-- 1 root root 1968379 2022-12-18 20:28 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./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 1520358 2022-12-14 21:23 ./FILELIST.TXT +-rw-r--r-- 1 root root 1520358 2022-12-17 21:16 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY -rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT @@ -738,13 +738,13 @@ drwxr-xr-x 2 root root 4096 2008-05-07 05:21 ./pasture/source/php/pear -rwxr-xr-x 1 root root 9448 2018-05-16 22:38 ./pasture/source/php/php.SlackBuild -rw-r--r-- 1 root root 775 2017-07-07 19:25 ./pasture/source/php/php.ini-development.diff.gz -rw-r--r-- 1 root root 830 2005-12-09 05:18 ./pasture/source/php/slack-desc -drwxr-xr-x 4 root root 4096 2022-12-17 21:16 ./patches --rw-r--r-- 1 root root 58727 2022-12-17 21:16 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-12-17 21:16 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 79234 2022-12-17 21:16 ./patches/FILE_LIST --rw-r--r-- 1 root root 11887756 2022-12-17 21:16 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 42425 2022-12-17 21:16 ./patches/PACKAGES.TXT -drwxr-xr-x 3 root root 20480 2022-12-17 21:16 ./patches/packages +drwxr-xr-x 4 root root 4096 2022-12-18 20:32 ./patches +-rw-r--r-- 1 root root 58727 2022-12-18 20:32 ./patches/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-12-18 20:32 ./patches/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 79234 2022-12-18 20:32 ./patches/FILE_LIST +-rw-r--r-- 1 root root 11881456 2022-12-18 20:32 ./patches/MANIFEST.bz2 +-rw-r--r-- 1 root root 42425 2022-12-18 20:32 ./patches/PACKAGES.TXT +drwxr-xr-x 3 root root 20480 2022-12-18 20:32 ./patches/packages -rw-r--r-- 1 root root 327 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txt -rw-r--r-- 1 root root 10716 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz -rw-r--r-- 1 root root 163 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz.asc @@ -820,9 +820,9 @@ drwxr-xr-x 3 root root 20480 2022-12-17 21:16 ./patches/packages -rw-r--r-- 1 root root 319 2022-12-02 20:24 ./patches/packages/krusader-2.8.0-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 3982252 2022-12-02 20:24 ./patches/packages/krusader-2.8.0-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-12-02 20:24 ./patches/packages/krusader-2.8.0-x86_64-1_slack15.0.txz.asc --rw-r--r-- 1 root root 402 2022-12-09 18:15 ./patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 511304 2022-12-09 18:15 ./patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 163 2022-12-09 18:15 ./patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 402 2022-12-18 19:33 ./patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txt +-rw-r--r-- 1 root root 511044 2022-12-18 19:33 ./patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txz +-rw-r--r-- 1 root root 163 2022-12-18 19:33 ./patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txz.asc -rw-r--r-- 1 root root 332 2022-10-08 18:41 ./patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 169288 2022-10-08 18:41 ./patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-10-08 18:41 ./patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txz.asc @@ -947,7 +947,7 @@ drwxr-xr-x 2 root root 4096 2022-11-29 21:00 ./patches/packages/linux-5.15 -rw-r--r-- 1 root root 388 2022-10-15 04:05 ./patches/packages/zlib-1.2.13-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 105356 2022-10-15 04:05 ./patches/packages/zlib-1.2.13-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-10-15 04:05 ./patches/packages/zlib-1.2.13-x86_64-1_slack15.0.txz.asc -drwxr-xr-x 59 root root 4096 2022-12-17 21:12 ./patches/source +drwxr-xr-x 59 root root 4096 2022-12-18 20:22 ./patches/source drwxr-xr-x 2 root root 4096 2022-01-16 05:07 ./patches/source/aaa_base -rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./patches/source/aaa_base/_aaa_base.tar.gz -rwxr-xr-x 1 root root 3894 2022-02-15 05:07 ./patches/source/aaa_base/aaa_base.SlackBuild @@ -1181,7 +1181,7 @@ drwxr-xr-x 2 root root 4096 2022-12-02 20:10 ./patches/source/krusader/src drwxr-xr-x 2 root root 4096 2022-12-09 18:14 ./patches/source/libarchive -rw-r--r-- 1 root root 5213196 2022-12-09 15:06 ./patches/source/libarchive/libarchive-3.6.2.tar.xz -rw-r--r-- 1 root root 659 2022-12-09 15:06 ./patches/source/libarchive/libarchive-3.6.2.tar.xz.asc --rwxr-xr-x 1 root root 3676 2022-04-08 18:29 ./patches/source/libarchive/libarchive.SlackBuild +-rwxr-xr-x 1 root root 3786 2022-12-18 19:32 ./patches/source/libarchive/libarchive.SlackBuild -rw-r--r-- 1 root root 41 2019-06-17 02:47 ./patches/source/libarchive/libarchive.url -rw-r--r-- 1 root root 856 2018-02-27 06:12 ./patches/source/libarchive/slack-desc drwxr-xr-x 2 root root 4096 2022-10-08 18:27 ./patches/source/libksba diff --git a/patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txt b/patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txt index 64742121f..64742121f 100644 --- a/patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txt +++ b/patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txt diff --git a/patches/source/libarchive/libarchive.SlackBuild b/patches/source/libarchive/libarchive.SlackBuild index 4cf5c2947..a72564117 100755 --- a/patches/source/libarchive/libarchive.SlackBuild +++ b/patches/source/libarchive/libarchive.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libarchive VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1_slack15.0} +BUILD=${BUILD:-2_slack15.0} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -96,6 +96,9 @@ make install DESTDIR=$PKG || exit 1 # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Don't list iconv in libarchive.pc: +sed -i "s/iconv //" $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libarchive.pc + # 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 |