From 970784a8a8c9a4f10fcc9014c5d51643d021ff82 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 8 Feb 2021 05:13:26 +0000 Subject: Mon Feb 8 05:13:26 UTC 2021 a/aaa_elflibs-15.0-x86_64-30.txz: Removed. Renamed to aaa_libraries. a/aaa_glibc-solibs-2.32-x86_64-2.txz: Added. This package has been renamed from glibc-solibs, which helps avoid trouble if someone upgrades using "upgradepkg --install-new */*.txz" by upgrading this package before aaa_libraries. Otherwise, if aaa_libraries is upgraded first any libraries in it that are linked against a newer version of glibc than the one installed on the system would refuse to load. a/aaa_libraries-15.0-x86_64-1.txz: Added. This package has been renamed from aaa_elflibs to insure that it will come after aaa_glibc-solibs when upgraded in alphabetical order. Upgraded: libcap.so.2.48, libelf-0.183.so, libglib-2.0.so.0.6600.6, libgmodule-2.0.so.0.6600.6, libgobject-2.0.so.0.6600.6, libgthread-2.0.so.0.6600.6. Added: libtirpc.so.3.0.0. a/btrfs-progs-5.10.1-x86_64-1.txz: Upgraded. a/glibc-solibs-2.32-x86_64-1.txz: Removed. Renamed to aaa_glibc-solibs. a/kernel-generic-5.10.14-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.14-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.14-x86_64-1.txz: Upgraded. ap/slackpkg-15.0-noarch-1.txz: Upgraded. These are some of the important changes (see the ChangeLog for more): Note that this slackpkg release contains a backwards-incompatible change to the blacklisting syntax (e.g. glibc ---> glibc-*). This changes the prior behavior of the blacklist function; previously, adding "glibc" to the blacklist would cause glibc, glibc-profile, glibc-zoneinfo, et al to be ignored by slackpkg. The new behavior is that *only* the glibc package is ignored. If you want to blacklist all packages whose names begin with glibc, you would need to add "glibc.*" to the blacklist now. Also note that any special characters, e.g. "+", will need to be escaped in the blacklist file. To blacklist entire package sets, a trailing slash is now required: e.g. kde/ Another backwards-incompatibility warning: check-updates will now return 1 if there are updates available - this will make it easier to use this feature with cron (thanks to Peter Hyman). Added support for Slackware-AArch64 (thanks to Stuart Winter). Added aaa_glibc-solibs and aaa_libraries to the "do these first" routine. Thanks to Robby Workman for the new slackpkg release! ap/soma-3.3.7-noarch-1.txz: Upgraded. Thanks to David Woodfall. ap/xorriso-1.5.4.pl02-x86_64-1.txz: Upgraded. d/help2man-1.48.1-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.14-x86-1.txz: Upgraded. k/kernel-source-5.10.14-noarch-1.txz: Upgraded. l/elfutils-0.183-x86_64-1.txz: Upgraded. l/glibc-2.32-x86_64-2.txz: Rebuilt. l/glibc-i18n-2.32-x86_64-2.txz: Rebuilt. l/glibc-profile-2.32-x86_64-2.txz: Rebuilt. l/lcms2-2.12-x86_64-1.txz: Upgraded. l/libburn-1.5.4-x86_64-1.txz: Upgraded. x/xf86-input-wacom-0.40.0-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/ap/slackpkg/files/slackpkg | 49 ++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 21 deletions(-) (limited to 'source/ap/slackpkg/files/slackpkg') diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg index 67864930c..49a123764 100644 --- a/source/ap/slackpkg/files/slackpkg +++ b/source/ap/slackpkg/files/slackpkg @@ -178,6 +178,14 @@ while [ -n "$1" ] ; do ONLY_NEW_DOTNEW=off shift ;; + -orig_backups=on) + ORIG_BACKUPS=on + shift + ;; + -orig_backups=off) + ORIG_BACKUPS=off + shift + ;; -use_includes=on) USE_INCLUDES=on shift @@ -206,7 +214,7 @@ while [ -n "$1" ] ; do SOURCE=$(echo $1 | cut -f2 -d=) shift ;; - install|reinstall|upgrade|remove|blacklist|download) + install|reinstall|upgrade|remove|download) CMD=$1 shift if [ -n "$1" ]; then @@ -238,7 +246,7 @@ while [ -n "$1" ] ; do shift fi ;; - install-new|upgrade-all|clean-system|new-config|check-updates|help) + install-new|upgrade-all|clean-system|new-config|check-updates|show-changelog|help) CMD=$1 shift if [ -n "$1" ]; then @@ -310,11 +318,22 @@ case "$CMD" in full_usage ;; check-updates) + # output to stdout if no change, or stderr if changes. Will cause + # cron jobs to notify system admin if checkchangelog 1>/dev/null 2>/dev/null ; then - echo "No updated packages since last check." + echo "Slackpkg: No updated packages since last check." + else + echo "Slackpkg: Updated packages are available since last check." >&2 + fi + ;; + show-changelog) + # display changelog and exit + if [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then + $MORECMD ${ROOT}/${WORKDIR}/ChangeLog.txt else - echo "Updated packages are available since last check." + echo "ChangeLog.txt file not found. Aborting" fi + POSTINST=off ;; update) # If you are using "slackpkg update gpg" OR the system @@ -431,7 +450,7 @@ case "$CMD" in cleanup exit 0 fi - for i in pkgtools glibc-solibs aaa_elflibs readline sed; do + for i in pkgtools aaa_glibc-solibs glibc-solibs aaa_libraries aaa_elflibs readline sed; do FOUND="" FOUND=$(echo $SHOWLIST | tr -s ' ' "\n" | grep "${i}-[0-9]") if [ "$FOUND" != "" ]; then @@ -461,20 +480,8 @@ case "$CMD" in grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD cleanup fi - - makelist ${INPUTLIST} - for i in $LIST; do - BASENAME=$(cutpkg $i) - BLACKLIST="$BLACKLIST $BASENAME" - done - BLACKLIST=$(echo $BLACKLIST | tr ' ' "\n") - if [ "$BLACKLIST" = "" ]; then - echo -e "No packages match the pattern." - cleanup - else - showlist "$BLACKLIST" $CMD - fi - + + # As of 15.0, this function just runs /bin/false and exits with a comment blacklist_pkg ;; file-search) @@ -586,11 +593,11 @@ esac # # Executes the post-install. This is the default # Before runs post-install, check if the slackpkg option is -# remove, search, update, blacklist, info or clean-system. +# remove, search, update, info or clean-system. # That options don't change configurations files and, if # someone remove the kernel, i hope he knows what is doing. # -for i in check-updates remove search file-search update blacklist info \ +for i in check-updates remove search file-search update info \ clean-system download generate-template remove-template; do if [ "$CMD" = "$i" ]; then POSTINST=off -- cgit v1.2.3-65-gdbad