- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.0rc1-22-gb2ea5f6
by allan＠archlinux.org 14 Mar '13

14 Mar '13

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 b2ea5f6860dda8267cc7468e975b073be5321228 (commit) via e42e9ab8733b4bfa4e5a201202a92332f36ba564 (commit) via 0ba9b262abcf5910ccdfe2a2e63878816d4d440d (commit) via 342924f796aa4776f46d5eba181a17b04cef1c13 (commit) via fa620685fac4c209045bee42073cd360b10f465d (commit) via 8c33d7f1efb321652a9f22521df32357487548ba (commit) via f3f257405b6e325317422a73be5ee5710271de00 (commit) via d5a06e964c2b127f192f756f6fef1be76bb0bff8 (commit) via 9ec049f518613315b12ba7ff7a57c81f526e8560 (commit) via 0d99b54ba2957d73c21f761471e54679ba719449 (commit) via 163c36bdcde6aa324060bafe5674ea83cf556fd8 (commit) via 62f828014f17596cf8fb5cd2ea0c34cb754f75cb (commit) via d35a7fb6f36509a53e8b36d4eca03cef9d2c20db (commit) via 6c870953c563c69c7e833637fec292e291511b45 (commit) via 63f04177c3987b5e4562d04ea05c867e56dabb9b (commit) from 1e21aa589d66c56db1c37078c3f1f6ed4095487b (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 b2ea5f6860dda8267cc7468e975b073be5321228 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 13 14:34:08 2013 +1000 update util-common.h copyright year Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e42e9ab8733b4bfa4e5a201202a92332f36ba564 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 12 14:48:02 2013 +1000 Make "[removal]" translatable Fixes FS#34241 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0ba9b262abcf5910ccdfe2a2e63878816d4d440d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 12 14:05:18 2013 +1000 Revert "makepkg: Use a recursive git clone." This reverts commit 8b03b1a8776043978aeac31682f94d65b4f3e514. It is much better to download the submodules using separate source entries and adjust the submodule configs to point at these versions in the prepare() function. See https://mailman.archlinux.org/pipermail/pacman-dev/2013-March/016771.html for an example. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 342924f796aa4776f46d5eba181a17b04cef1c13 Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 11 22:10:59 2013 -0500 doc: consistent formatting for pacman.conf options Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fa620685fac4c209045bee42073cd360b10f465d Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 11 22:10:58 2013 -0500 doc: Fix pacman-key title formatting Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8c33d7f1efb321652a9f22521df32357487548ba Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 11 21:37:38 2013 -0500 doc: Fix pacman.conf formatting Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f3f257405b6e325317422a73be5ee5710271de00 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 12 12:16:24 2013 +1000 Add compression defaults for lrzip and lzo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d5a06e964c2b127f192f756f6fef1be76bb0bff8 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 12 12:15:53 2013 +1000 Add Local/RemoteFileSigLevel to example config Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9ec049f518613315b12ba7ff7a57c81f526e8560 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Mon Mar 11 01:40:50 2013 -0400 pacman.conf: Remove empty line at end of file Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0d99b54ba2957d73c21f761471e54679ba719449 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Mon Mar 11 01:36:33 2013 -0400 makepkg.conf: Add staticlibs to default OPTIONS array in comments Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 163c36bdcde6aa324060bafe5674ea83cf556fd8 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 10 23:01:55 2013 -0500 Save and restore old locale when manipulating via setlocale 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62f828014f17596cf8fb5cd2ea0c34cb754f75cb Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 10 22:51:11 2013 -0500 Use C locale when parsing UseDelta floating point values 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d35a7fb6f36509a53e8b36d4eca03cef9d2c20db Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Mar 10 16:42:58 2013 -0400 alpm/remove.c: add newlines to debug output Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6c870953c563c69c7e833637fec292e291511b45 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 9 22:45:00 2013 -0500 pkgdelta: fix improper passing of file argument Looks like I hosed this pretty hard in 5a5e712c749edb8. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 63f04177c3987b5e4562d04ea05c867e56dabb9b Author: William Giokas <1007380(a)gmail.com> Date: Sat Mar 9 19:01:53 2013 -0600 zsh completion: Add new makepkg opts Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion.in | 2 ++ doc/pacman-key.8.txt | 2 +- doc/pacman.conf.5.txt | 4 ++-- etc/makepkg.conf.in | 5 +++-- etc/pacman.conf.in | 3 ++- lib/libalpm/remove.c | 4 ++-- lib/libalpm/util.c | 6 +++++- scripts/makepkg.sh.in | 2 +- scripts/pkgdelta.sh.in | 5 +++-- src/common/util-common.c | 2 +- src/pacman/conf.c | 9 +++++++++ src/pacman/util.c | 4 ++-- 12 files changed, 33 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Treat packages to be printed as non-ignored
by Connor Behan 13 Mar '13

13 Mar '13

Calling pacman -Sp is guaranteed not to install a package. So the user's IgnorePkg pref is still respected regardless of whether or not we print the mirror location. Therefore we might as well do so to give as much information as possible. Also fixes an edge case with devtools. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- lib/libalpm/alpm.h | 1 + lib/libalpm/handle.c | 7 +++++++ lib/libalpm/handle.h | 1 + lib/libalpm/package.c | 8 +++++++- src/pacman/conf.c | 1 + 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ccbdd1c..ec5716a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -587,6 +587,7 @@ int alpm_option_set_arch(alpm_handle_t *handle, const char *arch); double alpm_option_get_deltaratio(alpm_handle_t *handle); int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); +int alpm_option_set_print(alpm_handle_t *handle, int print); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 53c86c5..2d914ca 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -594,6 +594,13 @@ int SYMEXPORT alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio) return 0; } +int SYMEXPORT alpm_option_set_print(alpm_handle_t *handle, int print) +{ + CHECK_HANDLE(handle, return -1); + handle->print = print; + return 0; +} + alpm_db_t SYMEXPORT *alpm_get_localdb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5e84d58..413e19a 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -89,6 +89,7 @@ struct __alpm_handle_t { /* options */ char *arch; /* Architecture of packages we should allow */ double deltaratio; /* Download deltas if possible; a ratio value */ + int print; /* Treat pkgs as if they will not be installed anyway */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 098c867..ea82148 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -762,7 +762,8 @@ alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle) /** Test if a package should be ignored. * * Checks if the package is ignored via IgnorePkg, or if the package is - * in a group ignored via IgnoreGroup. + * in a group ignored via IgnoreGroup. Packages only being printed are + * immune from this. * * @param handle the context handle * @param pkg the package to test @@ -772,6 +773,11 @@ alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle) int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) { alpm_list_t *groups = NULL; + + /* #FS#34066 - Querying URLs for packages (even ignored ones) should succeed */ + if (handle->print) { + return 0; + } /* first see if the package is ignored */ if(alpm_list_find(handle->ignorepkg, pkg->name, _alpm_fnmatch)) { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 815df95..07255cb 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -721,6 +721,7 @@ static int setup_libalpm(void) alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); alpm_option_set_deltaratio(handle, config->deltaratio); + alpm_option_set_print(handle, config->print); alpm_option_set_ignorepkgs(handle, config->ignorepkg); alpm_option_set_ignoregroups(handle, config->ignoregrp); -- 1.8.1.5

3 2

[pacman-dev] [PATCH] Make "[removal]" translatable
by Allan McRae 13 Mar '13

13 Mar '13

Fixes FS#34241 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 cce1a18..238e328 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -903,8 +903,8 @@ static void _display_targets(alpm_list_t *targets, int verbose) pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), alpm_pkg_get_version(target->remove)); } else { - pm_asprintf(&str, "%s-%s [removal]", alpm_pkg_get_name(target->remove), - alpm_pkg_get_version(target->remove)); + pm_asprintf(&str, "%s-%s [%s]", alpm_pkg_get_name(target->remove), + alpm_pkg_get_version(target->remove), _("removal")); } names = alpm_list_add(names, str); } -- 1.8.1.5

2 3

[pacman-dev] [PATCH] makepkg: Use a recursive git clone.
by Neer Sighted 12 Mar '13

12 Mar '13

Make makepkg use a recursive clone when creating the working directory. This will initialize submodules --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..9399aa5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -490,7 +490,7 @@ download_git() { pushd "$srcdir" &>/dev/null rm -rf "${dir##*/}" - if ! git clone "$dir"; then + if ! git clone --recursive "$dir"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 1.8.1.4

4 9

[pacman-dev] [PATCH 1/2] doc: Fix pacman-key title formatting
by William Giokas 12 Mar '13

12 Mar '13

Signed-off-by: William Giokas <1007380(a)gmail.com> --- doc/pacman-key.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index ceedf83..f454074 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -119,7 +119,7 @@ Options Providing a Keyring for Import[[PK]] ------------------------------- +------------------------------------ A distribution or other repository provided may want to provide a set of PGP keys used in the signing of its packages and repository databases that can be readily imported into the pacman keyring. This is achieved by providing a -- 1.8.2.rc1.24.g06d67b8

2 2

[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