- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 00/13] global handle removal patch series
by Dan McGee 09 Jun '11

09 Jun '11

This is a bitch of a diffstat, unfortunately, and the patches aren't all that fun to look through. I have it pushed to my repo as alpm-cleanups if you'd rather grab it there. The bright side is it should successfully build and test after each patch as long as they are applied in the order sent here (or in my repo). Comments/suggestion/feedback welcome. Once these are applied, I think our API makes a lot more sense from a consumer standpoint as we have a single object, tracked by the "client", tracking all state in the library rather than the state being held in a global variable in the backend library. This patch series (and the previous one sent and now applied) makes it *much* easier for the next few patches, which will ensure DBs are signature-checked and verified at the right time, and at a time all clients expect them to be checked so error codes can be checked. Look at the bright side- the overall line differential is at least negative! -Dan Dan McGee (13): Require handle argument to alpm_logaction() Require handle argument to all alpm_option_(get|set)_*() methods Require handle argument to all alpm_trans_*() methods Require handle for alpm_db_register_sync() Require handle for alpm_sync_sysupgrade() Require handle for alpm_pkg_load() Require handle for alpm_checkconflicts() Add handle argument to two more alpm methods Require handle for alpm_find_grp_pkgs() Move pm_errno onto the handle Switch all logging to use handle directly Remove global handle variable Always pass data to trans_commit() lib/libalpm/add.c | 173 +++++++++++++++--------------- lib/libalpm/alpm.c | 14 +-- lib/libalpm/alpm.h | 159 +++++++++++++++------------- lib/libalpm/be_local.c | 77 ++++++------- lib/libalpm/be_package.c | 92 ++++++++-------- lib/libalpm/be_sync.c | 88 ++++++++-------- lib/libalpm/conflict.c | 151 ++++++++++++++------------ lib/libalpm/conflict.h | 3 +- lib/libalpm/db.c | 124 ++++++++++----------- lib/libalpm/delta.c | 31 +++--- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 117 +++++++++----------- lib/libalpm/deps.h | 4 +- lib/libalpm/diskspace.c | 38 ++++---- lib/libalpm/dload.c | 61 +++++------ lib/libalpm/dload.h | 3 +- lib/libalpm/error.c | 16 +--- lib/libalpm/graph.c | 2 +- lib/libalpm/group.c | 9 +- lib/libalpm/handle.c | 269 ++++++++++++++++++---------------------------- lib/libalpm/handle.h | 3 + lib/libalpm/log.c | 23 ++--- lib/libalpm/log.h | 3 +- lib/libalpm/package.c | 38 ++++--- lib/libalpm/package.h | 8 +- lib/libalpm/pkghash.c | 13 +-- lib/libalpm/remove.c | 118 +++++++++++---------- lib/libalpm/signing.c | 83 ++++++++------- lib/libalpm/signing.h | 3 +- lib/libalpm/sync.c | 192 +++++++++++++++++---------------- lib/libalpm/trans.c | 115 +++++++++----------- lib/libalpm/trans.h | 1 - lib/libalpm/util.c | 127 +++++++++++----------- lib/libalpm/util.h | 23 +++-- src/pacman/callback.c | 6 +- src/pacman/conf.c | 54 +++++----- src/pacman/database.c | 4 +- src/pacman/deptest.c | 3 +- src/pacman/package.c | 5 +- src/pacman/pacman.c | 18 ++-- src/pacman/query.c | 21 ++-- src/pacman/remove.c | 27 +++-- src/pacman/sync.c | 78 +++++++------ src/pacman/upgrade.c | 34 +++--- src/pacman/util.c | 22 ++-- src/util/cleanupdelta.c | 6 +- src/util/pactree.c | 34 ++---- src/util/testdb.c | 19 ++-- src/util/testpkg.c | 9 +- 49 files changed, 1227 insertions(+), 1296 deletions(-) -- 1.7.5.2

4 20

[pacman-dev] [PATCH 1/2] _alpm_lstat: only duplicate string if necessary
by Dan McGee 09 Jun '11

09 Jun '11

