From 22643bf37651b7677deb9e06c35d1c1b0c43b883 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 26 Jan 2019 04:15:08 +0000 Subject: Sat Jan 26 04:15:08 UTC 2019 a/mkinitrd-1.4.11-x86_64-11.txz: Rebuilt. setup.01.mkinitrd: revert to the previous command line for mkinitrd_command_generator.sh (the new one fails when called from the installer). --- ChangeLog.rss | 40 +++++++- ChangeLog.txt | 20 ++++ FILELIST.TXT | 113 +++++++++++---------- recompress.sh | 1 + source/a/mkinitrd/mkinitrd.SlackBuild | 2 +- source/a/mkinitrd/mkinitrd_command_generator.sh | 4 + source/a/mkinitrd/setup.01.mkinitrd | 53 ++++++++-- source/installer/ChangeLog.txt | 8 ++ .../installer/sources/initrd/usr/lib/setup/SeTEFI | 34 ++++--- source/n/gnutls/gnutls.SlackBuild | 2 +- source/x/xdg-utils/xdg-open.no.relative.paths.diff | 15 +++ source/x/xdg-utils/xdg-utils.SlackBuild | 5 +- 12 files changed, 210 insertions(+), 87 deletions(-) create mode 100644 source/x/xdg-utils/xdg-open.no.relative.paths.diff diff --git a/ChangeLog.rss b/ChangeLog.rss index f86ff8bf3..cb4dea98a 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,45 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Wed, 23 Jan 2019 22:02:34 GMT - Thu, 24 Jan 2019 07:59:45 GMT + Sat, 26 Jan 2019 04:15:08 GMT + Sat, 26 Jan 2019 07:59:43 GMT maintain_current_git.sh v 1.10 + + Sat, 26 Jan 2019 04:15:08 GMT + Sat, 26 Jan 2019 04:15:08 GMT + https://git.slackware.nl/current/tag/?h=20190126041508 + 20190126041508 + + +a/mkinitrd-1.4.11-x86_64-11.txz: Rebuilt. + setup.01.mkinitrd: revert to the previous command line for + mkinitrd_command_generator.sh (the new one fails when called from the + installer). + ]]> + + + + Fri, 25 Jan 2019 23:32:30 GMT + Fri, 25 Jan 2019 23:32:30 GMT + https://git.slackware.nl/current/tag/?h=20190125233230 + 20190125233230 + + +a/mkinitrd-1.4.11-x86_64-10.txz: Rebuilt. + mkinitrd_command_generator.sh: Emit an error if the command line ends in -k + without an arg (instead of triggering an infinite loop). + setup.01.mkinitrd: Added some debugging to see if we can diagnose failure + cases with automatic initrd generation. If your system triggers it, please + report it on the LQ thread. +d/meson-0.49.1-x86_64-1.txz: Upgraded. +n/gnutls-3.6.6-x86_64-1.txz: Upgraded. +x/xdg-utils-1.1.3-noarch-2.txz: Rebuilt. + Fixed xdg-open in LXDE. Thanks to TurboBlaze. +isolinux/initrd.img: Rebuilt. +usb-and-pxe-installers/usbboot.img: Rebuilt. + ]]> + + Wed, 23 Jan 2019 22:02:34 GMT Wed, 23 Jan 2019 22:02:34 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index b9cccb1f6..b816f2f83 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,23 @@ +Sat Jan 26 04:15:08 UTC 2019 +a/mkinitrd-1.4.11-x86_64-11.txz: Rebuilt. + setup.01.mkinitrd: revert to the previous command line for + mkinitrd_command_generator.sh (the new one fails when called from the + installer). ++--------------------------+ +Fri Jan 25 23:32:30 UTC 2019 +a/mkinitrd-1.4.11-x86_64-10.txz: Rebuilt. + mkinitrd_command_generator.sh: Emit an error if the command line ends in -k + without an arg (instead of triggering an infinite loop). + setup.01.mkinitrd: Added some debugging to see if we can diagnose failure + cases with automatic initrd generation. If your system triggers it, please + report it on the LQ thread. +d/meson-0.49.1-x86_64-1.txz: Upgraded. +n/gnutls-3.6.6-x86_64-1.txz: Upgraded. +x/xdg-utils-1.1.3-noarch-2.txz: Rebuilt. + Fixed xdg-open in LXDE. Thanks to TurboBlaze. +isolinux/initrd.img: Rebuilt. +usb-and-pxe-installers/usbboot.img: Rebuilt. ++--------------------------+ Wed Jan 23 22:02:34 UTC 2019 a/bash-5.0.002-x86_64-2.txz: Rebuilt. Rebuilt with --libdir=/usr/lib${LIBDIRSUFFIX}. Thanks to RandomTroll. diff --git a/FILELIST.TXT b/FILELIST.TXT index 9e61ae366..a7a5746fe 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,33 +1,33 @@ -Wed Jan 23 22:13:56 UTC 2019 +Sat Jan 26 04:26:59 UTC 2019 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 2019-01-23 22:02 . +drwxr-xr-x 12 root root 4096 2019-01-26 04:15 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14341 2018-11-29 05:40 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 909412 2019-01-23 05:03 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-01-23 05:03 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 909667 2019-01-25 23:38 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-01-25 23:38 ./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 551518 2019-01-23 22:02 ./ChangeLog.txt +-rw-r--r-- 1 root root 552434 2019-01-26 04:15 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI -drwxr-xr-x 2 root root 4096 2019-01-23 04:38 ./EFI/BOOT +drwxr-xr-x 2 root root 4096 2019-01-25 23:18 ./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 9504640 2019-01-23 01:18 ./EFI/BOOT/huge.s --rw-r--r-- 2 root root 37084732 2019-01-23 04:37 ./EFI/BOOT/initrd.img +-rw-r--r-- 2 root root 37087248 2019-01-25 23:15 ./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 1196795 2019-01-23 05:03 ./FILELIST.TXT +-rw-r--r-- 1 root root 1197095 2019-01-25 23:37 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 731671 2019-01-23 22:12 ./PACKAGES.TXT +-rw-r--r-- 1 root root 731672 2019-01-26 04:24 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3634 2019-01-23 01:55 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -728,12 +728,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 2019-01-23 04:37 ./isolinux +drwxr-xr-x 3 root root 4096 2019-01-25 23:18 ./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 37084732 2019-01-23 04:37 ./isolinux/initrd.img +-rw-r--r-- 2 root root 37087248 2019-01-25 23:15 ./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 @@ -798,13 +798,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 2019-01-23 22:12 ./slackware64 --rw-r--r-- 1 root root 290132 2019-01-23 22:12 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-01-23 22:12 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 361417 2019-01-23 22:09 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3647033 2019-01-23 22:10 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-01-26 04:25 ./slackware64 +-rw-r--r-- 1 root root 290135 2019-01-26 04:25 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-01-26 04:25 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 361420 2019-01-26 04:22 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3642953 2019-01-26 04:23 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 28672 2019-01-23 22:09 ./slackware64/a +drwxr-xr-x 2 root root 28672 2019-01-26 04:22 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt -rw-r--r-- 1 root root 10820 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz -rw-r--r-- 1 root root 163 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz.asc @@ -1016,9 +1016,9 @@ drwxr-xr-x 2 root root 28672 2019-01-23 22:09 ./slackware64/a -rw-r--r-- 1 root root 374 2018-04-13 13:09 ./slackware64/a/minicom-2.7.1-x86_64-2.txt -rw-r--r-- 1 root root 296324 2018-04-13 13:09 ./slackware64/a/minicom-2.7.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:09 ./slackware64/a/minicom-2.7.1-x86_64-2.txz.asc --rw-r--r-- 1 root root 527 2019-01-23 21:54 ./slackware64/a/mkinitrd-1.4.11-x86_64-9.txt --rw-r--r-- 1 root root 582624 2019-01-23 21:54 ./slackware64/a/mkinitrd-1.4.11-x86_64-9.txz --rw-r--r-- 1 root root 163 2019-01-23 21:54 ./slackware64/a/mkinitrd-1.4.11-x86_64-9.txz.asc +-rw-r--r-- 1 root root 527 2019-01-26 04:07 ./slackware64/a/mkinitrd-1.4.11-x86_64-11.txt +-rw-r--r-- 1 root root 582912 2019-01-26 04:07 ./slackware64/a/mkinitrd-1.4.11-x86_64-11.txz +-rw-r--r-- 1 root root 163 2019-01-26 04:07 ./slackware64/a/mkinitrd-1.4.11-x86_64-11.txz.asc -rw-r--r-- 1 root root 668 2018-04-13 13:10 ./slackware64/a/mlocate-0.26-x86_64-2.txt -rw-r--r-- 1 root root 107812 2018-04-13 13:10 ./slackware64/a/mlocate-0.26-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:10 ./slackware64/a/mlocate-0.26-x86_64-2.txz.asc @@ -1401,7 +1401,7 @@ drwxr-xr-x 2 root root 20480 2019-01-23 22:09 ./slackware64/ap -rw-r--r-- 1 root root 506 2018-09-14 17:54 ./slackware64/ap/zsh-5.6.2-x86_64-1.txt -rw-r--r-- 1 root root 2973268 2018-09-14 17:54 ./slackware64/ap/zsh-5.6.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-09-14 17:54 ./slackware64/ap/zsh-5.6.2-x86_64-1.txz.asc -drwxr-xr-x 2 root root 16384 2019-01-23 22:09 ./slackware64/d +drwxr-xr-x 2 root root 16384 2019-01-25 22:37 ./slackware64/d -rw-r--r-- 1 root root 360 2019-01-19 18:51 ./slackware64/d/Cython-0.29.3-x86_64-1.txt -rw-r--r-- 1 root root 3072936 2019-01-19 18:51 ./slackware64/d/Cython-0.29.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-01-19 18:51 ./slackware64/d/Cython-0.29.3-x86_64-1.txz.asc @@ -1517,9 +1517,9 @@ drwxr-xr-x 2 root root 16384 2019-01-23 22:09 ./slackware64/d -rw-r--r-- 1 root root 659 2019-01-08 19:59 ./slackware64/d/mercurial-4.8.2-x86_64-1.txt -rw-r--r-- 1 root root 4026860 2019-01-08 19:59 ./slackware64/d/mercurial-4.8.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-01-08 19:59 ./slackware64/d/mercurial-4.8.2-x86_64-1.txz.asc --rw-r--r-- 1 root root 410 2018-12-10 20:22 ./slackware64/d/meson-0.49.0-x86_64-1.txt --rw-r--r-- 1 root root 609296 2018-12-10 20:22 ./slackware64/d/meson-0.49.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-12-10 20:22 ./slackware64/d/meson-0.49.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 410 2019-01-24 19:05 ./slackware64/d/meson-0.49.1-x86_64-1.txt +-rw-r--r-- 1 root root 610684 2019-01-24 19:05 ./slackware64/d/meson-0.49.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-24 19:05 ./slackware64/d/meson-0.49.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 339 2018-12-27 22:59 ./slackware64/d/nasm-2.14.02-x86_64-1.txt -rw-r--r-- 1 root root 390388 2018-12-27 22:59 ./slackware64/d/nasm-2.14.02-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-27 22:59 ./slackware64/d/nasm-2.14.02-x86_64-1.txz.asc @@ -3429,7 +3429,7 @@ drwxr-xr-x 2 root root 69632 2019-01-23 22:09 ./slackware64/l -rw-r--r-- 1 root root 463 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txt -rw-r--r-- 1 root root 385208 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2019-01-23 22:09 ./slackware64/n +drwxr-xr-x 2 root root 36864 2019-01-25 22:37 ./slackware64/n -rw-r--r-- 1 root root 357 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txt -rw-r--r-- 1 root root 1644036 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txz.asc @@ -3517,9 +3517,9 @@ drwxr-xr-x 2 root root 36864 2019-01-23 22:09 ./slackware64/n -rw-r--r-- 1 root root 598 2018-12-15 18:37 ./slackware64/n/gnupg2-2.2.12-x86_64-1.txt -rw-r--r-- 1 root root 2225688 2018-12-15 18:37 ./slackware64/n/gnupg2-2.2.12-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-15 18:37 ./slackware64/n/gnupg2-2.2.12-x86_64-1.txz.asc --rw-r--r-- 1 root root 492 2019-01-05 19:21 ./slackware64/n/gnutls-3.6.5-x86_64-2.txt --rw-r--r-- 1 root root 2617616 2019-01-05 19:21 ./slackware64/n/gnutls-3.6.5-x86_64-2.txz --rw-r--r-- 1 root root 163 2019-01-05 19:21 ./slackware64/n/gnutls-3.6.5-x86_64-2.txz.asc +-rw-r--r-- 1 root root 492 2019-01-25 18:57 ./slackware64/n/gnutls-3.6.6-x86_64-1.txt +-rw-r--r-- 1 root root 2636776 2019-01-25 18:57 ./slackware64/n/gnutls-3.6.6-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-25 18:57 ./slackware64/n/gnutls-3.6.6-x86_64-1.txz.asc -rw-r--r-- 1 root root 286 2018-10-29 18:51 ./slackware64/n/gpa-0.10.0-x86_64-1.txt -rw-r--r-- 1 root root 302692 2018-10-29 18:51 ./slackware64/n/gpa-0.10.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-10-29 18:51 ./slackware64/n/gpa-0.10.0-x86_64-1.txz.asc @@ -3909,7 +3909,7 @@ drwxr-xr-x 2 root root 4096 2018-11-24 20:50 ./slackware64/tcl -rw-r--r-- 1 root root 227 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txt -rw-r--r-- 1 root root 1771556 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2019-01-23 04:58 ./slackware64/x +drwxr-xr-x 2 root root 65536 2019-01-25 22:37 ./slackware64/x -rw-r--r-- 1 root root 257 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txt -rw-r--r-- 1 root root 5074404 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz.asc @@ -4446,9 +4446,9 @@ drwxr-xr-x 2 root root 65536 2019-01-23 04:58 ./slackware64/x -rw-r--r-- 1 root root 475 2018-11-08 01:04 ./slackware64/x/xdg-user-dirs-0.17-x86_64-1.txt -rw-r--r-- 1 root root 46148 2018-11-08 01:04 ./slackware64/x/xdg-user-dirs-0.17-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-08 01:04 ./slackware64/x/xdg-user-dirs-0.17-x86_64-1.txz.asc --rw-r--r-- 1 root root 548 2018-05-16 20:39 ./slackware64/x/xdg-utils-1.1.3-noarch-1.txt --rw-r--r-- 1 root root 63852 2018-05-16 20:39 ./slackware64/x/xdg-utils-1.1.3-noarch-1.txz --rw-r--r-- 1 root root 163 2018-05-16 20:39 ./slackware64/x/xdg-utils-1.1.3-noarch-1.txz.asc +-rw-r--r-- 1 root root 548 2019-01-25 19:02 ./slackware64/x/xdg-utils-1.1.3-noarch-2.txt +-rw-r--r-- 1 root root 63764 2019-01-25 19:02 ./slackware64/x/xdg-utils-1.1.3-noarch-2.txz +-rw-r--r-- 1 root root 163 2019-01-25 19:02 ./slackware64/x/xdg-utils-1.1.3-noarch-2.txz.asc -rw-r--r-- 1 root root 338 2018-04-13 06:05 ./slackware64/x/xditview-1.0.4-x86_64-2.txt -rw-r--r-- 1 root root 33496 2018-04-13 06:05 ./slackware64/x/xditview-1.0.4-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 06:05 ./slackware64/x/xditview-1.0.4-x86_64-2.txz.asc @@ -5007,11 +5007,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 2019-01-23 22:13 ./source --rw-r--r-- 1 root root 458923 2019-01-23 22:13 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-01-23 22:13 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 649596 2019-01-23 22:13 ./source/FILE_LIST --rw-r--r-- 1 root root 16698100 2019-01-23 22:13 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-01-26 04:26 ./source +-rw-r--r-- 1 root root 459006 2019-01-26 04:26 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-01-26 04:26 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 649697 2019-01-26 04:26 ./source/FILE_LIST +-rw-r--r-- 1 root root 16686463 2019-01-26 04:26 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 111 root root 4096 2019-01-23 20:57 ./source/a -rw-r--r-- 1 root root 877 2018-11-21 18:49 ./source/a/FTBFSlog @@ -5541,12 +5541,12 @@ drwxr-xr-x 2 root root 4096 2019-01-23 20:36 ./source/a/mkinitrd -rw-r--r-- 1 root root 29903 2009-12-18 05:10 ./source/a/mkinitrd/keymaps.tar.gz -rw-r--r-- 1 root root 26432 2018-06-03 02:30 ./source/a/mkinitrd/mkinitrd -rw-r--r-- 1 root root 8981 2018-04-18 18:49 ./source/a/mkinitrd/mkinitrd.8 --rwxr-xr-x 1 root root 5733 2019-01-23 20:36 ./source/a/mkinitrd/mkinitrd.SlackBuild +-rwxr-xr-x 1 root root 5734 2019-01-26 04:04 ./source/a/mkinitrd/mkinitrd.SlackBuild -rw-r--r-- 1 root root 7109 2018-04-18 18:46 ./source/a/mkinitrd/mkinitrd.conf.5 -rw-r--r-- 1 root root 529 2017-06-29 16:52 ./source/a/mkinitrd/mkinitrd.conf.sample -rw-r--r-- 1 root root 5624 2016-02-08 20:10 ./source/a/mkinitrd/mkinitrd_command_generator.8 --rw-r--r-- 1 root root 28382 2018-07-12 18:53 ./source/a/mkinitrd/mkinitrd_command_generator.sh --rw-r--r-- 1 root root 2173 2019-01-23 21:52 ./source/a/mkinitrd/setup.01.mkinitrd +-rw-r--r-- 1 root root 28487 2019-01-25 22:06 ./source/a/mkinitrd/mkinitrd_command_generator.sh +-rw-r--r-- 1 root root 3648 2019-01-26 04:06 ./source/a/mkinitrd/setup.01.mkinitrd -rw-r--r-- 1 root root 983 2018-02-27 06:13 ./source/a/mkinitrd/slack-desc drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/a/mlocate -rw-r--r-- 1 root root 388 2017-03-16 18:04 ./source/a/mlocate/doinst.sh.gz @@ -6650,8 +6650,8 @@ drwxr-xr-x 2 root root 4096 2019-01-08 19:58 ./source/d/mercurial -rwxr-xr-x 1 root root 4113 2018-07-04 20:29 ./source/d/mercurial/mercurial.SlackBuild -rw-r--r-- 1 root root 38 2017-12-02 19:13 ./source/d/mercurial/mercurial.url -rw-r--r-- 1 root root 1245 2018-02-27 06:13 ./source/d/mercurial/slack-desc -drwxr-xr-x 2 root root 4096 2018-12-10 20:22 ./source/d/meson --rw-r--r-- 1 root root 1040214 2018-12-09 20:05 ./source/d/meson/meson-0.49.0.tar.lz +drwxr-xr-x 2 root root 4096 2019-01-24 19:04 ./source/d/meson +-rw-r--r-- 1 root root 1041519 2019-01-23 17:15 ./source/d/meson/meson-0.49.1.tar.lz -rwxr-xr-x 1 root root 2771 2018-10-20 16:44 ./source/d/meson/meson.SlackBuild -rw-r--r-- 1 root root 36 2018-11-09 03:24 ./source/d/meson/meson.url -rw-r--r-- 1 root root 895 2018-02-27 06:13 ./source/d/meson/slack-desc @@ -6855,7 +6855,7 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:13 ./source/f -rw-r--r-- 1 root root 960 2018-02-27 06:13 ./source/f/slack-desc.linux-faqs -rw-r--r-- 1 root root 801 2018-02-27 06:13 ./source/f/slack-desc.linux-howtos drwxr-xr-x 3 root root 4096 2018-10-10 22:22 ./source/installer --rw-r--r-- 1 root root 30450 2019-01-22 22:42 ./source/installer/ChangeLog.txt +-rw-r--r-- 1 root root 30801 2019-01-25 23:09 ./source/installer/ChangeLog.txt -rw-r--r-- 1 root root 6849 2018-03-11 00:53 ./source/installer/README -rwxr-xr-x 1 root root 71109 2018-11-28 02:18 ./source/installer/build_installer.sh -rwxr-xr-x 1 root root 2244 2018-03-18 19:14 ./source/installer/installer.SlackBuild @@ -6876,17 +6876,17 @@ drwxr-xr-x 2 root root 4096 2018-06-20 21:07 ./source/installer/sources/d drwxr-xr-x 3 root root 4096 2013-03-11 21:15 ./source/installer/sources/efi.i586 drwxr-xr-x 3 root root 4096 2013-03-11 21:15 ./source/installer/sources/efi.i586/EFI drwxr-xr-x 2 root root 4096 2015-11-24 23:20 ./source/installer/sources/efi.i586/EFI/BOOT --rwxr-xr-x 1 root root 237749 2017-11-20 18:36 ./source/installer/sources/efi.i586/EFI/BOOT/BOOTX64.EFI +-rwxr-xr-x 1 root root 216219 2018-06-12 18:49 ./source/installer/sources/efi.i586/EFI/BOOT/BOOTX64.EFI -rwxr-xr-x 1 root root 803 2013-03-27 03:35 ./source/installer/sources/efi.i586/EFI/BOOT/elilo.conf -rwxr-xr-x 1 root root 577 2018-06-11 18:52 ./source/installer/sources/efi.i586/EFI/BOOT/message.txt drwxr-xr-x 3 root root 4096 2013-03-11 21:15 ./source/installer/sources/efi.x86_64 drwxr-xr-x 3 root root 4096 2013-03-11 21:15 ./source/installer/sources/efi.x86_64/EFI drwxr-xr-x 2 root root 4096 2018-03-11 02:36 ./source/installer/sources/efi.x86_64/EFI/BOOT --rwxr-xr-x 1 root root 237749 2017-11-20 18:36 ./source/installer/sources/efi.x86_64/EFI/BOOT/BOOTX64.EFI +-rwxr-xr-x 1 root root 238531 2018-06-12 19:01 ./source/installer/sources/efi.x86_64/EFI/BOOT/BOOTX64.EFI -rwxr-xr-x 1 root root 422 2013-03-27 03:35 ./source/installer/sources/efi.x86_64/EFI/BOOT/elilo.conf -rwxr-xr-x 1 root root 561 2018-04-18 05:03 ./source/installer/sources/efi.x86_64/EFI/BOOT/message.txt -drwxr-xr-x 2 root root 4096 2019-01-22 22:42 ./source/installer/sources/initrd --rw-r--r-- 1 root root 140141 2019-01-22 22:42 ./source/installer/sources/initrd/skeleton_initrd.tar.gz +drwxr-xr-x 2 root root 4096 2019-01-24 20:01 ./source/installer/sources/initrd +-rw-r--r-- 1 root root 140121 2019-01-24 20:01 ./source/installer/sources/initrd/skeleton_initrd.tar.gz -rw-r--r-- 1 root root 16894 2012-09-03 20:53 ./source/installer/usbimg2disk.sh drwxr-xr-x 4 root root 4096 2019-01-22 21:39 ./source/k -rwxr-xr-x 1 root root 7342 2018-03-15 18:04 ./source/k/build-all-kernels.sh @@ -10015,10 +10015,10 @@ drwxr-xr-x 2 root root 4096 2018-12-15 18:35 ./source/n/gnupg2 -rw-r--r-- 1 root root 4727560 2018-12-14 14:46 ./source/n/gnupg2/gnupg-2.2.12.tar.lz -rwxr-xr-x 1 root root 4251 2018-09-18 22:04 ./source/n/gnupg2/gnupg2.SlackBuild -rw-r--r-- 1 root root 1052 2018-08-27 17:38 ./source/n/gnupg2/slack-desc -drwxr-xr-x 2 root root 4096 2018-12-05 17:39 ./source/n/gnutls --rw-r--r-- 1 root root 8192888 2018-12-01 05:34 ./source/n/gnutls/gnutls-3.6.5.tar.xz --rw-r--r-- 1 root root 310 2018-12-01 05:34 ./source/n/gnutls/gnutls-3.6.5.tar.xz.sig --rwxr-xr-x 1 root root 4868 2019-01-05 18:58 ./source/n/gnutls/gnutls.SlackBuild +drwxr-xr-x 2 root root 4096 2019-01-25 18:53 ./source/n/gnutls +-rw-r--r-- 1 root root 8257612 2019-01-25 07:48 ./source/n/gnutls/gnutls-3.6.6.tar.xz +-rw-r--r-- 1 root root 310 2019-01-25 07:48 ./source/n/gnutls/gnutls-3.6.6.tar.xz.sig +-rwxr-xr-x 1 root root 4868 2019-01-25 18:53 ./source/n/gnutls/gnutls.SlackBuild -rw-r--r-- 1 root root 946 2018-02-27 06:13 ./source/n/gnutls/slack-desc drwxr-xr-x 2 root root 4096 2018-10-29 18:51 ./source/n/gpa -rw-r--r-- 1 root root 232 2012-07-18 19:35 ./source/n/gpa/doinst.sh.gz @@ -12203,11 +12203,12 @@ drwxr-xr-x 2 root root 4096 2018-11-08 01:03 ./source/x/xdg-user-dirs -rw-r--r-- 1 root root 936 2018-02-27 06:13 ./source/x/xdg-user-dirs/slack-desc -rw-r--r-- 1 root root 182776 2018-03-14 09:14 ./source/x/xdg-user-dirs/xdg-user-dirs-0.17.tar.xz -rwxr-xr-x 1 root root 3787 2018-11-08 01:03 ./source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild -drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/x/xdg-utils +drwxr-xr-x 2 root root 4096 2019-01-25 19:01 ./source/x/xdg-utils -rw-r--r-- 1 root root 1432 2011-01-20 23:46 ./source/x/xdg-utils/doinst.sh.gz -rw-r--r-- 1 root root 1005 2018-02-27 06:13 ./source/x/xdg-utils/slack-desc +-rw-r--r-- 1 root root 328 2019-01-25 19:01 ./source/x/xdg-utils/xdg-open.no.relative.paths.diff.gz -rw-r--r-- 1 root root 268718 2018-05-10 15:03 ./source/x/xdg-utils/xdg-utils-1.1.3.tar.lz --rwxr-xr-x 1 root root 3009 2018-09-18 22:04 ./source/x/xdg-utils/xdg-utils.SlackBuild +-rwxr-xr-x 1 root root 3117 2019-01-25 19:02 ./source/x/xdg-utils/xdg-utils.SlackBuild -rw-r--r-- 1 root root 94 2015-10-04 22:28 ./source/x/xdg-utils/xdg-utils.url drwxr-xr-x 2 root root 4096 2019-01-14 21:01 ./source/x/xterm -rw-r--r-- 1 root root 391 2019-01-01 20:06 ./source/x/xterm/doinst.sh.gz @@ -12456,7 +12457,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xap/seyon -rw-r--r-- 1 root root 713 1999-05-09 22:46 ./source/xap/seyon/seyon-2.20c.lsm -rw-r--r-- 1 root root 167487 1999-05-09 22:47 ./source/xap/seyon/seyon-2.20c.tar.gz -rwxr-xr-x 1 root root 4696 2018-04-23 17:20 ./source/xap/seyon/seyon.SlackBuild --rw-r--r-- 1 root root 36723 2005-01-03 22:32 ./source/xap/seyon/seyon_2.20c-16.diff.gz +-rw-r--r-- 1 root root 36723 2005-01-03 22:32 ./source/xap/seyon/seyon_2.20c-16.diff.gz -rw-r--r-- 1 root root 1055 2018-02-27 06:13 ./source/xap/seyon/slack-desc lrwxrwxrwx 1 root root 9 2009-08-23 23:36 ./source/xap/vim-gvim -> ../ap/vim drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/windowmaker @@ -12783,9 +12784,9 @@ drwxr-xr-x 4 root root 4096 2019-01-08 21:28 ./testing -rw-r--r-- 1 root root 224 2019-01-08 21:28 ./testing/PACKAGES.TXT drwxr-xr-x 2 root root 4096 2019-01-08 20:12 ./testing/packages drwxr-xr-x 2 root root 4096 2019-01-08 20:12 ./testing/source -drwxr-xr-x 2 root root 4096 2019-01-23 04:38 ./usb-and-pxe-installers +drwxr-xr-x 2 root root 4096 2019-01-25 23:18 ./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 47649792 2019-01-23 04:37 ./usb-and-pxe-installers/usbboot.img +-rw-r--r-- 1 root root 47653888 2019-01-25 23:16 ./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 3c2aee309..6167d7b0e 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1055,6 +1055,7 @@ gzip ./source/xap/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff gzip ./source/xap/electricsheep/electricsheep.mplayer.diff gzip ./source/installer/sources/initrd/etc/keymaps.tar gzip ./source/x/liberation-fonts-ttf/doinst.sh +gzip ./source/x/xdg-utils/xdg-open.no.relative.paths.diff gzip ./source/x/xdg-utils/doinst.sh gzip ./source/x/ttf-indic-fonts/doinst.sh gzip ./source/x/wqy-zenhei-font-ttf/wqy-zenhei.fix.fontconfig.warning.diff diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 38ea9485e..4e298baec 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mkinitrd VERSION=${VERSION:-1.4.11} BB=1.28.3 -BUILD=${BUILD:-9} +BUILD=${BUILD:-11} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh index d6d0d1a13..df6f24c9c 100644 --- a/source/a/mkinitrd/mkinitrd_command_generator.sh +++ b/source/a/mkinitrd/mkinitrd_command_generator.sh @@ -341,6 +341,10 @@ while [ ! -z "$1" ]; do shift ;; -k) + if [ "$2" = "" ]; then + echo "Error: -k requires a kernel version." + exit 1 + fi KVER=$2 shift 2 ;; diff --git a/source/a/mkinitrd/setup.01.mkinitrd b/source/a/mkinitrd/setup.01.mkinitrd index b8004470e..8bddb5c55 100644 --- a/source/a/mkinitrd/setup.01.mkinitrd +++ b/source/a/mkinitrd/setup.01.mkinitrd @@ -8,31 +8,62 @@ fi # Next, if boot/vmlinuz-generic is a symlink to a kernel, generate a ramdisk # using the modules for that kernel: -if [ -f $(readlink -f boot/vmlinuz-generic) ]; then - KERNEL_SYMLINK="boot/vmlinuz-generic" +KERNEL_SYMLINK="boot/vmlinuz-generic" +if [ -L $KERNEL_SYMLINK ]; then KERNEL_VERSION="$(readlink -f $KERNEL_SYMLINK | sed "s/-smp/_smp/g" | rev | cut -f 1 -d - | rev | sed "s/_smp/-smp/g")" -dialog --title "GENERATING INITIAL RAMDISK" --infobox \ - "Generating an initial ramdisk for use with the $KERNEL_VERSION generic \ + # Sanity check. Not sure how/why, but there are reports we can arrive here + # without a $KERNEL_VERSION. The only way I see how is if the symlink were + # pointing to file with a malformed name + # (i.e. not ${KERNEL_SYMLINK}-${KERNEL_VERSION}). + # If ${KERNEL_VERSION} is blank, we'll bail out here. + # Any information on known cases that might cause this would be appreciated. + if [ ! "$KERNEL_VERSION" = "" ]; then + dialog --title "GENERATING INITIAL RAMDISK" --infobox \ + "Generating an initial ramdisk for use with the $KERNEL_VERSION generic \ kernel. The initial ramdisk contains kernel modules needed to mount the \ root partition, and must be regenerated whenever the kernel is updated. To \ regenerate the initrd, select this setup script from within pkgtool, or run \ 'geninitrd' which will produce an initial ramdisk (/boot/initrd.gz) for the \ kernel pointed to by the /$KERNEL_SYMLINK symlink." 9 68 - chroot . /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL_VERSION | sed "s/-c -k/-k/g" | chroot . bash 1> /dev/null 2> /dev/null + chroot . /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL_VERSION | sed "s/-c -k/-k/g" | chroot . bash 1> /dev/null 2> /dev/null + else + dialog --title "INTERNAL ERROR" --msgbox \ + "An internal error was detected. Please report the following information: \n\ +KERNEL_SYMLINK = $KERNEL_SYMLINK \n\ +KERNEL_SYMLINK (points to) = $(readlink -f $KERNEL_SYMLINK) \n\ +KERNEL_VERSION (is blank) \n\ +ls -l \$KERNEL_SYMLINK: \n\ +$(ls -l $KERNEL_SYMLINK)" 0 0 + fi fi # If boot/vmlinuz-generic-smp is a symlink to a kernel, also include the # modules for that kernel: -if [ -f $(readlink -f boot/vmlinuz-generic-smp) ]; then - KERNEL_SYMLINK="boot/vmlinuz-generic-smp" +KERNEL_SYMLINK="boot/vmlinuz-generic-smp" +if [ -L $KERNEL_SYMLINK ]; then KERNEL_VERSION="$(readlink -f $KERNEL_SYMLINK | sed "s/-smp/_smp/g" | rev | cut -f 1 -d - | rev | sed "s/_smp/-smp/g")" -dialog --title "GENERATING INITIAL RAMDISK" --infobox \ - "Generating an initial ramdisk for use with the $KERNEL_VERSION generic \ + # Sanity check. Not sure how/why, but there are reports we can arrive here + # without a $KERNEL_VERSION. The only way I see how is if the symlink were + # pointing to file with a malformed name + # (i.e. not ${KERNEL_SYMLINK}-${KERNEL_VERSION}). + # If ${KERNEL_VERSION} is blank, we'll bail out here. + # Any information on known cases that might cause this would be appreciated. + if [ ! "$KERNEL_VERSION" = "" ]; then + dialog --title "GENERATING INITIAL RAMDISK" --infobox \ + "Generating an initial ramdisk for use with the $KERNEL_VERSION generic \ kernel. The initial ramdisk contains kernel modules needed to mount the \ root partition, and must be regenerated whenever the kernel is updated. To \ regenerate the initrd, select this setup script from within pkgtool, or run \ 'geninitrd' which will produce an initial ramdisk (/boot/initrd.gz) for the \ kernel pointed to by the /$KERNEL_SYMLINK symlink." 9 68 - chroot . /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL_VERSION | sed "s/-c -k/-k/g" | chroot . bash 1> /dev/null 2> /dev/null + chroot . /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL_VERSION | sed "s/-c -k/-k/g" | chroot . bash 1> /dev/null 2> /dev/null + else + dialog --title "INTERNAL ERROR" --msgbox \ + "An internal error was detected. Please report the following information: \n\ +KERNEL_SYMLINK = $KERNEL_SYMLINK \n\ +KERNEL_SYMLINK (points to) = $(readlink -f $KERNEL_SYMLINK) \n\ +KERNEL_VERSION (is blank) \n\ +ls -l \$KERNEL_SYMLINK: \n\ +$(ls -l $KERNEL_SYMLINK)" 0 0 + fi fi - diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index cc14f1412..fa87dcc76 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,11 @@ +Fri Jan 25 23:06:42 UTC 2019 + Updated the elilo bootloaders in /EFI/BOOT which were older versions + (possibly with the 8MB kernel size limit?) ++--------------------------+ +Thu Jan 24 20:01:25 UTC 2019 + SeTEFI: If the kernel doesn't detect efi, bail. + SeTEFI: Detect EFI partition using lsblk. Thanks to Didier Spaier. ++--------------------------+ Tue Jan 22 22:42:47 UTC 2019 Before running the CONFIGURE section, create bind mounts to /dev, /proc, and /sys. This is useful for chrooting and setting up boot loaders. diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTEFI b/source/installer/sources/initrd/usr/lib/setup/SeTEFI index 35ac5f9fa..bb00d1e52 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTEFI +++ b/source/installer/sources/initrd/usr/lib/setup/SeTEFI @@ -4,27 +4,31 @@ T_PX="`cat $TMP/SeTT_PX`" if [ ! -d $TMP ]; then mkdir -p $TMP fi + +# If the kernel does not support EFI, then we shouldn't be trying to mount an +# EFI partition. If we do, probably the only device found with an EFI structure +# will be the installer, which we don't want added to /etc/fstab. +if [ ! -d /sys/firmware/efi ]; then + exit +fi + rm -f $TMP/SeTefipartitions touch $TMP/SeTefipartitions # Scan for EFI partitions: -# We accept at most 10 NVMe controllers, each controlling at most 4 SSDs -for drive in sda sdb sdc sdd sde sdf sdg sdh sdi sdj sdk sdl sdm sdn sdo sdp \ - mmcblk0 mmcblk1 mmcblk2 mmcblk3 mmcblk4 mmcblk5 mmcblk6 mmcblk7 mmcblk8 mmcblk9 \ - nvme0n1 nvme1n1 nvme2n1 nvme3n1 nvme4n1 nvme5n1 nvme6n1 nvme7n1 nvme8n1 nvme9n1 \ - nvme0n2 nvme1n2 nvme2n2 nvme3n2 nvme4n2 nvme5n2 nvme6n2 nvme7n2 nvme8n2 nvme9n2 \ - nvme0n3 nvme1n3 nvme2n3 nvme3n3 nvme4n3 nvme5n3 nvme6n3 nvme7n3 nvme8n3 nvme9n3 \ - nvme0n4 nvme1n4 nvme2n4 nvme3n4 nvme4n4 nvme5n4 nvme6n4 nvme7n4 nvme8n4 nvme9n4 ; do - gdisk -l /dev/$drive 2> /dev/null | grep -w EF00 | while read efisp ; do - p="" - echo $drive| grep -q nvme && p="p" - echo /dev/$drive$p$(expr $(echo "$efisp" | cut -b 1-4)) >> $TMP/SeTefipartitions - done -done +# The UEFI specification states that an EFI System partition should have +# a GUID of C12A7328-F81F-11D2-BA4B-00A0C93EC93B for a GPT disk layout. +# In case of a MBR disk layout instead, an ESP should have an OS type of +# 0xEF. lsblk writes these values in the same field: PARTTYPE. +ESPGUID=C12A7328-F81F-11D2-BA4B-00A0C93EC93B +OSTYPE=0xEF +lsblk -l -o parttype,name | \ +grep -i -F -e "$ESPGUID" -e "$OSTYPE" | \ +sed "s,[^ ]* ,/dev/," > $TMP/SeTefipartitions -if [ "$(cat $TMP/SeTefipartitions)" = "" ]; then # No EFI partitions +if [ ! -s $TMP/SeTefipartitions ]; then # No EFI partitions rm -f $TMP/SeTefipartitions - exit + exit fi # Initially, we will just take the first EFI partition found, which diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild index 40e523c25..2a87b9698 100755 --- a/source/n/gnutls/gnutls.SlackBuild +++ b/source/n/gnutls/gnutls.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gnutls VERSION=${VERSION:-$(echo gnutls-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/xdg-utils/xdg-open.no.relative.paths.diff b/source/x/xdg-utils/xdg-open.no.relative.paths.diff new file mode 100644 index 000000000..f28308eeb --- /dev/null +++ b/source/x/xdg-utils/xdg-open.no.relative.paths.diff @@ -0,0 +1,15 @@ +--- ./scripts/xdg-open.in.orig 2018-05-10 10:02:31.000000000 -0500 ++++ ./scripts/xdg-open.in 2019-01-25 13:01:17.492733618 -0600 +@@ -453,12 +453,6 @@ + # pcmanfm only knows how to handle file:// urls and filepaths, it seems. + if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then + local file="$(file_url_to_path "$1")" +- +- # handle relative paths +- if ! echo "$file" | grep -q ^/; then +- file="$(pwd)/$file" +- fi +- + pcmanfm "$file" + else + open_generic "$1" diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild index c15d398ec..060fbb536 100755 --- a/source/x/xdg-utils/xdg-utils.SlackBuild +++ b/source/x/xdg-utils/xdg-utils.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=xdg-utils VERSION=1.1.3 PKG_VERSION=${VERSION/-/_} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # 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 @@ -54,6 +54,9 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 +# Fix xdg-open usage in LXDE: +zcat $CWD/xdg-open.no.relative.paths.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -- cgit v1.2.3