- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] util: Use off_t instead of int for size values
by Florian Pritz 22 May '14

22 May '14

Old output: > Total Installed Size: -1527.44 MiB Fixed: > Total Installed Size: 2568.56 MiB Bug introduced in 7b8f8753b15037bf4a88126ffde8195416432c72. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index d42e27b..03e5a21 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -432,7 +432,7 @@ static void table_free(alpm_list_t *headers, alpm_list_t *rows) alpm_list_free(rows); } -static void add_transaction_sizes_row(alpm_list_t **rows, char *label, int size) +static void add_transaction_sizes_row(alpm_list_t **rows, char *label, off_t size) { alpm_list_t *row = NULL; char *str; -- 1.9.2

2 1

[pacman-dev] Comments with `)' are either broken or disallowed
by Michael Witten 14 May '14

14 May '14

In `makepkg' (that is, in `scripts/makepkg.sh.in'), the following exist: local provides_list=() eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \ sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//') ... local backup_list=() eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | \ sed -e "s/backup=/backup_list+=/" -e "s/#.*//" -e 's/\\$//') ... local optdepends_list=() eval $(awk '/^[[:space:]]*optdepends=$/,/$[[:space:]]*(#.*)?$/' "$BUILDFILE" | \ sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//') ... local known kopt options_list eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | \ sed -e "s/options=/options_list+=/" -e "s/#.*//" -e 's/\\$//') Perhaps there are more. As you can plainly see, this ruins the ability to include comments that use the `)' character, as in the following: options=( '!strip' '!makeflags' # Apparently, there are issues with concurrency (`-j2', etc.) ) Sincerely, Michael Witten

6 12

[pacman-dev] [PATCH] remove.c: downgrade TRANS_DUP_TARGET to warning
by Andrew Gregory 07 May '14

07 May '14

Matches the behavior for sync packages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/remove.c | 12 +++++++++--- test/pacman/tests/remove001.py | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 933e6f7..38ad2a2 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -43,9 +43,15 @@ static int remove_target(const char *target) if((pkg = alpm_db_get_pkg(db_local, target)) != NULL) { if(alpm_remove_pkg(config->handle, pkg) == -1) { - pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, - alpm_strerror(alpm_errno(config->handle))); - return -1; + alpm_errno_t err = alpm_errno(config->handle); + if(err == ALPM_ERR_TRANS_DUP_TARGET) { + /* just skip duplicate targets */ + pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), target); + return 0; + } else { + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err)); + return -1; + } } config->explicit_removes = alpm_list_add(config->explicit_removes, pkg); return 0; diff --git a/test/pacman/tests/remove001.py b/test/pacman/tests/remove001.py index 02d00a4..263418b 100644 --- a/test/pacman/tests/remove001.py +++ b/test/pacman/tests/remove001.py @@ -5,5 +5,5 @@ self.args = "-R " + "foo "*5 -self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_EXIST=foo") +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=foo") -- 1.9.2

2 1

[pacman-dev] [PATCHv2 1/3] makepkg: Use read to parse status file during signature verification.
by Thomas Bächler 04 May '14

04 May '14

