- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: avoid file|grep dependency for CRLF check
by Dave Reisner 06 Apr '13

06 Apr '13

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 73f45d4..a63b267 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2744,8 +2744,7 @@ if [[ ! -f $BUILDFILE ]]; then source_safe "$BUILDFILE" fi else - crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true) - if [[ -n $crlftest ]]; then + if [[ $(<"$BUILDFILE") = *$'\r'* ]]; then error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF" exit 1 fi -- 1.8.2

2 1

[pacman-dev] [PATCH] makepkg: remove extra ansi color codes
by Andrew Gregory 06 Apr '13

06 Apr '13

All those extra '\e[1;'s were just setting bold redundantly or immediately being cancelled. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..7ba53b0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2636,20 +2636,20 @@ if [[ -t 2 && ! $USE_COLOR = "n" ]] && check_buildenv "color" "y"; then ALL_OFF="$(tput sgr0)" BOLD="$(tput bold)" BLUE="${BOLD}$(tput setaf 4)" GREEN="${BOLD}$(tput setaf 2)" RED="${BOLD}$(tput setaf 1)" YELLOW="${BOLD}$(tput setaf 3)" else - ALL_OFF="\e[1;0m" - BOLD="\e[1;1m" - BLUE="${BOLD}\e[1;34m" - GREEN="${BOLD}\e[1;32m" - RED="${BOLD}\e[1;31m" - YELLOW="${BOLD}\e[1;33m" + ALL_OFF="\e[0m" + BOLD="\e[1m" + BLUE="${BOLD}\e[34m" + GREEN="${BOLD}\e[32m" + RED="${BOLD}\e[31m" + YELLOW="${BOLD}\e[33m" fi fi readonly ALL_OFF BOLD BLUE GREEN RED YELLOW # override settings with an environment variable for batch processing BUILDDIR=${_BUILDDIR:-$BUILDDIR} BUILDDIR=${BUILDDIR:-$startdir} #default to $startdir if undefined -- 1.8.2

2 1

[pacman-dev] [PATCH] contrib: Use sysconfdir instead of /etc
by William Giokas 06 Apr '13

06 Apr '13

Don't force people to see /etc. Signed-off-by: William Giokas <1007380(a)gmail.com> --- contrib/zsh_completion.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f9d1106..c6e884f 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -472,8 +472,8 @@ _key_longopts=( ) _pacman_key_options=( - '--config[Use an alternate config file (instead of /etc/pacman.con)]: :_files' - '--gpgdir[Set an alternate directory for GnuPG (instead of /etc/pacman.d/gnupg)]: :_files -/' + '--config[Use an alternate config file (instead of @sysconfdir@/pacman.conf)]: :_files' + '--gpgdir[Set an alternate directory for GnuPG (instead of @sysconfdir@/pacman.d/gnupg)]: :_files -/' '--keyserver[Specify a keyserver to use if necessary]' ) @@ -579,7 +579,7 @@ _makepkg_longopts=( '--allsource[Generate a source-only tarball including downloaded source]' '--asroot[Allow makepkg to run as root user]' '--check[Run check() function in the PKGBUILD]' - '--config[Use an alternate config file instead of '/etc/makepkg.conf']: :_files' + '--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files' '--holdver[Prevent automatic version bumping for development PKGBUILDs]' '--key[Specify key to use for gpg signing instead of the default]: :_keys' '--nocheck[Do not run the check() function in the PKGBUILD]' -- 1.8.2.282.ga32a0c2

2 1

[pacman-dev] [PATCH] updpkgsums: Add --clean to makepkg call
by Sébastien Luttringer 06 Apr '13

06 Apr '13

Avoid makepkg to let src/ directory after updating the sums Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- contrib/updpkgsums.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 7456553..cf3ce6a 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -75,7 +75,7 @@ fi # Generate the new sums and try to unlink the file before writing stdin back # into it. This final precaution shouldn't fail based on the previous checks, # but it's better to be extra careful before unlinking files. - newsums=$(makepkg --asroot -g -p "$buildfile") && rm -f "$buildfile" && + newsums=$(makepkg --asroot --clean -g -p "$buildfile") && rm -f "$buildfile" && exec awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*(#.*)?$/ { if (!w) { -- 1.8.2

4 5

