From a8f1b55a2eeadb0b756b59217f73af07c5c10eb3 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 23 Jun 2018 04:57:41 +0000 Subject: [PATCH] Sat Jun 23 04:57:41 UTC 2018 a/dialog-1.3_20170509-x86_64-2.txz: Rebuilt. It seems the latest dialog causes a lot of breakage in the installer and other scripts. I looked over the diff since last time and nothing jumped out at me. Reverting to the previous version that worked properly. isolinux/initrd.img: Rebuilt. usb-and-pxe-installers/usbboot.img: Rebuilt. --- ChangeLog.rss | 20 +++++++++- ChangeLog.txt | 8 ++++ FILELIST.TXT | 62 +++++++++++++++---------------- source/a/dialog/dialog.SlackBuild | 23 ++++++++++-- 4 files changed, 76 insertions(+), 37 deletions(-) diff --git a/ChangeLog.rss b/ChangeLog.rss index 449bd5009..ce9eed0f2 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,25 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Sat, 23 Jun 2018 01:22:07 GMT - Sat, 23 Jun 2018 07:00:29 GMT + Sat, 23 Jun 2018 04:57:41 GMT + Sat, 23 Jun 2018 19:00:36 GMT maintain_current_git.sh v 1.10 + + Sat, 23 Jun 2018 04:57:41 GMT + Sat, 23 Jun 2018 04:57:41 GMT + https://git.slackware.nl/current/tag/?h=20180623045741 + 20180623045741 + + +a/dialog-1.3_20170509-x86_64-2.txz: Rebuilt. + It seems the latest dialog causes a lot of breakage in the installer and + other scripts. I looked over the diff since last time and nothing jumped + out at me. Reverting to the previous version that worked properly. +isolinux/initrd.img: Rebuilt. +usb-and-pxe-installers/usbboot.img: Rebuilt. + ]]> + + Sat, 23 Jun 2018 01:22:07 GMT Sat, 23 Jun 2018 01:22:07 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 307a2aa46..efa164d24 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +Sat Jun 23 04:57:41 UTC 2018 +a/dialog-1.3_20170509-x86_64-2.txz: Rebuilt. + It seems the latest dialog causes a lot of breakage in the installer and + other scripts. I looked over the diff since last time and nothing jumped + out at me. Reverting to the previous version that worked properly. +isolinux/initrd.img: Rebuilt. +usb-and-pxe-installers/usbboot.img: Rebuilt. ++--------------------------+ Sat Jun 23 01:22:07 UTC 2018 a/aaa_elflibs-15.0-x86_64-2.txz: Rebuilt. Upgraded libacl.so.1 and libattr.so.1. diff --git a/FILELIST.TXT b/FILELIST.TXT index 1c817c981..482dced0c 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,33 +1,33 @@ -Sat Jun 23 01:32:10 UTC 2018 +Sat Jun 23 05:10:10 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-23 01:22 . +drwxr-xr-x 12 root root 4096 2018-06-23 05:02 . -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 896050 2018-06-22 22:06 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-06-22 22:06 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 896050 2018-06-23 05:02 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-23 05:02 ./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 425169 2018-06-23 01:22 ./ChangeLog.txt +-rw-r--r-- 1 root root 425569 2018-06-23 04:57 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI -drwxr-xr-x 2 root root 4096 2018-06-23 01:07 ./EFI/BOOT +drwxr-xr-x 2 root root 4096 2018-06-23 04:56 ./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-21 01:12 ./EFI/BOOT/huge.s --rw-r--r-- 2 root root 35148836 2018-06-23 01:06 ./EFI/BOOT/initrd.img +-rw-r--r-- 2 root root 35143980 2018-06-23 04:52 ./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 1179693 2018-06-22 22:06 ./FILELIST.TXT +-rw-r--r-- 1 root root 1179693 2018-06-23 05:01 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 726051 2018-06-23 01:30 ./PACKAGES.TXT +-rw-r--r-- 1 root root 726051 2018-06-23 05:09 ./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-21 04:51 ./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-23 01:07 ./isolinux +drwxr-xr-x 3 root root 4096 2018-06-23 04:56 ./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 35148836 2018-06-23 01:06 ./isolinux/initrd.img +-rw-r--r-- 2 root root 35143980 2018-06-23 04:52 ./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-23 01:30 ./slackware64 --rw-r--r-- 1 root root 288372 2018-06-23 01:30 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-06-23 01:30 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 359289 2018-06-23 01:28 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3624810 2018-06-23 01:29 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2018-06-23 05:10 ./slackware64 +-rw-r--r-- 1 root root 288372 2018-06-23 05:10 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-23 05:10 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 359289 2018-06-23 05:07 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3621240 2018-06-23 05:08 ./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-23 01:28 ./slackware64/a +drwxr-xr-x 2 root root 20480 2018-06-23 04:26 ./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 @@ -806,9 +806,9 @@ drwxr-xr-x 2 root root 20480 2018-06-23 01:28 ./slackware64/a -rw-r--r-- 1 root root 311 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txt -rw-r--r-- 1 root root 98596 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txz -rw-r--r-- 1 root root 197 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txz.asc --rw-r--r-- 1 root root 511 2018-06-22 20:42 ./slackware64/a/dialog-1.3_20180621-x86_64-1.txt --rw-r--r-- 1 root root 174812 2018-06-22 20:42 ./slackware64/a/dialog-1.3_20180621-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-06-22 20:42 ./slackware64/a/dialog-1.3_20180621-x86_64-1.txz.asc +-rw-r--r-- 1 root root 511 2018-04-13 13:01 ./slackware64/a/dialog-1.3_20170509-x86_64-2.txt +-rw-r--r-- 1 root root 169240 2018-04-13 13:01 ./slackware64/a/dialog-1.3_20170509-x86_64-2.txz +-rw-r--r-- 1 root root 163 2018-04-13 13:01 ./slackware64/a/dialog-1.3_20170509-x86_64-2.txz.asc -rw-r--r-- 1 root root 336 2018-04-13 13:02 ./slackware64/a/dosfstools-4.1-x86_64-2.txt -rw-r--r-- 1 root root 77464 2018-04-13 13:02 ./slackware64/a/dosfstools-4.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:02 ./slackware64/a/dosfstools-4.1-x86_64-2.txz.asc @@ -4933,13 +4933,13 @@ 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-23 01:32 ./source --rw-r--r-- 1 root root 452754 2018-06-23 01:32 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-06-23 01:32 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 640855 2018-06-23 01:31 ./source/FILE_LIST --rw-r--r-- 1 root root 14794783 2018-06-23 01:31 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2018-06-23 05:01 ./source +-rw-r--r-- 1 root root 452754 2018-06-23 05:01 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2018-06-23 05:01 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 640855 2018-06-23 05:01 ./source/FILE_LIST +-rw-r--r-- 1 root root 14795142 2018-06-23 05:01 ./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-23 00:51 ./source/a +drwxr-xr-x 110 root root 4096 2018-06-23 04:21 ./source/a -rw-r--r-- 1 root root 567 2018-03-13 18:43 ./source/a/FTBFSlog drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/aaa_base -rw-r--r-- 1 root root 11180 2016-05-20 20:17 ./source/a/aaa_base/_aaa_base.tar.gz @@ -5115,9 +5115,9 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/devs -rw-r--r-- 1 root root 10037 1998-09-07 17:52 ./source/a/devs/makedev_2.3.1.orig.tar.gz -rw-r--r-- 1 root root 262 2004-05-21 02:29 ./source/a/devs/makedev_2.3.1.slack.diff.gz -rw-r--r-- 1 root root 762 2018-02-27 06:13 ./source/a/devs/slack-desc -drwxr-xr-x 2 root root 4096 2018-06-22 20:41 ./source/a/dialog --rw-r--r-- 1 root root 356085 2018-06-21 23:47 ./source/a/dialog/dialog-1.3-20180621.tar.lz --rwxr-xr-x 1 root root 4734 2018-06-22 20:42 ./source/a/dialog/dialog.SlackBuild +drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/dialog +-rw-r--r-- 1 root root 349472 2017-05-09 23:27 ./source/a/dialog/dialog-1.3-20170509.tar.xz +-rwxr-xr-x 1 root root 5664 2018-06-23 04:46 ./source/a/dialog/dialog.SlackBuild -rw-r--r-- 1 root root 334 2009-04-23 01:28 ./source/a/dialog/dialog.smaller.min.height.diff.gz -rw-r--r-- 1 root root 965 2018-02-27 06:13 ./source/a/dialog/slack-desc drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/dosfstools @@ -12594,9 +12594,9 @@ drwxr-xr-x 4 root root 4096 2018-06-21 23:10 ./testing -rw-r--r-- 1 root root 224 2018-06-21 23:10 ./testing/PACKAGES.TXT drwxr-xr-x 2 root root 4096 2018-06-21 22:51 ./testing/packages drwxr-xr-x 2 root root 4096 2018-06-21 22:50 ./testing/source -drwxr-xr-x 2 root root 4096 2018-06-23 01:07 ./usb-and-pxe-installers +drwxr-xr-x 2 root root 4096 2018-06-23 04:56 ./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 45040640 2018-06-23 01:06 ./usb-and-pxe-installers/usbboot.img +-rw-r--r-- 1 root root 45036544 2018-06-23 04:52 ./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/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild index 87ded0946..56047e67a 100755 --- a/source/a/dialog/dialog.SlackBuild +++ b/source/a/dialog/dialog.SlackBuild @@ -22,8 +22,23 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dialog -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} -BUILD=${BUILD:-1} + +# Think twice (or more) before upgrading this - the latest versions completely +# destroy the careful formatting in the Slackware installer. While it's lost +# to history now for the most part, I was the original beta tester for dialog, +# which was created to support our installer. I even wrote the --infobox widget +# before the first release. While I appreciate the advances dialog has made in +# the years since then, I'm nnot about to quickly shoot myself in the foot again +# (think tar-1.13 ;-). If you are reading this and think that Slackware "needs" +# to have the latest dialog, I'm willing to listen to your rationale. However, +# unless it's been tested with the installer and every other script in Slackware +# that uses dialog and found to work, and you've already gotten any needed +# patches accepted upstream... well... I like this version. If it's got bugs, +# they aren't bugs that I'm running into often. +#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} +VERSION=1.3-20170509 + +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,7 +85,7 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION || exit 1 zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1 @@ -93,7 +108,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-nls \ --with-ncursesw \ --enable-widec \ - --build=$ARCH-slackware-linux || exit 1 + --build=$ARCH-slackware-linux # Build and install: make -j4 || exit 1