August 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v2 2/2] Save backup files with extension .pacsave.n
by Pang Yan Han 03 Aug '11

03 Aug '11

Teach pacman to save backup files with extension .pacsave.n, where n is a positive integer. The current backup file shall be saved as <name>.pacsave, while existing .pacsave.n files will be renamed to <name>.pacsave.n+1 Example: 1. You have subversion installed in your local repo. /etc/conf.d/svnserve is a file to be backed up. It contains local modifications 2. You remove subversion from your repo. /etc/conf.d/svnserve is backed up as /etc/conf.d/svnserve.pacsave 2. You install subversion again 3. You edit /etc/conf.d/svnserve 4. You remove subversion. The existing /etc/conf.d/svnserve.pacsave is renamed to /etc/conf.d/svnserve.pacsave.1 and /etc/conf.d/svnserve is backed up as /etc/conf.d/svnserve.pacsave Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/remove.c | 75 ++++++++++++++++++++++++++++++++++++++++ test/pacman/tests/remove012.py | 20 +++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/remove012.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 83c437f..22c4e23 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -28,8 +28,11 @@ #include <errno.h> #include <string.h> #include <limits.h> +#include <dirent.h> +#include <regex.h> #include <unistd.h> #include <sys/stat.h> +#include <sys/types.h> /* libalpm */ #include "remove.h" @@ -218,6 +221,77 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, return 1; } +static void shift_pacsave(alpm_handle_t *handle, const char *file) +{ + DIR *dir = NULL; + struct dirent *ent; + struct stat st; + regex_t reg; + + const char *basename; + char *dirname; + char oldfile[PATH_MAX]; + char newfile[PATH_MAX]; + char regstr[PATH_MAX]; + + unsigned long log_max = 0; + size_t basename_len; + + dirname = _alpm_mdirname(file); + if (!dirname) { + return; + } + + basename = _alpm_mbasename(file); + basename_len = strlen(basename); + + snprintf(regstr, PATH_MAX, "^%s\\.pacsave\\.([[:digit:]]+)$", basename); + if (regcomp(&reg, regstr, REG_EXTENDED | REG_NEWLINE) != 0) { + goto cleanup; + } + + dir = opendir(dirname); + if (dir == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open directory: %s: %s\n"), + dirname, strerror(errno)); + goto cleanup; + } + + while ((ent = readdir(dir)) != NULL) { + if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) { + continue; + } + + if (regexec(&reg, ent->d_name, 0, 0, 0) == 0) { + unsigned long cur_log; + cur_log = strtoul(ent->d_name + basename_len + strlen(".pacsave."), NULL, 10); + if (cur_log > log_max) { + log_max = cur_log; + } + } + } + + /* Shift pacsaves */ + unsigned long i; + for (i = log_max + 1; i > 1; i--) { + snprintf(oldfile, PATH_MAX, "%s.pacsave.%lu", file, i-1); + snprintf(newfile, PATH_MAX, "%s.pacsave.%lu", file, i); + rename(oldfile, newfile); + } + + snprintf(oldfile, PATH_MAX, "%s.pacsave", file); + if (stat(oldfile, &st) == 0) { + snprintf(newfile, PATH_MAX, "%s.1", oldfile); + rename(oldfile, newfile); + } + + regfree(&reg); + +cleanup: + free(dirname); + closedir(dir); +} + /* Helper function for iterating through a package's file and deleting them * Used by _alpm_remove_commit. */ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, @@ -298,6 +372,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, FREE(filehash); if(cmp != 0) { char newpath[PATH_MAX]; + shift_pacsave(handle, file); snprintf(newpath, PATH_MAX, "%s.pacsave", file); rename(file, newpath); _alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath); diff --git a/test/pacman/tests/remove012.py b/test/pacman/tests/remove012.py new file mode 100644 index 0000000..4274487 --- /dev/null +++ b/test/pacman/tests/remove012.py @@ -0,0 +1,20 @@ +self.description = "Remove a package with a modified file marked for backup and has existing pacsaves" + +self.filesystem = ["etc/dummy.conf.pacsave", + "etc/dummy.conf.pacsave.1", + "etc/dummy.conf.pacsave.2"] + +p1 = pmpkg("dummy") +p1.files = ["etc/dummy.conf*"] +p1.backup = ["etc/dummy.conf"] +self.addpkg2db("local", p1) + +self.args = "-R %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_EXIST=etc/dummy.conf") +self.addrule("FILE_PACSAVE=etc/dummy.conf") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.1") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.2") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.3") -- 1.7.6

