diff options
Diffstat (limited to '')
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg | 49 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg.8 | 27 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg.conf.5 | 18 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg.conf.new | 38 |
4 files changed, 87 insertions, 45 deletions
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 diff --git a/source/ap/slackpkg/files/slackpkg.8 b/source/ap/slackpkg/files/slackpkg.8 index 4ec901a41..b1baa45d3 100644 --- a/source/ap/slackpkg/files/slackpkg.8 +++ b/source/ap/slackpkg/files/slackpkg.8 @@ -6,18 +6,13 @@ .SH SYNOPSIS .B slackpkg .B [OPTIONS] -.B {install|remove|search|upgrade|reinstall|blacklist} +.B {install|remove|search|file-search|download|upgrade|reinstall|blacklist} .BI { PATTERN | FILE } .B slackpkg [OPTIONS] {clean-system|upgrade-all|install-new} .B slackpkg .B [OPTIONS] -.B {search|file-search} -.BI { PATTERN | FILE } - -.B slackpkg -.B [OPTIONS] .B {generate-template|install-template|remove-template} .I TEMPLATENAME @@ -26,7 +21,7 @@ .B slackpkg [OPTIONS] update [gpg] -.B slackpkg [OPTIONS] {new-config|check-updates} +.B slackpkg [OPTIONS] {new-config|check-updates|show-changelog} .B slackpkg [OPTIONS] help @@ -154,6 +149,11 @@ Verify if there is any update to ChangeLog.txt. This is good to be used from cron to alert the sysadmin about updates. .TP 5 +.B show-changelog +.br +Display Slackware ChangeLog.txt file and exit. + +.TP 5 .B file-search .br You can search the official Slackware packages for any file in the Slackware @@ -166,6 +166,12 @@ distribution. Do you need a strange library? Use file-search to find it. All packages with matching "filename" will be shown, thus you can see whether the packages are installed or not; if not, you can download and install them with other slackpkg actions. +Multiple filenames may be requested for searching by separating them with +space; those fragments will be ORed; +still, "filename" must be one argument; quotes and/or escapes are at your +discretion. +See also +.BR CAVEATS . .TP 5 .B search @@ -301,6 +307,13 @@ careful, this can put your machine in an unusable state. The "include" handling can be activated/deactivated in slackpkg.conf or with the appropriate option in command-line. +.SH CAVEATS +Long story short \(em spaces in filenames (of "file-search" action) are not +supported. +If you happen to be looking for a filename-with-space, you are safe to use the +left-most part up to the space (in that the right-most part after the space +will be ignored anyway (at best) or yield noise (at worst)). + .SH FILES .TP 5 .B /etc/slackpkg/mirrors diff --git a/source/ap/slackpkg/files/slackpkg.conf.5 b/source/ap/slackpkg/files/slackpkg.conf.5 index 5af259a84..529bfba71 100644 --- a/source/ap/slackpkg/files/slackpkg.conf.5 +++ b/source/ap/slackpkg/files/slackpkg.conf.5 @@ -38,6 +38,7 @@ value using "uname -m". The valid values are: .ds title MACHINE\t\tVALID ARCH VALUES .ds arm ARM\t\t\tarm +.ds aarch64 AArch64\t\taarch64 .ds x86 x86 (32bits)\ti386, i486, i586 and i686 .ds x86_64 x86 (64bits)\tx86_64 .ds ppc PowerPC\t\tpowerpc @@ -47,6 +48,8 @@ value using "uname -m". The valid values are: .br \*[arm] .br +\*[aarch64] +.br \*[x86] .br \*[x86_64] @@ -211,6 +214,21 @@ is "off". Only change this if you know what are you doing... From command line, you can use -only_new_dotnew=value. .TP 5 +.B ORIG_BACKUPS +.br +During integration of .new files during the post installation phase, original +files are backed up to a file name with a .orig extension. To prevent this, +set this option to "off" and note that you will no longer have a copy of the +content of the file prior to it being replaced by the .new version. + +The default value of +.B ORIG_BACKUPS +is "on". Only change this if you are sure you don't want backups of +overwritten files. +.br +From the command line, you can use -orig_backups=value. + +.TP 5 .B ONOFF .br The diff --git a/source/ap/slackpkg/files/slackpkg.conf.new b/source/ap/slackpkg/files/slackpkg.conf.new index 9eae0ab2a..fb6ae1ddc 100644 --- a/source/ap/slackpkg/files/slackpkg.conf.new +++ b/source/ap/slackpkg/files/slackpkg.conf.new @@ -1,9 +1,9 @@ # -# slackpkg.conf - Configuration for SlackPkg -# v2.8 +# /etc/slackpkg/slackpkg.conf +# Configuration for SlackPkg +# v15.0 # -# # SlackPkg - An Automated packaging tool for Slackware Linux # Copyright (C) 2003-2011 Roberto F. Batista, Evaldo Gardenali # @@ -24,21 +24,21 @@ # Project Page: http://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br -# # For configuration options that have only two states, possible values are # either "on" or "off" -# Remember, the only official Slackware ports are x86, s390 and arm, and -# slackpkg developers don't have s390 boxes for testing. If you are -# testing/using other architectures and have suggestions or patches, -# please let me know (piterpunk@slackware.com) +# Remember, the only official Slackware ports are x86, s390, arm, and aarch64, +# and slackpkg developers don't have s390 boxes for testing. If you are +# testing/using other architectures and have suggestions or patches, please +# let us know (email rworkman@slackware.com) # # Select the architecture of your system. Valid values are: # i#86 (where # is 3, 4, 5 or 6) # x86_64 # s390 # arm* (* can be v4, v5tejl, and other ARM versions) +# aarch64 # powerpc # # The line is commented because slackpkg will try to find your @@ -64,10 +64,10 @@ # as needed #SLACKKEY="Slackware Linux Project <security@slackware.com>" -# Downloaded files will be in directory below: +# Downloaded files will be in the TEMP directory: TEMP=/var/cache/packages -# Package lists, file lists, and others will be at WORKDIR: +# Package lists, file lists, and others will be stored in WORKDIR: WORKDIR=/var/lib/slackpkg # Special options for wget (default is WGETFLAGS="--passive-ftp") @@ -85,8 +85,8 @@ CHECKMD5=on CHECKGPG=on # If CHECKSIZE is "on", the system will check if we have sufficient disk -# space to install selected package. This make upgrade/install safer, but slow -# upgrade/install process. +# space to install selected package. This make upgrade/install safer, but +# will also slow down the upgrade/install process. CHECKSIZE=off # PRIORITY sets the download priority. slackpkg will try to found the @@ -101,14 +101,18 @@ PRIORITY=( patches %PKGMAIN extra pasture testing ) # prompts you for what it should do. Default=on POSTINST=on -# Post-installation features, by default, search all of /etc for .new files. -# This is the safe option: with it, you won't have any unmerged .new files -# to cause problems. Even so, some people prefer that only the .new files -# installed by the current slackpkg session be checked. -# If this is your case, change ONLY_NEW_DOTNEW to "on". +# Post-installation features, by default, search all of /etc and a few other +# predefined locations for .new files. This is the safe option: with it, +# you won't have any unmerged .new files to cause problems. Even so, some +# people prefer that only the .new files installed by the current slackpkg +# session be checked. If this is your case, change ONLY_NEW_DOTNEW to "on". # Default=off ONLY_NEW_DOTNEW=off +# Whether to backup files overwritten by their .new counterparts with a +# .orig extension. +ORIG_BACKUPS=on + # The ONOFF variable sets the initial behavior of the dialog interface. # If you set this to "on" then all packages will be selected by default. # If you prefer the opposite option (all unchecked), then set this to "off". |