- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-97-g5fcb005
by dan＠archlinux.org 12 Oct '10

12 Oct '10

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 5fcb005ebd270c1ecff3403695680145253961a2 (commit) via 827258f32ee898ed5422bc9219d9a42bd9bd2360 (commit) via 0ff2a9149711b9179d288f579c792890cd81d79b (commit) via 05f0a28932c1acab7a9ddb58435d69626dad54da (commit) via bce3c8efc7a2d187984aa0e7037307b99c217fd7 (commit) via 7d937772313a796f4c0bff76bf1bd7d78f8ccb5a (commit) via c9179b09db405e89093c07756d8e674ff8119ea2 (commit) via 53b41afbe8c47afaa5daf94f4e66cab81bd024cd (commit) via fb79d58109ff5a55ac3cea83607eb41e70456b17 (commit) from 46ffd342a4255916a9599692b5969ae4cd85a156 (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 5fcb005ebd270c1ecff3403695680145253961a2 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Oct 8 22:59:30 2010 +0200 CLI args: stricter/better parsing In the following, the letters SRUDQ refer to the corresponding pacman operations. Most of the work in this commit is about removing as many options as possible from the global section and moving them to where they actually belong. Additionally, --ignore{,group} are added to U and --dbonly is added to S. --dbonly added to S --asdeps moved to S/U/D --asexplicit moved to S/U/D --print-format moved to S/U/R --noprogressbar moved to S/U/R --noscriptlet moved to S/U/R --ignorepkg added to U --ignoregrp added to U -d moved to S/U/R (--nodeps) and Q (--deps) -p moved to S/U/R (--print) and Q (--file) -f moved to S/U Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 827258f32ee898ed5422bc9219d9a42bd9bd2360 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Oct 8 22:34:17 2010 +0200 CLI args: reorganize parsing Split parsing of CLI arguments into separate functions: parsearg_op (operations) parsearg_global (global options) parsearg_{database,query,remove,sync,deptest,upgrade} Organization strictly follows the manpage (even where the manpage is incorrect) - these cases will be fixed in the following commits. Switch cases are copy/pasted and statements unrelated to chosen operation are deleted. Parsing logic adjusted as follows: 1) Parse operation 2) If we can bail out early (duplicate op, help/version requested) do so 3) Parse arguments again: foreach arg: if arg is operation: continue tryparse_args_specific_to_op if unsuccessful tryparse_args_global if unsuccessful print error message and exit Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ff2a9149711b9179d288f579c792890cd81d79b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 11 20:20:06 2010 -0500 util: fall cleaning on single file programs * Add a bunch of static declarations where possible * Fix void functions to be proper syntax, e.g. void func(void) * Consistency fixes (such as argv references) * Remove dead str_cmp() function from testdb * Remove unneeded config.h header includes * vercmp: remove completely unnecessary string copying Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 05f0a28932c1acab7a9ddb58435d69626dad54da Author: Nezmer <git(a)nezmer.info> Date: Tue Oct 12 02:23:16 2010 +0300 Use sysconfdir, localstatedir, BASH instead of hardcoded values This applies to contrib/ files, our scripts, and the documentation. Dan: fix 'make clean' in contrib/ directory. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bce3c8efc7a2d187984aa0e7037307b99c217fd7 Author: Nezmer <git(a)nezmer.info> Date: Tue Oct 12 00:20:57 2010 +0300 Add .in extension to files in contrib This is needed If we want to use sysconfdir,localstatedir and other variables. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7d937772313a796f4c0bff76bf1bd7d78f8ccb5a Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 18:28:35 2010 +0200 repo-add: more informative delta messages - Print an error if database entry was not found and delta entry cannot be added - More informative line when delta entry is added (oldfile -> newfile) Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c9179b09db405e89093c07756d8e674ff8119ea2 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 17:08:00 2010 +0200 repo-add: add delta generation This allows deltas to be generated at repo-add invocation time as opposed to just added to the database. It will generate the delta from the package version currently in the database. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 53b41afbe8c47afaa5daf94f4e66cab81bd024cd Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Aug 18 23:53:29 2010 +0200 pactest: fix typo in ignore001 Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb79d58109ff5a55ac3cea83607eb41e70456b17 Author: Nezmer <git(a)nezmer.info> Date: Mon Oct 11 22:16:49 2010 +0300 makepkg: Use mkfifo instead of GNU-only 'mknod <file> p' 'mknod <file> p' is apparently GNU-only. Looking at coreutils' source code, It just calls mkfifo. This one line patch should fix makepkg logging in non-GNU systems. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + contrib/Makefile.am | 33 ++- contrib/{PKGBUILD.vim => PKGBUILD.vim.in} | 0 contrib/{bacman => bacman.in} | 16 +- contrib/{bash_completion => bash_completion.in} | 0 contrib/{pacdiff => pacdiff.in} | 2 +- contrib/{paclist => paclist.in} | 0 contrib/{pacscripts => pacscripts.in} | 8 +- contrib/{pacsearch => pacsearch.in} | 0 contrib/{pactree => pactree.in} | 10 +- contrib/{vimprojects => vimprojects.in} | 0 contrib/{wget-xdelta.sh => wget-xdelta.sh.in} | 10 +- contrib/{zsh_completion => zsh_completion.in} | 18 +- doc/Makefile.am | 1 + doc/makepkg.8.txt | 2 +- doc/pacman.8.txt | 30 +- doc/pacman.conf.5.txt | 12 +- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 4 +- scripts/repo-add.sh.in | 36 ++- src/pacman/pacman.c | 453 +++++++++++++++-------- src/util/cleanupdelta.c | 8 +- src/util/testdb.c | 17 +- src/util/testpkg.c | 6 +- src/util/vercmp.c | 23 +- test/pacman/tests/ignore001.py | 2 +- test/pacman/tests/pacman005.py | 3 - 30 files changed, 438 insertions(+), 266 deletions(-) rename contrib/{PKGBUILD.vim => PKGBUILD.vim.in} (100%) rename contrib/{bacman => bacman.in} (95%) rename contrib/{bash_completion => bash_completion.in} (100%) rename contrib/{pacdiff => pacdiff.in} (99%) rename contrib/{paclist => paclist.in} (100%) rename contrib/{pacscripts => pacscripts.in} (95%) rename contrib/{pacsearch => pacsearch.in} (100%) rename contrib/{pactree => pactree.in} (97%) rename contrib/{vimprojects => vimprojects.in} (100%) rename contrib/{wget-xdelta.sh => wget-xdelta.sh.in} (88%) rename contrib/{zsh_completion => zsh_completion.in} (92%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] util: fall cleaning on single file programs
by Dan McGee 12 Oct '10