1 0

[pacman-dev] [PATCH v2 1/2] libalpm: Introduce _alpm_mbasename and _alpm_mdirname
by Pang Yan Han 03 Aug '11

03 Aug '11

_alpm_mbasename and _alpm_mdirname are the same functions as mbasename and mdirname in src/pacman/util.c . Borrow them over to libalpm to prepare for the next patch which teaches pacman to save backup files with .pacsave.n extension. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 2 ++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 123cd24..413e406 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -175,6 +175,48 @@ cleanup: return ret; } +/** Parse the basename of a program from a path. +* @param path path to parse basename from +* +* @return everything following the final '/' +*/ +const char *_alpm_mbasename(const char *path) +{ + const char *last = strrchr(path, '/'); + if(last) { + return last + 1; + } + return path; +} + +/** Parse the dirname of a program from a path. +* The path returned should be freed. +* @param path path to parse dirname from +* +* @return everything preceding the final '/' +*/ +char *_alpm_mdirname(const char *path) +{ + char *ret, *last; + + /* null or empty path */ + if(path == NULL || path == '\0') { + return strdup("."); + } + + ret = strdup(path); + last = strrchr(ret, '/'); + + if(last != NULL) { + /* we found a '/', so terminate our string */ + *last = '\0'; + return ret; + } + /* no slash found */ + free(ret); + return strdup("."); +} + /* Trim whitespace and newlines from a string */ char *_alpm_strtrim(char *str) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 9ee6370..febfef9 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -94,6 +94,8 @@ struct archive_read_buffer { int _alpm_makepath(const char *path); int _alpm_makepath_mode(const char *path, mode_t mode); int _alpm_copyfile(const char *src, const char *dest); +const char *_alpm_mbasename(const char *path); +char *_alpm_mdirname(const char *path); char *_alpm_strtrim(char *str); size_t _alpm_strip_newline(char *str); int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, -- 1.7.6

1 0

[pacman-dev] [PATCH] contrib/paccache: misc cleanup and bugfix
by Dave Reisner 03 Aug '11

03 Aug '11

* add paccache to .gitignore * change error verbiage when run as root * delete sigs along with packages * fix bug in diskspace calculations Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This should cover Allan and Dan's concerns, as well as addressing a silly bug I found in counting diskspace saved. contrib/paccache.in | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/contrib/paccache.in b/contrib/paccache.in index 0bd0cf7..34ca06b 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -110,10 +110,11 @@ pkgfilter() { size_to_human() { awk -v size="$1" ' BEGIN { - suffix[1] = "KiB" - suffix[2] = "MiB" - suffix[3] = "GiB" - suffix[4] = "TiB" + suffix[1] = "B" + suffix[2] = "KiB" + suffix[3] = "MiB" + suffix[4] = "GiB" + suffix[5] = "TiB" count = 1 while (size > 1024) { @@ -142,7 +143,7 @@ runcmd() { } summarize() { - local -i filecount=$# + local -i filecount=$1; shift local seenarch= seen= arch= name= local -r pkg_re='(.+)-[^-]+-[0-9]+-([^.]+)\.pkg.*' @@ -204,7 +205,7 @@ EOF } if (( ! UID )); then - error "Bad dog, no biscuit. You will be prompted for privilege escalation." + error "Do not run this script as root. You will be prompted for privilege escalation." exit 42 fi @@ -277,8 +278,19 @@ if (( ! ${#candidates[*]} )); then exit 1 fi +# grab this prior to signature scavenging +pkgcount=${#candidates[*]} + +# copy the list, merging in any found sigs +for cand in "${candidates[@]}"; do + candtemp+=("$cand") + [[ -f $cand.sig ]] && candtemp+=("$cand.sig") +done +candidates=("${candtemp[@]}") +unset candtemp + # do this before we destroy anything -totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum = $1 } END { print sum }') +totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum += $1 } END { print sum }') # crush. kill. destroy. (( verbose )) && cmdopts+=(-v) @@ -288,4 +300,4 @@ elif (( move )); then runcmd mv "${cmdopts[@]}" "${candidates[@]}" "$movedir" fi -summarize "${candidates[@]}" +summarize "$pkgcount" "${candidates[@]}" -- 1.7.6

2 3

[pacman-dev] [PATCH] cachemoney: add new contrib script
by Dave Reisner 02 Aug '11

02 Aug '11

cachemoney is a robust and flexible package cache cleaner with a variety of options. Much credit goes to DJ Mills and Pat Brisbin for the ideas behind this script. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This sort of functionality has been in a few feature requests, and there exist a number of tools that already provide this, but none flexible enough (or portable enough) to be to my liking. This is all bash3 compat with awk, tested on gawk 3.1.8, gawk 4.0.0, bwk (the one true), mawk, and busybox awk (which fscking _sucks_) to do the heavy lifting (rather than bash4). It ends up being insanely fast, with the drawback being that its dependent on the format of the filename to find and consider packages for deletion. In other words, a valid package tarball that isn't compliant with the extglob *.pkg.tar?(.+([^.])) isn't going to be considered. I'm a fan of the name, but I'm also happy to hear alternatives. contrib/Makefile.am | 4 + contrib/cachemoney.in | 294 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 298 insertions(+), 0 deletions(-) create mode 100755 contrib/cachemoney.in diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 69304a4..301de41 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,5 +1,6 @@ OURSCRIPTS = \ bacman \ + cachemoney \ pacdiff \ paclist \ paclog-pkglist \ @@ -14,6 +15,7 @@ EXTRA_DIST = \ PKGBUILD.vim \ bacman.in \ bash_completion.in \ + cachemoney.in \ paclog-pkglist.in \ pacdiff.in \ paclist.in \ @@ -29,6 +31,7 @@ MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' $(OURSCRIPTS): Makefile @@ -50,6 +53,7 @@ all-am: $(OURSCRIPTS) $(OURFILES) bacman: $(srcdir)/bacman.in bash_completion: $(srcdir)/bash_completion.in +cachemoney: $(srcdir)/cachemoney.in pacdiff: $(srcdir)/pacdiff.in paclist: $(srcdir)/paclist.in paclog-pkglist: $(srcdir)/paclog-pkglist.in diff --git a/contrib/cachemoney.in b/contrib/cachemoney.in new file mode 100755 index 0000000..794ae45 --- /dev/null +++ b/contrib/cachemoney.in @@ -0,0 +1,294 @@ +#!/bin/bash +# +# cachemoney - clean yo pacman cache, dawg +# +# Copyright (C) 2011 Dave Reisner <dreisner(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + + +shopt -s extglob + +declare -a candidates=() cmdopts=() whitelist=() blacklist=() +declare -i delete=0 diskspace=0 dryrun=0 filecount=0 keep=3 move=0 totalsaved=0 +declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' movedir= scanarch= + +msg() { + local mesg=$1; shift + printf "==> $mesg\n" "$@" +} >&2 + +error() { + local mesg=$1; shift + printf "==> ERROR: $mesg\n" "$@" +} >&2 + +die() { + error "$@" + exit 1 +} + +# reads a list of files on stdin and prints out deletion candidates +pkgfilter() { + # there's whitelist and blacklist parameters passed to this + # script after the block of awk. + + awk -v keep="$1" -v scanarch="$2" ' + function parse_filename(filename, parts, count, i, pkgname, arch) { + + count = split(filename, parts, "-") + + i = 1 + pkgname = parts[i++] + while (i <= count - 3) { + pkgname = pkgname "-" parts[i++] + } + + arch = substr(parts[count], 1, index(parts[count], ".") - 1) + + # filter on whitelist or blacklist + if (wlen && !whitelist[pkgname]) return + if (blen && blacklist[pkgname]) return + + if ("" == packages[pkgname,arch]) { + packages[pkgname,arch] = filename + } else { + packages[pkgname,arch] = packages[pkgname,arch] SUBSEP filename + } + } + + BEGIN { + # create whitelist + wlen = ARGV[1]; delete ARGV[1] + for (i = 2; i < 2 + wlen; i++) { + whitelist[ARGV[i]] = 1 + delete ARGV[i] + } + + # create blacklist + blen = ARGV[i]; delete ARGV[i] + while (i++ < ARGC) { + blacklist[ARGV[i]] = 1 + delete ARGV[i] + } + + # read package filenames + while (getline < "/dev/stdin") { + parse_filename($0) + } + } + + END { + for (pkglist in packages) { + # idx[1,2] = idx[pkgname,arch] + split(pkglist, idx, SUBSEP) + + # enforce architecture match if specified + if (!scanarch || scanarch == idx[2]) { + count = split(packages[idx[1], idx[2]], pkgs, SUBSEP) + if (count > keep) { + for(i = 1; i <= count - keep; i++) { + print pkgs[i] + } + } + } + } + }' "${@:3}" +} + +size_to_human() { + awk -v size="$1" ' + BEGIN { + suffix[1] = "KiB" + suffix[2] = "MiB" + suffix[3] = "GiB" + suffix[4] = "TiB" + count = 1 + + while (size > 1024) { + size /= 1024 + count++ + } + + sizestr = sprintf("%.2f", size) + sub(/.?0+$/, "", sizestr) + printf("%s %s", sizestr, suffix[count]) + }' +} + +runcmd() { + if (( needsroot )); then + msg "Privilege escalation required" + if sudo -v &>/dev/null && sudo -l &>/dev/null; then + sudo "$@" + else + printf '%s ' 'root' + su -c "$(printf '%q ' "$@")" + fi + else + "$@" + fi +} + +summarize() { + local -i filecount=$# + local seenarch= seen= arch= name= + local -r pkg_re='(.+)-[^-]+-[0-9]+-([^.]+)\.pkg.*' + + if (( delete )); then + printf -v output 'finished: %d packages removed' "$filecount" + elif (( move )); then + printf -v output "finished: %d packages moved to \`%s'" "$filecount" "$movedir" + elif (( dryrun )); then + if (( verbose )); then + msg "Candidate packages:" + while read -r pkg; do + if (( verbose >= 3 )); then + [[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]} + if [[ -z $seen || $seenarch != $arch || $seen != $name ]]; then + printf '%s (%s):\n' "$name" "$arch" + fi + printf ' %s\n' "$pkg" + elif (( verbose >= 2 )); then + printf "$PWD/%s$delim" "$pkg" + else + printf "%s$delim" "$pkg" + fi + done < <(printf '%s\n' "$@" | sort -V) + printf '\n' >&2 + fi + + printf -v output 'finished dry run: %d candidates' "$filecount" + fi + + if (( diskspace )); then + output+=" (diskspace saved: $(size_to_human "$totalsaved"))" + fi + + msg "$output" +} +usage() { + cat <<EOF +usage: ${0##*/} <operation> [options] [targets...] + + Operations: + -d perform a dry run, only finding candidate packages. + -m <movedir> move candidate packages to 'movedir'. + -r remove candidate packages. + + Options: + -a <arch> scan for 'arch' (default: all architectures). + -c <cachedir> scan 'cachedir' for packages (default: @localstatedir@/cache/pacman/pkg). + -f apply force to mv(1) and rm(1) operations. + -h display this help message. + -i <pkgs> ignore 'pkgs', which is a comma separated. Alternatively, + specify '-' to read package names from stdin, newline delimited. + -k <num> keep 'num' of each package in 'cachedir' (default: 3). + -s show diskspace saved by the operation. + -u target uninstalled packages. + -v increase verbosity. specify up to 3 times. + -z use null delimiters for candidate names (only with -v and -vv) + +EOF +} + +if (( ! UID )); then + error "Bad dog, no biscuit. You will be prompted for privilege escalation." + exit 42 +fi + +while getopts ':a:c:dfhi:k:m:rsuvz' opt; do + case $opt in + a) scanarch=$OPTARG ;; + c) cachedir=$OPTARG ;; + d) dryrun=1 ;; + f) cmdopts=(-f) ;; + h) usage + exit 0 ;; + i) if [[ $OPTARG = '-' ]]; then + [[ ! -t 0 ]] && IFS=$'\n' read -r -d '' -a ign + else + IFS=',' read -r -a ign <<< "$OPTARG" + fi + blacklist+=("${ign[@]}") + unset i ign ;; + k) keep=$OPTARG + if [[ $keep != $OPTARG ]] || (( keep < 0 )); then + die 'argument to option -k must be a non-negative integer' + fi ;; + m) move=1 movedir=$OPTARG ;; + r) delete=1 ;; + s) diskspace=1 ;; + u) IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq) + blacklist+=("${ign[@]}") + unset ign ;; + v) (( ++verbose )) ;; + z) delim='\0' ;; + :) die "option '--%s' requires an argument" "$OPTARG" ;; + ?) die "invalid option -- '%s'" "$OPTARG" ;; + esac +done +shift $(( OPTIND - 1 )) + +# remaining args are a whitelist +whitelist=("$@") + +# sanity checks +case $(( dryrun+delete+move )) in + 0) die "no operation specified (use -h for help)" ;; + [^1]) die "only one operation may be used at a time" ;; +esac + +[[ -d $cachedir ]] || + die "cachedir \`%s' does not exist or is not a directory" "$cachedir" + +[[ $movedir && ! -d $movedir ]] && + die "move-to directory \`%s' does not exist or is not a directory" "$movedir" + +if (( move || delete )); then + # make it an absolute path since we're about to chdir + [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir + [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 +fi + +# unlikely that this will fail, but better make sure +cd "$cachedir" || die "failed to chdir to \`%s'" "$cachedir" + +# note that these results are returned in an arbitrary order from awk, but +# they'll be resorted (in summarize) iff we have a verbosity level set. +IFS=$'\n' read -r -d '' -a candidates < \ + <(printf '%s\n' *.pkg.tar?(.+([^.])) | sort -V | + pkgfilter "$keep" "$scanarch" \ + "${#whitelist[*]}" "${whitelist[@]}" \ + "${#blacklist[*]}" "${blacklist[@]}") + +if (( ! ${#candidates[*]} )); then + msg 'no candidate packages found for pruning' + exit 1 +fi + +# do this before we destroy anything +if (( diskspace )); then + totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum = $1 } END { print sum }') +fi + +# crush. kill. destroy. +(( verbose )) && cmdopts+=(-v) +if (( delete )); then + runcmd rm "${cmdopts[@]}" "${candidates[@]}" +elif (( move )); then + runcmd mv "${cmdopts[@]}" "${candidates[@]}" "$movedir" +fi + +summarize "${candidates[@]}" -- 1.7.6

4 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-531-gf10aea7
by dan＠archlinux.org 02 Aug '11

02 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via f10aea73e462f05d31de7b55667f58300fb89fa2 (commit) via b03b06cfd3afc95c328a166cfb8305a3df97819e (commit) via 6997a738bbca209cc6a8a29cdb71830bfb912f18 (commit) via c55cbfbd5f3659ee5c105bbdb932cdb7afab5f2a (commit) via cbaff216b3eca57b4fd717da53f43a6713722e95 (commit) via 573260556db49c62f5cf751f53812b7e06c1decb (commit) via 66d99957114e98ce41052fcd33200d8fbfbd9f26 (commit) via aecd0740cfa8f547b0e65e0ab7535c35a2b80beb (commit) via a3def7ac8745799e833b93f33954a02fd7efd83b (commit) via dffff9659be91d6f31c9e4cea1d9de06b00d5d6c (commit) via e42d97b7370c9e30d9ae66a33f42d27460eaf137 (commit) via e99b6a131ea08829da26d62d498c33f3129683e3 (commit) via cd8747ba6d6b4068331c921ee65260424c6d9699 (commit) from 804e2505cf4474791537a9f0ae8e9b6c274cb0c2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f10aea73e462f05d31de7b55667f58300fb89fa2 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 21 17:14:32 2011 -0500 docs/pacman.conf: Document SigLevel option This adds docs for SigLevel, which can exist in both [options] and [repository] sections. It also does a bit of reworking of the structure of this manpage and adds a labeled list under the repo sections where we didn't have one before. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b03b06cfd3afc95c328a166cfb8305a3df97819e Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 22 10:48:13 2011 -0500 Implement parsing of the new SigLevel directive Add code to conf.c that parses the new SigLevel directive. An overwhelming number of options are presented, but most users will still be fine with the Never/Optional/Required trio. More advanced users can combine these or any of the other options on a 'SigLevel = ' line, which is parsed in a left-to-right fashion and flags turned on and off accordingly. For example, all three of these will net the same config: SigLevel = Required PackageOptional SigLevel = Optional DatabaseRequired SigLevel = DatabaseRequired PackageOptional Additionally, database-specific lines assume you wish to start with any global default that has been set. For example, if any of the above lines were in the [options] section, something such as: SigLevel = PackageRequired PackageAllowMarginal Would continue to enforce required database signatures. Inspiration-by: Kerrick Staley <mail(a)kerrickstaley.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6997a738bbca209cc6a8a29cdb71830bfb912f18 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 27 14:36:27 2011 -0400 paccache: add new contrib script paccache is a robust and flexible package cache cleaner with a variety of options. Much credit goes to DJ Mills and Pat Brisbin for ideas behind this script. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> [Dan: add .gitignore entry] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c55cbfbd5f3659ee5c105bbdb932cdb7afab5f2a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 30 12:24:46 2011 +1000 pacman-key: follow gpg options for listing keys The current --list option outputed the keys and all their signatures which can be overly verbose. It also did not take a list of keys on the command line to limit its output (although the code suggests that was intended). That patch brings consistency with gpg, providing --list-keys and --list-sigs options that function equivalently to those provided by gpg. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cbaff216b3eca57b4fd717da53f43a6713722e95 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 29 18:49:38 2011 -0500 Don't trim whitespace when reading database entries We don't write with extra or unknown whitespace, so there is little reason for us to trim it when reading either. This also fixes the hopefully never encountered "paths that start or end with spaces" issue, for which two pactests have been added. The tests also contain other evil characters that we have encountered before and handle just fine, but it doesn't hurt to ensure we don't break such support in the future. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 573260556db49c62f5cf751f53812b7e06c1decb Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 29 18:49:37 2011 -0500 pactest: use subprocess module instead of os.system This is more in line with standard Python practice, and makes keyboard interrupts behave a lot more sanely. It also prevents the useless spawning of a shell as well as simplifies the command building and working directory stuff. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 66d99957114e98ce41052fcd33200d8fbfbd9f26 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 22 10:48:13 2011 -0500 Revamp signing checks This ensures we are actually making correct use of the information gpgme is returning to us. Marginal being allowed was obvious before, but Unknown should deal with trust level, and not the presence or lack thereof of a public key to validate the signature with. Return status and validity information in two separate values so check methods and the frontend can use them independently. For now, we treat expired keys as valid, while expired signatures are invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aecd0740cfa8f547b0e65e0ab7535c35a2b80beb Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 8 14:44:58 2011 -0500 Tidy up testdb to match coding styles Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a3def7ac8745799e833b93f33954a02fd7efd83b Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 6 13:40:03 2011 -0500 Make free_groupcache() private Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dffff9659be91d6f31c9e4cea1d9de06b00d5d6c Merge: cd8747b e42d97b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 28 12:48:38 2011 -0500 Merge remote-tracking branch 'dave/scripts-fixup' commit e42d97b7370c9e30d9ae66a33f42d27460eaf137 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 28 13:08:37 2011 -0400 scripts/pkgdelta: exit properly on missing args Removes usage of 'nounset' which, when combined with 'errexit' can cause undesirable early exits. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e99b6a131ea08829da26d62d498c33f3129683e3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 28 13:07:25 2011 -0400 scripts/repo-add: show usage when no DB file specified Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit cd8747ba6d6b4068331c921ee65260424c6d9699 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 11:06:34 2011 -0500 Unify modelines in Asciidoc files This gets us close to using the same modeline in all files we run through Asciidoc, as well as adding the spell and spelllang declarations, just as we had in NEWS already. The choice of 'en_us' is mainly for consistency and because the body of work already uses these spellings. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 2 +- contrib/.gitignore | 1 + contrib/Makefile.am | 4 + contrib/paccache.in | 291 ++++++++++++++++++++++++++++++++++++++++ doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 2 +- doc/index.txt | 10 +- doc/libalpm.3.txt | 2 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- doc/pacman-key.8.txt | 9 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 94 ++++++++++++-- doc/pkgdelta.8.txt | 2 +- doc/repo-add.8.txt | 2 +- doc/submitting-patches.txt | 6 +- doc/translation-help.txt | 34 +++--- doc/vercmp.8.txt | 2 +- lib/libalpm/alpm.h | 22 +++- lib/libalpm/be_local.c | 12 +- lib/libalpm/be_package.c | 7 +- lib/libalpm/be_sync.c | 12 +- lib/libalpm/db.c | 46 +++--- lib/libalpm/db.h | 2 - lib/libalpm/signing.c | 122 +++++++++++------ lib/libalpm/util.c | 20 +++ lib/libalpm/util.h | 1 + scripts/pacman-key.sh.in | 21 ++- scripts/pkgdelta.sh.in | 3 +- scripts/repo-add.sh.in | 6 +- src/pacman/conf.c | 136 ++++++++++++++----- src/pacman/util.c | 42 +++++-- src/util/testdb.c | 12 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 46 +++--- test/pacman/tests/remove071.py | 33 +++++ test/pacman/tests/sync600.py | 51 +++++++ test/pacman/util.py | 2 +- 38 files changed, 850 insertions(+), 217 deletions(-) create mode 100755 contrib/paccache.in create mode 100644 test/pacman/tests/remove071.py create mode 100644 test/pacman/tests/sync600.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Save backup files with extension .pacsave.timestamp
by Pang Yan Han 02 Aug '11

02 Aug '11

Teach pacman to save backup files using extension of .pacsave.timestamp "timestamp" is the time of removal of the backup file. It is in <year>-<month>-<day>-<HHMMSS> format, where: - year is either the year with century or a 2 digit number from 00 to 99 (year without century) if the timestamp string exceeds 20 characters - month is a 2 digit number from 01 to 12 - day is a 2 digit number from 01 to 31 - HH is a 2 digit number from 00 to 23 representing the hour - MM and SS are 2 digit numbers from 00 to 59 representing minutes and seconds respectively An example of such a pacsave file is /etc/pacman.conf.pacsave.2011-07-29-145035 This addresses FS#24192 (pacman overwrites .pacsave files) FILE_PACSAVE rule for the test suite is updated to reflect the change in .pacsave file extension. FILE_PACSAVE rules can be used as per before this patch. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- doc/pacman.8.txt | 13 ++++++++++++- lib/libalpm/remove.c | 20 ++++++++++++++++++-- test/pacman/pmrule.py | 21 +++++++++++++++++++-- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 64b1ff3..d029294 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -54,8 +54,19 @@ Operations removed, in which case every package in that group will be removed. Files belonging to the specified package will be deleted, and the database will be updated. Most configuration files will be saved - with a '.pacsave' extension unless the '\--nosave' option is used. + with a '.pacsave-<timestamp>' extension unless the '\--nosave' option is used. See <<RO,Remove Options>> below. ++ +'<timestamp>' is the time of removal of the configuration file. It is in +<year>-<month>-<day>-<HHMMSS> format, where: ++ + - year is either the year with century or a 2 digit number from 00 to 99 + (year without century) if the string exceeds 20 characters + - month is a 2 digit number from 01 to 12 + - day is a 2 digit number from 01 to 31 + - HH is a 2 digit number from 00 to 23 representing the hour + - MM and SS are 2 digit numbers from 00 to 59 representing minutes and seconds + respectively *-S, \--sync*:: Synchronize packages. Packages are installed directly from the ftp diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 83c437f..a39a154 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -27,6 +27,7 @@ #include <stdlib.h> #include <errno.h> #include <string.h> +#include <time.h> #include <limits.h> #include <unistd.h> #include <sys/stat.h> @@ -287,7 +288,8 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, } } } else { - /* if the file needs backup and has been modified, back it up to .pacsave */ + /* if the file needs backup and has been modified, back it up to + * .pacsave.YYYY-MM-DD-HHMMSS */ alpm_backup_t *backup = _alpm_needbackup(fileobj->name, info); if(backup) { if(nosave) { @@ -298,7 +300,21 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, FREE(filehash); if(cmp != 0) { char newpath[PATH_MAX]; - snprintf(newpath, PATH_MAX, "%s.pacsave", file); + char timestr[21]; + time_t curtime; + struct tm tm; + size_t ret; + + curtime = time(NULL); + localtime_r(&curtime, &tm); + ret = strftime(timestr, 21, "%Y-%m-%d-%H%M%S", &tm); + if (ret == 0) { + /* Year with century can't fit. + * So we print year without century (00 to 99) */ + strftime(timestr, 21, "%y-%m-%d-%H%M%S", &tm); + } + + snprintf(newpath, PATH_MAX, "%s.pacsave.%s", file, timestr); rename(file, newpath); _alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath); alpm_logaction(handle, "warning: %s saved as %s\n", file, newpath); diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index cb7ae88..44cee8a 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -17,6 +17,7 @@ import os import stat +import re import util @@ -141,8 +142,24 @@ def check(self, test): if not os.path.isfile("%s.pacorig" % filename): success = 0 elif case == "PACSAVE": - if not os.path.isfile("%s.pacsave" % filename): - success = 0 + # pacsave.YYYY-MM-DD-HHMMSS + saved_re = re.compile(filename + ".pacsave." + "\d{2,}-\d{2}-\d{2}-\d{6}") + + # Extract directory component of pacsave file + dir_ = "" + dir_re = re.compile('(.*)/[^/]*') + dir_match = dir_re.match(filename) + if dir_match is not None: + dir_ = dir_match.group(1) + dir_ = os.path.join(test.root, dir_) + + success = 0 + files = os.listdir(dir_) + for f in files: + fullname = os.path.join(dir_, f) + if saved_re.match(fullname): + success = 1 + break else: print "FILE rule '%s' not found" % case success = -1 -- 1.7.6.178.g55272

2 1

[pacman-dev] [PATCH v3 0/8] Patches for better optdep support
by Benedikt Morbach 02 Aug '11

02 Aug '11

I'm flooding your inbox one last time (for the next two weeks), so you can all bitch about how crappy my patches are while I'm away ;-) This implements most features from https://wiki.archlinux.org/index.php/User:Allan/Pacman_OptDepends (I've added some things regarding package removal there) I'v also added this here: https://wiki.archlinux.org/index.php/Pacman_Roadmap Github link: https://github.com/moben/pacman/tree/optdep What is there: - No regressions afaics - Only show uninstalled optdepends during install/upgrade - In package info, show [installed] after installed optdepends - In package info (local or -ii) show packages which optionally depend on the queried package - '-Qt' doesn't consider optdepends to be orphans, unless '--nooptdeps/-n' is given if it is given, display them like this: 'sqlite3 3.7.7.1-1 (optdepend for: dbmail, python)' - Recursive removal of unneeded optdeps What is still missing: - In package info display the description alongside the "reverse optdeps" [1] - Cascading to optdepends on package removal with an optional flag [2] - Warn when removing optdepends for installed packages [3] - Anything listed under "Other Ideas" - Tests (mainly needed for the package removal stuff I think) - Docs with less sucky english ;-) [1] Not sure if this would be to much and clutter the whole thing, especially for sync repos [2] Maybe '--optdeps/-o' (Related: make 'pacman -So foobar' install all optdepends) [3] like ':: foo: requires bar', but nonfatal Suggestions on how to implement [3]? I've looked at how it works for normal requires by getting ALPM_ERR_UNSATISFIED_DEPS from libalpm, but we don't want to raise an error here, so what to do? I'm still not sure about http://mailman.archlinux.org/pipermail/pacman-dev/2011-July/013886.html It sounds like a good idea, but would also mean changing (some|many|most|all) dep allocating functions from alpm_depend_t *func(foo) to int func(foo, alpm_depend_t *WriteThis) and make them not allocate the alpm_depend_t themselves. An alternative would be to create a new set of functions and make the current ones thin wrappers around those, so most code can stay as simple as it is now and use the allocated object. Comments? --- Benedikt Benedikt Morbach (8): Split optdep into alpm_depend_t and description Hook new optdepend structures up Only display uninstalled optdepends during install/upgrade Show optdep install status in package info optdepends are not orphans unless --nooptdepends is specified Make package info show optional requirements Make recursive removal consider optdepends Show list of optrequires with -Qtdn doc/pacman.8.txt | 6 ++ lib/libalpm/alpm.h | 14 +++++- lib/libalpm/be_local.c | 11 ++++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 7 ++- lib/libalpm/deps.c | 86 ++++++++++++++++++++++++++++++++- lib/libalpm/deps.h | 3 + lib/libalpm/package.c | 40 +++++++++++----- src/pacman/conf.h | 1 + src/pacman/package.c | 13 ++++- src/pacman/pacman.c | 3 + src/pacman/query.c | 27 +++++++++-- src/pacman/util.c | 120 +++++++++++++++++++++++++++++++++++++++------- src/pacman/util.h | 2 + src/util/pactree.c | 2 +- 15 files changed, 296 insertions(+), 44 deletions(-) -- 1.7.6

2 9