[pacman-dev] [PATCH] zsh completion: make sure -Ss works
by Daniel Wallace 06 Apr '13

06 Apr '13

if you put a type in pacman -Ss <regex> it doesn't work because it never passes through they pointer ->sync_search to set $state. All of the other iterations like this have a case, add one for -S*s* --- contrib/zsh_completion.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f9d1106..9edcdfa 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -202,7 +202,7 @@ _pacman_action_sync() { _arguments -s : \ {\*-c,\*--clean}'[Remove old packages from cache]' \ "$_pacman_opts_common[@]" \ - "$_pacman_opts_sync_modifiers[@]" \ + "$_pacman_opts_sync_modifiers[@]" ;; sync_group) _arguments -s : \ @@ -383,6 +383,12 @@ _pacman_zsh_comp() { "$_pacman_opts_sync_modifiers[@]" \ '*:package group:_pacman_completions_all_groups' ;; + S*s*) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:search text: ' + ;; S*) _pacman_action_sync ;; -- 1.8.2

2 1

[pacman-dev] [PATCH] ctypes.h shouldn't be included twice
by Simon Gomizelj 06 Apr '13

06 Apr '13

Earnestly spotted this on #archlinux. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/pacman.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 916873d..36244a0 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -24,7 +24,6 @@ #define PACKAGE_VERSION GIT_VERSION #endif -#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <ctype.h> /* isspace */ -- 1.8.2

2 1

[pacman-dev] [PATCH] doc: fix debug spelling mistake
by William Giokas 05 Apr '13

05 Apr '13

with -> when Signed-off-by: William Giokas <1007380(a)gmail.com> --- doc/makepkg.conf.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 0d1cf00..be5b809 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -182,7 +182,7 @@ Options *debug*;; Add the user-specified debug flags as specified in DEBUG_CFLAGS and DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate - package containing the debug symbols with used with `strip'. + package containing the debug symbols when used with `strip'. **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this -- 1.8.2.279.g631bc94

2 1

[pacman-dev] [PATCH] use off_t for table_row_t.size
by Andrew Gregory 05 Apr '13

05 Apr '13

size went from off_t in _display_targets to int in add_transaction_sizes and back to off_t in humanize_size leading to potential overflows. Fixes FS#34616. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 862c8e8..643b6fe 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -49,7 +49,7 @@ struct table_row_t { const char *label; - int size; + off_t size; }; int trans_init(alpm_transflag_t flags, int check_valid) @@ -828,7 +828,7 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) return ret; } -static void add_transaction_sizes_row(alpm_list_t **table, const char *label, int size) +static void add_transaction_sizes_row(alpm_list_t **table, const char *label, off_t size) { struct table_row_t *row = malloc(sizeof(struct table_row_t)); -- 1.8.2

2 1

[pacman-dev] [PATCH] More verbose bzr branching error
by Maxime Gauduin 05 Apr '13

05 Apr '13

From: Alucryd <alucryd(a)gmail.com> Prints the correct bzr url to be used in the source array. More details in this thread: https://mailman.archlinux.org/pipermail/aur-general/2013-April/022921.html Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- scripts/makepkg.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..777bbfb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -473,6 +473,7 @@ download_bzr() { # Make sure we are fetching the right repo if [[ "$url" != "$(bzr config parent_location -d $dir)" ]] ; then error "$(gettext "%s is not a branch of %s")" "$dir" "$url" + error "$(gettext "The reported url is %s")" "$(bzr config parent_location -d $dir)" plain "$(gettext "Aborting...")" exit 1 fi -- 1.8.2

2 1

[pacman-dev] [PATCH 1/2] util.c: ignore trailing whitespace in parseindex
by Andrew Gregory 03 Apr '13

03 Apr '13

strtol already ignores leading whitespace so it doesn't make much sense for us to worry about trailing whitespace. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pacman/util.c b/src/pacman/util.c index 7b7dace..115f328 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1292,6 +1292,10 @@ static int parseindex(char *s, int *val, int min, int max) { char *endptr = NULL; int n = strtol(s, &endptr, 10); + /* strtol skips leading whitespace, don't worry about trailing whitespace */ + while(isspace(*endptr)) { + endptr++; + } if(*endptr == '\0') { if(n < min || n > max) { pm_printf(ALPM_LOG_ERROR, -- 1.8.2

2 6