- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Improved alpm_list_mmerge() performance
by Diogo Sousa 24 Aug '11

24 Aug '11

Improved alpm_list_mmerge() performance by removing an extra final linear search of the tail node. This was actually suggested by a TODO comment. Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/alpm_list.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 83b9824..d50dce1 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -206,13 +206,17 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second) */ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn) { - alpm_list_t *newlist, *lp; + alpm_list_t *newlist, *lp, *tail_ptr, *left_tail_ptr, *right_tail_ptr; if(left == NULL) return right; if(right == NULL) return left; + /* Save tail node pointers for future use */ + left_tail_ptr=left->prev; + right_tail_ptr=right->prev; + if(fn(left->data, right->data) <= 0) { newlist = left; left = left->next; @@ -242,19 +246,17 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a if(left != NULL) { lp->next = left; left->prev = lp; + tail_ptr=left_tail_ptr; } else if(right != NULL) { lp->next = right; right->prev = lp; + tail_ptr=right_tail_ptr; } + else + tail_ptr=lp; - /* Find our tail pointer - * TODO maintain this in the algorithm itself */ - lp = newlist; - while(lp && lp->next) { - lp = lp->next; - } - newlist->prev = lp; + newlist->prev = tail_ptr; return newlist; } -- 1.7.6

3 2

[pacman-dev] [PATCH 1/2] lib/version: versions must be same length to be equal
by Dave Reisner 23 Aug '11

23 Aug '11

vercmp exhibited some odd behavior here, declaring versions such as '23.3a' and '23.3.a' as equivalent. Add an extra check before we return equality that the versions have the same length. Adds a pair of test cases to the vercmp test suite as well. Reported-by: Eric Belanger <eric(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/version.c | 13 ++++++++++++- test/util/vercmptest.sh | 4 ++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 9f3a9b7..bab9f92 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -88,6 +88,7 @@ static int rpmvercmp(const char *a, const char *b) char *str1, *str2; char *ptr1, *ptr2; char *one, *two; + size_t one_len, two_len; int rc; int isnum; int ret = 0; @@ -101,6 +102,9 @@ static int rpmvercmp(const char *a, const char *b) one = str1; two = str2; + one_len = strlen(one); + two_len = strlen(two); + /* loop through each version segment of str1 and str2 and compare them */ while(*one && *two) { while(*one && !isalnum((int)*one)) one++; @@ -187,9 +191,16 @@ static int rpmvercmp(const char *a, const char *b) /* this catches the case where all numeric and alpha segments have */ /* compared identically but the segment separating characters were */ - /* different */ + /* different. versions must also be the same length to be equivalent, */ + /* otherwise, the shorter version is declared newer. */ if ((!*one) && (!*two)) { + int diff = two_len - one_len; ret = 0; + if(diff > 0) { + ret = 1; + } else if (diff < 0) { + ret = -1; + } goto cleanup; } diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index 54ede04..ff498ba 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -137,6 +137,10 @@ runtest 1:1.0 1.0 1 runtest 1:1.0 1.1 1 runtest 1:1.1 1.1 1 +# same alnum content, different length +runtest 1a 1.a 1 +runtest 23.3.a 23.3a -1 + #END TESTS echo -- 1.7.6

3 5

[pacman-dev] [PATCH 1/5] pacman-key: rework importing distro/repo provided keyrings
by Allan McRae 23 Aug '11

23 Aug '11

The current --reload option, apart from being non-clear in its naming, is very limited in that only one keyring can be provided. A distribution may want to provide multiple keyrings for various subsets of its organisation or custom repo providers may also want to provide a keyring. This patch adds a --populate option that reads keyrings from (by default) /usr/share/pacman/keyrings. A keyring is named foo.gpg, with optional foo-revoked file providing a list of revoked key ids. These files are required to be signed (detached) by a key trusted by pacman-key, in practice probably by the key that signed the package providing these files. The --populate flag either updates the pacman keyring using all keyrings in the directory or individual keyrings can be specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman-key.8.txt | 8 ++- scripts/Makefile.am | 1 + scripts/pacman-key.sh.in | 150 +++++++++++++++++++++++----------------------- 3 files changed, 83 insertions(+), 76 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 9dc175c..f61c2ec 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -80,8 +80,12 @@ Options *-r, \--receive* <keyserver> <keyid(s)>:: Fetch the specified keyids from the specified key server URL. -*\--reload*:: - Reloads the keys from the keyring package. +*\--populate* [<keyring(s)>]:: + Reload the default keys from the (optionally provided) keyrings in + +{pkgdatadir}/keyrings+. Each keyring is provided in a file foo.gpg that + contains the keys for the foo keyring. Optionally the file foo-revoked + contains a list of revoked key IDs for that keyring. These files are + required to be signed (detached) by a trusted PGP key. *-u, \--updatedb*:: Equivalent to \--check-trustdb in GnuPG. diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 802b8f4..52a784a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -44,6 +44,7 @@ edit = sed \ -e 's|@localedir[@]|$(localedir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 74ecfcf..8580100 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -37,8 +37,8 @@ IMPORT_TRUSTDB=0 INIT=0 LISTKEYS=0 LISTSIGS=0 +POPULATE=0 RECEIVE=0 -RELOAD=0 UPDATEDB=0 VERIFY=0 @@ -73,7 +73,8 @@ usage() { echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" echo "$(gettext " --list-sigs [<keyid(s)>] List keys and their signatures")" - echo "$(gettext " --reload Reload the default keys")" + printf "$(gettext " --populate [<keyring(s)] Reload the default keys from the (given) keyrings\n\ + in '%s'")\n" "@pkgdatadir@/keyrings" } version() { @@ -139,75 +140,88 @@ check_keyring() { verify_keyring_input() { local ret=0; + local KEYRING_IMPORT_DIR='@pkgdatadir@/keyrings' - # Verify signatures of related files, if they exist - if [[ -r "${ADDED_KEYS}" ]]; then - msg "$(gettext "Verifying official keys file signature...")" - if ! "${GPG_PACMAN[@]}" --verify "${ADDED_KEYS}.sig" &>/dev/null; then + # Verify signatures of keyring files and association revocation files if they exist + msg "$(gettext "Verifying keyring file signatures...")" + local keyring + for keyring in ${KEYRINGIDS[@]}; do + if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}.gpg.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" ret=1 fi - fi - if [[ -r "${DEPRECATED_KEYS}" ]]; then - msg "$(gettext "Verifying deprecated keys file signature...")" - if ! "${GPG_PACMAN[@]}" --verify "${DEPRECATED_KEYS}.sig" &>/dev/null; then - error "$(gettext "The signature of file %s is not valid.")" "${DEPRECATED_KEYS}" - ret=1 + if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then + if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}-revoked.sig" &>/dev/null; then + error "$(gettext "The signature of file %s is not valid.")" "${KEYRING_IMPORT_DIR}/${keyring}-revoked" + ret=1 + fi fi - fi + done - if [[ -r "${REMOVED_KEYS}" ]]; then - msg "$(gettext "Verifying deleted keys file signature...")" - if ! "${GPG_PACMAN[@]}" --verify "${REMOVED_KEYS}.sig" &>/dev/null; then - error "$(gettext "The signature of file %s is not valid.")" "${REMOVED_KEYS}" + return $ret +} + +populate_keyring() { + local KEYRING_IMPORT_DIR='@pkgdatadir@/keyrings' + local GPG_NOKEYRING=(gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) + + local keyring + local ret=0 + if [[ -z ${KEYRINGIDS[@]} ]]; then + # get list of all available keyrings + shopt -s nullglob + KEYRINGIDS=("$KEYRING_IMPORT_DIR"/*.gpg) + shopt -u nullglob + KEYRINGIDS=("${KEYRINGIDS[@]##*/}") + KEYRINGIDS=("${KEYRINGIDS[(a)]%.gpg}") + if [[ -z ${KEYRINGIDS[@]} ]]; then + error "$(gettext "No keyring files exist in %s.")" "$KEYRING_IMPORT_DIR" ret=1 fi + else + # verify listed keyrings exist + for keyring in ${KEYRINGIDS[@]}; do + if [[ ! -f "$KEYRING_IMPORT_DIR/$keyring.gpg" ]]; then + error "$(gettext "The keyring file %s does not exist.")" "$KEYRING_IMPORT_DIR/$keyring.gpg" + ret=1 + fi + done fi - return $ret -} + if (( ret )); then + exit 1 + fi -reload_keyring() { - local PACMAN_SHARE_DIR='@prefix@/share/pacman' - local GPG_NOKEYRING=(gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir ${PACMAN_KEYRING_DIR}) + verify_keyring_input || exit 1 # Variable used for iterating on keyrings local key local key_id - # Keyring with keys to be added to the keyring - local ADDED_KEYS="${PACMAN_SHARE_DIR}/addedkeys.gpg" - - # Keyring with keys that were deprecated and will eventually be deleted - local DEPRECATED_KEYS="${PACMAN_SHARE_DIR}/deprecatedkeys.gpg" - - # List of keys removed from the keyring. This file is not a keyring, unlike the others. - # It is a textual list of values that gpg recogniezes as identifiers for keys. - local REMOVED_KEYS="${PACMAN_SHARE_DIR}/removedkeys" - - verify_keyring_input || exit 1 - # Read the key ids to an array. The conversion from whatever is inside the file # to key ids is important, because key ids are the only guarantee of identification # for the keys. local -A removed_ids - if [[ -r "${REMOVED_KEYS}" ]]; then - while read key; do - local key_values name - key_values="$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5,10 --output-delimiter=' ')" - if [[ -n $key_values ]]; then - # The first word is the key_id - key_id="${key_values%% *}" - # the rest if the name of the owner - name="${key_values#* }" - if [[ -n ${key_id} ]]; then - # Mark this key to be deleted - removed_ids[$key_id]="$name" + for keyring in ${KEYRINGIDS[@]}; do + if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then + while read key; do + local key_values name + # extract key ID (field 5) and the name of owner (field 10) + key_values="$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" 2>/dev/null | grep ^pub | cut -d: -f5,10 --output-delimiter=' ')" + if [[ -n $key_values ]]; then + # The first word is the key_id + key_id="${key_values%% *}" + # the rest is the name of the owner + name="${key_values#* }" + if [[ -n ${key_id} ]]; then + # Mark this key to be deleted + removed_ids[$key_id]="$name" + fi fi - fi - done < "${REMOVED_KEYS}" - fi + done < "${KEYRING_IMPORT_DIR}/${keyring}-revoked" + fi + done # List of keys that must be kept installed, even if in the list of keys to be removed local HOLD_KEYS="$(get_from "$CONFIG" "HoldKeys")" @@ -222,33 +236,21 @@ reload_keyring() { done fi - # Add keys from the current set of keys from pacman-keyring package. The web of trust will - # be updated automatically. - if [[ -r "${ADDED_KEYS}" ]]; then - msg "$(gettext "Appending official keys...")" - local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)" - for key_id in ${add_keys}; do - # There is no point in adding a key that will be deleted right after - if [[ -z "${removed_ids[$key_id]}" ]]; then - "${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import - fi - done - fi - - if [[ -r "${DEPRECATED_KEYS}" ]]; then - msg "$(gettext "Appending deprecated keys...")" - local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)" + # Add keys from requested keyrings + for keyring in ${KEYRINGIDS[@]}; do + msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" + local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --with-colons --list-keys | grep ^pub | cut -d: -f5)" for key_id in ${add_keys}; do # There is no point in adding a key that will be deleted right after if [[ -z "${removed_ids[$key_id]}" ]]; then - "${GPG_NOKEYRING[@]}" --keyring "${DEPRECATED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import + "${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --export "${key_id}" | "${GPG_PACMAN[@]}" --import fi done - fi + done # Remove the keys not marked to keep if (( ${#removed_ids[@]} > 0 )); then - msg "$(gettext "Removing deleted keys from keyring...")" + msg "$(gettext "Removing revoked keys from keyring...")" for key_id in "${!removed_ids[@]}"; do echo " removing key $key_id - ${removed_ids[$key_id]}" "${GPG_PACMAN[@]}" --quiet --batch --yes --delete-key "${key_id}" @@ -321,8 +323,8 @@ fi OPT_SHORT="a::d:e:f::hl::r:uv:V" OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" -OPT_LONG+=",help,import:,import-trustdb:,init,list-keys::,list-sigs::,,receive:" -OPT_LONG+=",reload,updatedb,verify:,version" +OPT_LONG+=",help,import:,import-trustdb:,init,list-keys::,list-sigs::" +OPT_LONG+=",populate::,receive:,updatedb,verify:,version" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; fi @@ -348,8 +350,8 @@ while true; do --init) INIT=1 ;; -l|--list-keys) LISTKEYS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; --list-sigs) LISTSIGS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; + --populate) POPULATE=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYRINGIDS=($1) ;; -r|--receive) RECEIVE=1; shift; TMP=($1); KEYSERVER=${TMP[0]}; KEYIDS=(${TMP[@]:1}); unset TMP;; - --reload) RELOAD=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1; shift; SIGNATURE=$1 ;; @@ -368,7 +370,7 @@ if ! type -p gpg >/dev/null; then exit 1 fi -if (( (ADD || DELETE || EDITKEY || IMPORT || IMPORT_TRUSTDB || INIT || RECEIVE || RELOAD || UPDATEDB) && EUID != 0 )); then +if (( (ADD || DELETE || EDITKEY || IMPORT || IMPORT_TRUSTDB || INIT || POPULATE || RECEIVE || UPDATEDB) && EUID != 0 )); then error "$(gettext "%s needs to be run as root for this operation.")" "pacman-key" exit 1 fi @@ -387,7 +389,7 @@ GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) # check only a single operation has been given numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + IMPORT + IMPORT_TRUSTDB + - INIT + LISTKEYS + LISTSIGS + RECEIVE + RELOAD + UPDATEDB + VERIFY )) + INIT + LISTKEYS + LISTSIGS + POPULATE + RECEIVE + UPDATEDB + VERIFY )) case $numopt in 0) @@ -413,8 +415,8 @@ esac (( INIT )) && initialize (( LISTKEYS )) && "${GPG_PACMAN[@]}" --batch --list-keys "${KEYIDS[@]}" (( LISTSIGS )) && "${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}" +(( POPULATE )) && populate_keyring (( RECEIVE )) && receive_keys -(( RELOAD )) && reload_keyring (( UPDATEDB )) && "${GPG_PACMAN[@]}" --batch --check-trustdb (( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE -- 1.7.6

1 0

[pacman-dev] [PATCH] Retrieve default SigLevel value from backend after initial setting
by Dan McGee 23 Aug '11

23 Aug '11

This ensures we grab and use the library default once we have processed the global SigLevel setting, but before processing the repo-specific settings. This means the following two configs will now evaluate the same, as the backend currently defaults to 'Optional': Config 1: [options] # nothing here [repo] SigLevel = TrustAll Config 2: [options] SigLevel = Optional [repo] SigLevel = TrustAll Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 29e835c..fe85849 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -563,6 +563,9 @@ static int setup_libalpm(void) if(config->siglevel != ALPM_SIG_USE_DEFAULT) { alpm_option_set_default_siglevel(handle, config->siglevel); } + /* retrieve the set or default siglevel from the backend at this point; + * this way all future DB settings base their setting off this value */ + config->siglevel = alpm_option_get_default_siglevel(handle); if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-83-g762cbf5
by dan＠archlinux.org 22 Aug '11

22 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 762cbf574b66ccbe6d4931e426b6d9e95b191bd5 (commit) via f3e285862143c09bc846fd62992cddd24aefd37e (commit) via c65cea0dcbc2777bd72b13d5a69f89d99fa0b0d5 (commit) via 10cbfc956c69db0cc2826e5a9c6b5b5df2a46326 (commit) via d64c409913720ed3fbf3713de621bbef4ea3bb49 (commit) via 592ed13bce83afeeb8deff5a81dc782fdc32ac11 (commit) via 329a7b7e242e0e4594eec9f70db4bd82d116c1c2 (commit) from c4350d90f137ff3177e68cb0bab82d14edaac54e (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 762cbf574b66ccbe6d4931e426b6d9e95b191bd5 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 22 09:27:13 2011 -0500 dload: prevent need to copy struct in mask_signal() Since we store this directly in the download function, just rework mask_signal() to take a pointer to a location to store the original. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f3e285862143c09bc846fd62992cddd24aefd37e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 14:22:14 2011 -0400 dload: extract tempfile creation to its own function Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c65cea0dcbc2777bd72b13d5a69f89d99fa0b0d5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 13:51:47 2011 -0400 dload: move (un)masking of signals to separate functions Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 10cbfc956c69db0cc2826e5a9c6b5b5df2a46326 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 13:46:37 2011 -0400 dload: move curl option setting to static function Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d64c409913720ed3fbf3713de621bbef4ea3bb49 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 13:42:53 2011 -0400 dload: add open_mode to payload struct This is a precursor to a following patch which will move the setting of options to a separate function. With the open mode as part of the struct, we can avoid modifying stack allocated variables. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 592ed13bce83afeeb8deff5a81dc782fdc32ac11 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 11:58:45 2011 -0400 dload: rename cd_filename to content_disp_name This is more in line with the menagerie of file name members that we now have on the payload struct. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 329a7b7e242e0e4594eec9f70db4bd82d116c1c2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 11:56:37 2011 -0400 dload: move tempfile and destfile to payload struct These are private to the download operation already, so glob them onto the struct. This is an ugly rename patch, with the only logical change being that destfile and tempfile are now freed by the payload_free function. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 221 ++++++++++++++++++++++++++++---------------------- lib/libalpm/dload.h | 5 +- 2 files changed, 128 insertions(+), 98 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-76-gc4350d9
by dan＠archlinux.org 22 Aug '11

22 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via c4350d90f137ff3177e68cb0bab82d14edaac54e (commit) via b6914d16cc7ee97f538b569b760c3ced18ee1fa9 (commit) via a98babbfef725147748fc1be149a57b1beaac615 (commit) via 343ea8171815debe3fc5a55ad0eeaf6c35f90bb9 (commit) via ffdfc825234987b9f974d7a8a152babb10cb8663 (commit) via e9b8a7693dce4d7be959c6a9f4112014884e647c (commit) via d9e5dab6aceeb4d32cfa52d5500f0d22cabb487b (commit) via d307ed5eb9d6684911c55f661e2d58e0fd6e4ceb (commit) via 82fc816d790ac8b2bfaa81575bf85067769ece10 (commit) via 43940f591ed77f984c49fe8a3629d66dbf78bfb0 (commit) via eae363c96fb5ffce8e88cb63c780769b1410a1f9 (commit) via d3f135af8f499fbab24b3ad9e76751a29bc4d3f5 (commit) via e07547ee4ed4fd812a7f50b998589fa27c12de4c (commit) via 6d544984f2418ea34caab4c433580487b760362a (commit) from 9934b3bd345011eef6a96249d8d90de594c04cd0 (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 c4350d90f137ff3177e68cb0bab82d14edaac54e Author: Dave Reisner <d(a)falconindy.com> Date: Sat Aug 20 13:19:19 2011 -0400 pacman/util: use string_length to calculate line length This is measuring strings that are potentially localized, so we need a multibyte aware function to count characters instead of bytes. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b6914d16cc7ee97f538b569b760c3ced18ee1fa9 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jul 14 00:05:30 2011 +1000 Print callback messages to stderr Fixes FS#25099. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a98babbfef725147748fc1be149a57b1beaac615 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 20 12:07:15 2011 -0500 Print debug timestamps to same stream as rest of output We used fprintf() elsewhere in this function, but we didn't use it on the debug timestamp printing. Use fprintf() instead of printf() to fix this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 343ea8171815debe3fc5a55ad0eeaf6c35f90bb9 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Mon Aug 22 13:00:34 2011 +0800 pacsort: correct list freeing Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ffdfc825234987b9f974d7a8a152babb10cb8663 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 22 08:50:43 2011 -0500 pacsort: ensure list is freed if size is 0 Found using: `valgrind ./src/util/.libs/lt-pacsort /dev/null` Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e9b8a7693dce4d7be959c6a9f4112014884e647c Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Mon Aug 22 13:00:33 2011 +0800 pacsort: correct pointer type in list_new Pointer sizes are the same but this makes intention clearer. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d9e5dab6aceeb4d32cfa52d5500f0d22cabb487b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 19 19:12:21 2011 -0500 Remove alpm_option_get_* usage from backend These are all available directly on the handle without indirection. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d307ed5eb9d6684911c55f661e2d58e0fd6e4ceb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 14:03:32 2011 -0400 dload: remove unused macro This was a vestige leftover from the libfetch days of yore. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82fc816d790ac8b2bfaa81575bf85067769ece10 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 14:07:29 2011 -0400 dload: delete zero length downloads on curl error In the case of a non-operation (e.g. DNS resolver error), delete the leftover 0 byte .part file. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 43940f591ed77f984c49fe8a3629d66dbf78bfb0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 11:43:27 2011 -0400 dload: rename payload->filename to payload->remote_name This is a far more accurate description of what this is, since it's more than likely not really a filename at all, but the name after a final slash on a URL. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eae363c96fb5ffce8e88cb63c780769b1410a1f9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 14:25:09 2011 -0400 dload: remove code duplication Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d3f135af8f499fbab24b3ad9e76751a29bc4d3f5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 16:48:09 2011 -0400 bash_completion: add dbonly to sync options Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e07547ee4ed4fd812a7f50b998589fa27c12de4c Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 19 13:10:17 2011 -0500 Rework finding a writable cache directory This is a refactor and refresh of the code used to find where we should download packages. * Incorporate suggestions from FS#25435 to use TMPDIR from the environment if set, otherwise fall back to /tmp as before. * Make the writability tests a bit more in depth. We now do a three part check consisting of: - S_ISDIR(): is this even a directory - access(W_OK): is this directory writable by the current user. Unfortunately for root, this almost always returns that it is, but in the case of a RO mount or NFS share inaccessible to root, this check will exclude the directory. - mode & (any write bit): is there a writable bit set on this directory. This makes it possible to enforce a read-only cache directory by setting permissions to 0555, for example. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6d544984f2418ea34caab4c433580487b760362a Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 19 11:06:55 2011 -0500 Be more robust when copying package data This changes the signature of _alpm_pkg_dup() to return an integer error code and provide the new package in a passed pointer argument. All callers are now more robust with checking the return value of this function to ensure a fatal error did not occur. We allow load failures to proceed as otherwise we have a chicken and egg problem- if a 'desc' local database entry is missing, the best way of restoring said file is `pacman -Sf --dbonly packagename`. This patch fixes a segfault that was occurring in this case. Fixes the segfault reported in FS#25667. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 2 +- lib/libalpm/add.c | 11 +++++++---- lib/libalpm/be_local.c | 3 +-- lib/libalpm/be_sync.c | 7 +++---- lib/libalpm/db.c | 7 +++---- lib/libalpm/deps.c | 12 +++++++++--- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/dload.c | 39 +++++++++++++++++++++------------------ lib/libalpm/dload.h | 2 +- lib/libalpm/package.c | 28 ++++++++++++++++++++++++---- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 35 ++++++++++++++++++++++++++--------- lib/libalpm/signing.c | 2 +- lib/libalpm/sync.c | 14 +++++++++----- lib/libalpm/trans.c | 6 +++--- lib/libalpm/util.c | 44 +++++++++++++++++++++++++++++--------------- src/pacman/callback.c | 2 +- src/pacman/util.c | 4 ++-- src/util/pacsort.c | 8 ++++---- 20 files changed, 148 insertions(+), 84 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/2] Minor cleanups to pacsort
by Pang Yan Han 22 Aug '11

22 Aug '11

Was reading pacsort today and caught two minor mistakes. Pang Yan Han (2): pacsort: correct pointer type in list_new pacsort: correct list freeing src/util/pacsort.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- 1.7.6

3 5

[pacman-dev] Public Keys
by Christian Hesse 21 Aug '11

21 Aug '11

Hello everybody, I've installed pacman-git on a test machine to play with package signing. Since today some packages in [core] and [extra], perhaps others, are signed. I found two keys on public key servers, the third one is still missing. The key in question was used to sign xfdesktop. Is there any official place I can find keys that are used to sign Arch packages? Or did I miss anything else? -- Regards, Chris

4 4

[pacman-dev] [PATCH] [makepkg] New patch for split debug support, using generic split packaging mechanism
by Vitaliy Gorbunov 20 Aug '11

20 Aug '11

---------- Forwarded message ---------- From: Vitaliy Gorbunov <vit.gorbunov(a)gmail.com> Date: Wed, Aug 10, 2011 at 9:14 PM Subject: Re: [pacman-dev] [PATCH] [makepkg] New patch for split debug support, using generic split packaging mechanism To: Dan McGee <dpmcgee(a)gmail.com> Sorry:) Here it is. --- bin/makepkg 2011-08-10 19:37:37.000000000 +0300 +++ local/bin/makepkg4 2011-08-10 19:41:15.000000000 +0300 @@ -44,7 +44,7 @@ srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'splitdbg' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -74,6 +74,8 @@ CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 +SPLIT_DBG=0 +SKIP_DEBUG_PACKAGE=0 PKGLIST=() # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call @@ -902,21 +904,49 @@ done fi + local is_splitdbg + [ "$(check_option splitdbg)" = "y" ] || (( SPLIT_DBG )) && is_splitdbg=1 + (( is_splitdbg )) && backup_package_variables "dbg" + + local dbgdir="$pkgdir-dbg" if [[ $(check_option strip) = y ]]; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" - local binary + local binary hardlink strip_opt find . -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip $STRIP_SHARED "$binary";; + strip_opt=$STRIP_SHARED;; *application/x-archive*) # Libraries (.a) - /usr/bin/strip $STRIP_STATIC "$binary";; + strip_opt=$STRIP_STATIC;; *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; + strip_opt=$STRIP_BINARIES;; + *) continue ;; esac + # Strip symbols + if (( is_splitdbg )); then + # Create directory for the symbol file + mkdir -p "${dbgdir}/usr/lib/debug/${binary%/*}" + if readelf -S $binary | grep "\.gnu_debuglink" &>/dev/null; then + # An already stripped binary is a hard link + find ${STRIP_DIRS[@]} -samefile "$binary" 2>/dev/null | while read hardlink ; do + # Is the symbol file for the hardlink in the right dir ? + [ -e "${dbgdir}/usr/lib/debug/${hardlink#/}.debug" ] && \ + [ "${hardlink%/*}" != "${binary%/*}" ] && \ + ln "${dbgdir}/usr/lib/debug/${hardlink#/}.debug" "${dbgdir}/usr/lib/debug/${binary%/*}" && break + done + else + # Strip the file + /usr/bin/objcopy --only-keep-debug "$binary" "${dbgdir}/usr/lib/debug/${binary#/}.debug" + /usr/bin/strip $strip_opts "$binary" + /usr/bin/objcopy --add-gnu-debuglink="${dbgdir}/usr/lib/debug/${binary#/}.debug" "$binary" + chmod 644 "${dbgdir}/usr/lib/debug/${binary#/}.debug" + fi + else + /usr/bin/strip $strip_opts "$binary" + fi done fi @@ -1008,6 +1038,12 @@ } create_package() { + if (( SKIP_DEBUG_PACKAGE )); then + warning "$(gettext "No .debug files for debug package found, skipping...")" + SKIP_DEBUG_PACKAGE=0 + return + fi + if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing pkg/ directory.")" plain "$(gettext "Aborting...")" @@ -1096,6 +1132,38 @@ fi } +add_split_debug_packages(){ + [ ${#pkgname[@]} = 1 ] && eval "function package_${pkgname}() { package;}" + + local pkg pkgname_dbg + for pkg in ${pkgname[@]} + do + pkgname_dbg=( ${pkgname_dbg[@]} ${pkg} ${pkg/%/-dbg} ) + eval "function package_${pkg}-dbg() { package_dbg; }" + done + pkgname=( ${pkgname_dbg[@]} ) +} + +package_dbg(){ + check_dbg_files=`find $pkgdir/ -name "*.debug"` + if [ -z "$check_dbg_files" ]; then + SKIP_DEBUG_PACKAGE=1 + return + fi + + restore_package_variables "dbg" + pkgdesc="$pkgdesc (debugging symbols)" + depends=("${pkgname%-dbg}=$pkgver-$pkgrel") + groups=('debug' ${groups[@]/%/-debug}) + optdepends=() + replaces=() + provides=() + conflicts=() + backup=() + options=(!strip !splitdbg docs !zipman !purge libtool !emptydirs) + unset install +} + create_srcpackage() { cd "$startdir" @@ -1423,17 +1491,19 @@ } backup_package_variables() { - local var + local var suffix + suffix=$1 for var in ${splitpkg_overrides[@]}; do - local indirect="${var}_backup" + local indirect="${var}_backup${suffix}" eval "${indirect}=(\"\${$var[@]}\")" done } restore_package_variables() { - local var + local var suffix + suffix=$1 for var in ${splitpkg_overrides[@]}; do - local indirect="${var}_backup" + local indirect="${var}_backup${suffix}" if [[ -n ${!indirect} ]]; then eval "${var}=(\"\${$indirect[@]}\")" else @@ -1582,6 +1652,7 @@ echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" + echo "$(gettext " -t, --splitdbg Split debugging symbols into separate package")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" echo "$(gettext " --asroot Allow makepkg to run as root user")" printf "$(gettext " --check Run the check() function in the %s")\n" "$BUILDSCRIPT" @@ -1622,11 +1693,11 @@ ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcCdefFghiLmop:rRsV" +OPT_SHORT="AcCdefFghiLmop:rRstV" OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" OPT_LONG+=",install,log,nocolor,nobuild,nocheck,pkg:,rmdeps" -OPT_LONG+=",repackage,skipinteg,source,syncdeps,version,config:" +OPT_LONG+=",repackage,skipinteg,source,syncdeps,splitdbg,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1671,6 +1742,7 @@ --skipinteg) SKIPINTEG=1 ;; --source) SOURCEONLY=1 ;; -s|--syncdeps) DEP_BIN=1 ;; + -t|--splitdbg) SPLIT_DBG=1 ;; -h|--help) usage; exit 0 ;; # E_OK -V|--version) version; exit 0 ;; # E_OK @@ -1874,6 +1946,8 @@ devel_check devel_update +[ "$(check_option splitdbg)" = "y" ] || (( SPLIT_DBG )) && add_split_debug_packages + if (( ${#pkgname[@]} > 1 )); then SPLITPKG=1 fi On Wed, Aug 10, 2011 at 9:09 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: > On Wed, Aug 10, 2011 at 12:04 PM, Vitaliy Gorbunov > <vit.gorbunov(a)gmail.com> wrote: > > I rewrite patch from Remy Oudomphen**g > Rémy Oudompheng ? Not sure what the ** was for. :) > > (http://bugs.archlinux.org/task/10975< > http://bugs.archlinux.org/task/10975>) > > in order to use generic split packaging mechanism. > > The main idea is that debug packages will be added to pkgname array and > for > > each of it package_<name>-dbg function will be created. So it treated > like > > usual split packages. > > Tested on split and non-split packages. All seems to work fine. > > Please send inline rather than as an attachment so we can review it, > thanks! > > -Dan >

4 4

[pacman-dev] [PATCH] Print debug timestamps to same stream as rest of output
by Dan McGee 20 Aug '11

20 Aug '11

We used fprintf() elsewhere in this function, but we didn't use it on the debug timestamp printing. Use fprintf() instead of printf() to fix this. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 91625a1..9c1e646 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1416,7 +1416,7 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list strftime(timestr, 9, "%H:%M:%S", tmp); timestr[8] = '\0'; - printf("[%s] ", timestr); + fprintf(stream, "[%s] ", timestr); } #endif -- 1.7.6

2 1

[pacman-dev] [PATCH 1/2][RFC] pacman/util: add methods to create a divider for tables
by Dave Reisner 20 Aug '11

20 Aug '11

This creates a dashed line underneath the header for each column in the table, e.g.: Name Old Version New Version Size ----- ------------ ------------ ----- at-spi2-core 2.0.2-1 0.18 MiB dconf 0.8.0-1 0.08 MiB at-spi2-atk 2.0.2-1 0.05 MiB gsettings-desktop-schemas 3.0.1-2 0.04 MiB Inspired-by: Pat Brisbin <pbrisbin(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I think it's a nice touch, and it's not a hugely invasive patch. src/pacman/util.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 91625a1..0c83020 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -555,6 +555,40 @@ static alpm_list_t *table_create_format(const alpm_list_t *header, return formats; } +static char *string_create_filled(const unsigned int fill, size_t len) +{ + char *filled; + + filled = malloc(len + 1); + if(!filled) { + return NULL; + } + + memset(filled, fill, len); + filled[len] = '\0'; + + return filled; +} + +static alpm_list_t *table_create_divider(const alpm_list_t *header, + const unsigned int fill) +{ + const alpm_list_t *i; + alpm_list_t *divider = NULL; + + for(i = header; i; i = alpm_list_next(i)) { + const char *header = alpm_list_getdata(i); + char *div = string_create_filled(fill, string_length(header) + 1); + if(!div) { + FREELIST(divider); + return NULL; + } + divider = alpm_list_add(divider, div); + } + + return divider; +} + /** Displays the list in table format * * @param title the tables title @@ -569,7 +603,7 @@ int table_display(const char *title, const alpm_list_t *header, const alpm_list_t *rows) { const alpm_list_t *i; - alpm_list_t *formats; + alpm_list_t *formats, *divider; if(rows == NULL || header == NULL) { return 0; @@ -580,17 +614,24 @@ int table_display(const char *title, const alpm_list_t *header, return -1; } + divider = table_create_divider(header, '-'); + if(divider == NULL) { + FREELIST(formats); + return -1; + } + if(title != NULL) { printf("%s\n\n", title); } table_print_line(header, formats); - printf("\n"); + table_print_line(divider, formats); for(i = rows; i; i = alpm_list_next(i)) { table_print_line(alpm_list_getdata(i), formats); } + FREELIST(divider); FREELIST(formats); return 0; } -- 1.7.6

1 1

[pacman-dev] [PATCH] Print callback messages to stderr
by Allan McRae 20 Aug '11

20 Aug '11

Fixes FS#25099. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 873e3fc..5ee4e5a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -690,7 +690,7 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) output = alpm_list_add(output, string); } } else { - pm_vfprintf(stdout, level, fmt, args); + pm_vfprintf(stderr, level, fmt, args); } } -- 1.7.6

3 6

[pacman-dev] Default value for SigLevel being wrongly overridden?
by Allan McRae 20 Aug '11

20 Aug '11

Is this expected behaviour for how the default value for SigLevel works? [options] # SigLevel = [repo] SigLevel = TrustAll is different from [options] SigLevel = Optional [repo] SigLevel = TrustAll and [options] # SigLevel = [repo] SigLevel = Optional TrustAll (the last two being the same) I thought if no option was specified in the [options] section, then Optional (being the default) would apply unless one of "Required" or "Never" was specified in the [repo] section to override it. It currently appears that specifying any option overrides it. Another example: [options] # SigLevel = [repo] SigLevel = DatabaseRequired is the same as [repo] SigLevel = DatabaseRequired PackageNever where I was really expecting PackageOptional through the Optional default. Allan

1 0

[pacman-dev] [PATCH] Fix formatting in pacman-key manpage
by Jakob Gruber 20 Aug '11

20 Aug '11

Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> --- doc/pacman-key.8.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index c8ce026..9dc175c 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -45,7 +45,7 @@ Options Export key(s) identified by the specified keyid(s) to 'stdout'. If no keyid is specified, all keys will be exported. -*\--edit-key * <keyid(s)>:: +*\--edit-key* <keyid(s)>:: Present a menu for key management task on the specified keyids. Useful for adjusting a keys trust level. @@ -86,7 +86,7 @@ Options *-u, \--updatedb*:: Equivalent to \--check-trustdb in GnuPG. -* -v, \--verify* <signature>:: +*-v, \--verify* <signature>:: Verify the given signature file. *-V, \--version*:: -- 1.7.6

1 0

[pacman-dev] [PATCH] Flush output of pacman debug times
by Allan McRae 20 Aug '11

20 Aug '11

This keeps the output going to stdout and stderr in sync fixing the pactests broken by changing the callback messages to stderr. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 91625a1..e0addc0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1417,6 +1417,7 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list timestr[8] = '\0'; printf("[%s] ", timestr); + fflush(stdout); } #endif -- 1.7.6

1 0

[pacman-dev] [PATCH] Remove alpm_option_get_* usage from backend
by Dan McGee 20 Aug '11

20 Aug '11

These are all available directly on the handle without indirection. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 3 +-- lib/libalpm/be_sync.c | 7 +++---- lib/libalpm/db.c | 4 ++-- lib/libalpm/diskspace.c | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/trans.c | 6 +++--- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 1b48922..f53bd64 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -194,8 +194,7 @@ static void *_cache_changelog_open(alpm_pkg_t *pkg) char clfile[PATH_MAX]; alpm_db_t *db = alpm_pkg_get_db(pkg); snprintf(clfile, PATH_MAX, "%s/%s/%s-%s/changelog", - alpm_option_get_dbpath(pkg->handle), - db->treename, pkg->name, pkg->version); + pkg->handle->dbpath, db->treename, pkg->name, pkg->version); return fopen(clfile, "r"); } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 75f0664..6e64e5f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -41,13 +41,12 @@ static char *get_sync_dir(alpm_handle_t *handle) { - const char *dbpath = alpm_option_get_dbpath(handle); - size_t len = strlen(dbpath) + 6; + size_t len = strlen(handle->dbpath) + 6; char *syncpath; struct stat buf; MALLOC(syncpath, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - sprintf(syncpath, "%s%s", dbpath, "sync/"); + sprintf(syncpath, "%s%s", handle->dbpath, "sync/"); if(stat(syncpath, &buf) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", @@ -260,7 +259,7 @@ cleanup: if(_alpm_handle_unlock(handle)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile(handle)); + handle->lockfile); } free(syncpath); umask(oldmask); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 33282b8..4b23509 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -224,7 +224,7 @@ alpm_siglevel_t SYMEXPORT alpm_db_get_siglevel(alpm_db_t *db) { ASSERT(db != NULL, return -1); if(db->siglevel & ALPM_SIG_USE_DEFAULT) { - return alpm_option_get_default_siglevel(db->handle); + return db->handle->siglevel; } else { return db->siglevel; } @@ -357,7 +357,7 @@ const char *_alpm_db_path(alpm_db_t *db) const char *dbpath; size_t pathsize; - dbpath = alpm_option_get_dbpath(db->handle); + dbpath = db->handle->dbpath; if(!dbpath) { _alpm_log(db->handle, ALPM_LOG_ERROR, _("database path is undefined\n")); RET_ERR(db->handle, ALPM_ERR_DB_OPEN, NULL); diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 1e2fa14..ad80304 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -211,7 +211,7 @@ static int calculate_installed_size(alpm_handle_t *handle, /* approximate space requirements for db entries */ if(filename[0] == '.') { - filename = alpm_option_get_dbpath(handle); + filename = handle->dbpath; } snprintf(path, PATH_MAX, "%s%s", handle->root, filename); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 28ce620..4428b54 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -116,7 +116,7 @@ static int init_gpgme(alpm_handle_t *handle) return 0; } - sigdir = alpm_option_get_gpgdir(handle); + sigdir = handle->gpgdir; if (_alpm_access(handle, sigdir, "pubring.gpg", R_OK) || _alpm_access(handle, sigdir, "trustdb.gpg", R_OK)) { diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 3f59596..c594520 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -82,7 +82,7 @@ static alpm_list_t *check_arch(alpm_handle_t *handle, alpm_list_t *pkgs) alpm_list_t *i; alpm_list_t *invalid = NULL; - const char *arch = alpm_option_get_arch(handle); + const char *arch = handle->arch; if(!arch) { return NULL; } @@ -224,9 +224,9 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) if(!nolock_flag) { if(_alpm_handle_unlock(handle)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile(handle)); + handle->lockfile); alpm_logaction(handle, "warning: could not remove lock file %s\n", - alpm_option_get_lockfile(handle)); + handle->lockfile); } } -- 1.7.6

1 0

[pacman-dev] [PATCH] Rework finding a writable cache directory
by Dan McGee 19 Aug '11

19 Aug '11

This is a refactor and refresh of the code used to find where we should download packages. * Incorporate suggestions from FS#25435 to use TMPDIR from the environment if set, otherwise fall back to /tmp as before. * Make the writability tests a bit more in depth. We now do a three part check consisting of: - S_ISDIR(): is this even a directory - access(W_OK): is this directory writable by the current user. Unfortunately for root, this almost always returns that it is, but in the case of a RO mount or NFS share inaccessible to root, this check will exclude the directory. - mode & (any write bit): is there a writable bit set on this directory. This makes it possible to enforce a read-only cache directory by setting permissions to 0555, for example. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 27709c6..7e3bc37 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -638,7 +638,7 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) struct stat buf; /* Loop through the cache dirs until we find a matching file */ - for(i = alpm_option_get_cachedirs(handle); i; i = i->next) { + for(i = handle->cachedirs; i; i = i->next) { snprintf(path, PATH_MAX, "%s%s", (char *)alpm_list_getdata(i), filename); if(stat(path, &buf) == 0 && S_ISREG(buf.st_mode)) { @@ -659,11 +659,11 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) const char *_alpm_filecache_setup(alpm_handle_t *handle) { struct stat buf; - alpm_list_t *i, *tmp; - char *cachedir; + alpm_list_t *i; + char *cachedir, *tmpdir; - /* Loop through the cache dirs until we find a writeable dir */ - for(i = alpm_option_get_cachedirs(handle); i; i = i->next) { + /* Loop through the cache dirs until we find a usable directory */ + for(i = handle->cachedirs; i; i = i->next) { cachedir = alpm_list_getdata(i); if(stat(cachedir, &buf) != 0) { /* cache directory does not exist.... try creating it */ @@ -673,21 +673,35 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); return cachedir; } - } else if(S_ISDIR(buf.st_mode) && (buf.st_mode & S_IWUSR)) { + } else if(!S_ISDIR(buf.st_mode)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, not a directory: %s\n", cachedir); + } else if(access(cachedir, W_OK) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, not writable: %s\n", cachedir); + } else if(!(buf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, no write bits set: %s\n", cachedir); + } else { _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); return cachedir; - } else { - _alpm_log(handle, ALPM_LOG_DEBUG, "skipping cachedir: %s\n", cachedir); } } - /* we didn't find a valid cache directory. use /tmp. */ - tmp = alpm_list_add(NULL, "/tmp/"); - alpm_option_set_cachedirs(handle, tmp); - alpm_list_free(tmp); - _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", "/tmp/"); - _alpm_log(handle, ALPM_LOG_WARNING, _("couldn't create package cache, using /tmp instead\n")); - return "/tmp/"; + /* we didn't find a valid cache directory. use TMPDIR or /tmp. */ + if((tmpdir = getenv("TMPDIR")) && stat(tmpdir, &buf) && S_ISDIR(buf.st_mode)) { + /* TMPDIR was good, we can use it */ + } else { + tmpdir = "/tmp"; + } + i = alpm_list_add(NULL, tmpdir); + alpm_option_set_cachedirs(handle, i); + alpm_list_free(i); + cachedir = handle->cachedirs->data; + _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); + _alpm_log(handle, ALPM_LOG_WARNING, + _("couldn't find or create package cache, using %s instead\n"), cachedir); + return cachedir; } /** lstat wrapper that treats /path/dirsymlink/ the same as /path/dirsymlink. -- 1.7.6

1 0

[pacman-dev] [PATCH] Be more robust when copying package data
by Dan McGee 19 Aug '11

19 Aug '11

This changes the signature of _alpm_pkg_dup() to return an integer error code and provide the new package in a passed pointer argument. All callers are now more robust with checking the return value of this function to ensure a fatal error did not occur. We allow load failures to proceed as otherwise we have a chicken and egg problem- if a 'desc' local database entry is missing, the best way of restoring said file is `pacman -Sf --dbonly packagename`. This patch fixes a segfault that was occurring in this case. Fixes the segfault reported in FS#25667. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 11 +++++++---- lib/libalpm/db.c | 3 +-- lib/libalpm/deps.c | 12 +++++++++--- lib/libalpm/deps.h | 2 +- lib/libalpm/package.c | 28 ++++++++++++++++++++++++---- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 35 ++++++++++++++++++++++++++--------- lib/libalpm/sync.c | 6 +++++- 8 files changed, 74 insertions(+), 25 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 8bbf157..cb8551e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -468,19 +468,22 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, is_upgrade = 1; /* we'll need to save some record for backup checks later */ - oldpkg = _alpm_pkg_dup(local); + if(_alpm_pkg_dup(local, &oldpkg) == -1) { + ret = -1; + goto cleanup; + } - EVENT(trans, ALPM_TRANS_EVT_UPGRADE_START, newpkg, oldpkg); + EVENT(trans, ALPM_TRANS_EVT_UPGRADE_START, newpkg, local); _alpm_log(handle, ALPM_LOG_DEBUG, "upgrading package %s-%s\n", newpkg->name, newpkg->version); /* copy over the install reason */ - newpkg->reason = alpm_pkg_get_reason(oldpkg); + newpkg->reason = alpm_pkg_get_reason(local); /* pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { _alpm_runscriptlet(handle, newpkg->origin_data.file, - "pre_upgrade", newpkg->version, oldpkg->version); + "pre_upgrade", newpkg->version, local->version); } } else { is_upgrade = 0; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 77bdf98..33282b8 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -553,8 +553,7 @@ int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg) return -1; } - newpkg = _alpm_pkg_dup(pkg); - if(newpkg == NULL) { + if(_alpm_pkg_dup(pkg, &newpkg)) { return -1; } diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 704a904..47b7637 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -512,13 +512,14 @@ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, * @param db package database to do dependency tracing in * @param *targs pointer to a list of packages * @param include_explicit if 0, explicitly installed packages are not included + * @return 0 on success, -1 on errors */ -void _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) +int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) { alpm_list_t *i, *j; if(db == NULL || targs == NULL) { - return; + return -1; } for(i = targs; i; i = i->next) { @@ -527,13 +528,18 @@ void _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) alpm_pkg_t *deppkg = j->data; if(_alpm_dep_edge(pkg, deppkg) && can_remove_package(db, deppkg, targs, include_explicit)) { + alpm_pkg_t *copy; _alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n", deppkg->name); /* add it to the target list */ - targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg)); + if(_alpm_pkg_dup(deppkg, &copy)) { + return -1; + } + targs = alpm_list_add(targs, copy); } } } + return 0; } /** diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 29e69eb..ce25bda 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -31,7 +31,7 @@ void _alpm_dep_free(alpm_depend_t *dep); alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep); void _alpm_depmiss_free(alpm_depmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, alpm_list_t *targets, int reverse); -void _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); +int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d865ac9..3d73a43 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -467,13 +467,32 @@ alpm_pkg_t *_alpm_pkg_new(void) return pkg; } -alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg) +/** + * Duplicate a package data struct. + * @param pkg the package to duplicate + * @param new_ptr location to store duplicated package pointer + * @return 0 on success, -1 on fatal error, 1 on non-fatal error + */ +int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr) { alpm_pkg_t *newpkg; alpm_list_t *i; + int ret = 0; + + if(!pkg || !pkg->handle) { + return -1; + } + + if(!new_ptr) { + RET_ERR(pkg->handle, ALPM_ERR_WRONG_ARGS, -1); + } if(pkg->ops->force_load(pkg)) { - return NULL; + _alpm_log(pkg->handle, ALPM_LOG_WARNING, + _("could not fully load metadata for package %s-%s\n"), + pkg->name, pkg->version); + ret = 1; + pkg->handle->pm_errno = ALPM_ERR_PKG_INVALID; } CALLOC(newpkg, 1, sizeof(alpm_pkg_t), goto cleanup); @@ -540,11 +559,12 @@ alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg) newpkg->ops = pkg->ops; newpkg->handle = pkg->handle; - return newpkg; + *new_ptr = newpkg; + return ret; cleanup: _alpm_pkg_free(newpkg); - return NULL; + RET_ERR(pkg->handle, ALPM_ERR_MEMORY, -1); } void _alpm_pkg_free(alpm_pkg_t *pkg) diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index bb92ddc..25d1b1a 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -144,7 +144,7 @@ alpm_file_t *_alpm_file_copy(alpm_file_t *dest, const alpm_file_t *src); int _alpm_files_cmp(const void *f1, const void *f2); alpm_pkg_t* _alpm_pkg_new(void); -alpm_pkg_t *_alpm_pkg_dup(alpm_pkg_t *pkg); +int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr); void _alpm_pkg_free(alpm_pkg_t *pkg); void _alpm_pkg_free_trans(alpm_pkg_t *pkg); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index c6886c6..7903a0f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -49,6 +49,7 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) { const char *pkgname; alpm_trans_t *trans; + alpm_pkg_t *copy; /* Sanity checks */ CHECK_HANDLE(handle, return -1); @@ -67,11 +68,14 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s to the transaction remove list\n", pkgname); - trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(pkg)); + if(_alpm_pkg_dup(pkg, &copy) == -1) { + return -1; + } + trans->remove = alpm_list_add(trans->remove, copy); return 0; } -static void remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) +static int remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) { alpm_trans_t *trans = handle->trans; @@ -81,14 +85,18 @@ static void remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) alpm_depmissing_t *miss = i->data; alpm_pkg_t *info = _alpm_db_get_pkgfromcache(handle->db_local, miss->target); if(info) { + alpm_pkg_t *copy; if(!_alpm_pkg_find(trans->remove, info->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "pulling %s in target list\n", info->name); - trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info)); + if(_alpm_pkg_dup(info, &copy) == -1) { + return -1; + } + trans->remove = alpm_list_add(trans->remove, copy); } } else { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not find %s in database -- skipping\n"), - miss->target); + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not find %s in database -- skipping\n"), miss->target); } } alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free); @@ -96,6 +104,7 @@ static void remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) lp = alpm_checkdeps(handle, _alpm_db_get_pkgcache(handle->db_local), trans->remove, NULL, 1); } + return 0; } static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) @@ -134,6 +143,7 @@ static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) * the packages blocking the transaction. * @param handle the context handle * @param data a pointer to an alpm_list_t* to fill + * @return 0 on success, -1 on error */ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) { @@ -144,8 +154,10 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) if((trans->flags & ALPM_TRANS_FLAG_RECURSE) && !(trans->flags & ALPM_TRANS_FLAG_CASCADE)) { _alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n"); - _alpm_recursedeps(db, trans->remove, - trans->flags & ALPM_TRANS_FLAG_RECURSEALL); + if(_alpm_recursedeps(db, trans->remove, + trans->flags & ALPM_TRANS_FLAG_RECURSEALL)) { + return -1; + } } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { @@ -156,7 +168,9 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) if(lp != NULL) { if(trans->flags & ALPM_TRANS_FLAG_CASCADE) { - remove_prepare_cascade(handle, lp); + if(remove_prepare_cascade(handle, lp)) { + return -1; + } } else if(trans->flags & ALPM_TRANS_FLAG_UNNEEDED) { /* Remove needed packages (which would break dependencies) * from target list */ @@ -184,7 +198,10 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) if((trans->flags & ALPM_TRANS_FLAG_CASCADE) && (trans->flags & ALPM_TRANS_FLAG_RECURSE)) { _alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n"); - _alpm_recursedeps(db, trans->remove, trans->flags & ALPM_TRANS_FLAG_RECURSEALL); + if(_alpm_recursedeps(db, trans->remove, + trans->flags & ALPM_TRANS_FLAG_RECURSEALL)) { + return -1; + } } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6c30c94..e3e7fa9 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -558,8 +558,12 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) for(j = spkg->removes; j; j = j->next) { alpm_pkg_t *rpkg = j->data; if(!_alpm_pkg_find(trans->remove, rpkg->name)) { + alpm_pkg_t *copy; _alpm_log(handle, ALPM_LOG_DEBUG, "adding '%s' to remove list\n", rpkg->name); - trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(rpkg)); + if(_alpm_pkg_dup(rpkg, &copy) == -1) { + return -1; + } + trans->remove = alpm_list_add(trans->remove, copy); } } } -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-62-g9934b3b
by dan＠archlinux.org 19 Aug '11

19 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 9934b3bd345011eef6a96249d8d90de594c04cd0 (commit) via 24824b54ce6ce3f62417be493d1e29eeb2cc8f53 (commit) via 2ca27ab3a14c106a7153dda337a61c79db7a6de0 (commit) via 1723e6dc4f8eff8aaa1e0f7560800c76e85f3009 (commit) via 16334f778b59ebf831c15640db2fe9706e7c9615 (commit) from c28052e45b94437d8c476c648ad6c9f9b8c04f36 (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 9934b3bd345011eef6a96249d8d90de594c04cd0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 18 15:21:58 2011 -0400 lib/dload: unlink on response code >=400 ftp and http both define >=400 as being "something bad happened" Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 24824b54ce6ce3f62417be493d1e29eeb2cc8f53 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 18 14:17:30 2011 -0400 dload: add 'unlink_on_fail' to payload struct Let callers of _alpm_download state whether we should delete on fail, rather than inferring it from context. We still override this decision and always unlink when a temp file is used. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2ca27ab3a14c106a7153dda337a61c79db7a6de0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 18 12:27:12 2011 -0400 makepkg: quote re-evaluation of simple vars This is a safety measure to prevent simple code injection. $ i="foo bar" $ eval i="$i" bash: bar: command not found $ eval i=\"$i\" $ echo "|$i|" |foo bar| Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1723e6dc4f8eff8aaa1e0f7560800c76e85f3009 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 18 12:18:39 2011 -0400 lib/dload: prevent possible NULL dereference Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 16334f778b59ebf831c15640db2fe9706e7c9615 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 02:17:04 2011 -0400 sync: fix garbled output in conflict prompt $ pacman -S cronie resolving dependencies... looking for inter-conflicts... :: cronie and fcron are in conflict (@.). Remove fcron? [y/N] n $ sudo pacman -S pacman resolving dependencies... looking for inter-conflicts... :: pacman and pacman-git are in conflict (pKÈ). Remove pacman-git? [y/N] Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_sync.c | 1 + lib/libalpm/dload.c | 16 ++++++++++------ lib/libalpm/dload.h | 1 + lib/libalpm/sync.c | 2 +- scripts/makepkg.sh.in | 12 ++++++------ 5 files changed, 19 insertions(+), 13 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/6] dload: move curl option setting to static func
by Dave Reisner 19 Aug '11

19 Aug '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/dload.c | 112 ++++++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 50 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 2a1fb41..16b2206 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -177,18 +177,74 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user) return realsize; } +static int curl_set_handle_opts(struct dload_payload *payload, + const char *destfile, const char *tempfile, FILE **localf, + const char **open_mode, char *error_buffer) +{ + char *useragent = getenv("HTTP_USER_AGENT"); + alpm_handle_t *handle = payload->handle; + struct stat st; + + /* the curl_easy handle is initialized with the alpm handle, so we only need + * to reset the curl handle set parameters for each time it's used. */ + curl_easy_reset(handle->curl); + curl_easy_setopt(handle->curl, CURLOPT_URL, payload->fileurl); + curl_easy_setopt(handle->curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(handle->curl, CURLOPT_ERRORBUFFER, error_buffer); + curl_easy_setopt(handle->curl, CURLOPT_CONNECTTIMEOUT, 10L); + curl_easy_setopt(handle->curl, CURLOPT_FILETIME, 1L); + curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 0L); + curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(handle->curl, CURLOPT_PROGRESSFUNCTION, curl_progress); + curl_easy_setopt(handle->curl, CURLOPT_PROGRESSDATA, (void *)payload); + curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); + curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_TIME, 10L); + curl_easy_setopt(handle->curl, CURLOPT_HEADERFUNCTION, parse_headers); + curl_easy_setopt(handle->curl, CURLOPT_WRITEHEADER, (void *)payload); + + if(payload->max_size) { + curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE, payload->max_size); + } + + if(useragent != NULL) { + curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, useragent); + } + + if(!payload->allow_resume && !payload->force && destfile && stat(destfile, &st) == 0) { + /* start from scratch, but only download if our local is out of date. */ + curl_easy_setopt(handle->curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(handle->curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); + } else if(stat(tempfile, &st) == 0 && payload->allow_resume) { + /* a previous partial download exists, resume from end of file. */ + *open_mode = "ab"; + curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM, (long)st.st_size); + _alpm_log(handle, ALPM_LOG_DEBUG, "tempfile found, attempting continuation\n"); + payload->initial_size = (double)st.st_size; + } + + if(*localf == NULL) { + *localf = fopen(tempfile, *open_mode); + if(*localf == NULL) { + return 1; + } + } + + curl_easy_setopt(handle->curl, CURLOPT_WRITEDATA, *localf); + + return 0; +} + + static int curl_download_internal(struct dload_payload *payload, const char *localpath, char **final_file) { int ret = -1; FILE *localf = NULL; - const char *useragent; const char *open_mode = "wb"; char *destfile = NULL, *tempfile = NULL, *effective_url; /* RFC1123 states applications should support this length */ char hostname[256]; - char error_buffer[CURL_ERROR_SIZE]; - struct stat st; + char error_buffer[CURL_ERROR_SIZE] = { 0 }; long timecond, remote_time = -1; double remote_size, bytes_dl; struct sigaction sig_pipe[2], sig_int[2]; @@ -233,55 +289,11 @@ static int curl_download_internal(struct dload_payload *payload, payload->filename = strrchr(randpath, '/') + 1; } - error_buffer[0] = '\0'; - - /* the curl_easy handle is initialized with the alpm handle, so we only need - * to reset the curl handle set parameters for each time it's used. */ - curl_easy_reset(handle->curl); - curl_easy_setopt(handle->curl, CURLOPT_URL, payload->fileurl); - curl_easy_setopt(handle->curl, CURLOPT_FAILONERROR, 1L); - curl_easy_setopt(handle->curl, CURLOPT_ERRORBUFFER, error_buffer); - curl_easy_setopt(handle->curl, CURLOPT_CONNECTTIMEOUT, 10L); - curl_easy_setopt(handle->curl, CURLOPT_FILETIME, 1L); - curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 0L); - curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(handle->curl, CURLOPT_PROGRESSFUNCTION, curl_progress); - curl_easy_setopt(handle->curl, CURLOPT_PROGRESSDATA, (void *)payload); - curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); - curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_TIME, 10L); - curl_easy_setopt(handle->curl, CURLOPT_HEADERFUNCTION, parse_headers); - curl_easy_setopt(handle->curl, CURLOPT_WRITEHEADER, (void *)payload); - - if(payload->max_size) { - curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE, payload->max_size); - } - - useragent = getenv("HTTP_USER_AGENT"); - if(useragent != NULL) { - curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, useragent); - } - - if(!payload->allow_resume && !payload->force && destfile && stat(destfile, &st) == 0) { - /* start from scratch, but only download if our local is out of date. */ - curl_easy_setopt(handle->curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(handle->curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); - } else if(stat(tempfile, &st) == 0 && payload->allow_resume) { - /* a previous partial download exists, resume from end of file. */ - open_mode = "ab"; - curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM, (long)st.st_size); - _alpm_log(handle, ALPM_LOG_DEBUG, "tempfile found, attempting continuation\n"); - payload->initial_size = (double)st.st_size; - } - - if(localf == NULL) { - localf = fopen(tempfile, open_mode); - if(localf == NULL) { - goto cleanup; - } + if(curl_set_handle_opts(payload, destfile, tempfile, &localf, &open_mode, + error_buffer) != 0) { + goto cleanup; } - curl_easy_setopt(handle->curl, CURLOPT_WRITEDATA, localf); - /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or * something along those lines. Store the old signal handler first. */ sig_pipe[NEW].sa_handler = SIG_IGN; -- 1.7.6

2 10

[pacman-dev] [PATCH] sync: fix garbled output in conflict prompt
by Dave Reisner 19 Aug '11

19 Aug '11

$ pacman -S cronie resolving dependencies... looking for inter-conflicts... :: cronie and fcron are in conflict (@.). Remove fcron? [y/N] n $ sudo pacman -S pacman resolving dependencies... looking for inter-conflicts... :: pacman and pacman-git are in conflict (pKÈ). Remove pacman-git? [y/N] Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 11ee817..6c30c94 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -527,7 +527,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2); int doremove = 0; QUESTION(trans, ALPM_TRANS_CONV_CONFLICT_PKG, conflict->package1, - conflict->package2, conflict->reason, &doremove); + conflict->package2, conflict->reason->name, &doremove); if(doremove) { /* append to the removes list */ _alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2); -- 1.7.6

