diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-31 04:55:33 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:57:37 +0200 |
commit | 8c9271e25c83e23cce857e3d79b47280b88a5ec4 (patch) | |
tree | 36ad9a121b5116b4c99aef2e9ef1ea67e8040991 /source/ap/slackpkg/files/slackpkg | |
parent | 646a5c1cbfd95873950a87b5f75d52073a967023 (diff) | |
download | current-8c9271e25c83e23cce857e3d79b47280b88a5ec4.tar.gz current-8c9271e25c83e23cce857e3d79b47280b88a5ec4.tar.xz |
Thu May 31 04:55:33 UTC 201820180531045533
a/kernel-generic-4.14.47-x86_64-1.txz: Upgraded.
a/kernel-huge-4.14.47-x86_64-1.txz: Upgraded.
SCSI_DPT_I2O m -> y
SCSI_ISCI m -> y (thanks to wael_h)
a/kernel-modules-4.14.47-x86_64-1.txz: Upgraded.
a/pkgtools-15.0-noarch-14.txz: Rebuilt.
installpkg: rarely, an uncompressed size that's not quite to the next level
(e.g., 1020K) will exceed the expected length and cause a --terse line to
be one character longer than --terselength. Chop lines to --terselength
before outputting them. The trailing ']' might be dropped, but no big deal.
ap/slackpkg-2.83.0-noarch-1.txz: Upgraded.
Release 2.83.0; thanks to orbea, Didier Spaier, burdi01, David Allen,
Eduard Rozenberg, and Stuart Winter for various fixes and enhancements.
Allow using vimdiff to compare .new and original files
Numerous fixups for alternate $ROOT
.new config files are sorted so that display order should be consistent
among multiple machines
Abort operation if system date is near epoch (mostly relevant for ARM
machines and others with no RTC)
Update Slackware ARM gpg key
Update Slackware ARM mirror list
No longer offer to run lilo - simply advise user that the kernel image has
changed and give advice, but also require a keypress to (hopefully) confirm
that the message was actually read
mandoc lint fixes to slackpkg.8
Warn user if a -current mirror is selected (but only warn once)
d/git-2.17.1-x86_64-1.txz: Upgraded.
d/kernel-headers-4.14.47-x86-1.txz: Upgraded.
d/rust-1.26.1-x86_64-1.txz: Upgraded.
k/kernel-source-4.14.47-noarch-1.txz: Upgraded.
l/fftw-3.3.8-x86_64-1.txz: Upgraded.
l/imagemagick-6.9.9_48-x86_64-1.txz: Upgraded.
n/network-scripts-15.0-noarch-8.txz: Rebuilt.
Allow setting an interface in promiscuous mode; this is needed for networking
to function properly in containers
Fixup setting of IPALIASES (allow non /32 masks; not only is the /32 mask not
required and even undesirable in some cases, this makes ipv6 support easier
to integrate (and Darren is working on that as well)
Thanks to Darren Austin.
n/stunnel-5.46-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-2.txz: Rebuilt.
Fixed empty logrotate file.
x/xorg-server-1.20.0-x86_64-2.txz: Rebuilt.
Patched to fix nouveau segfault. Thanks to Rod3775 for the patch.
x/xorg-server-xephyr-1.20.0-x86_64-2.txz: Rebuilt.
x/xorg-server-xnest-1.20.0-x86_64-2.txz: Rebuilt.
x/xorg-server-xvfb-1.20.0-x86_64-2.txz: Rebuilt.
xap/network-manager-applet-1.8.12-x86_64-2.txz: Rebuilt.
Patched crash bug. Thanks to gmgf.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap/slackpkg/files/slackpkg')
-rw-r--r-- | source/ap/slackpkg/files/slackpkg | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg index 4fcdd61ac..67864930c 100644 --- a/source/ap/slackpkg/files/slackpkg +++ b/source/ap/slackpkg/files/slackpkg @@ -22,6 +22,23 @@ # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br # +# Ensure that we're not at the epoch. slackpkg breaks with GPG checks when +# the date is so far in the past: +if [ $( date +%s ) -le 1437841588 ]; then +cat <<"EOF" +Error: Your system date is wrong. slackpkg requires that the date be correct +so that the package signatures can be verified. + +The date may be incorrect because you have a system such as a Raspberry Pi that +does does not have an RTC (Real Time Clock), or that the correct date was unable +to be read from the RTC due to a driver bug, or a missing driver. + +You may wish to set up NTP on your system: +http://docs.slackware.com/howtos:network_services:ntp + +EOF + exit 1 +fi #======================================================================== # @@ -30,22 +47,36 @@ # # CONF = configuration directory -# SOURCE = A mirror of Slackware. Source can be sett by editing $CONF/mirrors +# SOURCE = A mirror of Slackware. Source can be set by editing $CONF/mirrors # VERSION=@VERSION@ PATH=/bin:/usr/bin:/sbin:/usr/sbin SLACKWARE_VERSION=$(cat /etc/slackware-version | cut -f2 -d\ ) CONF=${CONF:-/etc/slackpkg} -SOURCE=$(sed -e 's/^[[:blank:]]*//' $CONF/mirrors | grep -m1 -e "^\([a-z]\)") +SOURCE=$(sed -n ' + # Remove leading and trailing blanks + s/^[[:blank:]]*// + s/[[:blank:]]*$// + # Only one token is allowed per line + /[[:blank:]]/d + # A single solidus should end the URI + s,[/]*$,/, + # Print the lines beginning with one of the URI schemes we look for + \@^file://@p + \@^cdrom://@p + \@^local://@p + \@^https\{0,1\}://@p + \@^ftps\{0,1\}://@p' $CONF/mirrors) . $CONF/slackpkg.conf ERROR="" # Set temporary directory # -TMPDIR=$(mktemp -p /tmp -d slackpkg.XXXXXX 2>/dev/null) +mkdir -p ${ROOT}/tmp +TMPDIR=$(mktemp -p ${ROOT}/tmp -d slackpkg.XXXXXX 2>/dev/null) if [ $? -ne 0 ]; then - TMPDIR="/tmp/slackpkg.${RANDOM}" - mkdir -m 700 $TMPDIR || TMPDIR="FAILED" + TMPDIR="${ROOT}/tmp/slackpkg.${RANDOM}" + mkdir -p -m 700 $TMPDIR || TMPDIR="FAILED" fi # @@ -485,7 +516,7 @@ case "$CMD" in if ( found != 1 ) { print \"No packages found! Try:\n\n\tslackpkg search $PATTERN\n\nand choose one (and ONLY one package).\n\" } - }" ${WORKDIR}/PACKAGES.TXT 2>/dev/null + }" ${ROOT}/${WORKDIR}/PACKAGES.TXT 2>/dev/null ;; new-config) POSTINST=on |