12 Oct '10

* Add a bunch of static declarations where possible * Fix void functions to be proper syntax, e.g. void func(void) * Consistency fixes (such as argv references) * Remove dead str_cmp() function from testdb * Remove unneeded config.h header includes * vercmp: remove completely unnecessary string copying Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/util/cleanupdelta.c | 8 ++++---- src/util/testdb.c | 17 ++++++----------- src/util/testpkg.c | 6 ++---- src/util/vercmp.c | 23 +++++++---------------- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index ffcfaba..c1ef18c 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -49,7 +49,7 @@ void output_cb(pmloglevel_t level, char *fmt, va_list args) } -void checkpkgs(alpm_list_t *pkglist) +static void checkpkgs(alpm_list_t *pkglist) { alpm_list_t *i, *j; for(i = pkglist; i; i = alpm_list_next(i)) { @@ -63,7 +63,7 @@ void checkpkgs(alpm_list_t *pkglist) } } -void checkdbs(char *dbpath, alpm_list_t *dbnames) { +static void checkdbs(char *dbpath, alpm_list_t *dbnames) { char syncdbpath[PATH_MAX]; pmdb_t *db = NULL; alpm_list_t *i; @@ -82,14 +82,14 @@ void checkdbs(char *dbpath, alpm_list_t *dbnames) { } -void usage() { +static void usage(void) { fprintf(stderr, "usage:\n"); fprintf(stderr, "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); exit(1); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { char *dbpath = DBPATH; int a = 1; diff --git a/src/util/testdb.c b/src/util/testdb.c index 45a2626..28f2b2b 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -30,11 +30,6 @@ #define BASENAME "testdb" -int str_cmp(const void *s1, const void *s2) -{ - return(strcmp(s1, s2)); -} - static void cleanup(int signum) { if(alpm_release() == -1) { fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); @@ -100,7 +95,7 @@ static int db_test(char *dbpath, int local) return(ret); } -int checkdeps(alpm_list_t *pkglist) +static int checkdeps(alpm_list_t *pkglist) { alpm_list_t *data, *i; int ret = 0; @@ -119,7 +114,7 @@ int checkdeps(alpm_list_t *pkglist) return(ret); } -int checkconflicts(alpm_list_t *pkglist) +static int checkconflicts(alpm_list_t *pkglist) { alpm_list_t *data, *i; int ret = 0; @@ -135,7 +130,7 @@ int checkconflicts(alpm_list_t *pkglist) return(ret); } -int check_localdb(char *dbpath) { +static int check_localdb(char *dbpath) { char localdbpath[PATH_MAX]; int ret = 0; pmdb_t *db = NULL; @@ -159,7 +154,7 @@ int check_localdb(char *dbpath) { return(ret); } -int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { +static int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { char syncdbpath[PATH_MAX]; int ret = 0; pmdb_t *db = NULL; @@ -190,7 +185,7 @@ cleanup: return(ret); } -void usage() { +static void usage(void) { fprintf(stderr, "usage:\n"); fprintf(stderr, "\t%s [-b <pacman db>] : check the local database\n", BASENAME); @@ -199,7 +194,7 @@ void usage() { exit(1); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { int ret = 0; char *dbpath = DBPATH; diff --git a/src/util/testpkg.c b/src/util/testpkg.c index d86fb1e..6fc0ce0 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> /* printf */ #include <stdarg.h> /* va_list */ @@ -26,7 +24,7 @@ #define BASENAME "testpkg" -static void output_cb(pmloglevel_t level, char *fmt, va_list args) +void output_cb(pmloglevel_t level, char *fmt, va_list args) { if(fmt[0] == '\0') { return; @@ -39,7 +37,7 @@ static void output_cb(pmloglevel_t level, char *fmt, va_list args) vprintf(fmt, args); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { int retval = 1; /* default = false */ pmpkg_t *pkg = NULL; diff --git a/src/util/vercmp.c b/src/util/vercmp.c index 959dc13..8a785bb 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -18,20 +18,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> /* printf */ #include <string.h> /* strncpy */ #define BASENAME "vercmp" -#define MAX_LEN 255 - /* forward declaration, comes from vercmp.o in libalpm source that is linked in * directly so we don't have any library deps */ int alpm_pkg_vercmp(const char *a, const char *b); -static void usage() +static void usage(void) { fprintf(stderr, "usage: %s <ver1> <ver2>\n\n", BASENAME); fprintf(stderr, "return values:\n"); @@ -42,8 +38,8 @@ static void usage() int main(int argc, char *argv[]) { - char s1[MAX_LEN] = ""; - char s2[MAX_LEN] = ""; + const char *s1 = ""; + const char *s2 = ""; int ret; if(argc == 1) { @@ -56,16 +52,11 @@ int main(int argc, char *argv[]) usage(); return(0); } - if(argc > 1) { - strncpy(s1, argv[1], MAX_LEN); - s1[MAX_LEN -1] = '\0'; - } if(argc > 2) { - strncpy(s2, argv[2], MAX_LEN); - s2[MAX_LEN -1] = '\0'; - } else { - printf("0\n"); - return(0); + s2 = argv[2]; + } + if(argc > 1) { + s1 = argv[1]; } ret = alpm_pkg_vercmp(s1, s2); -- 1.7.3.1

1 0

[pacman-dev] [PATCH 2/2] Use sysconfdir, localstatedir, BASH instead of hard-coded values (v.2)
by Nezmer 11 Oct '10

11 Oct '10

Signed-off-by: Nezmer <git(a)nezmer.info> --- configure.ac | 1 + contrib/Makefile.am | 30 ++++++++++++++++++++++++++++-- contrib/bacman.in | 16 ++++++++-------- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 8 ++++---- contrib/pactree.in | 10 +++++----- contrib/wget-xdelta.sh.in | 10 +++++----- contrib/zsh_completion.in | 18 +++++++++--------- doc/Makefile.am | 1 + doc/makepkg.8.txt | 2 +- doc/pacman.8.txt | 4 ++-- doc/pacman.conf.5.txt | 12 ++++++------ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 4 ++-- scripts/repo-add.sh.in | 2 +- 18 files changed, 78 insertions(+), 49 deletions(-) diff --git a/configure.ac b/configure.ac index 37b26f2..115aeb1 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,7 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false]) +AC_CHECK_PROGS([BASH], [bash bash4 bash3], [false]) # find installed gettext AM_GNU_GETTEXT([external]) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index c6243b1..f10abbf 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = \ +OURFILES = \ PKGBUILD.vim \ bacman \ bash_completion \ @@ -9,7 +9,33 @@ EXTRA_DIST = \ pactree \ vimprojects \ wget-xdelta.sh \ - zsh_completion \ + zsh_completion + +EXTRA_DIST = \ + PKGBUILD.vim.in \ + bacman.in \ + bash_completion.in \ + pacdiff.in \ + paclist.in \ + pacscripts.in \ + pacsearch.in \ + pactree.in \ + vimprojects.in \ + wget-xdelta.sh.in \ + zsh_completion.in \ README +edit = sed \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@BASH[@]|$(BASH)|g' + +$(OURFILES): Makefile + @rm -f $@ $@.tmp + @cp -a $@.in $@.tmp + $(edit) $@.in >$@.tmp + @mv $@.tmp $@ + +all-am: $(OURFILES) + # vim:set ts=2 sw=2 noet: diff --git a/contrib/bacman.in b/contrib/bacman.in index 6dd7839..2a93f8b 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # bacman: recreate a package from a running system # This script rebuilds an already installed package using metadata @@ -67,20 +67,20 @@ fi # # Setting environmental variables # -if [ ! -r /etc/pacman.conf ]; then - echo "ERROR: unable to read /etc/pacman.conf" +if [ ! -r @sysconfdir@/pacman.conf ]; then + echo "ERROR: unable to read @sysconfdir@/pacman.conf" exit 1 fi -eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) -pac_db="${DBPath:-/var/lib/pacman/}/local" +eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) +pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local" -if [ ! -r /etc/makepkg.conf ]; then - echo "ERROR: unable to read /etc/makepkg.conf" +if [ ! -r @sysconfdir@/makepkg.conf ]; then + echo "ERROR: unable to read @sysconfdir@/makepkg.conf" exit 1 fi -source "/etc/makepkg.conf" +source "@sysconfdir@/makepkg.conf" if [ -r ~/.makepkg.conf ]; then source ~/.makepkg.conf fi diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index 3f26f38..716333a 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # pacdiff : a simple pacnew/pacorig/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 101fb15..123c79d 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pacscripts : tries to print out the {pre,post}_{install,remove,upgrade} # scripts of a given package @@ -27,7 +27,7 @@ set -o errexit progname=$(basename $0) progver="0.4" -conf="/etc/pacman.conf" +conf="@sysconfdir@/pacman.conf" if [ ! -r "$conf" ]; then echo "ERROR: unable to read $conf" @@ -36,8 +36,8 @@ fi eval $(awk '/DBPath/ {print $1$2$3}' "$conf") eval $(awk '/CacheDir/ {print $1$2$3}' "$conf") -pac_db="${DBPath:-/var/lib/pacman}/local" -pac_cache="${CacheDir:-/var/cache/pacman/pkg}" +pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" +pac_cache="${CacheDir:-@localstatedir@/cache/pacman/pkg}" error() { local mesg=$1; shift diff --git a/contrib/pactree.in b/contrib/pactree.in index 6051724..29c6af6 100755 --- a/contrib/pactree.in +++ b/contrib/pactree.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # pactree : a simple dependency tree viewer # # Copyright (C) 2008 Carlo "carlocci" Bersani <carlocci(a)gmail.com> @@ -272,14 +272,14 @@ if [ $graphviz -eq 1 ]; then fi fi -if [ ! -r /etc/pacman.conf ]; then - echo "ERROR: unable to read /etc/pacman.conf" +if [ ! -r @sysconfdir@/pacman.conf ]; then + echo "ERROR: unable to read @sysconfdir@/pacman.conf" exit 1 else - eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) + eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) fi -pac_db="${DBPath:-/var/lib/pacman}/local" +pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" if [ ! -d "$pac_db" ] ; then echo "ERROR: pacman database directory ${pac_db} not found" diff --git a/contrib/wget-xdelta.sh.in b/contrib/wget-xdelta.sh.in index 4656f4d..caf0171 100755 --- a/contrib/wget-xdelta.sh.in +++ b/contrib/wget-xdelta.sh.in @@ -1,7 +1,7 @@ -#!/bin/bash +#!@BASH@ -if [ -r "/etc/makepkg.conf" ]; then - source /etc/makepkg.conf +if [ -r "@sysconfdir@/makepkg.conf" ]; then + source @sysconfdir@/makepkg.conf else echo "wget-xdelta: Unable to find makepkg.conf" exit 1 @@ -30,11 +30,11 @@ new_version=$(echo $pkg_data | cut -d ' ' -f 2) base_url=${file_url%/*} # Look for the last version -for file in $(ls -r /var/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do +for file in $(ls -r @localstatedir@/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do [[ "$file" =~ "$CARCH" ]] && arch="-$CARCH" || arch="" check_version=$(echo $file | \ sed "s|^.*/${pkgname}-$[[:alnum:]_\.]*-[[:alnum:]_\.]*$${arch}$PKGEXT$|\1|" | \ - grep -v "^/var/cache/pacman/pkg") + grep -v "^@localstatedir@/cache/pacman/pkg") [ "$check_version" = "" ] && continue diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f69fe63..1691913 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -222,20 +222,20 @@ _pacman_completions_all_groups() { _pacman_completions_all_packages() { local -a cmd packages repositories packages_long - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) typeset -U repositories - packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) - packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} ) typeset -U packages _wanted packages expl "packages" compadd - "${(@)packages}" if [[ $PREFIX != */* ]] ; then - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) typeset -U repositories _wanted repo_packages expl "repository/package" compadd -S "/" $repositories else compset -P '*/' - packages_long=(/var/lib/pacman/sync/$IPREFIX*(/)) - packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/sync/$IPREFIX*(/)) + packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} ) typeset -U packages _wanted repo_packages expl "repository/package" compadd ${(@)packages} fi @@ -253,15 +253,15 @@ _pacman_completions_installed_groups() { # provides completions for installed packages _pacman_completions_installed_packages() { local -a cmd packages packages_long - packages_long=(/var/lib/pacman/local/*(/)) - packages=( ${${packages_long/\/var\/lib\/pacman\/local\//}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/local/*(/)) + packages=( ${${packages_long#@localstatedir@/lib/pacman/local/}%-*-*} ) compadd "$@" -a packages } # provides completions for repository names _pacman_completions_repositories() { local -a cmd repositories - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) # Uniq the array typeset -U repositories compadd "$@" -a repositories diff --git a/doc/Makefile.am b/doc/Makefile.am index 2e656f6..748eb5f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -96,6 +96,7 @@ ASCIIDOC_OPTS = \ -a pacman_version="$(REAL_PACKAGE_VERSION)" \ -a pacman_date="`date +%Y-%m-%d`" \ -a pkgdatadir=$(pkgdatadir) \ + -a localstatedir=$(localstatedir) \ -a sysconfdir=$(sysconfdir) A2X_OPTS = \ diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index a2fdb3f..ff0f2b6 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -53,7 +53,7 @@ Options in linkman:makepkg.conf[5]. *--config* <`/path/to/config`>:: - Use an alternate config file instead of the `/etc/makepkg.conf` default; + Use an alternate config file instead of the `{sysconfdir}/makepkg.conf` default; *-d, \--nodeps*:: Do not perform any dependency checks. This will let you override and diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index de1f51f..2656fc7 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -118,7 +118,7 @@ Options *-b, \--dbpath* <'path'>:: Specify an alternative database location (a typical default is - ``/var/lib/pacman''). This should not be used unless you know what you are + ``{localstatedir}/lib/pacman''). This should not be used unless you know what you are doing. *NOTE*: if specified, this is an absolute path and the root path is not automatically prepended. @@ -151,7 +151,7 @@ Options *\--cachedir* <'dir'>:: Specify an alternative package cache location (a typical default is - ``/var/cache/pacman/pkg''). Multiple cache directories can be specified, + ``{localstatedir}/cache/pacman/pkg''). Multiple cache directories can be specified, and they are tried in the order they are passed to pacman. *NOTE*: this is an absolute path, the root path is not automatically prepended. diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 0e8426a..ecc5c74 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -35,7 +35,7 @@ NoUpgrade = etc/passwd etc/group etc/shadow NoUpgrade = etc/fstab [core] -Include = /etc/pacman.d/core +Include = {sysconfdir}/pacman.d/core [custom] Server = file:///home/pkgs @@ -57,13 +57,13 @@ Options *DBPath =* path/to/db/dir:: Overrides the default location of the toplevel database directory. A - typical default is ``/var/lib/pacman/''. Most users will not need to set + typical default is ``{localstatedir}/lib/pacman/''. Most users will not need to set this option. *NOTE*: if specified, this is an absolute path and the root path is not automatically prepended. *CacheDir =* path/to/cache/dir:: Overrides the default location of the package cache directory. A typical - default is ``/var/cache/pacman/pkg/''. Multiple cache directories can be + default is ``{localstatedir}/cache/pacman/pkg/''. Multiple cache directories can be specified, and they are tried in the order they are listed in the config file. If a file is not found in any cache directory, it will be downloaded to the first cache directory with write access. *NOTE*: this is an absolute @@ -72,7 +72,7 @@ Options *LogFile =* '/path/to/file':: Overrides the default location of the pacman log file. A typical default - is ``/var/log/pacman.log''. This is an absolute path and the root directory + is ``{localstatedir}/log/pacman.log''. This is an absolute path and the root directory is not prepended. *HoldPkg =* package ...:: @@ -147,7 +147,7 @@ Options *UseSyslog*:: Log action messages through syslog(). This will insert log entries into - ``/var/log/messages'' or equivalent. + ``{localstatedir}/log/messages'' or equivalent. *ShowSize*:: Display the size of individual packages for '\--sync' and '\--query' modes. @@ -180,7 +180,7 @@ contain a file that lists the servers for that repository. # use this repository first Server = ftp://ftp.archlinux.org/core/os/arch # next use servers as defined in the mirrorlist below -Include = /etc/pacman.d/mirrorlist +Include = {sysconfdir}/pacman.d/mirrorlist -------- During parsing, pacman will define the `$repo` variable to the name of the diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 31e8fb5..b9e3038 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -35,6 +35,7 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ + -e 's|@BASH[@]|$(BASH)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3a7a4d1..baabf26 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!@BASH@ -e # # makepkg - make packages compatible for use with pacman # @configure_input@ diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 78b2345..eb6691c 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pacman-optimize # @configure_input@ diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 1550fa1..d45678d 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pkgdelta - create delta files for use with pacman and repo-add # @configure_input@ diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 0cd4c08..3851b77 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # rankmirrors - read a list of mirrors from a file and rank them by speed # @configure_input@ @@ -25,7 +25,7 @@ usage() { echo "Usage: rankmirrors [options] MIRRORFILE | URL" echo echo "Ranks pacman mirrors by their connection and opening speed. Pacman mirror" - echo "files are located in /etc/pacman.d/. It can also rank one mirror if the URL is" + echo "files are located in @sysconfdir@/pacman.d/. It can also rank one mirror if the URL is" echo "provided." echo echo "Options:" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 8ef940d..4338011 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # repo-add - add a package to a given repo database file # repo-remove - remove a package entry from a given repo database file -- 1.7.3.1

1 0

[pacman-dev] [PATCH] alpm/remove.c : respect --dbonly during remove-upgrade
by Xavier Chantry 11 Oct '10

11 Oct '10

When a -Sk or -Uk operation induced a removal of an existing local package, --dbonly was not in effect and the files were all removed. Fixing this behavior was already marked as TODO in database012 pactest << TODO: I honestly think the above should NOT delete the original les, it hould upgrade the DB entry without touching anything on the file stem. E.g. this test should be the same as: pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz >> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- doc/pacman.8.txt | 2 -- lib/libalpm/remove.c | 4 ++++ src/pacman/pacman.c | 3 +-- test/pacman/tests/database012.py | 8 +------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index f389dfd..866c5a2 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -155,8 +155,6 @@ Transaction Options (apply to '-S', '-R' and '-U') *-k, \--dbonly*:: Adds/Removes the database entry only, leaves all files in place. - On an upgrade operation, the existing package and all files - will be removed and the database entry for the new package will be added. *\--noprogressbar*:: Do not show a progress bar when downloading files. This can be useful diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index dfaba03..e0099fb 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -311,6 +311,9 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *tra _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", oldpkg->name, oldpkg->version); + if(trans->flags & PM_TRANS_FLAG_DBONLY) + goto db; + /* copy the remove skiplist over */ skip_remove = alpm_list_join(alpm_list_strdup(trans->skip_remove),alpm_list_strdup(handle->noupgrade)); @@ -345,6 +348,7 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *tra alpm_list_free(newfiles); FREELIST(skip_remove); +db: /* remove the package from the database */ _alpm_log(PM_LOG_DEBUG, "updating database\n"); _alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 933698e..4bf2613 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -90,7 +90,6 @@ static void usage(int op, const char * const myname) printf("%s: %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); printf(_(" -c, --cascade remove packages and all packages that depend on them\n")); - printf(_(" -k, --dbonly only remove database entries, do not remove files\n")); printf(_(" -n, --nosave remove configuration files as well\n")); printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n" " (-ss includes explicitly installed dependencies too)\n")); @@ -138,7 +137,6 @@ static void usage(int op, const char * const myname) case PM_OP_SYNC: case PM_OP_UPGRADE: printf(_(" -f, --force force install, overwrite conflicting files\n")); - printf(_(" -k, --dbonly add database entries, do not install or keep existing files\n")); printf(_(" --asdeps install packages as non-explicitly installed\n")); printf(_(" --asexplicit install packages as explicitly installed\n")); printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); @@ -147,6 +145,7 @@ static void usage(int op, const char * const myname) /* pass through */ case PM_OP_REMOVE: printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -k, --dbonly only modify database entries, not package files\n")); printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); printf(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); printf(_(" --print only print the targets instead of performing the operation\n")); diff --git a/test/pacman/tests/database012.py b/test/pacman/tests/database012.py index a1f8698..52813ec 100644 --- a/test/pacman/tests/database012.py +++ b/test/pacman/tests/database012.py @@ -21,11 +21,5 @@ self.addrule("PKG_EXIST=dummy") self.addrule("PKG_VERSION=dummy|2.0-1") for f in lp.files: - self.addrule("!FILE_EXIST=%s" % f) -# TODO: I honestly think the above should NOT delete the original files, it -# should upgrade the DB entry without touching anything on the file system. -# E.g. this test should be the same as: -# pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz -#for f in lp.files: -# self.addrule("FILE_EXIST=%s" % f) + self.addrule("FILE_EXIST=%s" % f) self.addrule("!FILE_EXIST=bin/dummy2") -- 1.7.3.1