1 0

[pacman-dev] [PATCH 1/2] lib/dload: prevent possible NULL dereference
by Dave Reisner 18 Aug '11

18 Aug '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Our (my) download code isn't very clear, but there's an oddball chance this might happen. Pointed out by Lucas. lib/libalpm/dload.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 5464740..3798937 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -396,7 +396,7 @@ cleanup: } } - if((ret == -1 || dload_interrupted) && should_unlink) { + if((ret == -1 || dload_interrupted) && should_unlink && tempfile) { unlink(tempfile); } -- 1.7.6

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-57-gc28052e
by dan＠archlinux.org 18 Aug '11

18 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via c28052e45b94437d8c476c648ad6c9f9b8c04f36 (commit) via 2a466c2abc94ce835efac94510659af006bd4330 (commit) via 6cfc4757b98e813428d261dbc185e20618ca83a6 (commit) via 3752edbff48fc472c5944f05f665adb000a521d9 (commit) via d008a816f1125ca44f0b2165b38220047860ecb0 (commit) via 78b63ce7c30f4a20707bce61eeaef913b513f557 (commit) via 231d6cc1e4083e5e49063b22fe6e5b0318b85328 (commit) via 5d291d050ebd714851c6bd85efd49a03d88414f0 (commit) via c4bd476ad13e142fe8323fe74d84b3950b53da17 (commit) via c885a953eb888004f0302ed3eceafef93e2f072f (commit) via 4a7f3bbc469d1f6a8da1c7f310ab518ad841c2b9 (commit) via d18e600952015378c9ba79661597f1c01046f436 (commit) via 0745288c1441c73a0c6ce4279823d8363bcdc62f (commit) from 9f139550f815e2970b8929094e50acfd8b4cc2b7 (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 c28052e45b94437d8c476c648ad6c9f9b8c04f36 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 18 23:01:29 2011 +1000 makepkg: deal with variable substitution when checking sanity If any of pkgver, pkgrel or epoch contained a variable substitution, then it needed to be evaluated before checking its value conformed to the rules. [Dan: add quotes around RHS] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2a466c2abc94ce835efac94510659af006bd4330 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 18 00:40:28 2011 -0500 doc/PKGBUILD: update regarding versioned package fields Add the info that versioned replaces are now supported, as well as beefing up some of the other places touching on versioned fields. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6cfc4757b98e813428d261dbc185e20618ca83a6 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 18 00:24:41 2011 -0500 Convert resolvedep() to use _alpm_depcmp_literal() The whole first loop is trying to check literals only, so teach it to do so. Also, reorder operations to make more sense by putting the strcmp() first in the literal loop, and using a very cheap name_hash check first in the second loop. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3752edbff48fc472c5944f05f665adb000a521d9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 18 00:23:06 2011 -0500 Fix replacement of provider issue When we switched to using alpm_depcmp() in resolving replacments, we had some interesting behavior with regard to providers and packages not found in repositories. Teach the replacement resolving code to not look at provisions at all to be slightly more sane. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d008a816f1125ca44f0b2165b38220047860ecb0 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 18 00:11:19 2011 -0500 Add an _alpm_depcmp_literal() function This omits the finding of matching provisions and only checks the package itself against the provided dep. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 78b63ce7c30f4a20707bce61eeaef913b513f557 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 17 23:52:28 2011 -0500 Replacements refactor: extract check_replacers() This moves code that was inline in alpm_sync_sysupgrade() to its own method. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 231d6cc1e4083e5e49063b22fe6e5b0318b85328 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 17 23:39:41 2011 -0500 Replacements refactor: extract check_literal() This moves code that was inline in alpm_sync_sysupgrade() to its own method. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5d291d050ebd714851c6bd85efd49a03d88414f0 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 18 00:28:53 2011 -0500 Remove usages of alpm_list_next() in backend Another function call that can be replaced by a single pointer dereference. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c4bd476ad13e142fe8323fe74d84b3950b53da17 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 17 23:25:19 2011 -0500 Remove use of no-op accessor functions in library The functions alpm_db_get_name(), alpm_pkg_get_name(), and alpm_pkg_get_version() are not necessary at all, so remove the calling and indirection when used in the backend, which makes things slightly more efficient and reduces code size. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c885a953eb888004f0302ed3eceafef93e2f072f Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 17 21:06:04 2011 -0500 Enhance and utilize database status flags * Move is_local standalone field to status enum * Create VALID/INVALID flag pair * Create EXISTS/MISSING flag pair With these additional fields, we can be more intelligent with database loading and messages to the user. We now only warn once if a sync database does not exist and do not continue to try to load it once we have marked it as missing. The reason for the flags existing in pairs is so the unknown case can be represented. There should never be a time when both flags in the same group are true, but if they are both false, it represents the unknown case. Care is taken to always manipulate both flags at the same time. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a7f3bbc469d1f6a8da1c7f310ab518ad841c2b9 Author: Sebastien Luttringer <seblu(a)seblu.net> Date: Thu Aug 18 12:46:19 2011 +0200 Add makepkg -S which is an alias to makepkg --source makepkg --source is a often used go make source package like for AUR. Have a -S shortcut will save the world. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d18e600952015378c9ba79661597f1c01046f436 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Thu Aug 18 09:42:20 2011 +0200 lib/libalpm/dload.c: Use STRDUP() instead of strdup() Use the STRDUP macro instead of strdup() for the sake of better error handling on memory allocation failures. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0745288c1441c73a0c6ce4279823d8363bcdc62f Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Thu Aug 18 09:42:21 2011 +0200 lib/libalpm/dload.c: Add ASSERT() to alpm_fetch_pkgurl() Return with ALPM_ERR_WRONG_ARGS instead of causing a potential segfault if alpm_fetch_pkgurl() is invoked with a NULL URL. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 2 +- doc/PKGBUILD.5.txt | 21 ++-- doc/makepkg.8.txt | 14 ++-- lib/libalpm/add.c | 34 +++---- lib/libalpm/be_local.c | 25 ++++- lib/libalpm/be_sync.c | 48 ++++++--- lib/libalpm/conflict.c | 5 +- lib/libalpm/db.c | 16 ++- lib/libalpm/db.h | 18 ++-- lib/libalpm/deps.c | 40 ++++--- lib/libalpm/deps.h | 1 + lib/libalpm/diskspace.c | 6 +- lib/libalpm/dload.c | 9 +- lib/libalpm/package.c | 21 ++-- lib/libalpm/remove.c | 6 +- lib/libalpm/sync.c | 224 ++++++++++++++++++++++----------------- lib/libalpm/trans.c | 4 +- lib/libalpm/util.c | 4 +- scripts/makepkg.sh.in | 9 +- test/pacman/tests/replace103.py | 2 - 20 files changed, 299 insertions(+), 210 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: deal with variable substitution when checking sanity
by Allan McRae 18 Aug '11

18 Aug '11

If any of pkgver, pkgrel or epoch contained a variable substitution, then it needed to be evaluated before checking its value conformed to the rules. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e73fdfa..966caed 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1451,6 +1451,7 @@ check_sanity() { awk -F'=' '/^[[:space:]]*pkgver=/ { $1=""; print $0 }' "$BUILDFILE" | while read i _; do + eval i=$i if [[ $i =~ [[:space:]:-] ]]; then error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" return 1 @@ -1459,6 +1460,7 @@ check_sanity() { awk -F'=' '/^[[:space:]]*pkgrel=/ { $1=""; print $0 }' "$BUILDFILE" | while read i _; do + eval i=$i if [[ $i =~ [[:space:]-] ]]; then error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" return 1 @@ -1467,6 +1469,7 @@ check_sanity() { awk -F'=' '/^[[:space:]]*epoch=/ { $1=""; print $0 }' "$BUILDFILE" | while read i _; do + eval i=$i if [[ ! $i =~ ^[0-9]*$ ]]; then error "$(gettext "%s must be an integer.")" "epoch" return 1 -- 1.7.6

2 1

[pacman-dev] [PATCH] Add makepkg -S which is and alias to makepkg --source
by Sebastien Luttringer 18 Aug '11

18 Aug '11

makepkg --source is a often used go make source package like for AUR. Have a -S shortcut will save the world. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- contrib/bash_completion.in | 2 +- doc/makepkg.8.txt | 2 +- scripts/makepkg.sh.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index af5de17..8fa3da6 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -35,7 +35,7 @@ _makepkg() { opts=('allsource asroot check clean config force geninteg help holdver ignorearch install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps' - 'A L R c d e f g h i m o p r s') + 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi true diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 3206a90..ca5a273 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -145,7 +145,7 @@ Options such as a chroot or remote builder. It will also satisfy requirements of the GPL when distributing binary packages. -*\--source*:: +*-S, \--source*:: Do not actually build the package, but build a source-only tarball that does not include sources that can be fetched via a download URL. This is useful for passing a single tarball to another program such as a chroot, diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e73fdfa..8555db3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1844,6 +1844,7 @@ usage() { echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" printf "$(gettext " -s, --syncdeps Install missing dependencies with %s")\n" "pacman" + echo "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" printf "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" printf "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" @@ -1857,7 +1858,6 @@ usage() { echo "$(gettext " --skipchecksums Do not verify checksums of the source files")" echo "$(gettext " --skipinteg Do not perform any verification checks on source files")" echo "$(gettext " --skippgpcheck Do not verify source files with PGP signatures")" - echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" echo printf "$(gettext "These options can be passed to %s:")\n" "pacman" echo @@ -1889,7 +1889,7 @@ fi ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcdefFghiLmop:rRsV" +OPT_SHORT="AcdefFghiLmop:rRsSV" OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver,skippgpcheck" OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" @@ -1940,8 +1940,8 @@ while true; do --skipinteg) SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;; --skippgpcheck) SKIPPGPCHECK=1;; --sign) SIGNPKG='y' ;; - --source) SOURCEONLY=1 ;; -s|--syncdeps) DEP_BIN=1 ;; + -S|--source) SOURCEONLY=1 ;; -h|--help) usage; exit 0 ;; # E_OK -V|--version) version; exit 0 ;; # E_OK -- Sebastien "Seblu" Luttringer

2 1