Instead of invoking grep multiple times, parse the status file once. This refactoring also changes the behvaiour when signature verification fails due to a missing public key: It is now an error instead of a warning. --- scripts/makepkg.sh.in | 92 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e230c15..5386516 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1244,13 +1244,56 @@ check_checksums() { fi } +parse_gpg_statusfile() { + local gnupg type arg1 arg2 arg3 arg4 arg5 arg6 arg7 arg8 arg9 arg10 rest + + while read -r gnupg type arg1 arg2 arg3 arg4 arg5 arg6 arg7 arg8 arg9 arg10 rest; do + case "$type" in + GOODSIG) + pubkey=$arg1 + success=1 + status="good" + ;; + EXPSIG) + pubkey=$arg1 + success=1 + status="expired" + ;; + EXPKEYSIG) + pubkey=$arg1 + success=1 + status="expiredkey" + ;; + REVKEYSIG) + pubkey=$arg1 + success=0 + status="revokedkey" + ;; + BADSIG) + pubkey=$arg1 + success=0 + status="bad" + ;; + ERRSIG) + pubkey=$arg1 + success=0 + if [[ $arg6 == 9 ]]; then + status="missingkey" + else + status="error" + fi + ;; + esac + done < "$1" +} + check_pgpsigs() { (( SKIPPGPCHECK )) && return 0 ! source_has_signatures && return 0 msg "$(gettext "Verifying source file signatures with %s...")" "gpg" - local file pubkey ext decompress found + local file ext decompress found pubkey success status local warning=0 local errors=0 local statusfile=$(mktemp) @@ -1292,31 +1335,42 @@ check_pgpsigs() { "") decompress="cat" ;; esac - if ! $decompress < "$sourcefile" | gpg --quiet --batch --status-file "$statusfile" --verify "$file" - 2> /dev/null; then + $decompress < "$sourcefile" | gpg --quiet --batch --status-file "$statusfile" --verify "$file" - 2> /dev/null + success=0 + status= + pubkey= + parse_gpg_statusfile "$statusfile" + if (( ! $success )); then printf '%s' "$(gettext "FAILED")" >&2 - if ! pubkey=$(awk '/NO_PUBKEY/ { print $3; exit 1; }' "$statusfile"); then - printf ' (%s)' "$(gettext "unknown public key") $pubkey" >&2 - warnings=1 - else - errors=1 - fi - printf '\n' >&2 + case "$status" in + "missingkey") + printf ' (%s)' "$(gettext "unknown public key") $pubkey" >&2 + ;; + "revokedkey") + printf " ($(gettext "public key %s has been revoked"))" "$pubkey" >&2 + ;; + "bad") + printf ' (%s)' "$(gettext "bad signature from public key") $pubkey" >&2 + ;; + "error") + printf ' (%s)' "$(gettext "error during signature verification")" >&2 + ;; + esac + errors=1 else - if grep -q "REVKEYSIG" "$statusfile"; then - printf '%s (%s)' "$(gettext "FAILED")" "$(gettext "the key has been revoked.")" >&2 - errors=1 - else - printf '%s' "$(gettext "Passed")" >&2 - if grep -q "EXPSIG" "$statusfile"; then + printf '%s' "$(gettext "Passed")" >&2 + case "$status" in + "expired") printf ' (%s)' "$(gettext "WARNING:") $(gettext "the signature has expired.")" >&2 warnings=1 - elif grep -q "EXPKEYSIG" "$statusfile"; then + ;; + "expiredkey") printf ' (%s)' "$(gettext "WARNING:") $(gettext "the key has expired.")" >&2 warnings=1 - fi - fi - printf '\n' >&2 + ;; + esac fi + printf '\n' >&2 done rm -f "$statusfile" -- 1.9.0

2 5

[pacman-dev] [PATCH] pmdb.py: change siglevel name to Required
by Andrew Gregory 04 May '14

04 May '14

"Always" is not a valid siglevel. sign002.py was succeeding because pacman failed to parse the resulting config file rather than a failed signature check. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pmdb.py | 2 +- test/pacman/tests/sign002.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index 1d9d735..a6cf78f 100644 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -69,7 +69,7 @@ def __str__(self): return "%s" % self.treename def getverify(self): - for value in ("Always", "Never", "Optional"): + for value in ("Required", "Never", "Optional"): if value in self.treename: return value return "Never" diff --git a/test/pacman/tests/sign002.py b/test/pacman/tests/sign002.py index b55f331..58c4441 100644 --- a/test/pacman/tests/sign002.py +++ b/test/pacman/tests/sign002.py @@ -2,7 +2,7 @@ sp = pmpkg("pkg1") sp.pgpsig = "iEYEABECAAYFAkhMOggACgkQXC5GoPU6du2WVQCffVxF8GKXJIY4juJBIw/ljLrQxygAnj2QlvsUd7MdFekLX18+Ov/xzgZ1" -self.addpkg2db("sync+Always", sp) +self.addpkg2db("sync+Required", sp) self.args = "-S %s" % sp.name -- 1.9.2

2 1

[pacman-dev] [PATCH] register_syncdb: reject db names that contain /
by Andrew Gregory 04 May '14

04 May '14