1 0

[pacman-dev] [PATCH 1/2] Add .in extension to files in contrib
by Nezmer 11 Oct '10

11 Oct '10

This is needed If we want to use sysconfdir,localstatedir and other variables. Signed-off-by: Nezmer <git(a)nezmer.info> --- contrib/{PKGBUILD.vim => PKGBUILD.vim.in} | 0 contrib/{bacman => bacman.in} | 0 contrib/{bash_completion => bash_completion.in} | 0 contrib/{pacdiff => pacdiff.in} | 0 contrib/{paclist => paclist.in} | 0 contrib/{pacscripts => pacscripts.in} | 0 contrib/{pacsearch => pacsearch.in} | 0 contrib/{pactree => pactree.in} | 0 contrib/{vimprojects => vimprojects.in} | 0 contrib/{wget-xdelta.sh => wget-xdelta.sh.in} | 0 contrib/{zsh_completion => zsh_completion.in} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename contrib/{PKGBUILD.vim => PKGBUILD.vim.in} (100%) rename contrib/{bacman => bacman.in} (100%) rename contrib/{bash_completion => bash_completion.in} (100%) rename contrib/{pacdiff => pacdiff.in} (100%) rename contrib/{paclist => paclist.in} (100%) rename contrib/{pacscripts => pacscripts.in} (100%) rename contrib/{pacsearch => pacsearch.in} (100%) rename contrib/{pactree => pactree.in} (100%) rename contrib/{vimprojects => vimprojects.in} (100%) rename contrib/{wget-xdelta.sh => wget-xdelta.sh.in} (100%) rename contrib/{zsh_completion => zsh_completion.in} (100%) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim.in similarity index 100% rename from contrib/PKGBUILD.vim rename to contrib/PKGBUILD.vim.in diff --git a/contrib/bacman b/contrib/bacman.in similarity index 100% rename from contrib/bacman rename to contrib/bacman.in diff --git a/contrib/bash_completion b/contrib/bash_completion.in similarity index 100% rename from contrib/bash_completion rename to contrib/bash_completion.in diff --git a/contrib/pacdiff b/contrib/pacdiff.in similarity index 100% rename from contrib/pacdiff rename to contrib/pacdiff.in diff --git a/contrib/paclist b/contrib/paclist.in similarity index 100% rename from contrib/paclist rename to contrib/paclist.in diff --git a/contrib/pacscripts b/contrib/pacscripts.in similarity index 100% rename from contrib/pacscripts rename to contrib/pacscripts.in diff --git a/contrib/pacsearch b/contrib/pacsearch.in similarity index 100% rename from contrib/pacsearch rename to contrib/pacsearch.in diff --git a/contrib/pactree b/contrib/pactree.in similarity index 100% rename from contrib/pactree rename to contrib/pactree.in diff --git a/contrib/vimprojects b/contrib/vimprojects.in similarity index 100% rename from contrib/vimprojects rename to contrib/vimprojects.in diff --git a/contrib/wget-xdelta.sh b/contrib/wget-xdelta.sh.in similarity index 100% rename from contrib/wget-xdelta.sh rename to contrib/wget-xdelta.sh.in diff --git a/contrib/zsh_completion b/contrib/zsh_completion.in similarity index 100% rename from contrib/zsh_completion rename to contrib/zsh_completion.in -- 1.7.3.1

