diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-06-15 04:12:46 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-06-15 21:00:34 +0200 |
| commit | b5ea33bed63971ceb6b819ef86df097b9ee26b0d (patch) | |
| tree | 13a8fb928037ccc9be2e1d347535dea4e18f7af9 | |
| parent | 086112c734c9b6018855be83798bcdaf61505c14 (diff) | |
| download | current-b5ea33bed63971ceb6b819ef86df097b9ee26b0d.tar.gz | |
Fri Jun 15 04:12:46 UTC 201820180615041246
a/efibootmgr-16-x86_64-2.txz: Rebuilt.
a/efivar-35-x86_64-1.txz: Upgraded.
Switch to efivar-35, since 36 seems to have problems. Thanks to _RDS_.
ap/slackpkg-2.83.0-noarch-3.txz: Rebuilt.
Don't remove ChangeLog.txt upon upgrade/reinstall.
Use CHECKSUMS.md5.asc to determine if ChangeLog.txt is unchanged.
Remove dead bjtu.edu.cn mirrors from the sample mirrors files.
isolinux/initrd.img: Rebuilt.
Include libefivar.so.1 on the installer (needed by efibootmgr).
usb-and-pxe-installers/usbboot.img: Rebuilt.
Include libefivar.so.1 on the installer (needed by efibootmgr).
| -rw-r--r-- | ChangeLog.rss | 25 | ||||
| -rw-r--r-- | ChangeLog.txt | 13 | ||||
| -rw-r--r-- | FILELIST.TXT | 90 | ||||
| -rwxr-xr-x | recompress.sh | 2 | ||||
| -rwxr-xr-x | source/a/efibootmgr/efibootmgr.SlackBuild | 2 | ||||
| -rw-r--r-- | source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch | 57 | ||||
| -rw-r--r-- | source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch | 38 | ||||
| -rw-r--r-- | source/ap/slackpkg/doinst.sh | 1 | ||||
| -rwxr-xr-x | source/ap/slackpkg/slackpkg.SlackBuild | 22 |
9 files changed, 196 insertions, 54 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index c97e4341..396825b8 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,31 @@ <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>Fri, 15 Jun 2018 00:03:49 GMT</pubDate> - <lastBuildDate>Fri, 15 Jun 2018 07:00:26 GMT</lastBuildDate> + <pubDate>Fri, 15 Jun 2018 04:12:46 GMT</pubDate> + <lastBuildDate>Fri, 15 Jun 2018 19:00:31 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.9</generator> <item> + <title>Fri, 15 Jun 2018 04:12:46 GMT</title> + <pubDate>Fri, 15 Jun 2018 04:12:46 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20180615041246</link> + <guid isPermaLink="false">20180615041246</guid> + <description> + <![CDATA[<pre> +a/efibootmgr-16-x86_64-2.txz: Rebuilt. +a/efivar-35-x86_64-1.txz: Upgraded. + Switch to efivar-35, since 36 seems to have problems. Thanks to _RDS_. +ap/slackpkg-2.83.0-noarch-3.txz: Rebuilt. + Don't remove ChangeLog.txt upon upgrade/reinstall. + Use CHECKSUMS.md5.asc to determine if ChangeLog.txt is unchanged. + Remove dead bjtu.edu.cn mirrors from the sample mirrors files. +isolinux/initrd.img: Rebuilt. + Include libefivar.so.1 on the installer (needed by efibootmgr). +usb-and-pxe-installers/usbboot.img: Rebuilt. + Include libefivar.so.1 on the installer (needed by efibootmgr). + </pre>]]> + </description> + </item> + <item> <title>Fri, 15 Jun 2018 00:03:49 GMT</title> <pubDate>Fri, 15 Jun 2018 00:03:49 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20180615000349</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index 4aac1c75..cd6b1a3d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,16 @@ +Fri Jun 15 04:12:46 UTC 2018 +a/efibootmgr-16-x86_64-2.txz: Rebuilt. +a/efivar-35-x86_64-1.txz: Upgraded. + Switch to efivar-35, since 36 seems to have problems. Thanks to _RDS_. +ap/slackpkg-2.83.0-noarch-3.txz: Rebuilt. + Don't remove ChangeLog.txt upon upgrade/reinstall. + Use CHECKSUMS.md5.asc to determine if ChangeLog.txt is unchanged. + Remove dead bjtu.edu.cn mirrors from the sample mirrors files. +isolinux/initrd.img: Rebuilt. + Include libefivar.so.1 on the installer (needed by efibootmgr). +usb-and-pxe-installers/usbboot.img: Rebuilt. + Include libefivar.so.1 on the installer (needed by efibootmgr). ++--------------------------+ Fri Jun 15 00:03:49 UTC 2018 a/dcron-4.5-x86_64-8.txz: Rebuilt. rc.crond: match the running process more accurately. diff --git a/FILELIST.TXT b/FILELIST.TXT index b35b2746..244872ec 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,33 +1,33 @@ -Fri Jun 15 00:18:23 UTC 2018 +Fri Jun 15 04:22:24 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 12 root root 4096 2018-06-15 00:03 . +drwxr-xr-x 12 root root 4096 2018-06-15 04:12 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 13424 2018-06-13 05:25 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 895828 2018-06-13 22:10 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-06-13 22:10 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 895938 2018-06-15 00:18 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-15 00:18 ./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 415926 2018-06-15 00:03 ./ChangeLog.txt +-rw-r--r-- 1 root root 416572 2018-06-15 04:12 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI -drwxr-xr-x 2 root root 4096 2018-06-12 04:57 ./EFI/BOOT +drwxr-xr-x 2 root root 4096 2018-06-15 03:59 ./EFI/BOOT -rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi -rw-r--r-- 1 root root 78 2013-09-23 20:35 ./EFI/BOOT/grub-embedded.cfg -rw-r--r-- 1 root root 893 2018-04-17 21:17 ./EFI/BOOT/grub.cfg -rw-r--r-- 2 root root 8828688 2018-06-12 03:31 ./EFI/BOOT/huge.s --rw-r--r-- 2 root root 47916607 2018-06-12 04:57 ./EFI/BOOT/initrd.img +-rw-r--r-- 2 root root 47959603 2018-06-15 03:59 ./EFI/BOOT/initrd.img -rwxr-xr-x 1 root root 2494 2018-02-24 20:49 ./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 1179337 2018-06-13 22:09 ./FILELIST.TXT +-rw-r--r-- 1 root root 1179462 2018-06-15 00:18 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 725989 2018-06-15 00:16 ./PACKAGES.TXT +-rw-r--r-- 1 root root 725989 2018-06-15 04:21 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3634 2018-06-12 04:26 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -678,12 +678,12 @@ drwxr-xr-x 2 root root 4096 2011-01-31 03:46 ./extra/xf86-video-nouveau-bl -rw-r--r-- 1 root root 645 2010-04-27 21:47 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txt -rw-r--r-- 1 root root 880 2010-04-27 21:47 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txz -rw-r--r-- 1 root root 198 2010-04-27 21:47 ./extra/xf86-video-nouveau-blacklist/xf86-video-nouveau-blacklist-noarch-1.txz.asc -drwxr-xr-x 3 root root 4096 2018-06-12 04:57 ./isolinux +drwxr-xr-x 3 root root 4096 2018-06-15 03:59 ./isolinux -rw-r--r-- 1 root root 6183 2017-11-18 18:47 ./isolinux/README.TXT -rw-r--r-- 1 root root 788 2007-03-17 19:50 ./isolinux/README_SPLIT.TXT -rw-r--r-- 1 root root 1474560 2018-02-24 20:49 ./isolinux/efiboot.img -rw-r--r-- 1 root root 574 2013-10-24 00:19 ./isolinux/f2.txt --rw-r--r-- 2 root root 47916607 2018-06-12 04:57 ./isolinux/initrd.img +-rw-r--r-- 2 root root 47959603 2018-06-15 03:59 ./isolinux/initrd.img -rw-r--r-- 1 root root 50 2003-01-18 00:02 ./isolinux/iso.sort -rw-r--r-- 1 root root 24576 2016-05-27 20:36 ./isolinux/isolinux.bin -rw-r--r-- 1 root root 578 2013-03-27 03:29 ./isolinux/isolinux.cfg @@ -748,13 +748,13 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 18 root root 4096 2018-06-15 00:17 ./slackware64 --rw-r--r-- 1 root root 288405 2018-06-15 00:17 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-06-15 00:17 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 359320 2018-06-15 00:14 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3610511 2018-06-15 00:15 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2018-06-15 04:21 ./slackware64 +-rw-r--r-- 1 root root 288405 2018-06-15 04:21 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-15 04:21 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 359320 2018-06-15 04:18 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3605707 2018-06-15 04:19 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 20480 2018-06-15 00:14 ./slackware64/a +drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/a -rw-r--r-- 1 root root 327 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txt -rw-r--r-- 1 root root 10972 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz.asc @@ -818,12 +818,12 @@ drwxr-xr-x 2 root root 20480 2018-06-15 00:14 ./slackware64/a -rw-r--r-- 1 root root 350 2018-04-13 13:02 ./slackware64/a/ed-1.14.2-x86_64-2.txt -rw-r--r-- 1 root root 61660 2018-04-13 13:02 ./slackware64/a/ed-1.14.2-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:02 ./slackware64/a/ed-1.14.2-x86_64-2.txz.asc --rw-r--r-- 1 root root 463 2018-06-12 19:55 ./slackware64/a/efibootmgr-16-x86_64-1.txt --rw-r--r-- 1 root root 30624 2018-06-12 19:55 ./slackware64/a/efibootmgr-16-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-06-12 19:55 ./slackware64/a/efibootmgr-16-x86_64-1.txz.asc --rw-r--r-- 1 root root 312 2018-06-12 19:42 ./slackware64/a/efivar-36-x86_64-1.txt --rw-r--r-- 1 root root 97420 2018-06-12 19:42 ./slackware64/a/efivar-36-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-06-12 19:42 ./slackware64/a/efivar-36-x86_64-1.txz.asc +-rw-r--r-- 1 root root 463 2018-06-15 03:36 ./slackware64/a/efibootmgr-16-x86_64-2.txt +-rw-r--r-- 1 root root 30640 2018-06-15 03:36 ./slackware64/a/efibootmgr-16-x86_64-2.txz +-rw-r--r-- 1 root root 163 2018-06-15 03:36 ./slackware64/a/efibootmgr-16-x86_64-2.txz.asc +-rw-r--r-- 1 root root 312 2018-06-15 03:35 ./slackware64/a/efivar-35-x86_64-1.txt +-rw-r--r-- 1 root root 85440 2018-06-15 03:35 ./slackware64/a/efivar-35-x86_64-1.txz +-rw-r--r-- 1 root root 163 2018-06-15 03:35 ./slackware64/a/efivar-35-x86_64-1.txz.asc -rw-r--r-- 1 root root 445 2018-06-12 19:19 ./slackware64/a/elilo-3.16-x86_64-7.txt -rw-r--r-- 1 root root 153000 2018-06-12 19:19 ./slackware64/a/elilo-3.16-x86_64-7.txz -rw-r--r-- 1 root root 163 2018-06-12 19:19 ./slackware64/a/elilo-3.16-x86_64-7.txz.asc @@ -1102,7 +1102,7 @@ drwxr-xr-x 2 root root 20480 2018-06-15 00:14 ./slackware64/a -rw-r--r-- 1 root root 540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt -rw-r--r-- 1 root root 56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc -drwxr-xr-x 2 root root 20480 2018-06-15 00:14 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2018-06-15 04:18 ./slackware64/ap -rw-r--r-- 1 root root 291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt -rw-r--r-- 1 root root 694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz -rw-r--r-- 1 root root 163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc @@ -1296,9 +1296,9 @@ drwxr-xr-x 2 root root 20480 2018-06-15 00:14 ./slackware64/ap -rw-r--r-- 1 root root 452 2018-04-13 13:32 ./slackware64/ap/seejpeg-1.10-x86_64-2.txt -rw-r--r-- 1 root root 56752 2018-04-13 13:32 ./slackware64/ap/seejpeg-1.10-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:32 ./slackware64/ap/seejpeg-1.10-x86_64-2.txz.asc --rw-r--r-- 1 root root 555 2018-06-14 21:37 ./slackware64/ap/slackpkg-2.83.0-noarch-2.txt --rw-r--r-- 1 root root 175544 2018-06-14 21:37 ./slackware64/ap/slackpkg-2.83.0-noarch-2.txz --rw-r--r-- 1 root root 163 2018-06-14 21:37 ./slackware64/ap/slackpkg-2.83.0-noarch-2.txz.asc +-rw-r--r-- 1 root root 555 2018-06-15 03:50 ./slackware64/ap/slackpkg-2.83.0-noarch-3.txt +-rw-r--r-- 1 root root 175704 2018-06-15 03:50 ./slackware64/ap/slackpkg-2.83.0-noarch-3.txz +-rw-r--r-- 1 root root 163 2018-06-15 03:50 ./slackware64/ap/slackpkg-2.83.0-noarch-3.txz.asc -rw-r--r-- 1 root root 290 2018-06-05 04:55 ./slackware64/ap/soma-3.0.4-noarch-1.txt -rw-r--r-- 1 root root 23880 2018-06-05 04:55 ./slackware64/ap/soma-3.0.4-noarch-1.txz -rw-r--r-- 1 root root 163 2018-06-05 04:55 ./slackware64/ap/soma-3.0.4-noarch-1.txz.asc @@ -4933,11 +4933,11 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:35 ./slackware64/y -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez -rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile -drwxr-xr-x 19 root root 4096 2018-06-15 00:18 ./source --rw-r--r-- 1 root root 452637 2018-06-15 00:18 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-06-15 00:18 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 640616 2018-06-15 00:17 ./source/FILE_LIST --rw-r--r-- 1 root root 14765937 2018-06-15 00:17 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2018-06-15 04:22 ./source +-rw-r--r-- 1 root root 452745 2018-06-15 04:22 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-15 04:22 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 640875 2018-06-15 04:22 ./source/FILE_LIST +-rw-r--r-- 1 root root 14778011 2018-06-15 04:22 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 110 root root 4096 2018-06-14 19:02 ./source/a -rw-r--r-- 1 root root 567 2018-03-13 18:43 ./source/a/FTBFSlog @@ -5137,10 +5137,10 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/ed -rw-r--r-- 1 root root 800 2018-02-27 06:13 ./source/a/ed/slack-desc drwxr-xr-x 2 root root 4096 2018-06-12 19:49 ./source/a/efibootmgr -rw-r--r-- 1 root root 34084 2018-04-09 20:44 ./source/a/efibootmgr/efibootmgr-16.tar.lz --rwxr-xr-x 1 root root 3806 2018-06-12 19:55 ./source/a/efibootmgr/efibootmgr.SlackBuild +-rwxr-xr-x 1 root root 3806 2018-06-15 03:36 ./source/a/efibootmgr/efibootmgr.SlackBuild -rw-r--r-- 1 root root 953 2018-06-12 19:48 ./source/a/efibootmgr/slack-desc -drwxr-xr-x 2 root root 4096 2018-06-12 19:32 ./source/a/efivar --rw-r--r-- 1 root root 101631 2018-06-08 19:19 ./source/a/efivar/efivar-36.tar.lz +drwxr-xr-x 2 root root 4096 2018-06-15 03:34 ./source/a/efivar +-rw-r--r-- 1 root root 91475 2018-04-09 18:55 ./source/a/efivar/efivar-35.tar.lz -rwxr-xr-x 1 root root 3617 2018-06-12 19:33 ./source/a/efivar/efivar.SlackBuild -rw-r--r-- 1 root root 798 2018-06-12 19:27 ./source/a/efivar/slack-desc drwxr-xr-x 2 root root 4096 2018-06-12 19:02 ./source/a/elilo @@ -6239,9 +6239,11 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/seejpeg -rw-r--r-- 1 root root 46550 1999-11-09 00:03 ./source/ap/seejpeg/seejpeg-1.10.tgz -rwxr-xr-x 1 root root 2919 2018-04-23 17:20 ./source/ap/seejpeg/seejpeg.SlackBuild -rw-r--r-- 1 root root 907 2018-02-27 06:12 ./source/ap/seejpeg/slack-desc -drwxr-xr-x 3 root root 4096 2018-06-14 21:36 ./source/ap/slackpkg +drwxr-xr-x 3 root root 4096 2018-06-15 03:42 ./source/ap/slackpkg -rw-r--r-- 1 root root 1283 2018-06-14 21:35 ./source/ap/slackpkg/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz --rw-r--r-- 1 root root 469 2016-05-11 03:43 ./source/ap/slackpkg/doinst.sh.gz +-rw-r--r-- 1 root root 1002 2018-06-15 01:54 ./source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch.gz +-rw-r--r-- 1 root root 562 2018-06-15 01:54 ./source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz +-rw-r--r-- 1 root root 457 2018-06-15 03:41 ./source/ap/slackpkg/doinst.sh.gz drwxr-xr-x 2 root root 4096 2018-05-29 20:54 ./source/ap/slackpkg/files -rw-r--r-- 1 root root 18548 2018-05-24 07:24 ./source/ap/slackpkg/files/ChangeLog.gz -rw-r--r-- 1 root root 6849 2010-05-01 23:10 ./source/ap/slackpkg/files/GPL.gz @@ -6264,7 +6266,7 @@ drwxr-xr-x 2 root root 4096 2018-05-29 20:54 ./source/ap/slackpkg/files -rw-r--r-- 1 root root 4477 2018-01-06 23:55 ./source/ap/slackpkg/files/slackpkg.gz -rw-r--r-- 1 root root 82664 2018-05-29 20:52 ./source/ap/slackpkg/manpages-l10n.tar.xz -rw-r--r-- 1 root root 1007 2018-04-28 19:32 ./source/ap/slackpkg/slack-desc --rwxr-xr-x 1 root root 4569 2018-06-14 21:36 ./source/ap/slackpkg/slackpkg.SlackBuild +-rwxr-xr-x 1 root root 4977 2018-06-15 03:50 ./source/ap/slackpkg/slackpkg.SlackBuild drwxr-xr-x 2 root root 4096 2018-06-05 04:50 ./source/ap/soma -rw-r--r-- 1 root root 4517 2018-03-06 05:58 ./source/ap/soma/ChangeLog.txt -rw-r--r-- 1 root root 1950 2017-11-30 17:00 ./source/ap/soma/README @@ -12455,10 +12457,10 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/libxfce4util -rw-r--r-- 1 root root 776 2018-02-27 06:13 ./source/xfce/libxfce4util/slack-desc drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/orage -rw-r--r-- 1 root root 2165672 2015-04-10 10:30 ./source/xfce/orage/orage-4.12.1.tar.xz --rwxr-xr-x 1 root root 4085 2018-04-23 17:20 ./source/xfce/orage/orage.SlackBuild --rw-r--r-- 1 root root 723 2017-11-14 22:05 ./source/xfce/orage/orage.libical3.diff.gz --rw-r--r-- 1 root root 625 2018-02-27 06:13 ./source/xfce/orage/slack-desc -drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/thunar-volman +-rwxr-xr-x 1 root root 4085 2018-04-23 17:20 ./source/xfce/orage/orage.SlackBuild +-rw-r--r-- 1 root root 723 2017-11-14 22:05 ./source/xfce/orage/orage.libical3.diff.gz +-rw-r--r-- 1 root root 625 2018-02-27 06:13 ./source/xfce/orage/slack-desc +drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/thunar-volman -rw-r--r-- 1 root root 835 2015-03-22 04:39 ./source/xfce/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch -rw-r--r-- 1 root root 800 2018-02-27 06:13 ./source/xfce/thunar-volman/slack-desc -rw-r--r-- 1 root root 387076 2015-02-28 18:01 ./source/xfce/thunar-volman/thunar-volman-0.8.1.tar.xz @@ -12590,9 +12592,9 @@ drwxr-xr-x 4 root root 4096 2018-06-13 05:57 ./testing -rw-r--r-- 1 root root 224 2018-06-13 05:57 ./testing/PACKAGES.TXT drwxr-xr-x 2 root root 4096 2018-06-12 19:55 ./testing/packages drwxr-xr-x 2 root root 4096 2018-06-12 19:55 ./testing/source -drwxr-xr-x 2 root root 4096 2018-06-12 04:57 ./usb-and-pxe-installers +drwxr-xr-x 2 root root 4096 2018-06-15 03:59 ./usb-and-pxe-installers -rw-r--r-- 1 root root 31203 2011-03-21 21:21 ./usb-and-pxe-installers/README_PXE.TXT -rw-r--r-- 1 root root 9197 2013-09-25 04:33 ./usb-and-pxe-installers/README_USB.TXT -rw-r--r-- 1 root root 574 2013-03-27 04:59 ./usb-and-pxe-installers/pxelinux.cfg_default --rw-r--r-- 1 root root 57807872 2018-06-12 04:57 ./usb-and-pxe-installers/usbboot.img +-rw-r--r-- 1 root root 57848832 2018-06-15 03:59 ./usb-and-pxe-installers/usbboot.img -rw-r--r-- 1 root root 16045 2016-03-29 07:41 ./usb-and-pxe-installers/usbimg2disk.sh diff --git a/recompress.sh b/recompress.sh index c1f1e0bd..8dd80968 100755 --- a/recompress.sh +++ b/recompress.sh @@ -960,6 +960,8 @@ gzip ./source/ap/sysstat/doinst.sh gzip ./source/ap/soma/doinst.sh gzip ./source/ap/slackpkg/0001-Fix-for-var_log_packages-being-a-symlink.patch gzip ./source/ap/slackpkg/doinst.sh +gzip ./source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch +gzip ./source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch gzip ./source/ap/slackpkg/files/dialog-functions.sh gzip ./source/ap/slackpkg/files/slackpkg gzip ./source/ap/slackpkg/files/post-functions.sh diff --git a/source/a/efibootmgr/efibootmgr.SlackBuild b/source/a/efibootmgr/efibootmgr.SlackBuild index e91b25fd..9671a6e2 100755 --- a/source/a/efibootmgr/efibootmgr.SlackBuild +++ b/source/a/efibootmgr/efibootmgr.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=efibootmgr 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: if [ -z "$ARCH" ]; then diff --git a/source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch b/source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch new file mode 100644 index 00000000..26796773 --- /dev/null +++ b/source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch @@ -0,0 +1,57 @@ +From e1fc7d99876aaba621fb353d8c484756e20ad0e8 Mon Sep 17 00:00:00 2001 +From: "Patrick J. Volkerding" <volkerdi@slackware.com> +Date: Thu, 7 Jun 2018 19:03:40 -0500 +Subject: [PATCH 1/3] Use CHECKSUMS.md5.asc to determine ChangeLog newness + +Thanks to drgibbon on LQ for the suggestion. + +Signed-off-by: Robby Workman <rworkman@slackware.com> +--- + files/core-functions.sh | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/files/core-functions.sh b/files/core-functions.sh +index 667667c..ec753c7 100644 +--- a/files/core-functions.sh ++++ b/files/core-functions.sh +@@ -970,10 +970,37 @@ function getpkg() { + # + function checkchangelog() + { ++ if ! [ -e ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc ]; then ++ touch ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc ++ fi ++ + if ! [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then + touch ${ROOT}/${WORKDIR}/ChangeLog.txt + fi + ++ # First we will download CHECKSUMS.md5.asc since it is a very small ++ # file and if it has not changed, we can know that the ChangeLog ++ # has not changed either. If it _has_ changed, we'll need to pull ++ # the ChangeLog to check that as well. ++ echo -e "\tDownloading..." ++ getfile ${SOURCE}CHECKSUMS.md5.asc $TMPDIR/CHECKSUMS.md5.asc ++ if ! grep -q "PGP" $TMPDIR/CHECKSUMS.md5.asc ; then ++ echo -e "\ ++\nError downloading from $SOURCE.\n\ ++Please check your mirror and try again." ++ cleanup ++ fi ++ if diff --brief ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc $TMPDIR/CHECKSUMS.md5.asc ; then ++ # Before returning with the result that these signatures (and ++ # therefore the ChangeLog) are the same, we need to copy the ++ # ChangeLog into ${TMPDIR} in case the user decides to ++ # "download all other files": ++ cp ${ROOT}/${WORKDIR}/ChangeLog.txt $TMPDIR/ChangeLog.txt ++ return 0 ++ fi ++ # CHECKSUMS.md5.asc was different, so we'll go on to download and test ++ # the full ChangeLog.txt. ++ + echo -e "\tDownloading..." + # + # Download ChangeLog.txt first of all and test if it's equal +-- +2.17.1 + diff --git a/source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch b/source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch new file mode 100644 index 00000000..ad3a33b4 --- /dev/null +++ b/source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch @@ -0,0 +1,38 @@ +From 845c9adf65cc91d6f92d95fdedd514052a4b4164 Mon Sep 17 00:00:00 2001 +From: Robby Workman <rworkman@slackware.com> +Date: Tue, 12 Jun 2018 12:46:25 -0500 +Subject: [PATCH 3/3] mirrors-x86*.sample: Remove bjtu.edu.cn mirror + +Thanks to Lockywolf on LQ for the report. +--- + files/mirrors-x86.sample | 1 - + files/mirrors-x86_64.sample | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/files/mirrors-x86.sample b/files/mirrors-x86.sample +index 922bc17..e31d22e 100644 +--- a/files/mirrors-x86.sample ++++ b/files/mirrors-x86.sample +@@ -242,7 +242,6 @@ + # ftp://mirror.its.dal.ca/slackware/slackware-current/ + # http://mirror.its.dal.ca/slackware/slackware-current/ + # CHINA (CN) +-# http://mirror.bjtu.edu.cn/slackware/slackware-current/ + # http://mirrors.163.com/slackware/slackware-current/ + # http://mirrors.ustc.edu.cn/slackware/slackware-current/ + # COSTA RICA (CR) +diff --git a/files/mirrors-x86_64.sample b/files/mirrors-x86_64.sample +index aae06f1..de65a31 100644 +--- a/files/mirrors-x86_64.sample ++++ b/files/mirrors-x86_64.sample +@@ -240,7 +240,6 @@ + # ftp://mirror.its.dal.ca/slackware/slackware64-current/ + # http://mirror.its.dal.ca/slackware/slackware64-current/ + # CHINA (CN) +-# http://mirror.bjtu.edu.cn/slackware/slackware64-current/ + # http://mirrors.163.com/slackware/slackware64-current/ + # http://mirrors.ustc.edu.cn/slackware/slackware64-current/ + # COSTA RICA (CR) +-- +2.17.1 + diff --git a/source/ap/slackpkg/doinst.sh b/source/ap/slackpkg/doinst.sh index e04d744b..5e09d425 100644 --- a/source/ap/slackpkg/doinst.sh +++ b/source/ap/slackpkg/doinst.sh @@ -36,5 +36,4 @@ copy_mirror_file config etc/slackpkg/mirrors.new config etc/slackpkg/slackpkg.conf.new config etc/slackpkg/blacklist.new -rm -f var/lib/slackpkg/ChangeLog.txt rm -f var/lib/slackpkg/pkglist diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild index 7dc1949d..2d6fe94c 100755 --- a/source/ap/slackpkg/slackpkg.SlackBuild +++ b/source/ap/slackpkg/slackpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=slackpkg VERSION=${VERSION:-2.83.0} ARCH="noarch" -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # 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 @@ -76,11 +76,6 @@ gzip -d $PKG/usr/libexec/slackpkg/functions.d/* chmod 755 $PKG/usr/libexec/slackpkg/functions.d/* chown root:root $PKG/usr/libexec/slackpkg/functions.d/* -# Apply patch in case /var/log/packages is a symlink: -( cd $PKG/usr/libexec/slackpkg - zcat $CWD/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz | patch -p1 || exit 1 -) || exit 1 - # Install man pages: mkdir -pv $PKG/usr/man/man5 cp -av slackpkg.conf.5.gz $PKG/usr/man/man5 @@ -124,6 +119,21 @@ gzip -d $PKG/usr/doc/slackpkg-$VERSION/* mkdir -pv $PKG/var/lib/slackpkg mkdir -pv $PKG/var/cache/packages +# Apply patch in case /var/log/packages is a symlink: +( cd $PKG/usr/libexec/slackpkg + zcat $CWD/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz | patch -p1 --verbose || exit 1 +) || exit 1 + +# Check for new Changelog.txt by checking CHECKSUMS.md5.asc first: +( cd $PKG/usr/libexec/slackpkg + zcat $CWD/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch.gz | patch -p2 --verbose || exit 1 +) || exit 1 + +# Remove dead mirrors: +( cd $PKG/usr/doc/slackpkg-$VERSION + zcat $CWD/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz | patch -p2 --verbose || exit 1 +) || exit 1 + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc |