diff options
Diffstat (limited to 'slackware64-current/source')
24 files changed, 529 insertions, 98 deletions
diff --git a/slackware64-current/source/CHECKSUMS.md5 b/slackware64-current/source/CHECKSUMS.md5 index f02b4606b..2e1a0bc49 100644 --- a/slackware64-current/source/CHECKSUMS.md5 +++ b/slackware64-current/source/CHECKSUMS.md5 @@ -10,8 +10,8 @@ tail +13 CHECKSUMS.md5 | md5sum -c --quiet - | less /pub/gnu, or at any GNU mirror site. MD5 message digest Filename -95b202a855af9f5fb00c38dd27fd77f4 ./FILE_LIST -8c1204e24441d92dc5c573997a042345 ./MANIFEST.bz2 +c5615f2121a7cbd61a7b5d2739440730 ./FILE_LIST +e67cb517ff913a97fb44c8921440910c ./MANIFEST.bz2 842fe24ea4cecdae8e72ccac18b6e1b5 ./README.TXT 1a8b769d7f42ff59a066ca4e8200377e ./a/FTBFSlog f76a41cb2b7df6c0a9941392b3d9fd18 ./a/aaa_base/_aaa_base.tar.gz @@ -365,6 +365,9 @@ fb2ff1c1b0e5df6fa6d43de5038ebb15 ./a/kernel-firmware/slack-desc 34f325cab568f842fdde4f8b2182f220 ./a/kmod/kmod-25.tar.xz 7c071579991658de2ef0bf83fdc3422a ./a/kmod/kmod.SlackBuild bbbcadc15065f16be17c134dccd9ca41 ./a/kmod/slack-desc +27a18c719f7b8020e74fb263035e918c ./a/lbzip2/lbzip2-2.5.tar.lz +784e6c35f04783c2afb3b614a8df13f7 ./a/lbzip2/lbzip2.SlackBuild +4e3b5d40dc8fb5f9f6861a9422415e43 ./a/lbzip2/slack-desc 53d63e0075af28e774ed86c42e032162 ./a/less/less-530.tar.lz b2a3be443bae2f20b29c19b469c1a36d ./a/less/less.SlackBuild aa53e82906b828dacf94c963bea2eee6 ./a/less/lesspipe.sh.gz @@ -506,14 +509,16 @@ ed97cfc2aa25c3ac1832dfc8b31138bb ./a/pcmciautils/slack-desc 04be71425398d5850479d22de2195697 ./a/pkgtools/manpages/explodepkg.8 26a0185c8188bb1ac2b2a1a0b4bbd1fa ./a/pkgtools/manpages/installpkg.8 a81f8307ca74ee4dd962ecf9afe24bb9 ./a/pkgtools/manpages/makepkg.8 +4f9ce0742b15113215ebb86623cef2b8 ./a/pkgtools/manpages/pkgdiff.8 49ffe0740205aec77d9c2ab507a2f41f ./a/pkgtools/manpages/pkgtool.8 66a6254398ca20fb34d9b7f8c32139ca ./a/pkgtools/manpages/removepkg.8 fdad7f5cfa8fb8a20363306ba24eb8bf ./a/pkgtools/manpages/upgradepkg.8 -c69c8a67bf2cc7821247c826b3da3909 ./a/pkgtools/pkgtools.SlackBuild -7eccb8ed715be534594858d52cba5f2d ./a/pkgtools/scripts/explodepkg -44b71053d6b187a5802f019ab6f8c238 ./a/pkgtools/scripts/installpkg +5aa90309a166ab0b5ca61ab60d9f1194 ./a/pkgtools/pkgtools.SlackBuild +ca77243c4e773fdbf102d9826fe31f3c ./a/pkgtools/scripts/explodepkg +bc4e9918f9bd99bc3056f0abd2acca36 ./a/pkgtools/scripts/installpkg 7a3b73737b75f26fe939b573afeb9e44 ./a/pkgtools/scripts/makebootdisk -2787bc36969a31b2db84f963ea399cb2 ./a/pkgtools/scripts/makepkg +a0fd65e29c9ad190afa622705d7e6681 ./a/pkgtools/scripts/makepkg +0da51e0895d54f6a5f5d2e8387063550 ./a/pkgtools/scripts/pkgdiff 0ac1ad868ab43fab93b70547197f8b8f ./a/pkgtools/scripts/pkgtool 6b8a520bbcfb8820af59d1abc7e8c57e ./a/pkgtools/scripts/removepkg 610d750ba03a9740b9518e54e0947fae ./a/pkgtools/scripts/setup.70.install-kernel @@ -521,7 +526,7 @@ c69c8a67bf2cc7821247c826b3da3909 ./a/pkgtools/pkgtools.SlackBuild 9281c2c9510969dc5aa0d81bb9e680f7 ./a/pkgtools/scripts/setup.htmlview 66f5bf84725d6fe0261694253b84fecf ./a/pkgtools/scripts/setup.services a5d8965f29c68098c9ae22d9bfbabcf5 ./a/pkgtools/scripts/upgradepkg -a6f319c45b6f0ce64ca1c9b3c3fa0fbc ./a/pkgtools/slack-desc +48a4f75de0b5e239b55576f464c6812f ./a/pkgtools/slack-desc afc79d59c3ac07f2ab0b9d5854971e16 ./a/plzip/plzip-1.7.tar.lz d3704e4b290fb36773da6e32fffbd9ba ./a/plzip/plzip-1.7.tar.lz.sig 8d8357d24d16a7fcfe43925b01a3de87 ./a/plzip/plzip.SlackBuild @@ -1186,7 +1191,7 @@ f454d93cc8431cb9b2097eea720d8c6b ./ap/soma/soma-2.12.3.tar.gz 47a6629f099073818bc645e61c3b4c97 ./ap/sox/sox.SlackBuild 7080c9c38134f594259ad4fbb369813a ./ap/sqlite/COPYRIGHT.gz e0c4ec9da7ea025263edcf96d0479f36 ./ap/sqlite/slack-desc -8c96144e2d9dcded5b4951815511e2d0 ./ap/sqlite/sqlite-src-3230000.tar.xz +5018d721ea7174875b9ae35e45cd9ed4 ./ap/sqlite/sqlite-src-3230100.tar.xz 83b8df3abe48eda4d2d887cd29bc37bd ./ap/sqlite/sqlite.SlackBuild 9374e6f68645de288b89cbb73d7cb37c ./ap/squashfs-tools/0001-kfreebsd.patch.gz 8014fd049cefe0e963761c88d3b6bb5e ./ap/squashfs-tools/0002-fix_phys_mem_calculation.patch.gz @@ -1622,7 +1627,7 @@ ecb3649c886ebdaa339d44de0d8b6d3c ./k/slack-desc/slack-desc.kernel-source ecb3649c886ebdaa339d44de0d8b6d3c ./k/slack-desc/slack-desc.kernel-source.vanilla c6a558fbd5b8b1dde1fd8ac2cf95fdec ./k/slack-desc/slack-desc.kernel-template 1b05c3b0316f9eeed7a17e53c4e762b2 ./kde/FTBFSlog -13d417ae29b65a38d3623096833277dd ./kde/KDE.SlackBuild +11695cf6bfbb89ad127331aba2062a92 ./kde/KDE.SlackBuild 2730fddae0bf0c0a87e2ac6c27ca88ce ./kde/KDE.options b026324c6904b2a9cb4b88d6d61c81d1 ./kde/build/amarok 26ab0db90d72e28ad0ba1e22ee510510 ./kde/build/amor @@ -3573,10 +3578,8 @@ d626eafaafdc0e7bf3f1a3cc4bac3762 ./l/libxslt/libxslt.SlackBuild 6abf0b1cd1241af620a6930b9fc8e8a1 ./l/libyaml/libyaml.url c4f863e83408eba2ea0516a61e832e7a ./l/libyaml/slack-desc 5d19f7114c6ebcff1e5dd7ad417315f9 ./l/libyaml/yaml-0.1.7.tar.xz -090272c2a228cbaa93cc6b36b64bdadb ./l/libzip/0001-Use-GNUInstallDirs-variables-to-allow-installation-c.patch.gz -5d56f9140339144a26038707e4099210 ./l/libzip/0002-Set-bindir-in-pkgconfig-file-and-use-it.patch.gz -3b46f60c3cfa036f078c1a35dff16709 ./l/libzip/libzip-1.4.0.tar.lz -b67949cbd5eee73da8900b6fb591b060 ./l/libzip/libzip.SlackBuild +6fe665aa6d6bf3a99eb6fa9c553283fd ./l/libzip/libzip-1.5.1.tar.xz +3b7c4f6509c8fb1667e88aa3cf7bf432 ./l/libzip/libzip.SlackBuild b5e1f5c9edfb5b347246d4032c5fb394 ./l/libzip/slack-desc 1d7b4b7763879d6296347e9c5f8e0f88 ./l/loudmouth/loudmouth-1.5.3.tar.xz 4d426a4032157cf83a9a51e52b01c701 ./l/loudmouth/loudmouth.SlackBuild @@ -3598,9 +3601,9 @@ bfe1f75d606912a4111c90743d6c7325 ./l/mozilla-nss/MPL-1.1.txt 5c9745e29270bfd5d669b504d090925e ./l/mozilla-nss/faq.html 751419260aa954499f7abaabaa882bbe ./l/mozilla-nss/gpl-2.0.txt 243b725d71bb5df4a1e5920b344b86ad ./l/mozilla-nss/lgpl-2.1.txt -7719d9e3e2f33fb798e3c515c302bdb1 ./l/mozilla-nss/mozilla-nss.SlackBuild +54c9f2dba60ce183a185d86c836c9153 ./l/mozilla-nss/mozilla-nss.SlackBuild 50253950aba77154e8bf083aa0d6ca0f ./l/mozilla-nss/nspr-4.19.tar.lz -b8789112a73b116186a27796a810c0f6 ./l/mozilla-nss/nss-3.36.tar.lz +8d2583de9608353eeaf8f3abb8a671f5 ./l/mozilla-nss/nss-3.36.1.tar.lz 46bee81908f1e5b26d6a7a2e14c64d9f ./l/mozilla-nss/nss-config.in d6181c85e24c9c0caff648ec5bf26707 ./l/mozilla-nss/slack-desc b8dd19bd9bb1ec8831a6a582a7308073 ./l/mpfr/mpfr-4.0.1.tar.xz @@ -4283,8 +4286,8 @@ cfb0b5c79eab07686b6898160a407139 ./n/libgcrypt/libgcrypt-1.8.2.tar.bz2 21486e10d7813074dac6443ae312d917 ./n/libgcrypt/libgcrypt-1.8.2.tar.bz2.sig c5f1de93de4c64165dffdace9e88b85f ./n/libgcrypt/libgcrypt.SlackBuild 4d3f3d091d885237b582259f2b5daa54 ./n/libgcrypt/slack-desc -5217ef3e76a7275a2a3b569a12ddc989 ./n/libgpg-error/libgpg-error-1.27.tar.bz2 -e7291e9b998278a6285dbb27788504f2 ./n/libgpg-error/libgpg-error-1.27.tar.bz2.sig +3f6576c968e541b8fbab099a0f04cf5e ./n/libgpg-error/libgpg-error-1.29.tar.bz2 +f4d66c3f9f4c1f9dc8741a86e0e2cb05 ./n/libgpg-error/libgpg-error-1.29.tar.bz2.sig 7ee85f20c40314907db66d02a2c042b4 ./n/libgpg-error/libgpg-error.SlackBuild 37712b6d21ed7d5ad022dd3bc2a31212 ./n/libgpg-error/slack-desc 8302a3e263a7c630aa7dea7d341f07a2 ./n/libksba/libksba-1.3.5.tar.bz2 diff --git a/slackware64-current/source/CHECKSUMS.md5.asc b/slackware64-current/source/CHECKSUMS.md5.asc index 37837e48d..b8e0643a5 100644 --- a/slackware64-current/source/CHECKSUMS.md5.asc +++ b/slackware64-current/source/CHECKSUMS.md5.asc @@ -1,6 +1,6 @@ -----BEGIN PGP SIGNATURE----- -iEYEABECAAYFAlrNT6sACgkQakRjwEAQIjMbzQCgg9/yj2s+g35lU3eAEDYyWWjP -J08AoITw/nkYdKnZbdfkN2820c2JxhiC -=bdzh +iEYEABECAAYFAlrOdrkACgkQakRjwEAQIjNOOgCgjwtNYTj43VEymlpChulJju7N +MIcAoI+U9nj0+x4U2aoAhnpycgiBGcGw +=Es// -----END PGP SIGNATURE----- diff --git a/slackware64-current/source/FILE_LIST b/slackware64-current/source/FILE_LIST index af6391911..2a640ac9f 100644 --- a/slackware64-current/source/FILE_LIST +++ b/slackware64-current/source/FILE_LIST @@ -1,17 +1,17 @@ -Tue Apr 10 23:56:51 UTC 2018 +Wed Apr 11 20:55:52 UTC 2018 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 19 root root 4096 2018-04-10 23:56 . --rw-r--r-- 1 root root 450255 2018-04-10 17:42 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-04-10 17:42 ./CHECKSUMS.md5.asc --rw-r--r-- 1 root root 636758 2018-04-10 17:41 ./FILE_LIST --rw-r--r-- 1 root root 14641584 2018-04-10 23:56 ./MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2018-04-11 20:55 . +-rw-r--r-- 1 root root 450255 2018-04-10 23:48 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-04-10 23:48 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 636758 2018-04-10 23:47 ./FILE_LIST +-rw-r--r-- 1 root root 14642531 2018-04-11 20:55 ./MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./README.TXT -drwxr-xr-x 108 root root 4096 2018-04-06 19:23 ./a +drwxr-xr-x 109 root root 4096 2018-04-11 19:30 ./a -rw-r--r-- 1 root root 567 2018-03-13 18:43 ./a/FTBFSlog drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./a/aaa_base -rw-r--r-- 1 root root 11180 2016-05-20 20:17 ./a/aaa_base/_aaa_base.tar.gz @@ -422,6 +422,10 @@ drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./a/kmod -rw-r--r-- 1 root root 545416 2018-01-09 01:48 ./a/kmod/kmod-25.tar.xz -rwxr-xr-x 1 root root 5582 2018-03-22 00:36 ./a/kmod/kmod.SlackBuild -rw-r--r-- 1 root root 996 2018-02-27 06:13 ./a/kmod/slack-desc +drwxr-xr-x 2 root root 4096 2018-04-11 19:12 ./a/lbzip2 +-rw-r--r-- 1 root root 417096 2014-03-26 20:25 ./a/lbzip2/lbzip2-2.5.tar.lz +-rwxr-xr-x 1 root root 4217 2018-04-11 19:12 ./a/lbzip2/lbzip2.SlackBuild +-rw-r--r-- 1 root root 827 2018-04-11 19:09 ./a/lbzip2/slack-desc drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./a/less -rw-r--r-- 1 root root 248940 2018-02-17 17:49 ./a/less/less-530.tar.lz -rwxr-xr-x 1 root root 4041 2018-03-22 00:36 ./a/less/less.SlackBuild @@ -584,20 +588,22 @@ drwxr-xr-x 2 root root 4096 2008-09-12 04:35 ./a/pcmciautils/config -rwxr-xr-x 1 root root 4504 2018-03-22 00:36 ./a/pcmciautils/pcmciautils.SlackBuild -rw-r--r-- 1 root root 910 2018-02-27 06:13 ./a/pcmciautils/slack-desc drwxr-xr-x 4 root root 4096 2018-03-22 00:36 ./a/pkgtools -drwxr-xr-x 2 root root 4096 2018-02-13 02:44 ./a/pkgtools/manpages +drwxr-xr-x 2 root root 4096 2018-04-11 19:37 ./a/pkgtools/manpages -rw-r--r-- 1 root root 76636 2016-06-15 01:08 ./a/pkgtools/manpages-l10n.tar.xz -rw-r--r-- 1 root root 1256 2009-04-11 20:54 ./a/pkgtools/manpages/explodepkg.8 -rw-r--r-- 1 root root 3396 2018-02-17 05:53 ./a/pkgtools/manpages/installpkg.8 -rw-r--r-- 1 root root 5253 2018-02-17 05:53 ./a/pkgtools/manpages/makepkg.8 +-rw-r--r-- 1 root root 1401 2018-04-11 19:48 ./a/pkgtools/manpages/pkgdiff.8 -rw-r--r-- 1 root root 2518 2009-04-11 21:11 ./a/pkgtools/manpages/pkgtool.8 -rw-r--r-- 1 root root 3080 2009-04-11 21:15 ./a/pkgtools/manpages/removepkg.8 -rw-r--r-- 1 root root 2665 2009-04-11 21:14 ./a/pkgtools/manpages/upgradepkg.8 --rwxr-xr-x 1 root root 3430 2018-04-03 19:46 ./a/pkgtools/pkgtools.SlackBuild -drwxr-xr-x 2 root root 4096 2018-02-22 19:05 ./a/pkgtools/scripts --rw-r--r-- 1 root root 3385 2018-02-16 21:21 ./a/pkgtools/scripts/explodepkg --rw-r--r-- 1 root root 20713 2018-04-03 19:46 ./a/pkgtools/scripts/installpkg +-rwxr-xr-x 1 root root 3448 2018-04-11 19:50 ./a/pkgtools/pkgtools.SlackBuild +drwxr-xr-x 2 root root 4096 2018-04-11 19:36 ./a/pkgtools/scripts +-rw-r--r-- 1 root root 3591 2018-04-11 19:36 ./a/pkgtools/scripts/explodepkg +-rw-r--r-- 1 root root 20927 2018-04-11 19:36 ./a/pkgtools/scripts/installpkg -rw-r--r-- 1 root root 13749 2009-04-06 02:14 ./a/pkgtools/scripts/makebootdisk --rw-r--r-- 1 root root 15112 2018-02-20 00:53 ./a/pkgtools/scripts/makepkg +-rw-r--r-- 1 root root 15336 2018-04-11 19:36 ./a/pkgtools/scripts/makepkg +-rw-r--r-- 1 root root 4712 2018-04-11 20:28 ./a/pkgtools/scripts/pkgdiff -rw-r--r-- 1 root root 21819 2018-04-03 19:45 ./a/pkgtools/scripts/pkgtool -rw-r--r-- 1 root root 13813 2016-09-26 17:28 ./a/pkgtools/scripts/removepkg -rw-r--r-- 1 root root 170 2003-02-16 00:56 ./a/pkgtools/scripts/setup.70.install-kernel @@ -605,7 +611,7 @@ drwxr-xr-x 2 root root 4096 2018-02-22 19:05 ./a/pkgtools/scripts -rw-r--r-- 1 root root 1070 2007-06-27 00:28 ./a/pkgtools/scripts/setup.htmlview -rw-r--r-- 1 root root 8310 2018-02-22 19:04 ./a/pkgtools/scripts/setup.services -rw-r--r-- 1 root root 11485 2015-10-01 17:55 ./a/pkgtools/scripts/upgradepkg --rw-r--r-- 1 root root 1079 2018-02-27 06:13 ./a/pkgtools/slack-desc +-rw-r--r-- 1 root root 1128 2018-04-11 19:51 ./a/pkgtools/slack-desc drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./a/plzip -rw-r--r-- 1 root root 53414 2018-02-10 18:28 ./a/plzip/plzip-1.7.tar.lz -rw-r--r-- 1 root root 72 2018-02-10 18:28 ./a/plzip/plzip-1.7.tar.lz.sig @@ -1382,10 +1388,10 @@ drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./ap/sox -rw-r--r-- 1 root root 744 2018-02-27 06:13 ./ap/sox/slack-desc -rw-r--r-- 1 root root 763840 2015-02-22 21:04 ./ap/sox/sox-14.4.2.tar.xz -rwxr-xr-x 1 root root 3899 2018-03-22 00:36 ./ap/sox/sox.SlackBuild -drwxr-xr-x 2 root root 4096 2018-04-03 19:43 ./ap/sqlite +drwxr-xr-x 2 root root 4096 2018-04-11 19:56 ./ap/sqlite -rw-r--r-- 1 root root 1684 2008-08-01 05:31 ./ap/sqlite/COPYRIGHT.gz -rw-r--r-- 1 root root 937 2018-02-27 06:12 ./ap/sqlite/slack-desc --rw-r--r-- 1 root root 6031096 2018-04-02 11:20 ./ap/sqlite/sqlite-src-3230000.tar.xz +-rw-r--r-- 1 root root 6030796 2018-04-11 17:11 ./ap/sqlite/sqlite-src-3230100.tar.xz -rwxr-xr-x 1 root root 6162 2018-04-03 19:43 ./ap/sqlite/sqlite.SlackBuild drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./ap/squashfs-tools -rw-r--r-- 1 root root 653 2015-09-09 18:13 ./ap/squashfs-tools/0001-kfreebsd.patch.gz @@ -1914,9 +1920,9 @@ drwxr-xr-x 2 root root 4096 2018-03-05 18:29 ./k/slack-desc -rw-r--r-- 1 root root 778 2018-02-27 06:16 ./k/slack-desc/slack-desc.kernel-source -rw-r--r-- 1 root root 778 2018-02-27 06:16 ./k/slack-desc/slack-desc.kernel-source.vanilla -rw-r--r-- 1 root root 1000 2018-03-05 08:27 ./k/slack-desc/slack-desc.kernel-template -drwxr-xr-x 14 root root 4096 2018-02-12 06:57 ./kde +drwxr-xr-x 14 root root 4096 2018-04-11 05:23 ./kde -rw-r--r-- 1 root root 1025 2018-03-24 17:45 ./kde/FTBFSlog --rwxr-xr-x 1 root root 18913 2018-04-05 19:50 ./kde/KDE.SlackBuild +-rwxr-xr-x 1 root root 19820 2018-04-11 05:22 ./kde/KDE.SlackBuild -rw-r--r-- 1 root root 2201 2018-01-30 18:29 ./kde/KDE.options drwxr-xr-x 2 root root 4096 2018-03-12 00:06 ./kde/build -rw-r--r-- 1 root root 2 2018-03-07 23:37 ./kde/build/amarok @@ -4139,11 +4145,9 @@ drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./l/libyaml -rw-r--r-- 1 root root 31 2011-07-31 18:46 ./l/libyaml/libyaml.url -rw-r--r-- 1 root root 742 2018-02-27 06:12 ./l/libyaml/slack-desc -rw-r--r-- 1 root root 328028 2016-08-29 00:08 ./l/libyaml/yaml-0.1.7.tar.xz -drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./l/libzip --rw-r--r-- 1 root root 1543 2017-12-29 21:47 ./l/libzip/0001-Use-GNUInstallDirs-variables-to-allow-installation-c.patch.gz --rw-r--r-- 1 root root 666 2017-12-29 21:47 ./l/libzip/0002-Set-bindir-in-pkgconfig-file-and-use-it.patch.gz --rw-r--r-- 1 root root 709348 2017-12-29 12:50 ./l/libzip/libzip-1.4.0.tar.lz --rwxr-xr-x 1 root root 4076 2018-03-22 00:36 ./l/libzip/libzip.SlackBuild +drwxr-xr-x 2 root root 4096 2018-04-11 20:09 ./l/libzip +-rw-r--r-- 1 root root 717908 2018-04-11 08:08 ./l/libzip/libzip-1.5.1.tar.xz +-rwxr-xr-x 1 root root 3870 2018-04-11 20:09 ./l/libzip/libzip.SlackBuild -rw-r--r-- 1 root root 880 2018-02-27 06:12 ./l/libzip/slack-desc drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./l/loudmouth -rw-r--r-- 1 root root 327488 2016-02-14 17:25 ./l/loudmouth/loudmouth-1.5.3.tar.xz @@ -4166,14 +4170,14 @@ drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./l/mm -rw-r--r-- 1 root root 248658 2006-08-15 07:05 ./l/mm/mm-1.4.2.tar.bz2 -rwxr-xr-x 1 root root 4504 2018-03-22 00:36 ./l/mm/mm.SlackBuild -rw-r--r-- 1 root root 998 2018-02-27 06:12 ./l/mm/slack-desc -drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./l/mozilla-nss +drwxr-xr-x 2 root root 4096 2018-04-11 20:00 ./l/mozilla-nss -rw-r--r-- 1 root root 25755 2008-02-27 08:35 ./l/mozilla-nss/MPL-1.1.txt -rw-r--r-- 1 root root 18152 2009-01-01 08:10 ./l/mozilla-nss/faq.html -rw-r--r-- 1 root root 17987 2007-06-28 20:04 ./l/mozilla-nss/gpl-2.0.txt -rw-r--r-- 1 root root 26434 2009-04-08 16:39 ./l/mozilla-nss/lgpl-2.1.txt --rwxr-xr-- 1 root root 6241 2018-04-08 00:41 ./l/mozilla-nss/mozilla-nss.SlackBuild +-rwxr-xr-- 1 root root 6243 2018-04-11 20:01 ./l/mozilla-nss/mozilla-nss.SlackBuild -rw-r--r-- 1 root root 756183 2018-03-05 16:42 ./l/mozilla-nss/nspr-4.19.tar.lz --rw-r--r-- 1 root root 19913981 2018-03-05 16:43 ./l/mozilla-nss/nss-3.36.tar.lz +-rw-r--r-- 1 root root 19912676 2018-04-09 15:42 ./l/mozilla-nss/nss-3.36.1.tar.lz -rw-r--r-- 1 root root 2488 2012-04-29 21:05 ./l/mozilla-nss/nss-config.in -rw-r--r-- 1 root root 1023 2018-02-27 06:12 ./l/mozilla-nss/slack-desc drwxr-xr-x 3 root root 4096 2018-03-22 00:36 ./l/mpfr @@ -5004,9 +5008,9 @@ drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./n/libgcrypt -rw-r--r-- 1 root root 310 2017-12-13 13:57 ./n/libgcrypt/libgcrypt-1.8.2.tar.bz2.sig -rwxr-xr-x 1 root root 4214 2018-03-22 00:36 ./n/libgcrypt/libgcrypt.SlackBuild -rw-r--r-- 1 root root 702 2018-02-27 06:13 ./n/libgcrypt/slack-desc -drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./n/libgpg-error --rw-r--r-- 1 root root 813060 2017-02-28 14:25 ./n/libgpg-error/libgpg-error-1.27.tar.bz2 --rw-r--r-- 1 root root 620 2017-04-04 13:10 ./n/libgpg-error/libgpg-error-1.27.tar.bz2.sig +drwxr-xr-x 2 root root 4096 2018-04-11 20:07 ./n/libgpg-error +-rw-r--r-- 1 root root 894749 2018-04-11 07:36 ./n/libgpg-error/libgpg-error-1.29.tar.bz2 +-rw-r--r-- 1 root root 310 2018-04-11 07:41 ./n/libgpg-error/libgpg-error-1.29.tar.bz2.sig -rwxr-xr-x 1 root root 4670 2018-03-22 00:36 ./n/libgpg-error/libgpg-error.SlackBuild -rw-r--r-- 1 root root 852 2018-02-27 06:13 ./n/libgpg-error/slack-desc drwxr-xr-x 2 root root 4096 2018-03-22 00:36 ./n/libksba diff --git a/slackware64-current/source/MANIFEST.bz2 b/slackware64-current/source/MANIFEST.bz2 index ac3019163..70310e6a3 100644 --- a/slackware64-current/source/MANIFEST.bz2 +++ b/slackware64-current/source/MANIFEST.bz2 @@ -1 +1 @@ -bf01abdf700b44caf49412003bf27130e40ab2a7 +a6ad3e7edf71d318895397528a562b7359478068 diff --git a/slackware64-current/source/a/lbzip2/lbzip2-2.5.tar.lz b/slackware64-current/source/a/lbzip2/lbzip2-2.5.tar.lz new file mode 100644 index 000000000..17eab3b3c --- /dev/null +++ b/slackware64-current/source/a/lbzip2/lbzip2-2.5.tar.lz @@ -0,0 +1 @@ +59a07b1bebc8b9e91e597a8f7288400e9b5af207 diff --git a/slackware64-current/source/a/lbzip2/lbzip2.SlackBuild b/slackware64-current/source/a/lbzip2/lbzip2.SlackBuild new file mode 100755 index 000000000..bff2e6490 --- /dev/null +++ b/slackware64-current/source/a/lbzip2/lbzip2.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2018 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=lbzip2 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# 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. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +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 {} \; + +# Configure, build, and install: +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# 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 + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS COPYING* ChangeLog INSTALL NEWS* README* THANKS* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/slackware64-current/source/a/lbzip2/slack-desc b/slackware64-current/source/a/lbzip2/slack-desc new file mode 100644 index 000000000..02e37fb00 --- /dev/null +++ b/slackware64-current/source/a/lbzip2/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +lbzip2: lbzip2 (a pthreads-based parallel bzip2/bunzip2) +lbzip2: +lbzip2: Lbzip2 is a Pthreads-based parallel bzip2/bunzip2 filter passable to +lbzip2: GNU tar with the --use-compress-program option. It isn't restricted +lbzip2: to regular files on input, nor output. +lbzip2: +lbzip2: Homepage: http://lbzip2.org +lbzip2: +lbzip2: +lbzip2: +lbzip2: diff --git a/slackware64-current/source/a/pkgtools/manpages/pkgdiff.8 b/slackware64-current/source/a/pkgtools/manpages/pkgdiff.8 new file mode 100644 index 000000000..5d91ac211 --- /dev/null +++ b/slackware64-current/source/a/pkgtools/manpages/pkgdiff.8 @@ -0,0 +1,57 @@ +.\" -*- nroff -*- +.ds g \" empty +.ds G \" empty +.\" Like TP, but if specified indent is more than half +.\" the current line-length - indent, use the default indent. +.de Tp +.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP +.el .TP "\\$1" +.. +.TH PKGDIFF 8 "11 Apr 2018" "Slackware Version 15.0 +.SH NAME +pkgdiff \- compare the file contents of two packages. +.SH SYNOPSIS +.B pkgdiff +[ +.B \--help +] +[ +.B \-c +] +[ +.B \-a +] +.BI packagename +.BI packagename2 +.SH DESCRIPTION +.B pkgdiff +Displays the differences in the files contained in two packages. This works with +plain .tar, Slackware packages (.tgz, .tbz, .tlz, .txz), .rpm, and .deb. By default, +the results will be displayed in a tree-style unified diff format. +.SH OPTIONS +.TP +.B \--help +Display help for using the pkgdiff utility. +.TP +.B \-c +Colorize the tree-style output a-la DIR_COLORS. If piping to a pager such as +less, you'll need to enable displaying raw data. For example: +.P +pkgdiff -c package-1.0-i586-1.txz package-2.0-i586-1.txz | less -r +.TP +.B \-a +Instead of a tree-style output format, generate a simple unified diff of the +package file lists. +.SH EXAMPLES +.TP +.B Compare two packages and pipe the result to less: +.P +pkgdiff package-1.0-i586-1.txz package-2.0-i586-1.txz | less +.SH AUTHOR +Patrick J. Volkerding <volkerdi@slackware.com> +.SH "SEE ALSO" +.BR makepkg(8), +.BR removepkg(8), +.BR explodepkg(8), +.BR pkgtool(8), +.BR upgradepkg(8) diff --git a/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild b/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild index 006134f4f..db2aa2414 100755 --- a/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild +++ b/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.0 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # 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 @@ -49,8 +49,8 @@ mkdir -p $PKG # Install Slackware script manpages: ( cd $CWD/manpages mkdir -p $PKG/usr/man/man8 - for page in explodepkg.8 installpkg.8 makepkg.8 upgradepkg.8 pkgtool.8 \ - removepkg.8 ; do + for page in explodepkg.8 installpkg.8 makepkg.8 upgradepkg.8 pkgdiff.8 \ + pkgtool.8 removepkg.8 ; do cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz done ) @@ -74,7 +74,7 @@ mkdir -p $PKG mkdir -p $PKG/sbin # Don't include makebootdisk... it's useless since a kernel won't fit on a # floppy disk, and nobody uses floppies any more anyway. - for file in explodepkg installpkg makepkg pkgtool removepkg upgradepkg ; do + for file in explodepkg installpkg makepkg pkgdiff pkgtool removepkg upgradepkg ; do cp -a $CWD/scripts/$file $PKG/sbin done chown root:root $PKG/sbin/* diff --git a/slackware64-current/source/a/pkgtools/scripts/explodepkg b/slackware64-current/source/a/pkgtools/scripts/explodepkg index da35130e3..e1f9b1281 100644 --- a/slackware64-current/source/a/pkgtools/scripts/explodepkg +++ b/slackware64-current/source/a/pkgtools/scripts/explodepkg @@ -56,10 +56,18 @@ for PKG in $* ; do packagecompression=gzip ;; 'tbz' ) - packagecompression=bzip2 + if which lbzip2 1> /dev/null 2> /dev/null ; then + packagecompression=lbzip2 + else + packagecompression=bzip2 + fi ;; 'bz2' ) - packagecompression=bzip2 + if which lbzip2 1> /dev/null 2> /dev/null ; then + packagecompression=lbzip2 + else + packagecompression=bzip2 + fi ;; 'tlz' ) if which plzip 1> /dev/null 2> /dev/null ; then diff --git a/slackware64-current/source/a/pkgtools/scripts/installpkg b/slackware64-current/source/a/pkgtools/scripts/installpkg index 4333e9fa1..782d5310b 100644 --- a/slackware64-current/source/a/pkgtools/scripts/installpkg +++ b/slackware64-current/source/a/pkgtools/scripts/installpkg @@ -233,7 +233,11 @@ if [ "$MODE" = "warn" ]; then packagecompression=gzip ;; 'tbz' ) - packagecompression=bzip2 + if which lbzip2 1> /dev/null 2> /dev/null ; then + packagecompression=lbzip2 + else + packagecompression=bzip2 + fi ;; 'tlz' ) if which plzip 1> /dev/null 2> /dev/null ; then @@ -317,7 +321,11 @@ for package in $* ; do packagecompression=gzip ;; 'tbz' ) - packagecompression=bzip2 + if which lbzip2 1> /dev/null 2> /dev/null ; then + packagecompression=lbzip2 + else + packagecompression=bzip2 + fi ;; 'tlz' ) if which plzip 1> /dev/null 2> /dev/null ; then diff --git a/slackware64-current/source/a/pkgtools/scripts/makepkg b/slackware64-current/source/a/pkgtools/scripts/makepkg index c09f4206d..b6c48eed5 100644 --- a/slackware64-current/source/a/pkgtools/scripts/makepkg +++ b/slackware64-current/source/a/pkgtools/scripts/makepkg @@ -175,17 +175,27 @@ elif [ ! "$(basename $PACKAGE_NAME .tar.gz)" = "$PACKAGE_NAME" ]; then fi elif [ ! "$(basename $PACKAGE_NAME .tbz)" = "$PACKAGE_NAME" ]; then EXTENSION="tbz" - COMPRESSOR="bzip2 -9 -c" - if ! which bzip2 1> /dev/null 2> /dev/null ; then - echo "ERROR: bzip2 compression utility not found in \$PATH." - exit 3 + if which lbzip2 1> /dev/null 2> /dev/null ; then + COMPRESSOR="lbzip2 -9 -c" + else + if which bzip2 1> /dev/null 2> /dev/null ; then + COMPRESSOR="bzip2 -9 -c" + else + echo "ERROR: bzip2 compression utility not found in \$PATH." + exit 3 + fi fi elif [ ! "$(basename $PACKAGE_NAME .tar.bz2)" = "$PACKAGE_NAME" ]; then EXTENSION="tar.bz2" - COMPRESSOR="bzip2 -9 -c" - if ! which bzip2 1> /dev/null 2> /dev/null ; then - echo "ERROR: bzip2 compression utility not found in \$PATH." - exit 3 + if which lbzip2 1> /dev/null 2> /dev/null ; then + COMPRESSOR="lbzip2 -9 -c" + else + if which bzip2 1> /dev/null 2> /dev/null ; then + COMPRESSOR="bzip2 -9 -c" + else + echo "ERROR: bzip2 compression utility not found in \$PATH." + exit 3 + fi fi elif [ ! "$(basename $PACKAGE_NAME .tlz)" = "$PACKAGE_NAME" ]; then EXTENSION="tlz" diff --git a/slackware64-current/source/a/pkgtools/scripts/pkgdiff b/slackware64-current/source/a/pkgtools/scripts/pkgdiff new file mode 100644 index 000000000..ca21ad8f2 --- /dev/null +++ b/slackware64-current/source/a/pkgtools/scripts/pkgdiff @@ -0,0 +1,164 @@ +#!/bin/sh +# Copyright 2002 Patrick J. Volkerding, Concord, CA, USA +# Copyright 2018 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. + +CWD=$(pwd) + +# Display usage for basic usage errors: +usage() { + cat << EOF +pkgdiff: missing file arguments +Try 'pkgdiff --help' for more information. +EOF +} + +# Display full --help if requested: +helpme() { + cat << EOF +Usage: pkgdiff [OPTION] FILE1 FILE2 +Show which files are new and which are removed between two tar archives. +The tar archives may be uncompressed, or compressed with gzip, bzip2, +xz, or lzip. Also works with .rpm and .deb. + + --help display this help and exit + -c use ANSI color with default tree mode + -a show simple text (ASCII) diff of package file lists + +By default, the trees are drawn with in crude ASCII with no color. For +the full-color effect, try something like this: + + pkgdiff -c package1 package2 | less -r + +EOF + # --help doesn't return + exit 22 +} + +# How the heck do I open this? +explode() { + tar xf $1 1> /dev/null 2> /dev/null + # Check for common extensions and do additional magic: + if [ ! "$(basename $1)" = "$(basename $1 .zip)" ]; then + unzip $1 1> /dev/null 2> /dev/null + fi + if [ ! "$(basename $1)" = "$(basename $1 .rpm)" ]; then + cp $1 . + rpm2tgz $(basename $1) 1> /dev/null 2> /dev/null + rm -f $(basename $1) + tar xzf $(basename $1 .rpm).tgz 1> /dev/null 2> /dev/null + rm -f $(basename $1 .rpm).tgz + fi + if [ ! "$(basename $1)" = "$(basename $1 .deb)" ]; then + cp $1 . + ar x $(basename $1) 1> /dev/null 2> /dev/null + tar xf data.tar.xz 1> /dev/null 2> /dev/null + rm -f * 2> /dev/null + fi + # Diffs for other archive formats are welcome. +} + +# Parse options. +# -c turns on colorization ala dircolors: +unset COLOR +if [ "$1" = "-c" ]; then + COLOR="-C" + shift 1 +fi +if [ "$1" = "-a" ]; then + ASCII=true + shift 1 +fi +if [ "$1" = "--help" ]; then + helpme +fi + +TMPDIR=$(mktemp -d) +cd $TMPDIR + +if [ ! -r "$1" ]; then + if [ -d "$CWD/$1" ]; then + usage + exit 99 + else + PKG1="$CWD/$1" + fi +else + PKG1="$1" +fi + +if [ ! -r "$2" ]; then + if [ -d "$CWD/$2" ]; then + usage + #echo "pkgdiff -- find the difference between two tar archives" + #echo "usage: pkgdiff [ -C ] pkg1 pkg2" + exit 99 + else + PKG2="$CWD/$2" + fi +else + PKG2="$2" +fi + +# We have to account for the possibility that the packages have the +# same name, but different contents... +if [ "$(basename $PKG1)" = "$(basename $PKG2)" ]; then + PKG1=${PKG1}.orig +fi + +# This will be mighty safe even if we ended up in /tmp. +PKG=.pkgdiff.$(mcookie) + +( mkdir -p $TMPDIR/$PKG/1 + cd $TMPDIR/$PKG/1 + if [ -r $PKG1 ]; then + explode $PKG1 + elif [ -r $(dirname $PKG1)/$(basename $PKG1 .orig) ]; then + explode $(dirname $PKG1)/$(basename $PKG1 .orig) + fi + if [ ! "$ASCII" = "true" ]; then + tree $COLOR -a --noreport > ../$(basename $PKG1) + else + find ./ | sed '2,$s,^\./,,' | tar --no-recursion -T - -cf - | tar tf - | sort > ../$(basename $PKG1) + fi +) +( mkdir -p $TMPDIR/$PKG/2 + cd $TMPDIR/$PKG/2 + explode $PKG2 + if [ ! "$ASCII" = "true" ]; then + tree $COLOR -a --noreport > ../$(basename $PKG2) + else + find ./ | sed '2,$s,^\./,,' | tar --no-recursion -T - -cf - | tar tf - | sort > ../$(basename $PKG2) + fi +) + +# Always going that extra mile... ;) +if [ -r $PKG1 ]; then + touch -r $PKG1 $TMPDIR/$PKG/$(basename $PKG1) +elif [ -r $(dirname $PKG1)/$(basename $PKG1 .orig) ]; then + touch -r $(dirname $PKG1)/$(basename $PKG1 .orig) $TMPDIR/$PKG/$(basename $PKG1) +fi +touch -r $PKG2 $TMPDIR/$PKG/$(basename $PKG2) + +rm -rf $TMPDIR/$PKG/{1,2} +( cd $TMPDIR/$PKG ; diff -d -u $(basename $PKG1) $(basename $PKG2) ) + +# cleanup: +rm -rf $PKG $TMPDIR diff --git a/slackware64-current/source/a/pkgtools/slack-desc b/slackware64-current/source/a/pkgtools/slack-desc index edce6afc1..d06b58631 100644 --- a/slackware64-current/source/a/pkgtools/slack-desc +++ b/slackware64-current/source/a/pkgtools/slack-desc @@ -14,6 +14,6 @@ pkgtools: 'makepkg', 'explodepkg', and 'upgradepkg' that install, remove, pkgtools: build, examine, and upgrade software packages. Also included are pkgtools: 'pkgtool', a menu based program for installing packages, removing pkgtools: packages, or viewing the packages that are installed on the system, -pkgtools: documentation (man pages), and a few other system admin scripts. -pkgtools: +pkgtools: 'pkgdiff', a utility for comparing two packages, documentation (man +pkgtools: pages), and a few other system admin scripts. pkgtools: diff --git a/slackware64-current/source/kde/KDE.SlackBuild b/slackware64-current/source/kde/KDE.SlackBuild index b1e5862c7..3a1689e44 100755 --- a/slackware64-current/source/kde/KDE.SlackBuild +++ b/slackware64-current/source/kde/KDE.SlackBuild @@ -217,9 +217,11 @@ build_mod_pkg () { continue fi else - echo - echo "Building from source ${kde_src}" - echo + if [ -z "$PRINT_PACKAGE_NAME" ]; then + echo + echo "Building from source ${kde_src}" + echo + fi fi if grep -wq "^$PKGNAME" ${CWD}/modularize ; then # Set $PKG to a private dir for the modular package build: @@ -231,6 +233,18 @@ build_mod_pkg () { # Let's figure out the version number on the modular package: MODULAR_PACKAGE_VERSION=$(echo $kde_src | rev | cut -f 3- -d . | cut -f 1 -d - | rev) + # If this variable is passed to the script, nothing will be built. + # Instead, a list of packages to be built will be output. + if [ ! -z "$PRINT_PACKAGE_NAME" ]; then + if [ -r $CWD/build/${PKGNAME} ]; then + MODBUILD=$(cat $CWD/build/${PKGNAME}) + else + MODBUILD=$BUILD + fi + echo "${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz" + continue + fi + rm -rf $(pkgbase $kde_src) tar xf $(find $CWD/src -name ${kde_src}) || exit 1 cd $(pkgbase $kde_src) || exit 1 @@ -351,32 +365,40 @@ build_mod_pkg () { # If every package listed in modules/"<kde_module>" is also listed # in the modularize file, then there's no need to make a package # for "<kde_module>": - echo - echo "Searching for packages in ${kde_module} that were not built modular:" + if [ -z "$PRINT_PACKAGE_NAME" ]; then + echo + echo "Searching for packages in ${kde_module} that were not built modular:" + fi cat $CWD/modules/${kde_module} | grep -v "^#" | grep -v -w "^" | while read checkpackage ; do if ! grep -wq "^$checkpackage" ${CWD}/modularize ; then # Non-modular package found, so we'll have to build the package below. # It might already have been built once, but in that case it is likely # that more things have been added to the package directory since then. - echo "Found non-modular package $checkpackage." + if [ -z "$PRINT_PACKAGE_NAME" ]; then + echo "Found non-modular package $checkpackage." + fi exit 99 fi done # Exit if everything in "<kde_module>" was built modular: if [ ! $? = 99 ]; then - echo "No non-modular components found in ${kde_module}." - echo "Not building catch-all package for ${kde_module}." - echo + if [ -z "$PRINT_PACKAGE_NAME" ]; then + echo "No non-modular components found in ${kde_module}." + echo "Not building catch-all package for ${kde_module}." + echo + fi return fi # If there's no /usr directory in the "<kde_module>" package directory, # then skip it. There's nothing present worth packing up. if [ ! -d ${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}/usr ]; then - echo "No /usr directory found in package-${kde_module}." - echo "Not building catch-all package for ${kde_module}." - echo + if [ -z "$PRINT_PACKAGE_NAME" ]; then + echo "No /usr directory found in package-${kde_module}." + echo "Not building catch-all package for ${kde_module}." + echo + fi return fi @@ -385,11 +407,13 @@ build_mod_pkg () { # Put up a bit of a black-box warning, in case this was a mistake where # something was meant to be listed in the modularize file and wasn't: - echo - echo "**************************************************************************" - echo "* Building combined package for non-modular parts of ${kde_module}" - echo "**************************************************************************" - echo + if [ -z "$PRINT_PACKAGE_NAME" ]; then + echo + echo "**************************************************************************" + echo "* Building combined package for non-modular parts of ${kde_module}" + echo "**************************************************************************" + echo + fi PKGARCH=$ARCH cd $PKG @@ -524,20 +548,24 @@ fi for module in \ $MODQUEUE ; do - echo "SlackBuild processing module '$module'" + if [ -z "$PRINT_PACKAGE_NAME" ]; then + echo "SlackBuild processing module '$module'" + fi deterministic_build $module if [ $? = 0 ]; then # Move the created packages up into the KDE build directory: - mv ${SLACK_KDE_BUILD_DIR}/$(echo $module |cut -f1 -d:)/*.t?z ${SLACK_KDE_BUILD_DIR}/ + mv ${SLACK_KDE_BUILD_DIR}/$(echo $module |cut -f1 -d:)/*.t?z ${SLACK_KDE_BUILD_DIR}/ 2> /dev/null if [ "$CLEANUP" = "yes" -o "$CLEANUP" = "YES" ]; then # Clean out package and build directories: rm -rf ${SLACK_KDE_BUILD_DIR}/$(echo $module |cut -f1 -d:) fi else - echo "${module} failed to build." + if [ -z "$PRINT_PACKAGE_NAME" ]; then + echo "${module} failed to build." + fi exit 1 fi - cd - ; + cd - > /dev/null done exit 0 diff --git a/slackware64-current/source/l/libzip/0001-Use-GNUInstallDirs-variables-to-allow-installation-c.patch.gz b/slackware64-current/source/l/libzip/0001-Use-GNUInstallDirs-variables-to-allow-installation-c.patch.gz deleted file mode 100644 index 40c32f394..000000000 --- a/slackware64-current/source/l/libzip/0001-Use-GNUInstallDirs-variables-to-allow-installation-c.patch.gz +++ /dev/null @@ -1 +0,0 @@ -9ca3d1d42878d8eddbb75f6fbe201260db60e719 diff --git a/slackware64-current/source/l/libzip/0002-Set-bindir-in-pkgconfig-file-and-use-it.patch.gz b/slackware64-current/source/l/libzip/0002-Set-bindir-in-pkgconfig-file-and-use-it.patch.gz deleted file mode 100644 index 76b005266..000000000 --- a/slackware64-current/source/l/libzip/0002-Set-bindir-in-pkgconfig-file-and-use-it.patch.gz +++ /dev/null @@ -1 +0,0 @@ -35e8e9694cb68e853e378b6f4355a60dd65622ed diff --git a/slackware64-current/source/l/libzip/libzip-1.4.0.tar.lz b/slackware64-current/source/l/libzip/libzip-1.4.0.tar.lz deleted file mode 100644 index da4725336..000000000 --- a/slackware64-current/source/l/libzip/libzip-1.4.0.tar.lz +++ /dev/null @@ -1 +0,0 @@ -8c69d4e18f44c63dd820b61eae40abd71f2f1b28 diff --git a/slackware64-current/source/l/libzip/libzip.SlackBuild b/slackware64-current/source/l/libzip/libzip.SlackBuild index 2208de8ad..b36447d33 100755 --- a/slackware64-current/source/l/libzip/libzip.SlackBuild +++ b/slackware64-current/source/l/libzip/libzip.SlackBuild @@ -79,9 +79,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/0001-Use-GNUInstallDirs-variables-to-allow-installation-c.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/0002-Set-bindir-in-pkgconfig-file-and-use-it.patch.gz | patch -p1 --verbose || exit 1 - mkdir -p build cd build cmake \ diff --git a/slackware64-current/source/l/mozilla-nss/mozilla-nss.SlackBuild b/slackware64-current/source/l/mozilla-nss/mozilla-nss.SlackBuild index b23007092..c4241a1a7 100755 --- a/slackware64-current/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/slackware64-current/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.36} +VERSION=${VERSION:-3.36.1} NSPR=${NSPR:-4.19} BUILD=${BUILD:-1} diff --git a/slackware64-current/source/l/mozilla-nss/nss-3.36.1.tar.lz b/slackware64-current/source/l/mozilla-nss/nss-3.36.1.tar.lz new file mode 100644 index 000000000..b69a92ae0 --- /dev/null +++ b/slackware64-current/source/l/mozilla-nss/nss-3.36.1.tar.lz @@ -0,0 +1 @@ +6d6aafb71497696fceafb9e2324e1a4b0c55e194 diff --git a/slackware64-current/source/l/mozilla-nss/nss-3.36.tar.lz b/slackware64-current/source/l/mozilla-nss/nss-3.36.tar.lz deleted file mode 100644 index dd3d6fc2b..000000000 --- a/slackware64-current/source/l/mozilla-nss/nss-3.36.tar.lz +++ /dev/null @@ -1 +0,0 @@ -49c00f4117c1b2e66223ca2f7b61dc0f91f437a4 diff --git a/slackware64-current/source/n/libgpg-error/libgpg-error-1.27.tar.bz2.sig b/slackware64-current/source/n/libgpg-error/libgpg-error-1.27.tar.bz2.sig deleted file mode 100644 index fa07096f6..000000000 --- a/slackware64-current/source/n/libgpg-error/libgpg-error-1.27.tar.bz2.sig +++ /dev/null @@ -1 +0,0 @@ -9fbfa1575bbde4d0261f54bd36176f4117204c56 diff --git a/slackware64-current/source/n/libgpg-error/libgpg-error-1.29.tar.bz2.sig b/slackware64-current/source/n/libgpg-error/libgpg-error-1.29.tar.bz2.sig new file mode 100644 index 000000000..e8ee65dcb --- /dev/null +++ b/slackware64-current/source/n/libgpg-error/libgpg-error-1.29.tar.bz2.sig @@ -0,0 +1 @@ +68435c9f2f2615f47e6c2db98be17f182bbdd120 |