2 4

[pacman-dev] Minor patches to improve portability
by Nezmer 11 Oct '10

11 Oct '10

I'm about to send 4 minor patches that should improve portability. They mostly address using proper paths for binaries, databases and configs. I don't necessarily know what I'm doing especially inside Makefiles. So, I apologise If I did anything stupid in there.

2 8

[pacman-dev] [ABS] fails if INCLUDE env variable is set
by Ivan Stojic 11 Oct '10

11 Oct '10

ABS (Arch Build System 2.3.4.1) fails if INCLUDE environment variable is set: [~]# abs ==> Starting ABS sync... Unexpected remote arg: rsync.archlinux.org::abs/i686/ rsync error: syntax or usage error (code 1) at main.c(1204) [sender=3.0.7] [~]# echo $INCLUDE /opt/intel/Compiler/11.1/073/ipp/ia32/include:/opt/intel/Compiler/11.1/073/mkl/include [~]# INCLUDE="" abs ==> Starting ABS sync... receiving file list ... done sent 132 bytes received 282939 bytes 43549.38 bytes/sec total size is 13144299 speedup is 46.43 This is because it uses INCLUDE like this: $SYNCCMD $SYNCARGS $INCLUDE $EXCLUDE ${SYNCSERVER}::abs/{${ARCH},any}/ $ABSROOT which expands to: rsync -mrtv --no-motd --delete-after --no-p --no-o --no-g --delete-excluded /opt/intel/Compiler/11.1/073/ipp/ia32/include:/opt/intel/Compiler/11.1/073/mkl/include --filter=-_/testing/ --filter=-_/community-testing/ --filter=-_/staging/ --filter=-_/community-staging/ --filter=-_/gnome-unstable/ --filter=P_/local/ --filter=P_/README rsync.archlinux.org::abs/{i686,any}/ /var/abs/ INCLUDE should be set to "" at the start of abs script, along with EXCLUDE to prevent env variables from being used, patch is in the attachment.

