January 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 3/3] pacsearch now has localized output
by Pierre Neidhardt 15 Jan '14

15 Jan '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index d860471..10a6148 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -77,13 +77,16 @@ if ($ARGV[0] eq "--nocolor" || $ARGV[0] eq "-n") { $RESET = ""; } -my @COLORS=($RED, $GREEN, $YELLOW, $BLUE, $MAGENTA, $CYAN); +my @COLORS = ($RED, $GREEN, $YELLOW, $BLUE, $MAGENTA, $CYAN); # We can choose if we output repo/pkgname bold or not. Same thing for 'ver group # installed'. Not sure if it's worth a CLI option. my $FMT_REPO = $BOLD; my $FMT_OTHER = $REGULAR; +# localization +my $LC_INSTALLED = `gettext pacman installed`; + # Color a "repo/pkgname pkgver (goups) [installed]" line. # We try to stick to pacman colors. sub to_color { @@ -146,8 +149,7 @@ foreach $_ (@querypkgs) { if (not exists $allpkgs{$pkgfields[1]}) { # since 'group' is optional, we should fill it in if necessary $pkgfields[3] = "" if not defined $pkgfields[3]; - # TODO: localize the "installed" word - $pkgfields[4] = "[installed]"; + $pkgfields[4] = "[" . $LC_INSTALLED . "]"; # add a last field that indicates original order (after sync) push (@pkgfields, $cnt++); # add our local-only package to the hash -- 1.8.5.2

2 1

[pacman-dev] [PATCH] Fix compilation without gpgme
by Dan McGee 10 Jan '14

10 Jan '14

Two issues have snuck in that prevent the compile from working. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This and the rest of the patches available on my 'random-fixes' branch. lib/libalpm/sync.c | 2 +- src/pacman/package.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e358585..9531fa2 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1225,7 +1225,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return -1; } -#if HAVE_LIBGPGME +#ifdef HAVE_LIBGPGME /* make sure all required signatures are in keyring */ if(check_keyring(handle)) { return -1; diff --git a/src/pacman/package.c b/src/pacman/package.c index 52219ff..c44696b 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -193,6 +193,10 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } if(from == ALPM_PKG_FROM_SYNCDB && extra) { + string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg), cols); + string_display(_("SHA-256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); + +#ifdef HAVE_LIBGPGME const char *base64_sig = alpm_pkg_get_base64_sig(pkg); alpm_list_t *keys = NULL; if(base64_sig) { @@ -204,10 +208,8 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } else { keys = alpm_list_add(keys, _("None")); } - - string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg), cols); - string_display(_("SHA-256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); list_display(_("Signatures :"), keys, cols); +#endif } else { list_display(_("Validated By :"), validation, cols); } -- 1.8.5.2

3 16

[pacman-dev] [PATCH] pacsearch colors and variable names
by Pierre Neidhardt 09 Jan '14

09 Jan '14