alpm downloads databases based on basename causing [foo] and [bar/foo] to silently overwrite each other. Also remove an extra tab Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/db.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index dacc084..b4f3519 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -52,12 +52,13 @@ alpm_db_t SYMEXPORT *alpm_register_syncdb(alpm_handle_t *handle, CHECK_HANDLE(handle, return NULL); ASSERT(treename != NULL && strlen(treename) != 0, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL)); + ASSERT(!strchr(treename, '/'), RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL)); /* Do not register a database if a transaction is on-going */ ASSERT(handle->trans == NULL, RET_ERR(handle, ALPM_ERR_TRANS_NOT_NULL, NULL)); /* ensure database name is unique */ if(strcmp(treename, "local") == 0) { - RET_ERR(handle, ALPM_ERR_DB_NOT_NULL, NULL); + RET_ERR(handle, ALPM_ERR_DB_NOT_NULL, NULL); } for(i = handle->dbs_sync; i; i = i->next) { alpm_db_t *d = i->data; -- 1.9.2

2 1

[pacman-dev] [PATCH v5a] Add configuration options for libcurl's "low speed" timeout
by Andrew Hills 04 May '14

04 May '14

Add LowSpeedLimit and LowSpeedTime configuration options to correspond to libcurl's CURLOPT_LOW_SPEED_LIMIT and CURLOPT_LOW_SPEED_TIME options. This allows, e.g., transfers behind corporate virus-scanning firewalls to survive the delays. Increasing the timeout may not be desirable in all situations; similarly, disabling the check prevents detection of disappearing networks. Adds a utility function, parse_positive_long(), which yields a positive (but not unsigned) long integer from a null-terminated string using strtol(). A string containing anything but a base-10 number will cause the function to return -1. Signed-off-by: Andrew Hills <ahills(a)ednos.net> --- This version of the patch incorporates Dave Reisner's guidance regarding code style, string translation considerations, and error handling for invalid inputs to the new options. The new utility function is in util.[ch]. I opted for brevity in the error handling. This minor update is an attempt to cover up a silly errno mistake. Sorry for the extra noise. doc/pacman.conf.5.txt | 13 +++++++++++++ etc/pacman.conf.in | 2 ++ lib/libalpm/alpm.h | 10 ++++++++++ lib/libalpm/dload.c | 4 ++-- lib/libalpm/handle.c | 32 ++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 4 ++++ src/pacman/conf.c | 24 ++++++++++++++++++++++++ src/pacman/conf.h | 4 ++++ src/pacman/util.c | 19 +++++++++++++++++++ src/pacman/util.h | 1 + 10 files changed, 111 insertions(+), 2 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index f19311c..bfc0191 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -199,6 +199,19 @@ Options Displays name, version and size of target packages formatted as a table for upgrade, sync and remove operations. +*LowSpeedLimit* = speed:: + Sets the speed in bytes per second that a download should be below during + `LowSpeedTime` seconds to abort the transfer for being too slow. Setting + 'speed' to 0 will disable the speed check. Defaults to 1 byte per second. + Note that this option will not affect external programs specified by + `XferCommand`. + +*LowSpeedTime* = time:: + Sets the time in seconds that a download should be below the `LowSpeedLimit` + transfer speed to abort the transfer for being too slow. Setting 'time' to + 0 will disable the speed check. Defaults to 10 seconds. Note that this + option will not affect external programs specified by `XferCommand`. + Repository Sections ------------------- Each repository section defines a section name and at least one location where diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index b891de1..0bc5908 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -20,6 +20,8 @@ HoldPkg = pacman glibc #CleanMethod = KeepInstalled #UseDelta = 0.7 Architecture = auto +#LowSpeedLimit = 1 +#LowSpeedTime = 10 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b0adb95..d23ae23 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -595,6 +595,16 @@ const char *alpm_option_get_dbpath(alpm_handle_t *handle); /** Get the name of the database lock file. Read-only. */ const char *alpm_option_get_lockfile(alpm_handle_t *handle); +/** Returns the libcurl low speed limit in bytes per second. */ +long alpm_option_get_lowspeedlimit(alpm_handle_t *handle); +/** Sets the libcurl low speed limit in bytes per second. */ +int alpm_option_set_lowspeedlimit(alpm_handle_t *handle, long lowspeedlimit); + +/** Returns the libcurl low speed time in seconds. */ +long alpm_option_get_lowspeedtime(alpm_handle_t *handle); +/** Sets the libcurl low speed time in seconds. */ +int alpm_option_set_lowspeedtime(alpm_handle_t *handle, long lowspeedtime); + /** @name Accessors to the list of package cache directories. * @{ */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 53867f5..31edbf4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -294,8 +294,8 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, dload_progress_cb); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload); - curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1L); - curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, handle->lowspeedlimit); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, handle->lowspeedtime); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, dload_parseheader_cb); curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 0842d51..b7a13a0 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -198,6 +198,18 @@ const char SYMEXPORT *alpm_option_get_lockfile(alpm_handle_t *handle) return handle->lockfile; } +long SYMEXPORT alpm_option_get_lowspeedlimit(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->lowspeedlimit; +} + +long SYMEXPORT alpm_option_get_lowspeedtime(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->lowspeedtime; +} + const char SYMEXPORT *alpm_option_get_gpgdir(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -294,6 +306,26 @@ int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress return 0; } +int SYMEXPORT alpm_option_set_lowspeedlimit(alpm_handle_t *handle, long lowspeedlimit) +{ + CHECK_HANDLE(handle, return -1); + if(lowspeedlimit < 0) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } + handle->lowspeedlimit = lowspeedlimit; + return 0; +} + +int SYMEXPORT alpm_option_set_lowspeedtime(alpm_handle_t *handle, long lowspeedtime) +{ + CHECK_HANDLE(handle, return -1); + if(lowspeedtime < 0) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } + handle->lowspeedtime = lowspeedtime; + return 0; +} + static char *canonicalize_path(const char *path) { char *new_path; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 27241ea..25a51ff 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -104,6 +104,10 @@ struct __alpm_handle_t { /* for delta parsing efficiency */ int delta_regex_compiled; regex_t delta_regex; + + /* Curl timeouts */ + long lowspeedlimit; + long lowspeedtime; }; alpm_handle_t *_alpm_handle_new(void); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f75f3a7..0032ce0 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -120,6 +120,9 @@ config_t *config_new(void) newconfig->colstr.err = ""; newconfig->colstr.nocolor = ""; + newconfig->lowspeedlimit = 1L; + newconfig->lowspeedtime = 10L; + return newconfig; } @@ -596,6 +599,24 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(values); + } else if(strcmp(key, "LowSpeedLimit") == 0) { + config->lowspeedlimit = parse_positive_long(value); + if(config->lowspeedlimit < 0) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: invalid %s, using default.\n"), + file, linenum, "LowSpeedLimit"); + config->lowspeedlimit = 1L; + } + pm_printf(ALPM_LOG_DEBUG, "config: lowspeedlimit: %ld\n", config->lowspeedlimit); + } else if(strcmp(key, "LowSpeedTime") == 0) { + config->lowspeedtime = parse_positive_long(value); + if(config->lowspeedtime < 0) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: invalid %s, using default.\n"), + file, linenum, "LowSpeedTime"); + config->lowspeedtime = 10L; + } + pm_printf(ALPM_LOG_DEBUG, "config: lowspeedtime: %ld\n", config->lowspeedtime); } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -690,6 +711,9 @@ static int setup_libalpm(void) alpm_option_set_questioncb(handle, cb_question); alpm_option_set_progresscb(handle, cb_progress); + alpm_option_set_lowspeedlimit(handle, config->lowspeedlimit); + alpm_option_set_lowspeedtime(handle, config->lowspeedtime); + config->logfile = config->logfile ? config->logfile : strdup(LOGFILE); ret = alpm_option_set_logfile(handle, config->logfile); if(ret != 0) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index e8cac50..3f2cdb3 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -113,6 +113,10 @@ typedef struct __config_t { /* Color strings for output */ colstr_t colstr; + + /* Curl timeouts */ + long lowspeedlimit; + long lowspeedtime; } config_t; /* Operations */ diff --git a/src/pacman/util.c b/src/pacman/util.c index d42e27b..1c7fb0f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1535,6 +1535,25 @@ int noyes(const char *format, ...) return ret; } +/* Attempts to extract a positive long from a string; failure yields -1. */ +long parse_positive_long(const char *str) +{ + char *end; + long num; + + errno = 0; + num = strtol(str, &end, 10); + + if(end == str || /* Not a decimal number */ + *end != 0 || /* Extra characters */ + (num == LONG_MAX && errno == ERANGE) || /* Out of range */ + num < 0) { /* Out of range (negative) */ + return -1; + } + + return num; +} + int colon_printf(const char *fmt, ...) { int ret; diff --git a/src/pacman/util.h b/src/pacman/util.h index 4a31e89..2f0271f 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -74,6 +74,7 @@ int multiselect_question(char *array, int count); int colon_printf(const char *format, ...) __attribute__((format(printf, 1, 2))); int yesno(const char *format, ...) __attribute__((format(printf, 1, 2))); int noyes(const char *format, ...) __attribute__((format(printf, 1, 2))); +long parse_positive_long(const char *str); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); -- 1.9.1

2 1

[pacman-dev] [PATCH] makepkg: Allow using sources with :: in them
by William Giokas 04 May '14

04 May '14

Git has the ability to use helper applications for interfacing with hg, and from what we had before, the following url:: foo::git+hg::http://foo.bar/foobar would get converted to something along the lines of: filename: foo URL: http://foo.bar/foobar and the 'git+hg' part would essentially be ignored when it's getting set up in the 'get_protocol' and 'get_downloadclient' functions. With this patch it is possible to have a source link with '::' in it, however it is not possible to have a filename with '::', which is the current behavior. --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d8cdc88..7d6ecfa 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -275,10 +275,10 @@ get_url() { get_protocol() { if [[ $1 = *://* ]]; then # strip leading filename - local proto="${1##*::}" + local proto="${1#*::}" printf "%s\n" "${proto%%://*}" elif [[ $1 = *lp:* ]]; then - local proto="${1##*::}" + local proto="${1#*::}" printf "%s\n" "${proto%%lp:*}" else printf "%s\n" local @@ -293,7 +293,7 @@ get_downloadclient() { for i in "${DLAGENTS[@]}"; do local handler="${i%%::*}" if [[ $proto = "$handler" ]]; then - local agent="${i##*::}" + local agent="${i#*::}" break fi done -- 2.0.0.rc0

2 1

[pacman-dev] [PATCH 0/2][WIP][RFC] hooks
by Andrew Gregory 22 Apr '14

22 Apr '14

This is a lazy conversion of a work-in-progress hook implementation from my pacutils library [1] (hence all the pu_* prefixes). I have left out several previously outlined features that I do not see as essential to an initial implementation and can be easily added later if they are actually needed: * mid-transaction hooks (PreInstall, PostRemove, etc..) * passing triggering packages/files to the hook * system vs user hook directories with overriding (use backup=() instead) * specifying hook order Some included features not previously discussed that I know of: * pre-transaction hooks can cancel the transaction * multiple triggers per-hook Major TODO's: * documentation * error handling * use _alpm_run_chroot or similar to run the hook instead of system() I have chosen to implement hooks entirely in the front-end as the only alternatives I came up with were having alpm do the file parsing itself or having pacman repeatedly reset the list of hooks as packages are added/removed. Because this is a rather minimal implementation, my primary concern at this point is making sure that no essential features are missing and that I don't commit us to anything that would make implementing the remaining features more difficult later. Some example hooks: # basic hook [Trigger] Operation = Install Object = File Target = usr/bin/foo # note no / prefix [Action] When = PostTransaction Exec = /usr/bin/echo "I'm in a hook" # don't uninstall linux* packages [Trigger] Operation = Remove Object = Package Target = linux* [Action] When = PreTransaction Exec = /usr/bin/false Previous discussion: https://mailman.archlinux.org/pipermail/pacman-dev/2013-July/017508.html Wiki: https://wiki.archlinux.org/index.php/User:Allan/Pacman_Hooks [1] https://github.com/andrewgregory/pacutils Andrew Gregory (2): add TRANS_COMMIT_{START,END} events add basic hook support lib/libalpm/alpm.h | 5 +- lib/libalpm/sync.c | 6 ++ lib/libalpm/trans.c | 7 +++ src/pacman/Makefile.am | 1 + src/pacman/callback.c | 42 +++++++++++++ src/pacman/hook.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/hook.h | 52 +++++++++++++++++ 7 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 src/pacman/hook.c create mode 100644 src/pacman/hook.h -- 1.9.1

5 10

[pacman-dev] [PATCH] strtrim: reset pointer after trimming leading whitespace
by Dave Reisner 20 Apr '14

20 Apr '14

Breakage introduced in 92216c5864efccac when we changed the signature of strtrim to return something more useful. Fixes FS#39976. --- src/pacman/util.c | 1 + src/util/pactree.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pacman/util.c b/src/pacman/util.c index d42e27b..ec2d3d2 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -299,6 +299,7 @@ size_t strtrim(char *str) size_t len = strlen(pch); if(len) { memmove(str, pch, len + 1); + pch = str; } else { *str = '\0'; } diff --git a/src/util/pactree.c b/src/util/pactree.c index 6c620aa..5c76542 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -159,6 +159,7 @@ static size_t strtrim(char *str) size_t len = strlen(pch); if(len) { memmove(str, pch, len + 1); + pch = str; } else { *str = '\0'; } -- 1.9.2

1 0