1 0

[pacman-dev] Sodeps support
by Florian Pritz 11 Oct '10

11 Oct '10

These patches add a -dd option which ignores the version of dependencies only and sodependencies. They are also available online at http://git.server-speed.net/users/flo/pacman/

4 10

[pacman-dev] [PATCH 1/2] pactest: use simpler method to create tar
by Xavier Chantry 11 Oct '10

11 Oct '10

just like in 24fc623e1a8bf905cf0367f9bd40bc5bd6034378 , apply to pmdb gensync as well. --- test/pacman/pmdb.py | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index 41bd738..11083db 100755 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -346,11 +346,8 @@ def gensync(self, path): mkdir(path) archive = os.path.join(path, "%s.db" % (self.treename)) tar = tarfile.open(archive, "w:gz") - for root, dirs, files in os.walk('.'): - for d in dirs: - tar.add(os.path.join(root, d), recursive=False) - for f in files: - tar.add(os.path.join(root, f)) + for i in os.listdir("."): + tar.add(i) tar.close() os.chdir(curdir) -- 1.7.3.1

2 2

[pacman-dev] [PATCH] RFC: Allow building against internal libarchive
by Allan McRae 07 Oct '10

07 Oct '10

The idea behind this patch is to allow putting a libarchive source folder in the pacman source directory and then build against that libarchive version. This is handy for testing pacman out on systems when libarchive is not available (and you do not want to or unable to install it for some reason). It would also allow easy testing of patches to libarchive and how they affected pacman without touching your system libarchive. Currently, the following works: 1) extract the libarchive source in the root of the pacman source and rename or symlink the folder to be called libarchive. 2) build libarchive using: ./configure --prefix=$PWD/install make make install 3) build pacman in the usual way The pacman build will then link against/use headers from the libarchive version in ./libarchive/install/{lib,include}. Note that the "make install" step is necessary to put the needed files in a clean place or all sorts of weird build issues happen... Hence the weird --prefix to the ./configure. It should be possible to automate the building of libarchive as necessary, even to the extent of not running ./configure if the Makefile is there and possible doing necessary stuff for using SVN checkouts of libarchive. But I have absolutely no idea how... Help! --- configure.ac | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e709fc4..8f34776 100644 --- a/configure.ac +++ b/configure.ac @@ -133,8 +133,17 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.13.1) # Check for libarchive -AC_CHECK_LIB([archive], [archive_read_data], , - AC_MSG_ERROR([libarchive is needed to compile pacman!])) +if test -d ${srcdir}/libarchive; then + # Do not test libarchive as it is in the source tree and the library + # has not been built yet + libarchivedir=`(cd $srcdir && pwd)`/libarchive/install + CFLAGS="-I${libarchivedir}/include $CFLAGS" + LIBS="-L${libarchivedir}/lib -larchive $LIBS" + AM_CONDITIONAL(INTERNAL_LIBARCHIVE, true) +else + AC_CHECK_LIB([archive], [archive_read_data], , + AC_MSG_ERROR([libarchive is needed to compile pacman!])) +fi # Check for OpenSSL AC_MSG_CHECKING(whether to link with libssl) -- 1.7.3

2 1