For now I've kept the original pacsearch colors for the repos. Some fields have the same colors--e.g. 'extra' and 'version' are both bold green. Maybe it would look nicer to make repo/name bold and to leave the other fields regular. I've changed repo-specific variables to formatting variables. Additionally I have rephrased the help message; the previous message would let one think this script was rather useless compared to a simple pacman -Ss. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 55 +++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 624f201..a05ae87 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -20,6 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #TODO: colors flag on commandline +#TODO: for now the whole line is bold and some parts have the same formatting (e.g. extra and version), maybe it would be better to use regular formatting use strict; use warnings; @@ -29,7 +30,7 @@ my $myver = '@PACKAGE_VERSION@'; sub usage { print "$myname (pacman) v$myver\n\n"; - print "Add color and install information to a 'pacman -Ss' search\n\n"; + print "Perform a pacman search using both the local and the sync databases.\n\n"; print "Usage: $myname <pattern>\n\n"; print "Example: $myname ^gnome\n"; } @@ -54,32 +55,38 @@ if ($ARGV[0] eq "--version" || $ARGV[0] eq "-V") { exit 0; } -# define our colors to use when printing -my $CLR1 = "\e[0;34m"; -my $CLR2 = "\e[0;32m"; -my $CLR3 = "\e[0;35m"; -my $CLR4 = "\e[0;36m"; -my $CLR5 = "\e[0;31m"; -my $CLR6 = "\e[0;33m"; -my $CLR7 = "\e[1;36m"; -my $INST = "\e[1;31m"; -my $BASE = "\e[0m"; - -# color a "repo/pkgname pkgver" line based on the repository name +# define formatting variables +my $FMT_BLUE = "\e[1;94m"; +my $FMT_CYAN = "\e[1;96m"; +my $FMT_GREEN = "\e[1;92m"; +my $FMT_MAGENTA = "\e[1;95m"; +my $FMT_RED = "\e[1;91m"; +my $FMT_YELLOW = "\e[1;93m"; +my $FMT_BOLD = "\e[1m"; +my $FMT_RESET = "\e[0m"; + +# Color a "repo/pkgname pkgver (goups) [installed]" line. +# We try to stick to pacman colors. sub to_color { my $line = shift; - # get the installed text colored first - $line =~ s/(\[.*\]$)/$INST$1$BASE/; - # and now the repo and dealings - $line =~ s/(^core\/.*)/$CLR1$1$BASE/; - $line =~ s/(^extra\/.*)/$CLR2$1$BASE/; - $line =~ s/(^community\/.*)/$CLR3$1$BASE/; - $line =~ s/(^testing\/.*)/$CLR4$1$BASE/; - $line =~ s/(^community-testing\/.*)/$CLR5$1$BASE/; - $line =~ s/(^multilib\/.*)/$CLR6$1$BASE/; - $line =~ s/(^local\/.*)/$CLR7$1$BASE/; + # get the installed text colored first (between square brackets) + $line =~ s/(\[.*\]$)/$FMT_CYAN$1$FMT_RESET/; + # group (between parentheses) + $line =~ s/($.*$)/$FMT_BLUE$1$FMT_RESET/; + # version (second field) + $line =~ s/^([^ ]+) ([^ ]+) /$1 $FMT_GREEN$2$FMT_RESET /; + # name (word after slash) + $line =~ s/\/([\w-]*)/\/$FMT_BOLD$1$FMT_RESET/; + # repo (word before slash inclusive) + $line =~ s/(^core\/)/$FMT_BLUE$1$FMT_RESET/; + $line =~ s/(^extra\/)/$FMT_GREEN$1$FMT_RESET/; + $line =~ s/(^community\/)/$FMT_MAGENTA$1$FMT_RESET/; + $line =~ s/(^testing\/)/$FMT_CYAN$1$FMT_RESET/; + $line =~ s/(^community-testing\/)/$FMT_RED$1$FMT_RESET/; + $line =~ s/(^multilib\/)/$FMT_YELLOW$1$FMT_RESET/; + $line =~ s/(^local\/)/$FMT_CYAN$1$FMT_RESET/; # any other unknown repository - $line =~ s/(^[\w-]*\/.*)/$CLR6$1$BASE/; + $line =~ s/(^[\w-]*\/)/$FMT_YELLOW$1$FMT_RESET/; return $line; } -- 1.8.5.2

2 4

[pacman-dev] [PATCH] Makefile.am: move test-suite.log into test/
by Andrew Gregory 09 Jan '14

09 Jan '14

Pushing down the testing .gitignore entries in commit e25afaf6 exposed test-suite.log in the root. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 2887157..d39ab5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,7 @@ TESTS = test/scripts/parseopts_test.sh \ test/util/vercmptest.sh include $(top_srcdir)/test/pacman/tests/TESTS +TEST_SUITE_LOG = test/test-suite.log TEST_EXTENSIONS = .py AM_TESTS_ENVIRONMENT = \ PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \ -- 1.8.5.2

1 0

[pacman-dev] [PATCH] Updated pacsearch colors to match pacman's coloring
by Pierre Neidhardt 08 Jan '14

08 Jan '14

