September 2018 - Pacman-contrib - lists.archlinux.org

[PATCH] paccache: add --age-atime and --age-mtime options
by wisp3rwind 23 Sep '18

23 Sep '18

--- I would feel a lot more confident about using the paccache systemd service if it kept packages based on age instead of just the few most recent. This patch adds the functionality to skip candidates that are not older (in terms of atime or mtime) than some specified age. It seems to work, but I'm not exactly a bash expert, so please review with care. I'd appreciate if this could be merged! doc/paccache.8.txt | 5 ++++ src/paccache.sh.in | 58 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/doc/paccache.8.txt b/doc/paccache.8.txt index db81283..c9e3807 100644 --- a/doc/paccache.8.txt +++ b/doc/paccache.8.txt @@ -38,6 +38,11 @@ Options Scan for packages for a specific architecture. Default is to scan for all architectures. +*\--age-atime <age>*:: +*\--age-mtime <age>*:: + Only consider packages for removal with atime respectively mtime older than + specified. The age can be given as '10d', '1m', '1y', '1y1m' etc. + *-c, \--cachedir <dir>*:: Specify a different cache directory. This option can be used more than once. Default is to use the cache directory configured in 'pacman.conf'. diff --git a/src/paccache.sh.in b/src/paccache.sh.in index 012ba9f..8ee5792 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -27,6 +27,7 @@ declare -r myver='@PACKAGE_VERSION@' declare -a cachedirs=() candidates=() cmdopts=() whitelist=() blacklist=() declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 +declare -i age_atime=0 age_mtime=0 declare delim=$'\n' keep=3 movedir= scanarch= QUIET=0 @@ -40,6 +41,29 @@ die() { exit 1 } +# Parses the age --age-atime and --age-mtime arguments +parse_age() { + declare -i age=0 + if [[ $2 =~ ^[[:space:]]*([0-9]+[dmy][[:space:]]*)+$ ]]; then + # Add spaces to facilitate splitting + temp=${2//d/d } + temp=${temp//m/m } + temp=${temp//y/y } + read -a temp <<< "${temp[*]}" + for a in ${temp[@]}; do + num=${a:0: -1} + case ${a: -1} in + d) age=$(( age + num )) ;; + m) age=$(( age + num * 30 )) ;; + y) age=$(( age + num * 365 )) ;; + esac + done + else + die "argument '%s' to option '%s' must be of the form '([0-9]+[dmy])+'" "$2" "$1" + fi + echo $(( age * 24 * 60 * 60 )) +} + # reads a list of files on stdin and prints out deletion candidates pkgfilter() { # there's whitelist and blacklist parameters passed to this @@ -174,6 +198,10 @@ Usage: ${myname} <operation> [options] [targets...] -r, --remove remove candidate packages. Options: + --age-atime <age> + --age-mtime <age> keep packages with an atime/mtime that is not at least + <age> ago, where <age> is given as '10d', '1m', '1y', + '1y1m' etc. -a, --arch <arch> scan for "arch" (default: all architectures). -c, --cachedir <dir> scan "dir" for packages. can be used more than once. (default: read from @sysconfdir@/pacman.conf). @@ -200,7 +228,8 @@ version() { OPT_SHORT=':a:c:dfhi:k:m:qrsuVvz' OPT_LONG=('arch:' 'cachedir:' 'dryrun' 'force' 'help' 'ignore:' 'keep:' 'move' - 'nocolor' 'quiet' 'remove' 'uninstalled' 'version' 'verbose' 'null') + 'nocolor' 'quiet' 'remove' 'uninstalled' 'version' 'verbose' 'null' + 'age-atime:' 'age-mtime:') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 @@ -210,6 +239,18 @@ unset OPT_SHORT OPT_LONG OPTRET while :; do case $1 in + --age-atime) + age_atime=$(parse_age "$1" "$2") + if (( $? )); then + exit 1 + fi + shift ;; + --age-mtime) + age_mtime=$(parse_age "$1" "$2") + if (( $? )); then + exit 1 + fi + shift ;; -a|--arch) scanarch=$2 shift ;; @@ -319,6 +360,21 @@ for cachedir in "${cachedirs[@]}"; do popd &>/dev/null done +# remove any candidates that are not old enough yet +if (( $age_atime || $age_mtime )); then + currtime=$(date +%s) + for cand in "${candidates[@]}"; do + IFS=';' read -d '' -a temp <<< $(stat --format '%X;%Y' "$cand") + if (( ( $(( $currtime - ${temp[0]} )) > $age_atime ) && \ + ( $(( $currtime - ${temp[1]} )) > $age_mtime ) \ + )); then + candtemp+=("$cand") + fi + done + candidates=("${candtemp[@]}") + unset candtemp +fi + if (( ! ${#candidates[*]} )); then msg 'no candidate packages found for pruning' exit 0 -- 2.19.0

3 3

[PATCH] doc: Add man page for checkupdates
by Jelle van der Waa 22 Sep '18

