April 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Mark already installed optional dependencies
by Arokux B. 05 Aug '12

05 Aug '12

This patch adds "[installed]" prefix to already installed optional dependency. Signed-off-by: Arokux arokux(a)gmail.com --- src/pacman/util.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index a5242ae..d0a049e 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1189,19 +1189,40 @@ static int depend_cmp(const void *d1, const void *d2) return ret; } +alpm_list_t *optdeps_to_strings(alpm_list_t *optdeps) +{ + alpm_list_t *i, *optstrings = NULL; + alpm_db_t *localdb = alpm_get_localdb(config->handle); + + /* turn optdepends list into a text list */ + for(i = optdeps; i; i = alpm_list_next(i)) { + alpm_depend_t *optdep = i->data; + char *optdepstring = alpm_dep_compute_string(optdep); + + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdepstring)) { + char *optdepstring_in; + pm_asprintf(&optdepstring_in, _("[installed] %s"), optdepstring); + free(optdepstring); + + optdepstring = optdepstring_in; + optdepstring_in = NULL; + } + + optstrings = alpm_list_add(optstrings, optdepstring); + } + + return optstrings; +} + void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) { - alpm_list_t *i, *old, *new, *optdeps, *optstrings = NULL; + alpm_list_t *old, *new, *optdeps, *optstrings = NULL; old = alpm_pkg_get_optdepends(oldpkg); new = alpm_pkg_get_optdepends(newpkg); optdeps = alpm_list_diff(new, old, depend_cmp); - /* turn optdepends list into a text list */ - for(i = optdeps; i; i = alpm_list_next(i)) { - alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); - } + optstrings = optdeps_to_strings(optdeps); if(optstrings) { printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg)); @@ -1214,15 +1235,9 @@ void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) void display_optdepends(alpm_pkg_t *pkg) { - alpm_list_t *i, *optdeps, *optstrings = NULL; + alpm_list_t *optstrings = NULL; - optdeps = alpm_pkg_get_optdepends(pkg); - - /* turn optdepends list into a text list */ - for(i = optdeps; i; i = alpm_list_next(i)) { - alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); - } + optstrings = optdeps_to_strings(alpm_pkg_get_optdepends(pkg)); if(optstrings) { printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg));

2 5

[pacman-dev] [PATCH] makepkg: add mtree file into package
by Allan McRae 30 Apr '12

30 Apr '12

Add an mtree file to the package with all file information. This can be added to the local pacman database on install allowing full package verification. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Two things I want to query here... 1) bsdtar -czf .MTREE .... When creating the package, we use gzip instead of bsdtar's -z option due to it including time stamps. From memory this was important due to package deltas. So I guess that does not apply here? 2) The timestamps are interesting.... - etc/bash_completion.d/burp time=1335764490.307580112 - etc/bash_completion.d/burp time=1335764490.0 The first is from creating the .MTREE file before compressing the package. The second is creating the mtree file from files on the filesystem after the package is installed. Does anyone know what is going on here? I guess we can just round the times in the mtree file to the nearest second when checking. scripts/makepkg.sh.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d1251b8..fa8ba66 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1350,8 +1350,6 @@ create_package() { done # tar it up - msg2 "$(gettext "Compressing package...")" - local fullver=$(get_full_version) local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${pkgarch}${PKGEXT}" local ret=0 @@ -1362,6 +1360,14 @@ create_package() { # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob + + msg2 "$(gettext "Generating .MTREE file...")" + bsdtar -czf .MTREE --format=mtree \ + --options='!all,use-set,type,uid,gid,mode,size,time,md5' \ + "${comp_files[@]}" * + comp_files+=(".MTREE") + + msg2 "$(gettext "Compressing package...")" # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail # bsdtar's gzip compression always saves the time stamp, making one -- 1.7.10

3 2

[pacman-dev] [PATCH] Extract .MTREE file into local package database
by Allan McRae 30 Apr '12

30 Apr '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b007766..b98346e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -164,6 +164,11 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, snprintf(filename, PATH_MAX, "%s%s-%s/changelog", _alpm_db_path(handle->db_local), newpkg->name, newpkg->version); archive_entry_set_perm(entry, 0644); + } else if(strcmp(entryname, ".MTREE") == 0) { + /* the mtree file goes inside the db */ + snprintf(filename, PATH_MAX, "%s%s-%s/mtree", + _alpm_db_path(handle->db_local), newpkg->name, newpkg->version); + archive_entry_set_perm(entry, 0644); } else if(*entryname == '.') { /* for now, ignore all files starting with '.' that haven't * already been handled (for future possibilities) */ -- 1.7.10

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-250-g2e6cb69
by dan＠archlinux.org 30 Apr '12