For now I've kept the original pacsearch colors for the repos. Some fields have the same colors--e.g. 'extra' and 'version' are both bold green. Maybe it would look nicer to make repo/name bold and to leave the other fields regular. Additionally I have rephrased the help message; the previous message would let one think this script was rather useless compared to a simple pacman -Ss. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 58 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 624f201..a580d85 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -20,6 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #TODO: colors flag on commandline +#TODO: for now the whole line is bold and some parts have the same formatting (e.g. extra and version), maybe it would be better to use regular formatting use strict; use warnings; @@ -29,7 +30,7 @@ my $myver = '@PACKAGE_VERSION@'; sub usage { print "$myname (pacman) v$myver\n\n"; - print "Add color and install information to a 'pacman -Ss' search\n\n"; + print "Perform a pacman search using both the local and the sync databases.\n\n"; print "Usage: $myname <pattern>\n\n"; print "Example: $myname ^gnome\n"; } @@ -54,32 +55,41 @@ if ($ARGV[0] eq "--version" || $ARGV[0] eq "-V") { exit 0; } -# define our colors to use when printing -my $CLR1 = "\e[0;34m"; -my $CLR2 = "\e[0;32m"; -my $CLR3 = "\e[0;35m"; -my $CLR4 = "\e[0;36m"; -my $CLR5 = "\e[0;31m"; -my $CLR6 = "\e[0;33m"; -my $CLR7 = "\e[1;36m"; -my $INST = "\e[1;31m"; -my $BASE = "\e[0m"; - -# color a "repo/pkgname pkgver" line based on the repository name +# define our colors to use when printing; we try to stick to pacman colors +my $CLR_CORE = "\e[1;94m"; # blue +my $CLR_EXTRA = "\e[1;92m"; # green +my $CLR_COMMUNITY = "\e[1;95m"; # magenta +my $CLR_TESTING = "\e[1;96m"; # cyan +my $CLR_COMMUNITY_TESTING = "\e[1;91m"; # red +my $CLR_MULTILIB = "\e[1;93m"; # yello +my $CLR_LOCAL = "\e[1;96m"; # cyan +my $CLR_INST = "\e[1;96m"; # cyan +my $CLR_PACKAGE = "\e[1m"; # bold +my $CLR_VERSION = "\e[1;92m"; # green +my $CLR_GROUP = "\e[1;94m"; # blue +my $CLR_BASE = "\e[0m"; + +# color a "repo/pkgname pkgver (goups) [installed]" line sub to_color { my $line = shift; - # get the installed text colored first - $line =~ s/(\[.*\]$)/$INST$1$BASE/; - # and now the repo and dealings - $line =~ s/(^core\/.*)/$CLR1$1$BASE/; - $line =~ s/(^extra\/.*)/$CLR2$1$BASE/; - $line =~ s/(^community\/.*)/$CLR3$1$BASE/; - $line =~ s/(^testing\/.*)/$CLR4$1$BASE/; - $line =~ s/(^community-testing\/.*)/$CLR5$1$BASE/; - $line =~ s/(^multilib\/.*)/$CLR6$1$BASE/; - $line =~ s/(^local\/.*)/$CLR7$1$BASE/; + # get the installed text colored first (between square brackets) + $line =~ s/(\[.*\]$)/$CLR_INST$1$CLR_BASE/; + # group (between parentheses) + $line =~ s/($.*$)/$CLR_GROUP$1$CLR_BASE/; + # version (second field) + $line =~ s/^([^ ]+) ([^ ]+) /$1 $CLR_VERSION$2$CLR_BASE /; + # name (word after slash) + $line =~ s/\/([\w-]*)/\/$CLR_PACKAGE$1$CLR_BASE/; + # repo (word before slash inclusive) + $line =~ s/(^core\/)/$CLR_CORE$1$CLR_BASE/; + $line =~ s/(^extra\/)/$CLR_EXTRA$1$CLR_BASE/; + $line =~ s/(^community\/)/$CLR_COMMUNITY$1$CLR_BASE/; + $line =~ s/(^testing\/)/$CLR_TESTING$1$CLR_BASE/; + $line =~ s/(^community-testing\/)/$CLR_COMMUNITY_TESTING$1$CLR_BASE/; + $line =~ s/(^multilib\/)/$CLR_MULTILIB$1$CLR_BASE/; + $line =~ s/(^local\/)/$CLR_LOCAL$1$CLR_BASE/; # any other unknown repository - $line =~ s/(^[\w-]*\/.*)/$CLR6$1$BASE/; + $line =~ s/(^[\w-]*\/)/$CLR_MULTILIB$1$CLR_BASE/; return $line; } -- 1.8.5.2

2 2

[pacman-dev] Bug or feature? Nonexistent SRCDEST or PKGDEST
by Emil Lundberg 07 Jan '14