The vast majority of the time we will just be passing the same string value on to the lstat() call. The only time we need to duplicate it is if the path ends in '/'. In one run using a profiler, only 400 of the 200,000 calls (0.2%) required the string to be copied first. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 9a8f06d..357ce50 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -636,17 +636,18 @@ const char *_alpm_filecache_setup(pmhandle_t *handle) int _alpm_lstat(const char *path, struct stat *buf) { int ret; - char *newpath = strdup(path); - size_t len = strlen(newpath); + size_t len = strlen(path); /* strip the trailing slash if one exists */ - if(len != 0 && newpath[len - 1] == '/') { - newpath[len - 1] = '\0'; + if(len != 0 && path[len - 1] == '/') { + char *newpath = strdup(path); + newpath[len - 1] = '\0'; + ret = lstat(newpath, buf); + free(newpath); + } else { + ret = lstat(path, buf); } - ret = lstat(newpath, buf); - - FREE(newpath); return ret; } -- 1.7.5.2

1 1

[pacman-dev] [PATCH 1/9] conf: _parseconfig() cleanups and documentation
by Dan McGee 09 Jun '11

09 Jun '11

* Function doxygen documentation * Reuse a single strlen() call * Prevent infinite recursion (limit to 10 levels) * Other small cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/conf.c | 59 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 97e6497..68fe59c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -508,32 +508,52 @@ static int setup_libalpm(void) } -/* The real parseconfig. Called with a null section argument by the publicly - * visible parseconfig so we can recall from within ourself on an include */ -static int _parseconfig(const char *file, int parse_options, - char **section, pmdb_t *db) +/** The "real" parseconfig. Each "Include" directive will recall this method so + * recursion and stack depth are limited to 10 levels. The publicly visible + * parseconfig calls this with a NULL section argument so we can recall from + * within ourself on an include. + * @param file path to the config file + * @param section the current active section name; should be freed after all + * parsing is complete + * @param db the current active alpm database object + * @param parse_options whether to parse and call methods for the options + * section; if 0, parse and call methods for the repos sections + * @param depth the current recursion depth + **/ +static int _parseconfig(const char *file, char **section, pmdb_t *db, + int parse_options, int depth) { FILE *fp = NULL; - char line[PATH_MAX+1]; + char line[PATH_MAX]; int linenum = 0; - char *ptr; int ret = 0; + const int max_depth = 10; + + if(depth >= max_depth) { + pm_printf(PM_LOG_ERROR, + _("config parsing exceeded max recursion depth of %d.\n"), max_depth); + ret = 1; + goto cleanup; + } pm_printf(PM_LOG_DEBUG, "config: attempting to read file %s\n", file); fp = fopen(file, "r"); if(fp == NULL) { pm_printf(PM_LOG_ERROR, _("config file %s could not be read.\n"), file); - return 1; + ret = 1; + goto cleanup; } while(fgets(line, PATH_MAX, fp)) { - char *key, *value; + char *key, *value, *ptr; + size_t line_len; linenum++; strtrim(line); + line_len = strlen(line); /* ignore whole line and end of line comments */ - if(strlen(line) == 0 || line[0] == '#') { + if(line_len == 0 || line[0] == '#') { continue; } if((ptr = strchr(line, '#'))) { @@ -548,19 +568,18 @@ static int _parseconfig(const char *file, int parse_options, goto cleanup; } - if(line[0] == '[' && line[strlen(line)-1] == ']') { + if(line[0] == '[' && line[line_len - 1] == ']') { char *name; - /* new config section, skip the '[' */ - ptr = line; - ptr++; - name = strdup(ptr); - name[strlen(name)-1] = '\0'; - if(!strlen(name)) { + /* only possibility here is a line == '[]' */ + if(line_len <= 2) { pm_printf(PM_LOG_ERROR, _("config file %s, line %d: bad section name.\n"), file, linenum); ret = 1; goto cleanup; } + /* new config section, skip the '[' */ + name = strdup(line + 1); + name[line_len - 2] = '\0'; pm_printf(PM_LOG_DEBUG, "config: new section '%s'\n", name); /* if we are not looking at the options section, register a db */ if(!parse_options && strcmp(name, "options") != 0) { @@ -634,7 +653,7 @@ static int _parseconfig(const char *file, int parse_options, for(gindex = 0; gindex < globbuf.gl_pathc; gindex++) { pm_printf(PM_LOG_DEBUG, "config file %s, line %d: including %s\n", file, linenum, globbuf.gl_pathv[gindex]); - _parseconfig(globbuf.gl_pathv[gindex], parse_options, section, db); + _parseconfig(globbuf.gl_pathv[gindex], section, db, parse_options, depth++); } break; } @@ -690,7 +709,7 @@ cleanup: } /** Parse a configuration file. - * @param file path to the config file. + * @param file path to the config file * @return 0 on success, non-zero on error */ int parseconfig(const char *file) @@ -703,7 +722,7 @@ int parseconfig(const char *file) /* call the real parseconfig function with a null section & db argument */ pm_printf(PM_LOG_DEBUG, "parseconfig: options pass\n"); - if((ret = _parseconfig(file, 1, &section, NULL))) { + if((ret = _parseconfig(file, &section, NULL, 1, 0))) { free(section); return ret; } @@ -714,7 +733,7 @@ int parseconfig(const char *file) /* second pass, repo section parsing */ section = NULL; pm_printf(PM_LOG_DEBUG, "parseconfig: repo pass\n"); - return _parseconfig(file, 0, &section, NULL); + return _parseconfig(file, &section, NULL, 0, 0); free(section); } -- 1.7.5.2

3 15

[pacman-dev] [PATCH 0/6] Package signing patches
by Pang Yan Han 09 Jun '11

09 Jun '11

This is a series of patches which can hopefully take package signing a small step forward. Patch 1/6 lets pacman -v print the GPG Dir Patch 2/6 updates the pacman manpage's --gpgdir section and adds a commented GPGDir option in pacman.conf which shows the user the default gpgdir. Patch 3/6 updates Makefile.am to create the default gpgdir, pubring.gpg and trustdb.gpg if they do not exist. Patch 4/6 adds a --verify option to pacman which lets the user control the level of signature verification. Valid arguments to --verify include "always", "optional", "never". Think of this as a way to override the "VerifySig" option in pacman.conf . In addition Patch 4/6 updates configure.ac to output gpgdir at the end of ./configure. Patch 5/6 updates the help text of pacman-key with regards to --gpgdir. Patch 6/6 adds a --import-trustdb option to pacman-key. This allows the user to import a selected trustdb upon confirmation. For Patch 6/6, Bash is not really my strong point and I took quite some time to get it right. Please help me check it. Thanks! Pang Yan Han (6): Let pacman -v print GPG Dir Update pacman manpage and pacman.conf for gpgdir Update Makefile.am and configure.ac for gpgdir Add --verify option for signature level pacman-key: print default gpgdir in usage pacman-key: add --import-trustdb option Makefile.am | 7 +++- configure.ac | 1 + doc/pacman-key.8.txt | 4 ++ doc/pacman.8.txt | 16 ++++++--- etc/pacman.conf.in | 1 + scripts/pacman-key.sh.in | 83 +++++++++++++++++++++++++++++++++++++++++++++- src/pacman/conf.h | 3 +- src/pacman/pacman.c | 16 +++++++++ 8 files changed, 122 insertions(+), 9 deletions(-) -- 1.7.5.rc0.101.g3d23c

6 24

[pacman-dev] [PATCH] makepkg: move option parsing code to separte file
by Allan McRae 09 Jun '11

09 Jun '11

This move the getopt replacement function parse_options out of makepkg.sh.in and into a separate file. The code is inserted into the relevant place in makepkg using m4. This will allow the reuse of the option parsing code in other scripts (i.e. pacman-key) while avoiding code duplication. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Is there a better way to do this that I am missing? scripts/Makefile.am | 10 +++-- scripts/library/parse_options.sh | 87 +++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 88 +------------------------------------- 3 files changed, 94 insertions(+), 91 deletions(-) create mode 100644 scripts/library/parse_options.sh diff --git a/scripts/Makefile.am b/scripts/Makefile.am index fd9b20d..6335ba1 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -56,10 +56,12 @@ edit = sed \ # third 'test' line- make sure one of the two checks succeeded $(OURSCRIPTS): Makefile @echo ' ' GEN $@; - @rm -f $@ $@.tmp - @test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true - @test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true - @test -f $@.tmp || false + @rm -f $@ $@.m4 $@.tmp + @test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.m4 || true + @test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.m4 || true + @test -f $@.m4 || false + @m4 -P $@.m4 >$@.tmp + @rm -f $@.m4 @chmod +x $@.tmp @chmod a-w $@.tmp @mv $@.tmp $@ diff --git a/scripts/library/parse_options.sh b/scripts/library/parse_options.sh new file mode 100644 index 0000000..878cff1 --- /dev/null +++ b/scripts/library/parse_options.sh @@ -0,0 +1,87 @@ +# getopt like parser +parse_options() { + local short_options=$1; shift; + local long_options=$1; shift; + local ret=0; + local unused_options="" + local i + + while [[ -n $1 ]]; do + if [[ ${1:0:2} = '--' ]]; then + if [[ -n ${1:2} ]]; then + local match="" + for i in ${long_options//,/ }; do + if [[ ${1:2} = ${i//:} ]]; then + match=$i + break + fi + done + if [[ -n $match ]]; then + if [[ ${1:2} = $match ]]; then + printf ' %s' "$1" + else + if [[ -n $2 ]]; then + printf ' %s' "$1" + shift + printf " '%s'" "$1" + else + echo "makepkg: option '$1' $(gettext "requires an argument")" >&2 + ret=1 + fi + fi + else + echo "makepkg: $(gettext "unrecognized option") '$1'" >&2 + ret=1 + fi + else + shift + break + fi + elif [[ ${1:0:1} = '-' ]]; then + for ((i=1; i<${#1}; i++)); do + if [[ $short_options =~ ${1:i:1} ]]; then + if [[ $short_options =~ ${1:i:1}: ]]; then + if [[ -n ${1:$i+1} ]]; then + printf ' -%s' "${1:i:1}" + printf " '%s'" "${1:$i+1}" + else + if [[ -n $2 ]]; then + printf ' -%s' "${1:i:1}" + shift + printf " '%s'" "${1}" + else + echo "makepkg: option $(gettext "requires an argument") -- '${1:i:1}'" >&2 + ret=1 + fi + fi + break + else + printf ' -%s' "${1:i:1}" + fi + else + echo "makepkg: $(gettext "invalid option") -- '${1:i:1}'" >&2 + ret=1 + fi + done + else + unused_options="${unused_options} '$1'" + fi + shift + done + + printf " --" + if [[ -n $unused_options ]]; then + for i in ${unused_options[@]}; do + printf ' %s' "$i" + done + fi + if [[ -n $1 ]]; then + while [[ -n $1 ]]; do + printf " '%s'" "${1}" + shift + done + fi + printf "\n" + + return $ret +} \ No newline at end of file diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b3081fc..0639fbd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1506,93 +1506,7 @@ canonicalize_path() { fi } -# getopt like parser -parse_options() { - local short_options=$1; shift; - local long_options=$1; shift; - local ret=0; - local unused_options="" - local i - - while [[ -n $1 ]]; do - if [[ ${1:0:2} = '--' ]]; then - if [[ -n ${1:2} ]]; then - local match="" - for i in ${long_options//,/ }; do - if [[ ${1:2} = ${i//:} ]]; then - match=$i - break - fi - done - if [[ -n $match ]]; then - if [[ ${1:2} = $match ]]; then - printf ' %s' "$1" - else - if [[ -n $2 ]]; then - printf ' %s' "$1" - shift - printf " '%s'" "$1" - else - echo "makepkg: option '$1' $(gettext "requires an argument")" >&2 - ret=1 - fi - fi - else - echo "makepkg: $(gettext "unrecognized option") '$1'" >&2 - ret=1 - fi - else - shift - break - fi - elif [[ ${1:0:1} = '-' ]]; then - for ((i=1; i<${#1}; i++)); do - if [[ $short_options =~ ${1:i:1} ]]; then - if [[ $short_options =~ ${1:i:1}: ]]; then - if [[ -n ${1:$i+1} ]]; then - printf ' -%s' "${1:i:1}" - printf " '%s'" "${1:$i+1}" - else - if [[ -n $2 ]]; then - printf ' -%s' "${1:i:1}" - shift - printf " '%s'" "${1}" - else - echo "makepkg: option $(gettext "requires an argument") -- '${1:i:1}'" >&2 - ret=1 - fi - fi - break - else - printf ' -%s' "${1:i:1}" - fi - else - echo "makepkg: $(gettext "invalid option") -- '${1:i:1}'" >&2 - ret=1 - fi - done - else - unused_options="${unused_options} '$1'" - fi - shift - done - - printf " --" - if [[ -n $unused_options ]]; then - for i in ${unused_options[@]}; do - printf ' %s' "$i" - done - fi - if [[ -n $1 ]]; then - while [[ -n $1 ]]; do - printf " '%s'" "${1}" - shift - done - fi - printf "\n" - - return $ret -} +m4_include(library/parse_options.sh) usage() { printf "makepkg (pacman) %s\n" "$myver" -- 1.7.5.4

3 3

[pacman-dev] Should we bump major version number too?
by Rémy Oudompheng 08 Jun '11

08 Jun '11

Hi all, It's in the mood: GTK, Gnome, Linux are bumping their major version numbers. Should we follow the same path? Several reasons why I think this is a good idea: - we have a major feature coming: signature checks - we have a major API breakage: the pmhandle_t thing, the signature check level thing - throughout the 3.x development cycle, a lot of incompatibilities/changes have happened: * database have no longer the separate "depends" file * sync DBs are now a single tarball * packages have an "epoch" field not understood by previous versions * packages can be xz-compressed * PKGBUILDs have epoch, check() and checkdepends * force is not accepted anymore by makepkg If the next pacman version were to be 3.6, it would have very little similarities with pacman 3.0. They don't seem to be forward-compatible, neither are they backward-compatible. So maybe it's time to go pacman 4.0 ? Cheers, Rémy.

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-207-gdfaeb6b
by dan＠archlinux.org 08 Jun '11

08 Jun '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 dfaeb6bb2ca8311ac418a16c30006eb7d0534d71 (commit) via 11ba7a0e8a253bff53778688ee174f42c1513738 (commit) via beffab02c41251d4d05d29c0eebbe5a6b6997095 (commit) via 2668782db282130bc1f845173228371d3447e4a2 (commit) via 87072ff63907ce6040be7e59b9b07fd891a8254a (commit) via 361b6a9403c9b87521ec3e1df64b6fe95fe52d7d (commit) via 80b024d56ae61902025983470e93893d76109ac4 (commit) via 45fe92bf39a193252d0fc5e44526877002297659 (commit) from 8c6a636cd970c19e7a79bb17c484b28454da877d (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 dfaeb6bb2ca8311ac418a16c30006eb7d0534d71 Merge: 11ba7a0 87072ff Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 8 02:49:09 2011 -0500 Merge remote-tracking branch 'allan/working' commit 11ba7a0e8a253bff53778688ee174f42c1513738 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 8 02:47:26 2011 -0500 Fix graph free valgrind warnings Due to the way we set up the graph structure, we don't always have good parent information. The changes made in dd8cf0c12dd5e assumed this, so back them out and just live with the dead pointers being there in the memory while we are cleaning up after ourselves. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit beffab02c41251d4d05d29c0eebbe5a6b6997095 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 8 02:32:56 2011 -0500 pactest: only create install file if necessary We were testing whether there were any values in the array, rather than looking if the values contained anything. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2668782db282130bc1f845173228371d3447e4a2 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 23:26:28 2011 -0500 Plug a memory leak Introduced by me in commit cc25576f8b54b3. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 87072ff63907ce6040be7e59b9b07fd891a8254a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 17:36:03 2011 +1000 Fix name of original files in scripts Our scripts all currently say: Generated from foo.in; do not edit by hand. Fix this to say foo.sh.in, which is the actual original file name. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 361b6a9403c9b87521ec3e1df64b6fe95fe52d7d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 16:48:56 2011 +1000 pacman-key: add vim modeline and fix whitespace issues Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80b024d56ae61902025983470e93893d76109ac4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 16:44:38 2011 +1000 pkgdelta: add vim modeline Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 45fe92bf39a193252d0fc5e44526877002297659 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 15:34:47 2011 +1000 Remove incorrect output with download only and IgnorePkg When only downloading a package that is in IgnorePkg, pacman incorrectly asks about installing. e.g. with <pkg> in IgnorePkg in pacman.conf: > pacman -Sddw <pkg> :: <pkg> is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] This output is now silenced when downloading only. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_sync.c | 1 + lib/libalpm/graph.c | 11 ----------- scripts/Makefile.am | 2 +- scripts/pacman-key.sh.in | 14 ++++++++------ scripts/pkgdelta.sh.in | 2 ++ src/pacman/callback.c | 8 ++++++-- test/pacman/pmpkg.py | 4 ++-- 7 files changed, 20 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove incorrect output with download only and IgnorePkg
by Allan McRae 08 Jun '11

08 Jun '11

When only downloading a package that is in IgnorePkg, pacman incorrectly asks about installing. e.g. with <pkg> in IgnorePkg in pacman.conf: > pacman -Sddw <pkg> :: <pkg> is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] This output is now silenced when downloading only. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This moves the hiding of the output to the pacman callback rather than doing it in the libalpmm backend as previously submitted. Note this is the same as how the similar output issue with PM_TRANS_CONV_LOCAL_NEWER is handled. src/pacman/callback.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f1c314f..4a02574 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -256,8 +256,12 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, { switch(event) { case PM_TRANS_CONV_INSTALL_IGNOREPKG: - *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data1)); + if(!config->op_s_downloadonly) { + *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), + alpm_pkg_get_name(data1)); + } else { + *response = 1; + } break; case PM_TRANS_CONV_REPLACE_PKG: *response = yesno(_(":: Replace %s with %s/%s?"), -- 1.7.5.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-199-g8c6a636
by dan＠archlinux.org 07 Jun '11

07 Jun '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 8c6a636cd970c19e7a79bb17c484b28454da877d (commit) via c7501148942159597677c2a8a738f0d59fdaa6dd (commit) via 4fdcf50d6696709fde8942fee592ab076ddb6004 (commit) via 19755b648c80f637a430ba5c914db76264024c9a (commit) via fb4b422fc4567238332050b9a6c8c1cac2a8f091 (commit) via 992fa50dfd4faba93e37364bded015ea04d1fe15 (commit) via c1a5b11f1151040e3341d9222cc246c3aa140182 (commit) via 991b3ff7e63314ea14a40bb437e49ec8553abff2 (commit) via e62566a7635449e3e35d757c4b3bb768479689ab (commit) via 67c33fb8fff4db008e3afde8b6dd228f181755ed (commit) via 3df88a1a01926587b0b68dcff97d539746e3a8f9 (commit) via cc25576f8b54b3e975949ac7991a193053b519bc (commit) via e68f5d9a30671419c853b255b32b2e9d0239c9f1 (commit) via d2f05f72f02e15164f2d83347317f15c7e8c4fb9 (commit) via 307a6de17a3bca9f8666b33aa3fb9a8dd88c300b (commit) via 4015b23e8ef1e5a0e8d103ffefca0ffc4ad9e6c0 (commit) via 7fc635fee071e18d0422a4773937e66960be96b2 (commit) via de36c5fac4ab50259418c3850b6fb25b96b702f3 (commit) via 7f98460e37bc032b58ca7c82e70c357aa39370f8 (commit) via c47d25d74be9ce1fbbfb8577687d9f37ba38d98b (commit) via 2102d1a2eb6cb9db674fd76aa7aa3192befad733 (commit) via 78cbc045c129ca7767b13127e1e17c400b112770 (commit) from 9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9 (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 8c6a636cd970c19e7a79bb17c484b28454da877d Merge: c750114 e62566a Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 11:41:16 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/add.c commit c7501148942159597677c2a8a738f0d59fdaa6dd Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 5 00:18:33 2011 +1000 pacman-key: update copyright Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4fdcf50d6696709fde8942fee592ab076ddb6004 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 16:13:04 2011 -0500 Revamp pacman setup code to handle new alpm initialize routine Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19755b648c80f637a430ba5c914db76264024c9a Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 15:46:06 2011 -0500 Update utilities for new initialize/release methods Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb4b422fc4567238332050b9a6c8c1cac2a8f091 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 15:24:01 2011 -0500 New signatures for alpm initialize and release These new method signatures return and take handle objects to operate on so we can move away from the idea of one global handle in the API. There is also another important change and that deals with the setting of root and dbpaths. These are now done at initialization time instead of using setter methods. This allows the library to operate more safely knowing that paths won't change underneath it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 992fa50dfd4faba93e37364bded015ea04d1fe15 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 11:36:30 2011 -0500 Add cachedirs one-by-one in set_cachedirs() This addresses the issue where calling set_cachedirs() didn't canonicalize the passed-in paths. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c1a5b11f1151040e3341d9222cc246c3aa140182 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 11:33:29 2011 -0500 Be consistent with memory treatment for plural option setters In all cases we should duplicate the passed-in list so the caller is free to do with it as it pleases. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 991b3ff7e63314ea14a40bb437e49ec8553abff2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 16:42:41 2011 -0500 Add helper methods for setting directory options This keeps duplicate code to a minimum. This will come in more handy as we refactor some of these option setters away. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cc25576f8b54b3e975949ac7991a193053b519bc Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 14:37:51 2011 -0500 Use standard errno codes in return from _alpm_archive_fgets This allows us to not require the context (e.g. handle) when calling this function. Also beef up the checks in the two callers of this function to bail if the last return code is not ARCHIVE_EOF, which is the expected value. This requires a change to one of the pactest return codes and the overall result of the test, but results in a much safer operating condition whereby invalid database entries will stop the operation. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e68f5d9a30671419c853b255b32b2e9d0239c9f1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 13:18:36 2011 -0500 Remove global handle dependencies from sync/upgrade paths This kills a lot more global handle business off. sync.c still requires the handle declaration for one reference that can't be changed yet; it will be removed in a future patch which isolates all of the necesary API changes. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d2f05f72f02e15164f2d83347317f15c7e8c4fb9 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:53:53 2011 -0500 Remove global handle from remove.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 307a6de17a3bca9f8666b33aa3fb9a8dd88c300b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:44:01 2011 -0500 Remove global handle from some package and db code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4015b23e8ef1e5a0e8d103ffefca0ffc4ad9e6c0 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:36:13 2011 -0500 Remove global handle from diskspace.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7fc635fee071e18d0422a4773937e66960be96b2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:33:18 2011 -0500 Remove global handle from util.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit de36c5fac4ab50259418c3850b6fb25b96b702f3 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:23:32 2011 -0500 Push down extern handle variable to files that need it This will make the patching process less invasive as we start to remove this variable from all source files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f98460e37bc032b58ca7c82e70c357aa39370f8 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:13:22 2011 -0500 Add handle attribute to pmpkg_t struct Similar to what we just did for the database; this will make it easy to always know what handle a given package originated from. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c47d25d74be9ce1fbbfb8577687d9f37ba38d98b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:06:25 2011 -0500 Add handle attribute to pmdb_t struct This is the first step in a long process to remove our dependence on the global handle variable we currently share in libalpm, with the goal to make things a bit more thread-safe and re-entrant. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2102d1a2eb6cb9db674fd76aa7aa3192befad733 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 11:54:58 2011 -0500 Remove unnecessary handle != NULL asserts These are simple accessor functions for a struct; the handle never even comes into play when calling these functions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 78cbc045c129ca7767b13127e1e17c400b112770 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 11:48:24 2011 -0500 Remove ALPM_LOG_FUNC macro The usefulness of this is rather limited due to it not being compiled into production builds. When you do choose to see the output, it is often overwhelming and not helpful. The best bet is to use a debugger and/or well-placed fprintf() statements. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 68 ++++++-------- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 76 +++++++++++----- lib/libalpm/alpm.h | 37 +++----- lib/libalpm/backup.c | 2 - lib/libalpm/be_local.c | 39 +------- lib/libalpm/be_package.c | 23 +++-- lib/libalpm/be_sync.c | 38 +++++--- lib/libalpm/conflict.c | 44 ++-------- lib/libalpm/conflict.h | 4 +- lib/libalpm/db.c | 84 ++--------------- lib/libalpm/db.h | 9 +- lib/libalpm/delta.c | 2 - lib/libalpm/deps.c | 28 +----- lib/libalpm/diskspace.c | 19 ++-- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 5 +- lib/libalpm/error.c | 3 + lib/libalpm/group.c | 8 -- lib/libalpm/handle.c | 152 +++++++++++-------------------- lib/libalpm/handle.h | 13 +-- lib/libalpm/log.c | 5 +- lib/libalpm/log.h | 7 -- lib/libalpm/package.c | 27 +---- lib/libalpm/package.h | 3 +- lib/libalpm/pkghash.c | 2 - lib/libalpm/remove.c | 72 ++++++--------- lib/libalpm/remove.h | 7 +- lib/libalpm/signing.c | 7 -- lib/libalpm/sync.c | 51 +++++------ lib/libalpm/sync.h | 4 +- lib/libalpm/trans.c | 40 +++------ lib/libalpm/trans.h | 5 +- lib/libalpm/util.c | 43 ++++----- lib/libalpm/util.h | 5 +- po/fr.po | 149 +++++++++++++++--------------- po/zh_CN.po | 13 ++- scripts/makepkg.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- src/pacman/conf.c | 205 +++++++++++++++++++++++------------------ src/pacman/conf.h | 16 +++- src/pacman/pacman.c | 52 +++-------- src/util/cleanupdelta.c | 14 ++- src/util/pactree.c | 21 +--- src/util/testdb.c | 17 ++-- src/util/testpkg.c | 11 ++- test/pacman/pactest.py | 1 + test/pacman/tests/smoke002.py | 12 +-- 48 files changed, 603 insertions(+), 848 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/6] Use standard errno codes in return from _alpm_archive_fgets
by Dan McGee 07 Jun '11

07 Jun '11

This allows us to not require the context (e.g. handle) when calling this function. Also beef up the checks in the two callers of this function to bail if the last return code is not ARCHIVE_EOF, which is the expected value. This requires a change to one of the pactest return codes and the overall result of the test, but results in a much safer operating condition whereby invalid database entries will stop the operation. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 10 +++++++--- lib/libalpm/be_sync.c | 22 ++++++++++++++++++---- lib/libalpm/util.c | 7 +++---- test/pacman/pactest.py | 1 + test/pacman/tests/smoke002.py | 12 +++++------- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c70d1e9..c89365a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -137,13 +137,13 @@ static struct pkg_operations *get_file_pkg_ops(void) * @param archive the archive to read from, pointed at the .PKGINFO entry * @param newpkg an empty pmpkg_t struct to fill with package info * - * @return 0 on success, 1 on error + * @return 0 on success, -1 on error */ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) { char *ptr = NULL; char *key = NULL; - int linenum = 0; + int ret, linenum = 0; struct archive_read_buffer buf; memset(&buf, 0, sizeof(buf)); @@ -151,7 +151,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) buf.max_line_size = 512 * 1024; /* loop until we reach EOF or other error */ - while(_alpm_archive_fgets(a, &buf) == ARCHIVE_OK) { + while((ret = _alpm_archive_fgets(a, &buf)) == ARCHIVE_OK) { char *line = _alpm_strtrim(buf.line); linenum++; @@ -215,6 +215,10 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) } line[0] = '\0'; } + if(ret != ARCHIVE_EOF) { + _alpm_log(PM_LOG_DEBUG, "error parsing package descfile\n"); + return -1; + } return 0; } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 953e4dc..aeba86f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -294,6 +294,7 @@ static int sync_db_populate(pmdb_t *db) _alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'\n"), name); _alpm_pkg_free(pkg); + pkg = NULL; continue; } @@ -301,6 +302,7 @@ static int sync_db_populate(pmdb_t *db) if(_alpm_pkghash_find(db->pkgcache, pkg->name)) { _alpm_log(PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name); _alpm_pkg_free(pkg); + pkg = NULL; continue; } @@ -316,7 +318,14 @@ static int sync_db_populate(pmdb_t *db) count++; } else { /* we have desc, depends or deltas - parse it */ - sync_db_read(db, archive, entry, pkg); + if(sync_db_read(db, archive, entry, pkg) != 0) { + _alpm_log(PM_LOG_ERROR, + _("could not parse package '%s' description file from db '%s'\n"), + pkg->name, db->treename); + _alpm_pkg_free(pkg); + pkg = NULL; + continue; + } } } @@ -401,7 +410,8 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0 || strcmp(filename, "deltas") == 0) { - while(_alpm_archive_fgets(archive, &buf) == ARCHIVE_OK) { + int ret; + while((ret = _alpm_archive_fgets(archive, &buf)) == ARCHIVE_OK) { char *line = _alpm_strtrim(buf.line); if(strcmp(line, "%NAME%") == 0) { @@ -478,6 +488,9 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, } } } + if(ret != ARCHIVE_EOF) { + goto error; + } } else if(strcmp(filename, "files") == 0) { /* currently do nothing with this file */ } else { @@ -485,10 +498,11 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, _alpm_log(PM_LOG_DEBUG, "unknown database file: %s\n", filename); } + return 0; + error: FREE(pkgname); - /* TODO: return 0 always? */ - return 0; + return -1; } static int sync_db_version(pmdb_t UNUSED *db) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index e25e19d..5821bf9 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -771,20 +771,19 @@ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b) /* allocate our buffer, or ensure our existing one is big enough */ if(!b->line) { /* set the initial buffer to the read block_size */ - CALLOC(b->line, b->block_size + 1, sizeof(char), - RET_ERR(PM_ERR_MEMORY, -1)); + CALLOC(b->line, b->block_size + 1, sizeof(char), return ENOMEM); b->line_size = b->block_size + 1; b->line_offset = b->line; } else { size_t needed = (size_t)((b->line_offset - b->line) + (i - b->block_offset) + 1); if(needed > b->max_line_size) { - RET_ERR(PM_ERR_MEMORY, -1); + return ERANGE; } if(needed > b->line_size) { /* need to realloc + copy data to fit total length */ char *new; - CALLOC(new, needed, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1)); + CALLOC(new, needed, sizeof(char), return ENOMEM); memcpy(new, b->line, b->line_size); b->line_size = needed; b->line_offset = new + (b->line_offset - b->line); diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index 64d5651..77f87da 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -114,6 +114,7 @@ def createOptParser(): env.results() if env.failed > 0: + print "pacman testing root saved: %s" % root_path sys.exit(1) if not opts.keeproot: diff --git a/test/pacman/tests/smoke002.py b/test/pacman/tests/smoke002.py index 44f2d0e..8ff5cab 100644 --- a/test/pacman/tests/smoke002.py +++ b/test/pacman/tests/smoke002.py @@ -10,10 +10,8 @@ self.args = "-U %s %s" % (p1.filename(), p2.filename()) -# Note that the current cutoff on line length is 512K, so the first package -# will succeed while the second one will fail to record the description. -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_DESC=pkg1|%s" % p1.desc) -self.addrule("PKG_EXIST=pkg1") -self.addrule("!PKG_DESC=pkg1|%s" % p2.desc) +# We error out when fed a package with an invalid description; the second one +# fits the bill in this case as the desc is > 512K +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg1") -- 1.7.5.2

3 9