30 Apr '12

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 2e6cb69bf6d6b2738d7a9c23c55d1734378402c7 (commit) via 8c7202ca19361c35357140b0e3083cfa5bc12d21 (commit) via 9dd42dc0daab510a4e68118d89b5543936d2074f (commit) via 8a9c666a8c0f46739724e2032cedb451121c4594 (commit) via 6d2fb6fd815c7f427028b20faa16e531d5cc2aa4 (commit) via 52a9a5240ac8dc9eef1fc68c1bf4290b76fe09ae (commit) via 82b7122542e16354b560bae9c7f6f3608873a8e1 (commit) via e0afd81d18fdc646bbf6d37a1627c0267176e167 (commit) via dbc58d9386170a193d951c926c87075450de3bb1 (commit) via 20ff0cd40fd228f56251634a7429439244c24eac (commit) via 1583a2079c8e84c9cd960a596dae2e36c9077bbb (commit) via 953415c86a17c1db8bebbbaca89e6fd5783386b6 (commit) via 242411a1b4197910ac75b50033eb530004cc0e5c (commit) via 22050f18f4049b20f56e98766b68c0c32d070f1a (commit) via d38a1c02dbbf90b890bcd79d0354d04a4886c026 (commit) via 6d10de881e0ca38d8f20384e20139784589ea2c7 (commit) via ea4aa6f184909db38bacbbf60f22f1674f2853a6 (commit) via 03acea832ad39fa371781f045c39677a02d1156a (commit) via 1b494ab77198a6cbb9c06a13435159641e2dc0c5 (commit) via 71fcb69028d6e02bc7f24459918e504d261f86cd (commit) from b2a2a982979ecd9b9bcdbf5f1c60d005ed238b60 (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 2e6cb69bf6d6b2738d7a9c23c55d1734378402c7 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 29 13:23:23 2012 +1000 Output "Packages" instead of "Targets" Prefix the list of packages being installed/removed with "Packages" instead of "Targets" as they are package names by this stage. Fixes FS#23123. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8c7202ca19361c35357140b0e3083cfa5bc12d21 Merge: 9dd42dc 82b7122 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 29 20:27:32 2012 -0500 Merge remote-tracking branch 'dave/buildsys' commit 9dd42dc0daab510a4e68118d89b5543936d2074f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 24 23:36:08 2012 -0400 makepkg: remove subshelling from check_option and friends Instead of creating a subshell for each of these checks (of which there are many), pass in an expected value and make the check_* function do the comparison for us, returning 0 (match), 1, (mismatch), or 127 (not found). For a measureable benefit, I tested this on a fairly simple package, perl-term-readkey, and counted the number of clone(2) syscalls to try and isolate those generated by makepkg itself, rather than the user defined functions. Results as shown below: 336 before 180 after So, roughly a 50% reduction, which makes sense given that a single check_option() call could be up to 3 subprocesses in total. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8a9c666a8c0f46739724e2032cedb451121c4594 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 24 23:09:31 2012 -0400 makepkg: null terminate filenames to strip Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6d2fb6fd815c7f427028b20faa16e531d5cc2aa4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 22 23:35:20 2012 -0400 pacman/package.c: show checksums with -Sii These were removed entirely by f34864cc9e, but some people (myself included) still find them useful. Revive these details, but "demote" them, so that they're only displayed when extra sync data is requested. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52a9a5240ac8dc9eef1fc68c1bf4290b76fe09ae Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 29 20:14:10 2012 -0500 Move short-lived realpath buffers to the stack There is little reason here to grab 4K from the heap only to return it a few lines later. Instead, just use the stack to hold the returned value saving ourselves the malloc/free cycle. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82b7122542e16354b560bae9c7f6f3608873a8e1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Mar 19 23:56:59 2012 -0400 libalpm: add pkg-config file No one seems to do this "correctly", but for the sake of having an easy method of detecting the presence and version of libalpm on a given system, we provide a straightforward .pc file. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e0afd81d18fdc646bbf6d37a1627c0267176e167 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 21:05:51 2012 -0500 Pointer coding style cleanups 'foo_type_t *variable' rather than 'foo_type_t* variable'. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbc58d9386170a193d951c926c87075450de3bb1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 21:01:55 2012 -0500 be_local: write all single-valued attributes first There isn't a whole lot of reason other than code clarity for this, but it makes it a bit more obvious where multivalued attributes start. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20ff0cd40fd228f56251634a7429439244c24eac Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 20:59:24 2012 -0500 util/testdb: don't return crazy error values With some contrived examples, you could easily make testdb return a very high error count, which could easily overflow the 8-bit unsigned integer limit. Instead, simply return 1 or 0 based on whether errors were found. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1583a2079c8e84c9cd960a596dae2e36c9077bbb Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 20:44:29 2012 -0500 Split check steps in Makefile into multiple targets This allows a `make -j4 check` invocation to actually run in parallel, even though 95% of our test suite time is currently dominated by pactest. It also allows running something like `make test-vercmp`. Also, add some targets to the .PHONY list that belong in it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 953415c86a17c1db8bebbbaca89e6fd5783386b6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 22 17:38:48 2012 -0400 rankmirrors: move to contrib/ This script is of questionable value, as it ranks mirrors by an uninteresting attribute: ping. While the script itself is interesting, people should be encouraged to rank mirrors by more useful measures, such as actual speed, locality, or up to date-ness. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 242411a1b4197910ac75b50033eb530004cc0e5c Author: Allan McRae <allan(a)archlinux.org> Date: Fri Apr 13 14:34:02 2012 +1000 makepkg: Be more consistent with missing program message Also prevent "sudo" and "su" from being translated. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 22050f18f4049b20f56e98766b68c0c32d070f1a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 9 16:27:00 2012 +1000 makepkg: treat list of packages to be installed as an array Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d38a1c02dbbf90b890bcd79d0354d04a4886c026 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 9 21:09:35 2012 +1000 makepkg: deal with overriden package arch properly This fixes a lot of checks done by makepkg (e.g. to see if a package is already built and choosing which package to install). Previously, if a package had both "i686" and "any" versions, the "i686" one always took precidence regardless of the value of "arch" in the PKGBUILD for that package. Fixes FS#27204. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6d10de881e0ca38d8f20384e20139784589ea2c7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Apr 19 13:33:57 2012 -0400 paccache: adopt parseopts for options parsing Add longopts and update usage. This removes the TODO item and incorporates --help/--version into the standard option set. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ea4aa6f184909db38bacbbf60f22f1674f2853a6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Apr 11 09:29:07 2012 -0400 configure: require bash >= 4.1 at compile time We've unofficially agreed to raise our minimum supported bash version to 4.1, and since added features that require it. Additionally, an earlier commit adds a syntax check to the builds of scripts/ and contrib/ which could conceivably fail with an earlier shell. Therefore, make this a hard requirement of the build process. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 03acea832ad39fa371781f045c39677a02d1156a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 17 21:34:30 2012 -0400 validate bash scripts with 'bash -n' during build. Use the no-exec mode of $(BASH_SHELL) to check for syntax errors in shell scripts. Since we use the extglob feature in various places, this requires that we pass -O extglob to the shell as well, to ensure that the parser is armed to handle this syntax. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1b494ab77198a6cbb9c06a13435159641e2dc0c5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Apr 19 12:55:20 2012 -0400 contrib: rename bash scripts: .in -> .sh.in For consistency with the scripts/ directory, ensure that all bash scripts use the same pre-build suffix. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 71fcb69028d6e02bc7f24459918e504d261f86cd Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Apr 19 12:46:48 2012 -0400 contrib: use a separate build rule for bash scripts Treat bash scripts separately from the others to allow for a different build rule, which is reused from the scripts/ subdir. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 16 +- configure.ac | 19 +- contrib/.gitignore | 1 + contrib/Makefile.am | 51 +++-- contrib/{bacman.in => bacman.sh.in} | 1 - contrib/{paccache.in => paccache.sh.in} | 119 +++++++----- contrib/{pacdiff.in => pacdiff.sh.in} | 0 contrib/{paclist.in => paclist.sh.in} | 0 .../{paclog-pkglist.in => paclog-pkglist.sh.in} | 0 contrib/{pacscripts.in => pacscripts.sh.in} | 0 contrib/{pacsysclean.in => pacsysclean.sh.in} | 0 {scripts => contrib}/rankmirrors.sh.in | 0 doc/Makefile.am | 2 + lib/libalpm/.gitignore | 1 + lib/libalpm/Makefile.am | 3 + lib/libalpm/be_local.c | 38 ++-- lib/libalpm/conflict.c | 3 +- lib/libalpm/group.c | 2 +- lib/libalpm/handle.c | 5 +- lib/libalpm/libalpm.pc.in | 12 ++ lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- scripts/.gitignore | 1 - scripts/Makefile.am | 5 +- scripts/makepkg.sh.in | 194 ++++++++++++-------- src/pacman/package.c | 9 +- src/pacman/util.c | 2 +- src/util/testdb.c | 8 +- 28 files changed, 309 insertions(+), 187 deletions(-) rename contrib/{bacman.in => bacman.sh.in} (99%) rename contrib/{paccache.in => paccache.sh.in} (76%) rename contrib/{pacdiff.in => pacdiff.sh.in} (100%) rename contrib/{paclist.in => paclist.sh.in} (100%) rename contrib/{paclog-pkglist.in => paclog-pkglist.sh.in} (100%) rename contrib/{pacscripts.in => pacscripts.sh.in} (100%) rename contrib/{pacsysclean.in => pacsysclean.sh.in} (100%) rename {scripts => contrib}/rankmirrors.sh.in (100%) create mode 100644 lib/libalpm/libalpm.pc.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Manual rankmirrors.
by Kevin Chadwick 27 Apr '12

27 Apr '12

I use rankmirrors and I notice on timeouts pacman automatically switches. Today, though most packages downloaded quickly from the mirror just selected by rankmirrors, one or two went very very slow. I guess differing routes by different package requests. Would it be easy to add a ^S (Ctrl-S) to tell pacman to stop and retry at the next mirror. If I ever find the time, not too likely for a while, I might look into it. Just figured if anyone had worked on it and thought yeah I could just change that then it wold be worth flinging the idea at the devs. On a side note should pacman be using /proc/mounts for Checkspace rather than /etc/mtab.

6 10

[pacman-dev] [PATCH] makepkg: remove subshelling from check_option and friends
by Dave Reisner 25 Apr '12

25 Apr '12

Instead of creating a subshell for each of these checks (of which there are many), pass in an expected value and make the check_* function do the comparison for us, returning 0 (match), 1, (mismatch), or 127 (not found). For a measureable benefit: I tested this on a fairly simple package (perl-term-readkey) and counted the number of clone syscalls to try and isolate those generated by makepkg itself, rather than the user defined functions. Results as shown below: 336 before 180 after So, roughly a 50% reduction, which makes sense given that a single check_option() call could be up to 3 subprocesses in total. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I've looked over this enough times that I'm starting to go blind looking at the patch. It's passed my testing as well, but this is the sort of thing that's ripe for regressions, so another set of eyes/testing would be appreciated. scripts/makepkg.sh.in | 137 ++++++++++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 58 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0f3c466..cfe00d3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -264,47 +264,67 @@ get_full_version() { # Checks to see if options are present in makepkg.conf or PKGBUILD; # PKGBUILD options always take precedence. # -# usage : check_option( $option ) -# return : y - enabled -# n - disabled -# ? - not found +# usage : check_option( $option, $expected_val ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found ## check_option() { - local ret=$(in_opt_array "$1" ${options[@]}) - if [[ $ret != '?' ]]; then - printf "%s\n" "$ret" - return - fi + in_opt_array "$1" ${options[@]} + case $? in + 0) # assert enabled + [[ $2 = y ]] + return ;; + 1) # assert disabled + [[ $2 = n ]] + return + esac # fall back to makepkg.conf options - ret=$(in_opt_array "$1" ${OPTIONS[@]}) - if [[ $ret != '?' ]]; then - printf "%s\n" "$ret" - return - fi + in_opt_array "$1" ${OPTIONS[@]} + case $? in + 0) # assert enabled + [[ $2 = y ]] + return ;; + 1) # assert disabled + [[ $2 = n ]] + return + esac - echo '?' # Not Found + # not found + return 127 } ## # Check if option is present in BUILDENV # -# usage : check_buildenv( $option ) -# return : y - enabled -# n - disabled -# ? - not found +# usage : check_buildenv( $option, $expected_val ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found ## check_buildenv() { in_opt_array "$1" ${BUILDENV[@]} + case $? in + 0) # assert enabled + [[ $2 = "y" ]] + return ;; + 1) # assert disabled + [[ $2 = "n" ]] + return ;; + esac + + # not found + return 127 } ## # usage : in_opt_array( $needle, $haystack ) -# return : y - enabled -# n - disabled -# ? - not found +# return : 0 - enabled +# 1 - disabled +# 127 - not found ## in_opt_array() { local needle=$1; shift @@ -312,15 +332,16 @@ in_opt_array() { local opt for opt in "$@"; do if [[ $opt = "$needle" ]]; then - echo 'y' # Enabled - return + # enabled + return 0 elif [[ $opt = "!$needle" ]]; then - echo 'n' # Disabled - return + # disabled + return 1 fi done - echo '?' # Not Found + # not found + return 127 } @@ -910,12 +931,12 @@ run_function() { local pkgfunc="$1" # clear user-specified buildflags if requested - if [[ $(check_option buildflags) = "n" ]]; then + if check_option "buildflags" "n"; then unset CFLAGS CXXFLAGS LDFLAGS fi # clear user-specified makeflags if requested - if [[ $(check_option makeflags) = "n" ]]; then + if check_option "makeflags" "n"; then unset MAKEFLAGS fi @@ -962,13 +983,13 @@ run_function() { run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) - if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then + if check_buildenv "distcc" "y" && ! check_option "distc" "n"; then [[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS fi # use ccache if it is requested (check buildenv and PKGBUILD opts) - if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then + if check_buildenv "ccache" "y" && ! check_option "ccache" "n"; then [[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH" fi @@ -994,12 +1015,12 @@ tidy_install() { cd_safe "$pkgdir" msg "$(gettext "Tidying install...")" - if [[ $(check_option docs) = "n" && -n ${DOC_DIRS[*]} ]]; then + if check_option "docs" "n" && [[ -n ${DOC_DIRS[*]} ]]; then msg2 "$(gettext "Removing doc files...")" rm -rf -- ${DOC_DIRS[@]} fi - if [[ $(check_option purge) = "y" && -n ${PURGE_TARGETS[*]} ]]; then + if check_option "purge" "y" && [[ -n ${PURGE_TARGETS[*]} ]]; then msg2 "$(gettext "Purging unwanted files...")" local pt for pt in "${PURGE_TARGETS[@]}"; do @@ -1011,7 +1032,7 @@ tidy_install() { done fi - if [[ $(check_option zipman) = "y" && -n ${MAN_DIRS[*]} ]]; then + if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" local manpage ext file link hardlinks hl find ${MAN_DIRS[@]} -type f 2>/dev/null | @@ -1047,7 +1068,7 @@ tidy_install() { done fi - if [[ $(check_option strip) = "y" ]]; then + if check_option "strip" "y"; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" @@ -1065,17 +1086,17 @@ tidy_install() { done fi - if [[ $(check_option libtool) = "n" ]]; then + if check_option "libtool" "n"; then msg2 "$(gettext "Removing "%s" files...")" "libtool" find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi - if [[ $(check_option emptydirs) = "n" ]]; then + if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -empty -delete fi - if [[ $(check_option upx) = "y" ]]; then + if check_option "upx" "y"; then msg2 "$(gettext "Compressing binaries with %s...")" "UPX" local binary find . -type f -perm -u+w 2>/dev/null | while read binary ; do @@ -1234,14 +1255,15 @@ write_pkginfo() { done for it in "${packaging_options[@]}"; do - local ret="$(check_option $it)" - if [[ $ret != "?" ]]; then - if [[ $ret = "y" ]]; then + check_option "$it" "y" + case $? in + 0) printf "makepkgopt = %s\n" "$it" - else + ;; + 1) printf "makepkgopt = %s\n" "!$it" - fi - fi + ;; + esac done check_license @@ -1658,7 +1680,7 @@ check_software() { fi # fakeroot - building as non-root user - if [[ $(check_buildenv fakeroot) = "y" ]] && (( EUID > 0 )); then + if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then error "$(gettext "Cannot find the %s binary required for building as non-root user.")" "fakeroot" ret=1 @@ -1666,7 +1688,7 @@ check_software() { fi # gpg - package signing - if [[ $SIGNPKG == 'y' || (-z "$SIGNPKG" && $(check_buildenv sign) == 'y') ]]; then + if [[ $SIGNPKG == 'y' ]] || { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; }; then if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the %s binary required for signing packages.")" "gpg" ret=1 @@ -1690,7 +1712,7 @@ check_software() { fi # upx - binary compression - if [[ $(check_option upx) == 'y' ]]; then + if check_option "upx" "y"; then if ! type -p upx >/dev/null; then error "$(gettext "Cannot find the %s binary required for compressing binaries.")" "upx" ret=1 @@ -1698,7 +1720,7 @@ check_software() { fi # distcc - compilation with distcc - if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then + if check_buildenv "distcc" "y" && ! check_option "distcc" "n" ]]; then if ! type -p distcc >/dev/null; then error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" ret=1 @@ -1706,7 +1728,7 @@ check_software() { fi # ccache - compilation with ccache - if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then + if check_buildenv "ccache" "y" && ! check_option "ccache" "n"; then if ! type -p ccache >/dev/null; then error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" ret=1 @@ -1714,7 +1736,7 @@ check_software() { fi # strip - strip symbols from binaries/libraries - if [[ $(check_option strip) = "y" ]]; then + if check_option "strip" "y"; then if ! type -p strip >/dev/null; then error "$(gettext "Cannot find the %s binary required for object file stripping.")" "strip" ret=1 @@ -1722,7 +1744,7 @@ check_software() { fi # gzip - compressig man and info pages - if [[ $(check_option zipman) = "y" ]]; then + if check_option "zipman" "y"; then if ! type -p gzip >/dev/null; then error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" ret=1 @@ -2062,7 +2084,7 @@ PACMAN=${PACMAN:-pacman} # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW -if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then +if [[ -t 2 && ! $USE_COLOR = "n" ]] && check_buildenv "color" "y"; then # prefer terminal safe colored and bold text when tput is supported if tput setaf 0 &>/dev/null; then ALL_OFF="$(tput sgr0)" @@ -2146,7 +2168,7 @@ use the %s option.")" "makepkg" "--asroot" error "$(gettext "The %s option is meant for the root user only. Please\n\ rerun %s without the %s flag.")" "--asroot" "makepkg" "--asroot" exit 1 # $E_USER_ABORT - elif (( EUID > 0 )) && [[ $(check_buildenv fakeroot) != "y" ]]; then + elif (( EUID > 0 )) && ! check_buildenv "fakeroot" "y"; then warning "$(gettext "Running %s as an unprivileged user will result in non-root\n\ ownership of the packaged files. Try using the %s environment by\n\ placing %s in the %s array in %s.")" "makepkg" "fakeroot" "'fakeroot'" "BUILDENV" "$MAKEPKG_CONF" @@ -2230,7 +2252,7 @@ if declare -f build >/dev/null; then fi if declare -f check >/dev/null; then # "Hide" check() function if not going to be run - if [[ $RUN_CHECK = 'y' || (! $(check_buildenv check) = "n" && ! $RUN_CHECK = "n") ]]; then + if [[ $RUN_CHECK = 'y' ]] || { ! check_buildenv "check" "n" && [[ $RUN_CHECK != "n" ]]; }; then CHECKFUNC=1 fi fi @@ -2246,8 +2268,7 @@ if [[ -n "${PKGLIST[@]}" ]]; then fi # check if gpg signature is to be created and if signing key is valid -[[ -z $SIGNPKG ]] && SIGNPKG=$(check_buildenv sign) -if [[ $SIGNPKG == 'y' ]]; then +if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; then if ! gpg --list-key ${GPGKEY} &>/dev/null; then if [[ ! -z $GPGKEY ]]; then error "$(gettext "The key %s does not exist in your keyring.")" "${GPGKEY}" @@ -2361,7 +2382,7 @@ if (( SOURCEONLY )); then cd_safe "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it - if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then + if ! check_buildenv "fakeroot" "y" || (( EUID == 0 )); then create_srcpackage else enter_fakeroot @@ -2453,7 +2474,7 @@ else cd_safe "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it - if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then + if ! check_buildenv "fakeroot" "y" || (( EUID == 0 )); then if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build -- 1.7.10

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-230-gb2a2a98
by dan＠archlinux.org 24 Apr '12

24 Apr '12

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 b2a2a982979ecd9b9bcdbf5f1c60d005ed238b60 (commit) via ca4f8687f7816c283ee2b4a438b28deff3a276d4 (commit) via ac6ebcfe93e8214ad4170caab006ffe5f9abe98d (commit) via 59dc631c9a2c8bacb19109e75c4fd0f604e85758 (commit) via 2d0a00b409cc76527d71d01acd1d517db11a0ff0 (commit) via 00ab01e6342b7183d5a16ae57497b19dc1c2c7dc (commit) via e07a2ab45e67e8ee989f9d102051481a35329b09 (commit) via 62dbf7ec43f4420c20b78ec647594c3f63558a39 (commit) via f61f075b1cd4c226d1633abd383565934bea2f0d (commit) via 3f9cf8471f9c6faecba8e09deb97a8d042525307 (commit) via d85c71865ee826041c85cd47189ea43b44ce52cc (commit) via 8679cd68d825bfe28ba0c833494c415bcfa6d8f6 (commit) via 1eb6a9cbfef4f0ad5151b4850d81141b7a535be6 (commit) via 5f71570ec48588bf24bfe786f40b500216084d07 (commit) via 133d174e60951dcca39d4c4063a85de75f52f6a8 (commit) via 839953f1113c70d13560bfd05c5e52139c7f562f (commit) via 70d425c1d341e5b3d36e612560f922dbd3b20e63 (commit) via 0fc5aea027d83cc21498e14330d1f0d514a60112 (commit) via b9fc709c55cc24a4b026c2a23d32f6dd901b2d61 (commit) from d7b728591ad68712be2c0ade7c2dd8e45bc2dfed (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 b2a2a982979ecd9b9bcdbf5f1c60d005ed238b60 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Apr 14 19:56:03 2012 -0400 pacman-key: lookup keys before receiving Perform a search for keys that clearly aren't key IDs. This allows receiving keys by name or email address, but only if the key resolves unambiguously. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ca4f8687f7816c283ee2b4a438b28deff3a276d4 Merge: ac6ebcf 5f71570 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 08:41:46 2012 -0500 Merge branch 'maint' Conflicts: scripts/repo-add.sh.in commit ac6ebcfe93e8214ad4170caab006ffe5f9abe98d Merge: 1eb6a9c 59dc631 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 24 08:39:31 2012 -0500 Merge branch 'parse-opts' commit 59dc631c9a2c8bacb19109e75c4fd0f604e85758 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 22 00:03:07 2012 -0400 makepkg.8: remove bold from --pkg's optarg Keep this in line with the rest of the manpages. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 2d0a00b409cc76527d71d01acd1d517db11a0ff0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 15:40:18 2012 -0400 pacman-key: allow verification of multiple sig files Loop through arguments passed to verify_sig and treat each as a signature to be verified against a source file. Output each file as its checked to avoid ambiguity. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 00ab01e6342b7183d5a16ae57497b19dc1c2c7dc Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 15:12:27 2012 -0400 scripts/library: remove parse_options This is retired, as the two consumers of this function are now using the new parseopts instead. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e07a2ab45e67e8ee989f9d102051481a35329b09 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 15 22:13:49 2012 -0400 bash_completion: update for changes to pacman-key - only do file completion for options which expect files - add completion for possible key ids when a relevant operation is in COMPWORDS. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 62dbf7ec43f4420c20b78ec647594c3f63558a39 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 17 00:27:37 2012 -0400 scripts: avoid dumping usage on parser fail Avoid letting the error message from parseopts get lost in the usage output from pacman-key and makepkg (which is already verbose). commit f61f075b1cd4c226d1633abd383565934bea2f0d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 14:51:28 2012 -0400 pacman-key: adopt parseopts for option parsing This requires an ugly amount of reworking of how pacman-key handles options. The change simply to avoid passing keys, files, and directories as arguments to options, but to leave them as arguments to the overall program. This is reasonable since pacman-key limits the user to essentially one operation per invocation (like pacman). Since we now pass around the positional parameters to the various operations, we can add some better sanity checking. Each operation is responsible for testing input and making sure it can operate properly, otherwise it throws an error and exits. The doc is updated to reflect this, and uses similar verbiage as pacman, describing the non-option arguments now passed to pacman-key as targets. Similar to the doc, --help is reorganized to separate operations and options and remove argument tokens from operations. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 3f9cf8471f9c6faecba8e09deb97a8d042525307 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 13:26:41 2012 -0400 makepkg: allow specifying --pkg multiple times Make this option additive, so that the following two operations are equivalent: makepkg --pkg foo --pkg bar makepkg --pkg foo,bar commit d85c71865ee826041c85cd47189ea43b44ce52cc Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 13:13:07 2012 -0400 makepkg: adopt parseopts for option parsing Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8679cd68d825bfe28ba0c833494c415bcfa6d8f6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 12:32:17 2012 -0400 scripts/library: introduce parseopts This will replace our current options parser used in pacman-key, makepkg, and ideally elsewhere. It follows heuristics closer to that of GNU getopt long (and thus pacman itself), with the exception that it does not allow for options with optional arguments. Due to the way this parser will be used, this sort of functionality will not be needed. Instead of relying on eval+set, options are normalized into an array, OPTRET, which callers should expect to be populated after returning from parseopts. This avoids problems with quotes and spaces in arguments, assuming that the user quotes properly when passing into the application. A new test harness for parseopts is added in test/scripts. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1eb6a9cbfef4f0ad5151b4850d81141b7a535be6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 17 15:58:51 2012 -0400 configure: avoid linking against libssl We're not linking to libssl, only libcrypto. -Wl,--as-needed will get rid of this, but there's no sense in checking for and linking against a library we don't need. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 6 +- configure.ac | 3 +- contrib/.gitignore | 1 - contrib/Makefile.am | 1 - contrib/bash_completion.in | 35 +++++- doc/PKGBUILD.5.txt | 5 +- doc/makepkg.8.txt | 5 +- doc/pacman-key.8.txt | 74 ++++++------ doc/pkgdelta.8.txt | 12 +- scripts/Makefile.am | 6 +- scripts/library/README | 24 +++- scripts/library/parse_options.sh | 105 ----------------- scripts/library/parseopts.sh | 141 ++++++++++++++++++++++ scripts/makepkg.sh.in | 33 +++--- scripts/pacman-key.sh.in | 229 ++++++++++++++++++++++-------------- scripts/pkgdelta.sh.in | 99 ++++++++++++---- scripts/po/POTFILES.in | 2 +- scripts/repo-add.sh.in | 94 +++++++-------- test/{util => scripts}/Makefile.am | 3 +- test/scripts/parseopts_test.sh | 138 ++++++++++++++++++++++ 20 files changed, 680 insertions(+), 336 deletions(-) delete mode 100644 scripts/library/parse_options.sh create mode 100644 scripts/library/parseopts.sh copy test/{util => scripts}/Makefile.am (77%) create mode 100755 test/scripts/parseopts_test.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-9-g5f71570
by dan＠archlinux.org 24 Apr '12

24 Apr '12

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, maint has been updated via 5f71570ec48588bf24bfe786f40b500216084d07 (commit) via 133d174e60951dcca39d4c4063a85de75f52f6a8 (commit) via 839953f1113c70d13560bfd05c5e52139c7f562f (commit) via 70d425c1d341e5b3d36e612560f922dbd3b20e63 (commit) via 0fc5aea027d83cc21498e14330d1f0d514a60112 (commit) via b9fc709c55cc24a4b026c2a23d32f6dd901b2d61 (commit) from ded66fbb62cdad37d577dc048e37f7cea7f7a4da (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 5f71570ec48588bf24bfe786f40b500216084d07 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Apr 13 15:40:30 2012 -0400 makepkg: restrict allowed characters in pkgname Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 133d174e60951dcca39d4c4063a85de75f52f6a8 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sat Apr 7 14:18:28 2012 +0200 pkgdelta/repo-add: quoting fixes This removes some unnecessary quotes and adds quotes in a few places to hopefully work correctly if the tempdir has spaces. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 839953f1113c70d13560bfd05c5e52139c7f562f Author: Florian Pritz <bluewind(a)xinu.at> Date: Fri Apr 6 23:37:32 2012 +0200 pkgdelta: implement requirments for delta generation Big deltas or deltas for very small packages are not needed so we should check that and not generate any. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70d425c1d341e5b3d36e612560f922dbd3b20e63 Author: Florian Pritz <bluewind(a)xinu.at> Date: Fri Apr 6 20:51:17 2012 +0200 pkgdelta: rework option/argument parser Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0fc5aea027d83cc21498e14330d1f0d514a60112 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 15 10:27:51 2012 -0400 contrib: remove pactree make rule This is a vestige leftover from the rewrite over a year ago in 622e7fdd4. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b9fc709c55cc24a4b026c2a23d32f6dd901b2d61 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 17 21:36:20 2012 -0400 contrib: remove wget-xdelta from gitignore I removed this in ff713a51 over a year ago. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/.gitignore | 1 - contrib/Makefile.am | 1 - doc/PKGBUILD.5.txt | 5 ++- doc/pkgdelta.8.txt | 12 +++++- scripts/makepkg.sh.in | 5 +++ scripts/pkgdelta.sh.in | 99 +++++++++++++++++++++++++++++++++++++----------- scripts/repo-add.sh.in | 94 ++++++++++++++++++++++----------------------- 7 files changed, 143 insertions(+), 74 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman-key: lookup keys before receiving
by Dave Reisner 23 Apr '12

23 Apr '12

Perform a search for keys that clearly aren't key IDs. This allows receiving keys by name or email address, but only if the key resolves unambiguously. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/pacman-key.sh.in | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index bd2c739..e2e8980 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -116,6 +116,30 @@ get_from() { return 1 } +key_lookup_from_name() { + local ids + + mapfile -t ids < \ + <("${GPG_PACMAN[@]}" --search-keys --batch --with-colons "$1" 2>/dev/null | + awk -F: '$1 == "pub" { print $2 }') + + # only return success on non-ambiguous lookup + case ${#ids[*]} in + 0) + error "$(gettext "Failed to lookup key by name:") %s" "$name" + return 1 + ;; + 1) + printf '%s' "${ids[0]}" + return 0 + ;; + *) + error "$(gettext "Key name is ambiguous:") %s" "$name" + return 1 + ;; + esac +} + generate_master_key() { # Generate the master key, which will be in both pubring and secring "${GPG_PACMAN[@]}" --gen-key --batch <<EOF @@ -424,7 +448,22 @@ lsign_keys() { } receive_keys() { - if ! "${GPG_PACMAN[@]}" --recv-keys "$@" ; then + local name id keyids + + # if the key is not a hex ID, do a lookup + for name; do + if [[ $name = ?(0x)+([0-9a-fA-F]) ]]; then + keyids+=("$name") + else + if id=$(key_lookup_from_name "$name"); then + keyids+=("$id") + fi + fi + done + + (( ${#keyids[*]} > 0 )) || exit 1 + + if ! "${GPG_PACMAN[@]}" --recv-keys "${keyids[@]}" ; then error "$(gettext "Remote key not fetched correctly from keyserver.")" exit 1 fi -- 1.7.10

1 0

[pacman-dev] [PATCH] Append timestamp to .pacsave files; PacsaveDate config option
by Florian Pritz 23 Apr '12

23 Apr '12

This implements FS#7308 Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- The bugreport also suggests that this could be added for .pacnew, but I don't think this make much sense because those will change more often and when you diff them you only really need the most recent version. I'm not too happy about the name of the config option so if you have ideas, please shoot. I'm adding the date after ".pacsave" in order to keep scripts such as pacdiff working. I haven't checked, but they might not be able to deal properly with "foo_<date>.pacsave". doc/pacman.conf.5.txt | 3 +++ lib/libalpm/alpm.h | 2 ++ lib/libalpm/handle.c | 7 +++++++ lib/libalpm/handle.h | 1 + lib/libalpm/remove.c | 29 +++++++++++++++++++++++++++-- src/pacman/conf.c | 3 +++ src/pacman/conf.h | 1 + 7 files changed, 44 insertions(+), 2 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index a9c5db3..36ac223 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -177,6 +177,9 @@ Options Performs an approximate check for adequate available disk space before installing packages. +*PacsaveDate*:: + Append the date to the filename when generating .pacsave files. + *VerbosePkgLists*:: Displays name, version and size of target packages formatted as a table for upgrade, sync and remove operations. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index bb792cf..2a9d0ba 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -547,6 +547,8 @@ int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); +int alpm_option_set_pacsavedate(alpm_handle_t *handle, int pacsavedate); + alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 2db27fb..86ca5eb 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -603,6 +603,13 @@ int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) return 0; } +int SYMEXPORT alpm_option_set_pacsavedate(alpm_handle_t *handle, int pacsavedate) +{ + CHECK_HANDLE(handle, return -1); + handle->pacsavedate = pacsavedate; + return 0; +} + int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index c0ad668..f551b8c 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -91,6 +91,7 @@ struct __alpm_handle_t { double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ + int pacsavedate; /* Append date to .pacsave files */ alpm_siglevel_t siglevel; /* Default signature verification level */ /* error code */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 469ce9b..713018f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -28,6 +28,7 @@ #include <limits.h> #include <unistd.h> #include <sys/stat.h> +#include <time.h> /* libalpm */ #include "remove.h" @@ -322,9 +323,33 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, FREE(filehash); if(cmp != 0) { char *newpath; - size_t len = strlen(file) + 8 + 1; + + // not configurable, makes size calculation of the final string easier + char *date_fmt = "_%Y-%m-%d_%H%M%S"; + char date_string[18 + 1]; + + size_t len = strlen(file) + 8 + 1 + sizeof(date_string); + + if (handle->pacsavedate) { + time_t t; + struct tm *tm; + + t = time(NULL); + tm = localtime(&t); + + if (tm == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, "failed to determine time for pacsave name: localtime: %s\n", strerror(errno)); + date_string[0] = '\0'; + } else { + if (strftime(date_string, sizeof(date_string), date_fmt, tm) == 0) { + _alpm_log(handle, ALPM_LOG_ERROR, "failed to determine time for pacsave name: strftime returned 0: %s\n", strerror(errno)); + date_string[0] = '\0'; + } + } + } + MALLOC(newpath, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(newpath, len, "%s.pacsave", file); + snprintf(newpath, len, "%s.pacsave%s", file, date_string); if(rename(file, newpath)) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), file, newpath, strerror(errno)); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 4aaacb5..4357dc1 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -404,6 +404,8 @@ static int _parse_options(const char *key, char *value, pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); } else if(strcmp(key, "CheckSpace") == 0) { config->checkspace = 1; + } else if(strcmp(key, "PacsaveDate") == 0) { + config->pacsavedate = 1; } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -614,6 +616,7 @@ static int setup_libalpm(void) alpm_option_set_arch(handle, config->arch); alpm_option_set_checkspace(handle, config->checkspace); + alpm_option_set_pacsavedate(handle, config->pacsavedate); alpm_option_set_usesyslog(handle, config->usesyslog); alpm_option_set_deltaratio(handle, config->deltaratio); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 69c955e..0e170ad 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -33,6 +33,7 @@ typedef struct __config_t { unsigned short logmask; unsigned short print; unsigned short checkspace; + unsigned short pacsavedate; unsigned short usesyslog; double deltaratio; char *arch; -- 1.7.10

2 2