07 Jan '14

Hello! While playing around with a package of mine, I noticed that the command $ SRCDEST=/tmp/emil/foo/src makepkg fails with error message "You do not have write permission to store downloads in /tmp/emil/foo/src." if the directory does not already exist. Likewise, setting PKGDEST to a nonexistent directory causes failure with error message "You do not have write permission to store packages in PKGDEST". I patched /usr/bin/makepkg to create the directories if necessary, and now it works fine. Since it was so easy, and I imagine others have experimented with the above environment variables, I am lead to ask: Is this behaviour by design, or should I submit my patch? Keep up the great work! Emil Lundberg

3 3

[pacman-dev] [PATCH] create_verbose_row: free malloc'd cells
by Andrew Gregory 06 Jan '14

06 Jan '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 05135d7..9338d2a 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -808,23 +808,23 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) } else { pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove)); } - add_table_cell(&ret, str, CELL_NORMAL); + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* old and new versions */ pm_asprintf(&str, "%s", target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); - add_table_cell(&ret, str, CELL_NORMAL); + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); pm_asprintf(&str, "%s", target->install != NULL ? alpm_pkg_get_version(target->install) : ""); - add_table_cell(&ret, str, CELL_NORMAL); + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* and size */ size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; size += target->install ? alpm_pkg_get_isize(target->install) : 0; human_size = humanize_size(size, 'M', 2, &label); pm_asprintf(&str, "%.2f %s", human_size, label); - add_table_cell(&ret, str, CELL_RIGHT_ALIGN); + add_table_cell(&ret, str, CELL_RIGHT_ALIGN | CELL_FREE); size = target->install ? alpm_pkg_download_size(target->install) : 0; if(size != 0) { -- 1.8.5.2

2 2

[pacman-dev] [PATCH] valgrind.supp: suppress leak in gpgme_get_key
by Andrew Gregory 06 Jan '14

06 Jan '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- valgrind.supp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/valgrind.supp b/valgrind.supp index 46edccf..55effa9 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -64,6 +64,13 @@ fun:gpgme_get_engine_info } { + gpgme-static-get-key + Memcheck:Leak + fun:calloc + ... + fun:gpgme_get_key +} +{ gpgme-static-set-engine-info Memcheck:Leak fun:malloc -- 1.8.5.2

4 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-240-g480a9ff
by allan＠archlinux.org 06 Jan '14