22 Sep '18

Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- doc/Makefile.am | 4 ++++ doc/checkupdates.8.txt | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 doc/checkupdates.8.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index 65bc4f5..3b8452a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,11 +4,13 @@ # man_MANS if --enable-asciidoc and/or --enable-doxygen are used. ASCIIDOC_MANS = \ + checkupdates.8 \ paccache.8 \ pacdiff.8 \ pactree.8 HTML_MANPAGES = \ + checkupdates.8.html \ paccache.8.html \ pacdiff.8.html \ pactree.8.html @@ -23,6 +25,7 @@ HTML_DOCS = \ EXTRA_DIST = \ asciidoc.conf \ asciidoc-override.css \ + checkupdates.8.txt \ paccache.8.txt \ pacdiff.8.txt \ pactree.8.txt \ @@ -100,6 +103,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am %.3.html: ASCIIDOC_OPTS += -d manpage # Dependency rules +checkupdates.8 checkupdates.8.html: checkupdates.8.txt paccache.8 paccache.8.html: paccache.8.txt pacdiff.8 pacdiff.8.html: pacdiff.8.txt pactree.8 pactree.8.html: pactree.8.txt diff --git a/doc/checkupdates.8.txt b/doc/checkupdates.8.txt new file mode 100644 index 0000000..337e608 --- /dev/null +++ b/doc/checkupdates.8.txt @@ -0,0 +1,37 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +checkupdates(8) +============= + +Name +---- +checkupdates - safely print a list of pending updates + + +Synopsis +-------- +'checkupdates' + + +Description +----------- +Checks for pending updates using a separate Pacman database located in +*`TMPDIR`* if *`CHECKUPDATES_DB`* is not set and outputs a list of updates with the +old and new version. + + +Environment +----------- +*CHECKUPDATES_DB*:: + Override the default update db location. + +*TMPDIR*:: + Overrides the default '/tmp' temporary directory. + + +See Also +-------- +linkman:pacman[8], linkman:pacman.conf[5] + +include::footer.txt[] -- 2.19.0

1 0

[PATCH] Move paccache.service to gitignore in src
by Michael Straube 18 Sep '18

18 Sep '18

For consistency move paccache.service to gitignore in the src directory. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- .gitignore | 1 - src/.gitignore | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1d6e802..204eb3e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ depcomp install-sh missing test-driver -src/paccache.service diff --git a/src/.gitignore b/src/.gitignore index 894f5c3..38264e4 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,6 +1,7 @@ .deps/ checkupdates paccache +paccache.service pacdiff paclist paclog-pkglist -- 2.19.0

1 0

[GIT] branch master updated (f4954c2 -> a22070a)
by Johannes Löthberg 16 Sep '18

16 Sep '18

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from f4954c2 Release v1.1.0 new 35eef6b doc: Add man page for pacdiff new a22070a Add generated paccache.service to gitignore The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * a22070a (HEAD -> master) Add generated paccache.service to gitignore * 35eef6b doc: Add man page for pacdiff Detailed log of new commits: commit a22070a80e3dfb5078d87f908d617d83e7a8e66b Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Fri Sep 14 19:05:33 2018 +0200 Add generated paccache.service to gitignore Message-Id: <20180914170533.5716-1-jelle(a)vdwaa.nl> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit 35eef6b3ef1fc3f4d5c277d0bc54b769a0f65b7a Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Fri Sep 14 19:10:55 2018 +0200 doc: Add man page for pacdiff Message-Id: <20180914171055.6643-1-jelle(a)vdwaa.nl> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: .gitignore | 1 + doc/Makefile.am | 4 ++++ doc/pacdiff.8.txt | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 doc/pacdiff.8.txt -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH] Add generated paccache.service to gitignore
by Jelle van der Waa 16 Sep '18

16 Sep '18

--- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 204eb3e..1d6e802 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ depcomp install-sh missing test-driver +src/paccache.service -- 2.19.0

2 1

[pacman-contrib] [PATCH] doc: Add man page for pacdiff
by Jelle van der Waa 16 Sep '18

16 Sep '18

--- doc/Makefile.am | 4 ++++ doc/pacdiff.8.txt | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 doc/pacdiff.8.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index cf48bb5..65bc4f5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -5,10 +5,12 @@ ASCIIDOC_MANS = \ paccache.8 \ + pacdiff.8 \ pactree.8 HTML_MANPAGES = \ paccache.8.html \ + pacdiff.8.html \ pactree.8.html HTML_OTHER = \ @@ -22,6 +24,7 @@ EXTRA_DIST = \ asciidoc.conf \ asciidoc-override.css \ paccache.8.txt \ + pacdiff.8.txt \ pactree.8.txt \ footer.txt \ $(ASCIIDOC_MANS) @@ -98,6 +101,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am # Dependency rules paccache.8 paccache.8.html: paccache.8.txt +pacdiff.8 pacdiff.8.html: pacdiff.8.txt pactree.8 pactree.8.html: pactree.8.txt # vim:set noet: diff --git a/doc/pacdiff.8.txt b/doc/pacdiff.8.txt new file mode 100644 index 0000000..a4c5850 --- /dev/null +++ b/doc/pacdiff.8.txt @@ -0,0 +1,55 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +pacdiff(8) +========== + +Name +---- +pacdiff - pacorig, pacnew and pacsave maintenance utility + + +Synopsis +-------- +'pacdiff' [options] + + +Description +----------- +pacdiff is a script which looks for pacorig, pacnew and pacsave files from the +backup entries found in the local Pacman db. For every found file the option is +given to view, skip, diff, remove or overwrite the found pacorig, pacnew or +pacsave file. + +Environment +----------- +*DIFFPROG*:: + Override the default 'vim -d' merge program. + +*DIFFSEARCHPATH*:: + Override the default search path '/etc', only when using find. + + +Options +------- +*-l, \--locate*:: + Select one (default: \--pacmandb). + +*-f, \--find*:: + Scan using locate. + +*-p, \--pacmandb*:: + Scan active config files from Pacman database. + +*-o, \--output*:: + Print files instead of merging them. + +*\--nocolor*:: + Remove colors from output. + + +See Also +-------- +linkman:pacman[8], linkman:pacman.conf[5] + +include::footer.txt[] -- 2.19.0

2 1