March 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg.conf: Add staticlibs to default OPTIONS array in comments
by Eric Bélanger 12 Mar '13

12 Mar '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- etc/makepkg.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index b2bf811..af9588e 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -65,7 +65,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) +# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries -- 1.8.1.5

3 2

[pacman-dev] [PATCH] doc: Fix pacman.conf formatting
by William Giokas 12 Mar '13

12 Mar '13

Signed-off-by: William Giokas <1007380(a)gmail.com> --- Yay tiny patch doc/pacman.conf.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 58d68f3..5d83638 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -238,7 +238,7 @@ even be used for different architectures. information, see <<SC,Package and Database Signature Checking>> below. Package and Database Signature Checking[[SC]] ---------------------------------------- +--------------------------------------------- The 'SigLevel' directive is valid in both the `[options]` and repository sections. If used in `[options]`, it sets a default value for any repository that does not provide the setting. -- 1.8.2.rc1.24.g06d67b8

1 0

[pacman-dev] [PATCH 1/2] Add Local/RemoteFileSigLevel to example config
by Allan McRae 12 Mar '13

12 Mar '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- etc/pacman.conf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index d1eee7f..b891de1 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -37,6 +37,8 @@ CheckSpace # PGP signature checking #SigLevel = Optional +#LocalFileSigLevel = Optional +#RemoteFileSigLevel = Optional # # REPOSITORIES -- 1.8.1.5

1 1

[pacman-dev] [PATCH 2/2] pacman.conf: Remove empty line at end of file
by Eric Bélanger 11 Mar '13

11 Mar '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- etc/pacman.conf.in | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index f610fa8..d1eee7f 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -72,4 +72,3 @@ CheckSpace #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs - -- 1.8.1.5

1 0

[pacman-dev] [PATCH] Save and restore old locale when manipulating via setlocale
by Dan McGee 11 Mar '13

11 Mar '13

We shouldn't assume a frontend program didn't explicitly set the LC_TIME setting to a value not in the environment, which is what we previously assumed. Save the old locale before forcing the 'C' locale and restore it when we are done. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f4c33a0..dc1d043 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1170,12 +1170,16 @@ alpm_time_t _alpm_parsedate(const char *line) errno = 0; if(isalpha((unsigned char)line[0])) { + const char *oldlocale; /* initialize to null in case of failure */ struct tm tmp_tm; memset(&tmp_tm, 0, sizeof(struct tm)); + + oldlocale = setlocale(LC_TIME, NULL); setlocale(LC_TIME, "C"); strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - setlocale(LC_TIME, ""); + setlocale(LC_TIME, oldlocale); + return (alpm_time_t)mktime(&tmp_tm); } -- 1.8.1.5

1 0

[pacman-dev] [PATCH] Use C locale when parsing UseDelta floating point values
by Dan McGee 11 Mar '13

11 Mar '13

We should save the current locale, use the 'C' locale during parsing, then restore the original locale. Config files should always parse regardless of the current user's locale setting. Fixes FS#34253. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/conf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 815df95..3f1b1c3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -21,6 +21,7 @@ #include <errno.h> #include <glob.h> #include <limits.h> +#include <locale.h> /* setlocale */ #include <fcntl.h> /* open */ #include <stdlib.h> #include <stdio.h> @@ -514,7 +515,15 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "UseDelta") == 0) { double ratio; char *endptr; + const char *oldlocale; + + /* set the locale to 'C' for consistant decimal parsing (0.7 and never + * 0,7) from config files, then restore old setting when we are done */ + oldlocale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); ratio = strtod(value, &endptr); + setlocale(LC_NUMERIC, oldlocale); + if(*endptr != '\0' || ratio < 0.0 || ratio > 2.0) { pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: invalid value for '%s' : '%s'\n"), -- 1.8.1.5

1 0

[pacman-dev] [PATCH] Use C locale for parsing Delta value
by Allan McRae 11 Mar '13

11 Mar '13

Locales that use "," as their decimal separator resulted in parsing issues with the Delta value. Ensure the C locale is used during parsing. Fixes FS#34253 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 815df95..71bfed6 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -22,6 +22,7 @@ #include <glob.h> #include <limits.h> #include <fcntl.h> /* open */ +#include <locale.h> #include <stdlib.h> #include <stdio.h> #include <string.h> /* strdup */ @@ -514,7 +515,9 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "UseDelta") == 0) { double ratio; char *endptr; + setlocale(LC_NUMERIC, "C"); ratio = strtod(value, &endptr); + setlocale(LC_NUMERIC, ""); if(*endptr != '\0' || ratio < 0.0 || ratio > 2.0) { pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: invalid value for '%s' : '%s'\n"), -- 1.8.1.5

1 0

[pacman-dev] [translation] pacman-4.1
by Allan McRae 10 Mar '13

10 Mar '13

Hi translators, I have pushed the updated translation files to Transifex for the pacman-4.1 release. I aim to make the release before the end of the month, so it would be great if translations could be finished in the next two weeks. There are a few bugs about translations that I will outline: FS#22575, FS#30474 [de, pt, ALL] pacman -Qi and pacman -Si output are not well aligned in many languages. We will try to do something about that in the next release but it would be good to try and align these if possible FS#28857, FS#30740 [fi] Do not use positional parameters (e.g. %2$d) in the "pacman scripts" section as bash does not deal with these FS#29405 [pt, ALL] Do not translate pacman options like "--config". Notes about mistranslations for specific languages: Czech - https://bugs.archlinux.org/task/33953 Spanish - https://bugs.archlinux.org/task/33732 German - https://bugs.archlinux.org/task/31475 Thanks, Allan

3 3

[pacman-dev] [PATCH] alpm/remove.c: add newlines to debug output
by Andrew Gregory 10 Mar '13

10 Mar '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/remove.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0642e04..d0cd613 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -278,7 +278,7 @@ static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, struct stat dir_stbuf; if(stat(directory, &dir_stbuf) < 0) { _alpm_log(handle, ALPM_LOG_DEBUG, - "failed to stat directory %s: %s", + "failed to stat directory %s: %s\n", directory, strerror(errno)); return 0; } @@ -290,7 +290,7 @@ static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, snprintf(parent_dir, PATH_MAX, "%s..", directory); if(stat(parent_dir, &parent_stbuf) < 0) { _alpm_log(handle, ALPM_LOG_DEBUG, - "failed to stat parent of %s: %s: %s", + "failed to stat parent of %s: %s: %s\n", directory, parent_dir, strerror(errno)); return 0; } -- 1.8.1.5

1 0

[pacman-dev] [PATCH] Make VCS download functions print correct filename
by Neer Sighted 10 Mar '13

10 Mar '13

I've made the VCS download functions print the correct filename for their clone, as opposed to the last fragment in the url. --- scripts/makepkg.sh.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..0facb5e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -456,9 +456,7 @@ download_git() { local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" - local repo=${netfile##*/} - repo=${repo%%#*} - repo=${repo%%.git*} + local repo=$(get_filename "$netfile") local url=$(get_url "$netfile") url=${url##*git+} @@ -536,8 +534,7 @@ download_hg() { local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" - local repo=${netfile##*/} - repo=${repo%%#*} + local repo=$(get_filename "$netfile") local url=$(get_url "$netfile") url=${url##*hg+} @@ -596,8 +593,7 @@ download_svn() { local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" - local repo=${netfile##*/} - repo=${repo%%#*} + local repo=$(get_filename "$netfile") local url=$(get_url "$netfile") if [[ $url != svn+ssh* ]]; then -- 1.8.1.4

3 11