06 Jan '14

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 480a9ff82fe6d560c7d6e7b6e5e5ecad30699f12 (commit) via ffa4c6fc8f7b4dd3d70434759513571d3b4ac4c7 (commit) via 6c917e433e3192d4ac6bc8cc34d9c3a95a53c361 (commit) via 30740d9d2fd859cbfa214a8bb3236ba73dedf159 (commit) via 086bbc5b623d08df9ffe595bd5ee965e668a4ae1 (commit) via 8bec8a3f6a09155827aa8c3287f6d814c6912717 (commit) via bad86247f74c181f9ae2e01fc71d5289f08f3bc3 (commit) via e25afaf673f8be96a05ad1ed68e3bedaf1f88585 (commit) via e20500363582cae3b4dd285adadc4dfdf0b715d2 (commit) via 3bb3b1555a5456aab4a7d51ea695ddb728fa8079 (commit) via 77268f352f2b3f4503be3748e0599822390902ae (commit) via 7fa35f32d8526e77c3e2ef075bc2aa353a9fafe3 (commit) via 19445e42e6ec2eb631c3d18f0cb161548996d787 (commit) via 6f468c2465f4bfdcf4779c920899a960857c7361 (commit) via 6a656c7429c6fce44abf6f83657dd7b423979cd9 (commit) via 452ee39de180c5c77f2f264d38a7c4d5925c1099 (commit) via f7f8964c2315c81939798e870f96083146bbb27c (commit) via 50e9543908817940792cd9a590c42aed5230c311 (commit) via 2f8be5f8db1e157d3bcdac763b79c7989567ca6d (commit) via 714609639f9a316e037252d31437505520a7966f (commit) via 9652c27710142e91ca863047832c0796e72380f6 (commit) from 31fcdec619a5d738221b6629ec5e48205b4e04fe (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 480a9ff82fe6d560c7d6e7b6e5e5ecad30699f12 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 3 14:43:05 2014 -0500 check_keyring: plug memory leak Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ffa4c6fc8f7b4dd3d70434759513571d3b4ac4c7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 3 14:43:04 2014 -0500 valgrind.supp: suppress leak in gpgme_get_key Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6c917e433e3192d4ac6bc8cc34d9c3a95a53c361 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 2 12:37:10 2014 -0600 Reorder and reshape the package struct for better packing This shrinks down the total size of the package struct by a handful of bytes, saving us some memory and cache pressure when we are loading up the entirety of the sync and local databases. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 30740d9d2fd859cbfa214a8bb3236ba73dedf159 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 2 12:37:08 2014 -0600 Minor struct member reordering for packing concerns Noticed using clang and `-Wpadded`. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 086bbc5b623d08df9ffe595bd5ee965e668a4ae1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 2 12:37:12 2014 -0600 Use O_CLOEXEC as much as possible when opening files When calling open(), use O_CLOEXEC as much as possible to ensure the file descriptor is closed when and if a process using libalpm forks. For most of these cases, and especially in utility functions, the file descriptor is opened and closed in the same function, so we don't have too much to worry about. However, for things like the log file and database lock file, we should ensure descriptors aren't left hanging around for children to touch. This patch is inspired by the problem in FS#36161, where an open file descriptor to the current working directory prevents chroot() from working on FreeBSD. We don't need this file descriptor in the child process, so open it (and now several others) with O_CLOEXEC. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8bec8a3f6a09155827aa8c3287f6d814c6912717 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 2 12:37:11 2014 -0600 Log more in search debug message Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bad86247f74c181f9ae2e01fc71d5289f08f3bc3 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 2 12:37:09 2014 -0600 Remove -fgnu89-inline from compile options This was a hack done by me in commit d8e88aa0175fd back in 2007 that is no longer necessary, given a sufficiently smart compiler and one that supports the inline keyword. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e25afaf673f8be96a05ad1ed68e3bedaf1f88585 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 2 12:37:13 2014 -0600 Push down testing .gitignore entries Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e20500363582cae3b4dd285adadc4dfdf0b715d2 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 2 12:37:06 2014 -0600 Clear up definition of INFRQ_ALL Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3bb3b1555a5456aab4a7d51ea695ddb728fa8079 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 1 20:24:48 2014 +1000 Update copyright years for 2014 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 77268f352f2b3f4503be3748e0599822390902ae Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 1 19:44:00 2014 +1000 Copy validation field in _alpm_pkg_dup Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7fa35f32d8526e77c3e2ef075bc2aa353a9fafe3 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 1 19:40:49 2014 +1000 Update comment for local db entry creation Mention mtree files do not need creation in addtion to install files. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19445e42e6ec2eb631c3d18f0cb161548996d787 Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Mon Nov 11 06:47:43 2013 -0500 Add the unit tests for -Qk and -Qkk that are possible now. The -Qk test (001) validates the existence of the package files (which were installed to the filesystem by the framework because the package was added to the "local" db). The -Qkk test (002) does not validate any file's properties - it can only check that the pacman run produces the expected warning message saying that the package lacks an mtree. Further tests will require modifications to the testing framework to allow intentional damage to the filesystem and generating an mtree. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> [Allan] Make warning message detection more specific Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6f468c2465f4bfdcf4779c920899a960857c7361 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Nov 14 21:02:07 2013 -0500 deps.c: remove filtered_depend functions filtered_dep was duplicating an alpm_depend_t solely for the purpose of overriding its depmod and would effectively cause alpm_checkdeps to ignore ALPM_TRANS_FLAG_NODEPVERSION if the duplication failed. Manually overriding/restoring the depmod for the original depend removes the duplication as a point of failure and fixes a memory leak where the duplicated depend was not being properly freed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6a656c7429c6fce44abf6f83657dd7b423979cd9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Dec 29 22:51:20 2013 -0500 conf.c: add missing newline to warning Fixes tests that use pacman's output when built without libcurl. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 452ee39de180c5c77f2f264d38a7c4d5925c1099 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 21 18:04:41 2013 +1000 Fix build warnings with --disable-nls The gettext functions return a "char *", so do the same for the defines in the case where gettext is unavailable. This prevents a number of warnings about const being dropped. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f7f8964c2315c81939798e870f96083146bbb27c Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Fri Dec 20 11:59:46 2013 -0500 Use the 'configure'd PYTHON to run pactest. Use the 'configure'd PYTHON to run pactest instead of the one hard-coded (with '#!') in pactest.py. Also remove useless '#!' from non-main .py files. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 50e9543908817940792cd9a590c42aed5230c311 Author: Maxime Arthaud <maxime.arthaud(a)gmail.com> Date: Sat Dec 21 10:12:53 2013 +1000 makepkg: fix check for distcc Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2f8be5f8db1e157d3bcdac763b79c7989567ca6d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Dec 11 11:58:28 2013 -0500 trans_prepare: always sort trans->remove by deps Packages can be removed during a sync transaction either directly or due to conflicts and need to be sorted. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 714609639f9a316e037252d31437505520a7966f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Dec 18 15:24:45 2013 -0500 dload: allow curl to response to any auth challenge Previously, we only allowed the default of responding to basic auth challenges. Mirrors requiring authorization are far and away the edge case, but there's no sense in preventing access to them. Implements FS#38184. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9652c27710142e91ca863047832c0796e72380f6 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Mon Dec 2 21:45:15 2013 +0100 alpm: Rename a variable for future clarity We will be adding event structs in the following patches. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 2 -- Makefile.am | 2 +- configure.ac | 2 -- contrib/bacman.sh.in | 4 ++-- contrib/pacdiff.sh.in | 4 ++-- contrib/pacscripts.sh.in | 2 +- doc/index.txt | 2 +- lib/libalpm/Makefile.am | 3 --- lib/libalpm/add.c | 18 +++++++++--------- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 6 +++--- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 5 +++-- lib/libalpm/db.h | 7 ++++--- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 34 +++++++++++----------------------- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 3 ++- lib/libalpm/dload.h | 6 +++--- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 6 +++--- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 4 ++-- lib/libalpm/handle.h | 6 ++++-- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 13 ++++++++++--- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 3 ++- lib/libalpm/package.h | 27 ++++++++++++++------------- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 9 +-------- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 8 ++------ lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 18 +++++++++++++++++- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 16 ++++++++-------- lib/libalpm/util.h | 4 ++-- lib/libalpm/version.c | 2 +- m4/acinclude.m4 | 20 -------------------- scripts/makepkg-template.pl.in | 4 ++-- scripts/makepkg-wrapper.sh.in | 2 +- scripts/makepkg.sh.in | 6 +++--- scripts/pacman-db-upgrade.sh.in | 4 ++-- scripts/pacman-key.sh.in | 4 ++-- scripts/pacman-optimize.sh.in | 4 ++-- scripts/repo-add.sh.in | 4 ++-- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 6 +++--- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/ini.c | 2 +- src/pacman/ini.h | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 4 ++-- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 6 +++--- src/util/cleanupdelta.c | 2 +- src/util/pacsort.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 1 + src/util/testpkg.c | 1 + src/util/vercmp.c | 2 +- test/.gitignore | 2 ++ test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 4 +--- test/pacman/pmenv.py | 4 +--- test/pacman/pmfile.py | 4 +--- test/pacman/pmpkg.py | 4 +--- test/pacman/pmrule.py | 4 +--- test/pacman/pmtest.py | 4 +--- test/pacman/tap.py | 2 +- test/pacman/tests/TESTS | 3 +++ test/pacman/tests/querycheck001.py | 15 +++++++++++++++ test/pacman/tests/querycheck002.py | 15 +++++++++++++++ test/pacman/tests/sync046.py | 29 +++++++++++++++++++++++++++++ test/pacman/util.py | 4 +--- test/util/pacsorttest.sh | 2 +- test/util/vercmptest.sh | 1 + valgrind.supp | 7 +++++++ 111 files changed, 268 insertions(+), 228 deletions(-) create mode 100644 test/.gitignore create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py create mode 100644 test/pacman/tests/sync046.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] check_keyring: plug memory leak
by Andrew Gregory 06 Jan '14

06 Jan '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e358585..e17476e 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1031,6 +1031,7 @@ static int check_keyring(alpm_handle_t *handle) } FREELIST(keys); } + free(decoded_sigdata); } } } -- 1.8.5.2

2 1