- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Update copyright years for 2014
by Allan McRae 01 Jan '14

01 Jan '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/bacman.sh.in | 4 ++-- contrib/pacdiff.sh.in | 4 ++-- contrib/pacscripts.sh.in | 2 +- doc/index.txt | 2 +- lib/libalpm/add.c | 2 +- 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 | 2 +- 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 | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/makepkg-template.pl.in | 4 ++-- scripts/makepkg-wrapper.sh.in | 2 +- scripts/makepkg.sh.in | 4 ++-- 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 | 2 +- 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 | 2 +- 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/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tap.py | 2 +- test/pacman/util.py | 2 +- test/util/pacsorttest.sh | 2 +- test/util/vercmptest.sh | 1 + 100 files changed, 109 insertions(+), 106 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 222b0f8..6779bfc 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -5,7 +5,7 @@ # stored into the pacman database and system files # # Copyright (c) 2008 locci <carlocci_at_gmail_dot_com> -# Copyright (c) 2008-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2008-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ usage() { version() { printf "%s %s\n" "$myname" "$myver" echo 'Copyright (C) 2008 locci <carlocci_at_gmail_dot_com>' - echo 'Copyright (C) 2008-2013 Pacman Development Team <pacman-dev(a)archlinux.org>' + echo 'Copyright (C) 2008-2014 Pacman Development Team <pacman-dev(a)archlinux.org>' } while [[ ! -z $1 ]]; do diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index cd5160c..3f62d91 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -2,7 +2,7 @@ # pacdiff : a simple pacnew/pacorig/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> -# Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ EOF version() { printf "%s %s\n" "$myname" "$myver" echo 'Copyright (C) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com>' - echo 'Copyright (C) 2013 Pacman Development Team <pacman-dev(a)archlinux.org>' + echo 'Copyright (C) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org>' } print_existing() { diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in index da7c55a..f1bf822 100644 --- a/contrib/pacscripts.sh.in +++ b/contrib/pacscripts.sh.in @@ -5,7 +5,7 @@ # # Copyright (c) 2009 Giulio "giulivo" Fidente <giulivo.navigante(a)gmail.com> # Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com> -# Copyright (c) 2009-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2009-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/index.txt b/doc/index.txt index 3c4339e..ab1dc79 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -247,7 +247,7 @@ bugs under the Pacman project. Copyright --------- -pacman is Copyright (C) 2006-2013 Pacman Development Team +pacman is Copyright (C) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> and Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org> and is licensed through the GNU General Public License, version 2 or later. diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index c7e5b5d..b879afc 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -1,7 +1,7 @@ /* * add.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h index 2e1104f..5999d08 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/add.h @@ -1,7 +1,7 @@ /* * add.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 878c38b..f2e97ce 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -1,7 +1,7 @@ /* * alpm.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e9b0feb..5628527 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1,7 +1,7 @@ /* * alpm.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index a3c73aa..cc89568 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -1,7 +1,7 @@ /* * alpm_list.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 3f3566b..9995e88 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -1,7 +1,7 @@ /* * alpm_list.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 04168c5..e098c10 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -1,7 +1,7 @@ /* * backup.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2005 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h index 765195f..c158561 100644 --- a/lib/libalpm/backup.h +++ b/lib/libalpm/backup.h @@ -1,7 +1,7 @@ /* * backup.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 96fe52b..6029e12 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1,7 +1,7 @@ /* * be_local.c : backend for the local database * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index aaf60fe..b672bbe 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -1,7 +1,7 @@ /* * be_package.c : backend for packages * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 123d953..67b7368 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -1,7 +1,7 @@ /* * be_sync.c : backend for sync databases * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 54ed25e..5a6e2be 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -1,7 +1,7 @@ /* * conflict.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by David Kimpe <dnaku(a)frugalware.org> diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 983ed39..f7a667d 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -1,7 +1,7 @@ /* * conflict.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 2069a7b..2740955 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -1,7 +1,7 @@ /* * db.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 4bb6ee9..1db2ca1 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -1,7 +1,7 @@ /* * db.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 2da1496..6e1ff0a 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -1,7 +1,7 @@ /* * delta.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2007-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 90a170c..417b12d 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -1,7 +1,7 @@ /* * delta.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2007-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 6771eac..4eb779f 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -1,7 +1,7 @@ /* * deps.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index d5ca236..546521f 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -1,7 +1,7 @@ /* * deps.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 66d83c2..a83d642 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -1,7 +1,7 @@ /* * diskspace.c * - * Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index 4d876d7..4a9314d 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -1,7 +1,7 @@ /* * diskspace.h * - * Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index d5906a3..bc59cd1 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -1,7 +1,7 @@ /* * download.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 6c9f7a7..e2c85af 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -1,7 +1,7 @@ /* * dload.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 8622180..b3ebc72 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -1,7 +1,7 @@ /* * error.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index e6da681..7de190d 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -1,7 +1,7 @@ /* * filelist.c * - * Copyright (c) 2012-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2012-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/filelist.h b/lib/libalpm/filelist.h index 66501f3..4f96550 100644 --- a/lib/libalpm/filelist.h +++ b/lib/libalpm/filelist.h @@ -1,7 +1,7 @@ /* * filelist.h * - * Copyright (c) 2012-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2012-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c index 81ee6fd..837774e 100644 --- a/lib/libalpm/graph.c +++ b/lib/libalpm/graph.c @@ -1,7 +1,7 @@ /* * graph.c - helpful graph structure and setup/teardown methods * - * Copyright (c) 2007-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2007-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index bf06047..25605be 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -1,7 +1,7 @@ /* * graph.h - helpful graph structure and setup/teardown methods * - * Copyright (c) 2007-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2007-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 614dbaf..af71c32 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -1,7 +1,7 @@ /* * group.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h index b8cd3e1..6facaa8 100644 --- a/lib/libalpm/group.h +++ b/lib/libalpm/group.h @@ -1,7 +1,7 @@ /* * group.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 1d661a2..9f5a945 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -1,7 +1,7 @@ /* * handle.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 4126e1a..402e414 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -1,7 +1,7 @@ /* * handle.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h index 1e2e1e8..584d80e 100644 --- a/lib/libalpm/libarchive-compat.h +++ b/lib/libalpm/libarchive-compat.h @@ -4,7 +4,7 @@ /* * libarchive-compat.h * - * Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 271bd00..2cdf740 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -1,7 +1,7 @@ /* * log.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index dd60c85..c767bfb 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -1,7 +1,7 @@ /* * log.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 8e67f17..76e94a9 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1,7 +1,7 @@ /* * package.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 07b043c..e56e14e 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -1,7 +1,7 @@ /* * package.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by David Kimpe <dnaku(a)frugalware.org> diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index acb1a1c..a58fff9 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -1,7 +1,7 @@ /* * pkghash.c * - * Copyright (c) 2011-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2011-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/pkghash.h b/lib/libalpm/pkghash.h index 546d3ae..f2887c3 100644 --- a/lib/libalpm/pkghash.h +++ b/lib/libalpm/pkghash.h @@ -1,7 +1,7 @@ /* * pkghash.h * - * Copyright (c) 2011-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2011-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 6c50ab3..899952b 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -1,7 +1,7 @@ /* * remove.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h index cd53285..8c6bd41 100644 --- a/lib/libalpm/remove.h +++ b/lib/libalpm/remove.h @@ -1,7 +1,7 @@ /* * remove.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 6043a8e..8ed8c14 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -1,7 +1,7 @@ /* * signing.c * - * Copyright (c) 2008-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2008-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 42b60b1..239bfef 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -1,7 +1,7 @@ /* * signing.h * - * Copyright (c) 2008-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2008-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index dd4ac4b..c61ffd3 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1,7 +1,7 @@ /* * sync.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index 82ed4be..1aeba7d 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -1,7 +1,7 @@ /* * sync.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 6ace823..ada8100 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -1,7 +1,7 @@ /* * trans.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index f8ef045..7daa78f 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -1,7 +1,7 @@ /* * trans.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 40a5ebd..ab40761 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1,7 +1,7 @@ /* * util.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 2142171..c0997c6 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -1,7 +1,7 @@ /* * util.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 59a7a4e..bc6d441 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 03dd6b8..6e6d944 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -2,7 +2,7 @@ # makepkg-template - template system for makepkg # @configure_input@ # -# Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -186,7 +186,7 @@ sub version { my ($exitstatus) = @_; printf "makepkg-template (pacman) %s\n", '@PACKAGE_VERSION@'; print gettext( - 'Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org>.'."\n". + 'Copyright (c) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org>.'."\n". 'This is free software; see the source for copying conditions.'."\n". 'There is NO WARRANTY, to the extent permitted by law.'."\n"); exit($exitstatus); diff --git a/scripts/makepkg-wrapper.sh.in b/scripts/makepkg-wrapper.sh.in index d703ee4..fd83a01 100644 --- a/scripts/makepkg-wrapper.sh.in +++ b/scripts/makepkg-wrapper.sh.in @@ -2,7 +2,7 @@ # # makepkg - a wrapper for running the real makepkg in the source tree # -# Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0896a9c..112c3e0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3,7 +3,7 @@ # makepkg - make packages compatible for use with pacman # @configure_input@ # -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> # Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> # Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> @@ -2536,7 +2536,7 @@ usage() { version() { printf "makepkg (pacman) %s\n" "$makepkg_version" printf -- "$(gettext "\ -Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 2b39538..1a7c258 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -3,7 +3,7 @@ # pacman-db-upgrade - upgrade the local pacman db to a newer format # @configure_input@ # -# Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2010-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ usage() { version() { printf "pacman-db-upgrade (pacman) %s\n" "$myver" printf -- "$(gettext "\ -Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2010-2014 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 30fba10..27410b8 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -4,7 +4,7 @@ # Based on apt-key, from Debian # @configure_input@ # -# Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2010-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -92,7 +92,7 @@ usage() { version() { printf "pacman-key (pacman) %s\n" "${myver}" printf -- "$(gettext "\ -Copyright (c) 2010-2013 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2010-2014 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index d13ce0e..f0e8222 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -3,7 +3,7 @@ # pacman-optimize # @configure_input@ # -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> # # This program is free software; you can redistribute it and/or modify @@ -51,7 +51,7 @@ does not have to move around the disk as much.\n")" version() { printf "pacman-optimize (pacman) %s\n" "$myver" printf -- "$(gettext "\ -Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index a9a4499..dfa8b16 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -4,7 +4,7 @@ # repo-remove - remove a package entry from a given repo database file # @configure_input@ # -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -93,7 +93,7 @@ version() { cmd=${0##*/} printf "%s (pacman) %s\n\n" "$cmd" "$myver" printf -- "$(gettext "\ -Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org>\n\n\ +Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org>\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/src/common/util-common.c b/src/common/util-common.c index e4a9de9..5a16212 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -1,7 +1,7 @@ /* * util-common.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/util-common.h b/src/common/util-common.h index 04d4e9d..6853f18 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -1,7 +1,7 @@ /* * util-common.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a181fa5..506692f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -1,7 +1,7 @@ /* * callback.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/callback.h b/src/pacman/callback.h index a291fc7..61a7e4c 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -1,7 +1,7 @@ /* * callback.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/check.c b/src/pacman/check.c index f9166b0..f464925 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -1,7 +1,7 @@ /* * check.c * - * Copyright (c) 2012-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2012-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pacman/check.h b/src/pacman/check.h index 9f86a2a..3dfd947 100644 --- a/src/pacman/check.h +++ b/src/pacman/check.h @@ -1,7 +1,7 @@ /* * check.h * - * Copyright (c) 2012-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2012-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 05c4610..02de1f0 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -1,7 +1,7 @@ /* * conf.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/conf.h b/src/pacman/conf.h index c2ed1ca..9faf5de 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -1,7 +1,7 @@ /* * conf.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/database.c b/src/pacman/database.c index 44bf3af..eebcb50 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -1,7 +1,7 @@ /* * database.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index f3a9035..5449df6 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -1,7 +1,7 @@ /* * deptest.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/ini.c b/src/pacman/ini.c index cd7741d..554935b 100644 --- a/src/pacman/ini.c +++ b/src/pacman/ini.c @@ -1,7 +1,7 @@ /* * ini.c * - * Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pacman/ini.h b/src/pacman/ini.h index 4d403c1..fc881a2 100644 --- a/src/pacman/ini.h +++ b/src/pacman/ini.h @@ -1,7 +1,7 @@ /* * ini.h * - * Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pacman/package.c b/src/pacman/package.c index 52219ff..8ccdc1b 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -1,7 +1,7 @@ /* * package.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/package.h b/src/pacman/package.h index 65eea87..6f0e082 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -1,7 +1,7 @@ /* * package.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index df73bcf..6bf94e9 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1,7 +1,7 @@ /* * pacman.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify @@ -218,7 +218,7 @@ static void version(void) { printf("\n"); printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); - printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2013 Pacman Development Team\n"); + printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2014 Pacman Development Team\n"); printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet\n"); printf(" '--'\n"); printf(_(" This program may be freely redistributed under\n" diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index 7c9c365..fb5856a 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -1,7 +1,7 @@ /* * pacman.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/query.c b/src/pacman/query.c index e62272a..d832d98 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -1,7 +1,7 @@ /* * query.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 8cf3ebc..aefe454 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -1,7 +1,7 @@ /* * remove.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e9b98fa..5ed43ed 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -1,7 +1,7 @@ /* * sync.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 5495ea9..0bf8d22 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -1,7 +1,7 @@ /* * upgrade.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/util.c b/src/pacman/util.c index 05135d7..58b0cec 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1,7 +1,7 @@ /* * util.c * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/util.h b/src/pacman/util.h index 9920e74..747a67e 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -1,7 +1,7 @@ /* * util.h * - * Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index b13d770..b57b203 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -1,7 +1,7 @@ /* * cleanupdelta.c : return list of unused delta in a given sync database * - * Copyright (c) 2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2011-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 687e558..443e822 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -1,7 +1,7 @@ /* * pacsort.c - a sort utility implementing alpm_pkg_vercmp * - * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/util/pactree.c b/src/util/pactree.c index 7813267..bd6e9dd 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -1,7 +1,7 @@ /* * pactree.c - a simple dependency tree viewer * - * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/util/testdb.c b/src/util/testdb.c index 3d341b3..53cdb3c 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -1,6 +1,7 @@ /* * testdb.c : Test a pacman local database for validity * + * Copyright (c) 2007-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2007 by Aaron Griffin <aaronmgriffin(a)gmail.com> * * This program is free software; you can redistribute it and/or modify diff --git a/src/util/testpkg.c b/src/util/testpkg.c index d1b75ac..cc7d9c2 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -1,6 +1,7 @@ /* * testpkg.c : Test a pacman package for validity * + * Copyright (c) 2007-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2007 by Aaron Griffin <aaronmgriffin(a)gmail.com> * * This program is free software; you can redistribute it and/or modify diff --git a/src/util/vercmp.c b/src/util/vercmp.c index 41a4f8e..cc44518 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -2,7 +2,7 @@ * vercmp.c - Compare package version numbers using pacman's version * comparison logic * - * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2005 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index e21cde7..fe14671 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -3,7 +3,7 @@ # pactest : run automated testing on the pacman binary # # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index e64255e..1d9d735 100644 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -1,5 +1,5 @@ # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index 2b021d1..fa864fe 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -1,5 +1,5 @@ # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Developmet Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Developmet Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/pacman/pmfile.py b/test/pacman/pmfile.py index 7109873..4d09e1d 100644 --- a/test/pacman/pmfile.py +++ b/test/pacman/pmfile.py @@ -1,5 +1,5 @@ # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 3daa93f..8ec0800 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -1,5 +1,5 @@ # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 9c11d5d..ba94ab8 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -1,5 +1,5 @@ # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 583007f..2c50f2a 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -1,5 +1,5 @@ # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/pacman/tap.py b/test/pacman/tap.py index c70a535..216bc9f 100644 --- a/test/pacman/tap.py +++ b/test/pacman/tap.py @@ -1,4 +1,4 @@ -# Copyright (c) 2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2013-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/pacman/util.py b/test/pacman/util.py index 7947124..57471fe 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -1,5 +1,5 @@ # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2014 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/util/pacsorttest.sh b/test/util/pacsorttest.sh index ef24a76..a2adac9 100755 --- a/test/util/pacsorttest.sh +++ b/test/util/pacsorttest.sh @@ -2,7 +2,7 @@ # # pacsorttest - a test suite for pacsort # -# Copyright (c) 2013 by Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2013-2014 by Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2011 by Dan McGee <dan(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index 2d74b57..9032cbf 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -2,6 +2,7 @@ # # vercmptest - a test suite for the vercmp/libalpm program # +# Copyright (c) 2009-2014 by Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2008 by Dan McGee <dan(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify -- 1.8.5.2

1 0

[pacman-dev] [PATCH] Update comment for local db entry creation
by Allan McRae 01 Jan '14

01 Jan '14

Mention mtree files do not need creation in addtion to install files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2c18a45..96fe52b 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -990,8 +990,8 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq fp = NULL; } - /* INSTALL */ - /* nothing needed here (script is automatically extracted) */ + /* INSTALL and MTREE */ + /* nothing needed here (automatically extracted) */ cleanup: umask(oldmask); -- 1.8.5.2

1 1

[pacman-dev] [PATCH 0/5] Unit tests for -Qk and -Qkk
by Jeremy Heiner 31 Dec '13

31 Dec '13

There are two changes to the test framework to allow these new unit tests: PATCH 2 adds code to run pre and post install scripts for "local" packages, and PATCH 4 adds code to generate mtree data (if the unit test requests it). Thanks again to everyone who provided feedback on my previous attempt at this... hopefully the improvement your suggestions inspired will be obvious. Jeremy Heiner (5): Add the unit tests for -Qk and -Qkk that are possible now. Add unit tests for -Qk and -Qkk with missing files. Simplify the Python code that sets utime of test package files. Add mtree code to test framework and basic unit tests for -Qkk. Add unit tests for -Qkk with altered files. test/pacman/pmdb.py | 3 ++ test/pacman/pmpkg.py | 36 +++++++++++++++++++--- test/pacman/pmtest.py | 5 +--- test/pacman/tests/TESTS | 8 +++++ test/pacman/tests/querycheck001.py | 15 ++++++++++ test/pacman/tests/querycheck002.py | 15 ++++++++++ test/pacman/tests/querycheck003.py | 19 ++++++++++++ test/pacman/tests/querycheck004.py | 17 +++++++++++ test/pacman/tests/querycheck005.py | 16 ++++++++++ test/pacman/tests/querycheck006.py | 20 +++++++++++++ test/pacman/tests/querycheck007.py | 25 ++++++++++++++++ test/pacman/tests/querycheck008.py | 25 ++++++++++++++++ test/pacman/util.py | 61 +++++++++++++++++++++++++++++++++++++- 13 files changed, 256 insertions(+), 9 deletions(-) create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py create mode 100644 test/pacman/tests/querycheck003.py create mode 100644 test/pacman/tests/querycheck004.py create mode 100644 test/pacman/tests/querycheck005.py create mode 100644 test/pacman/tests/querycheck006.py create mode 100644 test/pacman/tests/querycheck007.py create mode 100644 test/pacman/tests/querycheck008.py -- 1.8.4.2

3 25

[pacman-dev] Improving -Qi/-Si code
by Simon Gomizelj 30 Dec '13

30 Dec '13

I've been working out-of-tree for a replacement for -Qi / -Si, which can be found here: <https://github.com/vodik/alpm-dump> and I'm looking for some feedback before I start integrating it into pacman. For those not familiar with why I've decided to rewrite this, the existing code is rather clumsy and makes some assumptions: string_display(_("Name :"), alpm_pkg_get_name(pkg), cols); The header is "Name", but the padding is embedded into the string. This forces translation writers to also put the right paddings into their translations, something which they shouldn't be burdened with. Further, `string_display` actually needs to know how long "Name :" is so it can do proper line wrapping. The following lines need to be indented properly. This ends up being recalculated for every header. Instead, if we knew how wide the widest header would be ahead of time, we no longer need to embed padding into translations and we no longer need to calculate line lengths for each print operation. This is what the code in the alpm-dump repository attempts to do. The approach I've taken is have the printing function take an array of const char *. Each index represents a field, like Name or Version. If the index is NULL, its ignored, and if it has a value, it is printed along side corresponding data from the package. For example: static const char *sync_table[LAST_ENTRY] = { [ENTRY_REPOSITORY] = "Repository", [ENTRY_NAME] = "Name", [ENTRY_VERSION] = "Version", [ENTRY_DESCRIPTION] = "Description", [ENTRY_ARCHITECTURE] = "Architecture", ... }; Calculating the max width means iterating across this table once looking for the longest field length. Dumping a package is then a matter of iterating across the table, printing the stored string and then the value that corresponds to the array index. printf("%-*s : ", width, table[index]); switch(index) { case ENTRY_REPOSITORY: indentprint_r(alpm_db_get_name(alpm_pkg_get_db(pkg)), width, 0); break; case ENTRY_NAME: indentprint_r(alpm_pkg_get_name(pkg), width, 0); break; case ENTRY_VERSION: indentprint_r(alpm_pkg_get_version(pkg), width, 0); break; ... } And as an added bonus, alpm-dump is measurably faster than the current code. Not that this matters that much. The current code isn't exactly slow and is still much much faster than stdout is.

2 3

[pacman-dev] [PATCH] deps.c: remove filtered_depend functions
by Andrew Gregory 30 Dec '13

30 Dec '13

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> --- lib/libalpm/deps.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e5a0404..6771eac 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -276,24 +276,6 @@ static int no_dep_version(alpm_handle_t *handle) return (handle->trans->flags & ALPM_TRANS_FLAG_NODEPVERSION); } -static alpm_depend_t *filtered_depend(alpm_depend_t *dep, int nodepversion) -{ - if(nodepversion) { - alpm_depend_t *newdep = _alpm_dep_dup(dep); - ASSERT(newdep, return dep); - newdep->mod = ALPM_DEP_MOD_ANY; - dep = newdep; - } - return dep; -} - -static void release_filtered_depend(alpm_depend_t *dep, int nodepversion) -{ - if(nodepversion) { - free(dep); - } -} - /** Find a package satisfying a specified dependency. * The dependency can include versions with depmod operators. * @param pkgs an alpm_list_t* of alpm_pkg_t where the satisfier will be searched @@ -350,7 +332,10 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, for(j = alpm_pkg_get_depends(tp); j; j = j->next) { alpm_depend_t *depend = j->data; - depend = filtered_depend(depend, nodepversion); + alpm_depmod_t orig_mod = depend->mod; + if(nodepversion) { + depend->mod = ALPM_DEP_MOD_ANY; + } /* 1. we check the upgrade list */ /* 2. we check database for untouched satisfying packages */ if(!find_dep_satisfier(upgrade, depend) && @@ -364,7 +349,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, miss = depmiss_new(tp->name, depend, NULL); baddeps = alpm_list_add(baddeps, miss); } - release_filtered_depend(depend, nodepversion); + depend->mod = orig_mod; } } @@ -375,7 +360,10 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_pkg_t *lp = i->data; for(j = alpm_pkg_get_depends(lp); j; j = j->next) { alpm_depend_t *depend = j->data; - depend = filtered_depend(depend, nodepversion); + alpm_depmod_t orig_mod = depend->mod; + if(nodepversion) { + depend->mod = ALPM_DEP_MOD_ANY; + } alpm_pkg_t *causingpkg = find_dep_satisfier(modified, depend); /* we won't break this depend, if it is already broken, we ignore it */ /* 1. check upgrade list for satisfiers */ @@ -391,7 +379,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, miss = depmiss_new(lp->name, depend, causingpkg->name); baddeps = alpm_list_add(baddeps, miss); } - release_filtered_depend(depend, nodepversion); + depend->mod = orig_mod; } } } -- 1.8.4.2

2 1

[pacman-dev] [PATCH] cache terminal column width and handle SIGWINCH
by Simon Gomizelj 30 Dec '13

30 Dec '13

Instead of doing ioctl each time, cache the result. Handle SIGWINCH to we know the size of the terminal has changed (handle by clearing the cache). --- Inspired by systemd. This is to set things up for paging, as paging would require caching this value. Once the pager is up, there's no way to poll for columns. src/pacman/pacman.c | 10 ++++++++++ src/pacman/util.c | 20 ++++++++++++++++---- src/pacman/util.h | 1 + 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index df73bcf..1643a63 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1044,6 +1044,16 @@ int main(int argc, char *argv[]) } } + new_action.sa_handler = columns_reset; + sigemptyset(&new_action.sa_mask); + new_action.sa_flags = 0; + + sigaction(SIGWINCH, NULL, &old_action); + if(old_action.sa_handler != SIG_IGN) { + sigaction(SIGWINCH, &new_action, NULL); + } + + /* i18n init */ #if defined(ENABLE_NLS) localize(); diff --git a/src/pacman/util.c b/src/pacman/util.c index 23eea98..fec14b7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -46,6 +46,7 @@ #include "conf.h" #include "callback.h" +static volatile unsigned cached_columns = 0; struct table_cell_t { char *label; @@ -155,12 +156,21 @@ static int flush_term_input(int fd) return 0; } +/* intended to be used as a SIGWINCH handler */ +void columns_reset(int signum) +{ + cached_columns = 0; +} + /* gets the current screen column width */ unsigned short getcols(int fd) { const unsigned short default_tty = 80; const unsigned short default_notty = 0; - unsigned short termwidth = 0; + unsigned short columns = 0; + + if (cached_columns > 0) + return cached_columns; if(!isatty(fd)) { return default_notty; @@ -169,15 +179,17 @@ unsigned short getcols(int fd) #if defined(TIOCGSIZE) struct ttysize win; if(ioctl(fd, TIOCGSIZE, &win) == 0) { - termwidth = win.ts_cols; + columns = win.ts_cols; } #elif defined(TIOCGWINSZ) struct winsize win; if(ioctl(fd, TIOCGWINSZ, &win) == 0) { - termwidth = win.ws_col; + columns = win.ws_col; } #endif - return termwidth == 0 ? default_tty : termwidth; + + cached_columns = columns == 0 ? default_tty : columns; + return cached_columns; } /* does the same thing as 'rm -rf' */ diff --git a/src/pacman/util.h b/src/pacman/util.h index e2297f8..d7f7b3c 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -49,6 +49,7 @@ int trans_init(alpm_transflag_t flags, int check_valid); int trans_release(void); int needs_root(void); int check_syncdbs(size_t need_repos, int check_valid); +void columns_reset(int signum); unsigned short getcols(int fd); int rmrf(const char *path); void indentprint(const char *str, unsigned short indent, unsigned short cols); -- 1.8.4.2

2 3

[pacman-dev] [PATCH] conf.c: add missing newline to warning
by Andrew Gregory 30 Dec '13

30 Dec '13

Fixes tests that use pacman's output when built without libcurl. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cf8a417..05c4610 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -716,7 +716,7 @@ static int setup_libalpm(void) if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); } else if(!(alpm_capabilities() & ALPM_CAPABILITY_DOWNLOADER)) { - pm_printf(ALPM_LOG_WARNING, _("no '%s' configured"), "XferCommand"); + pm_printf(ALPM_LOG_WARNING, _("no '%s' configured\n"), "XferCommand"); } if(config->totaldownload) { -- 1.8.5.2

2 1

[pacman-dev] [PATCH] Have configure set pactest options that it knows.
by Jeremy Heiner 28 Dec '13

28 Dec '13

This patch is not ready for accepting into the repository. It does not work for VPATH builds (because the paths to all the .py tests are seen as relative to $(builddir)). Dave is working on a fix for this VPATH issue, so a real version of this patch must wait to incorporate his commit. This patch works fine for in-$(srcdir) builds. The purpose of posting it is to follow up Saturday's conversation. I think it implements all of Allan's suggestions (if I understood correctly). The real commit message would be something like: SCRIPTLET_SHELL and LDCONFIG can be set via args to configure, and up 'till now those options were passed to pactest by Makefile.am as command-line args. That works fine for 'make check', but required repeated specification when running pactest manually. This patch makes pactest a configured file so it has direct access to those options and they no longer need to be specified (by Makefile.am nor by hand). Also the default for the pactest '-p' arg is changed to be the pacman that the make builds. The '-p' arg is still available, but it should now be very rare to have to use it when calling pactest manually. --- Makefile.am | 4 -- configure.ac | 1 + test/pacman/.gitignore | 1 + test/pacman/pactest.py | 125 -------------------------------------------- test/pacman/pactest.py.in | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 129 deletions(-) delete mode 100755 test/pacman/pactest.py create mode 100644 test/pacman/pactest.py.in diff --git a/Makefile.am b/Makefile.am index 4d5adae..9689992 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,10 +41,6 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh PY_LOG_COMPILER = $(top_srcdir)/test/pacman/pactest.py -AM_PY_LOG_FLAGS = \ - --scriptlet-shell $(SCRIPTLET_SHELL) \ - --ldconfig $(LDCONFIG) \ - -p $(top_builddir)/src/pacman/pacman # create the pacman DB and cache directories upon install install-data-local: diff --git a/configure.ac b/configure.ac index cfcc8d1..292260a 100644 --- a/configure.ac +++ b/configure.ac @@ -507,6 +507,7 @@ test/util/Makefile contrib/Makefile Makefile ]) +AC_CONFIG_FILES([test/pacman/pactest.py],[chmod +x test/pacman/pactest.py]) AC_OUTPUT echo " diff --git a/test/pacman/.gitignore b/test/pacman/.gitignore index 0d20b64..39fa72b 100644 --- a/test/pacman/.gitignore +++ b/test/pacman/.gitignore @@ -1 +1,2 @@ *.pyc +pactest.py diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py deleted file mode 100755 index e21cde7..0000000 --- a/test/pacman/pactest.py +++ /dev/null @@ -1,125 +0,0 @@ -#! /usr/bin/python2 -# -# pactest : run automated testing on the pacman binary -# -# Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -import glob -from optparse import OptionParser -import os -import shutil -import sys -import tempfile - -import pmenv -import tap -import util - -__author__ = "Aurelien FORET" -__version__ = "0.4" - -def resolve_binary_path(option, opt_str, value, parser): - setattr(parser.values, option.dest, os.path.abspath(value)) - -def create_parser(): - usage = "usage: %prog [options] <path/to/testfile.py>..." - description = "Runs automated tests on the pacman binary. Tests are " \ - "described using an easy python syntax, and several can be " \ - "ran at once." - parser = OptionParser(usage = usage, description = description) - - parser.add_option("-v", "--verbose", action = "count", - dest = "verbose", default = 0, - help = "print verbose output") - parser.add_option("-d", "--debug", type = "int", - dest = "debug", default = 0, - help = "set debug level for pacman") - parser.add_option("-p", "--pacman", action = "callback", - callback = resolve_binary_path, type = "string", - dest = "bin", default = "pacman", - help = "specify location of the pacman binary") - parser.add_option("--keep-root", action = "store_true", - dest = "keeproot", default = False, - help = "don't remove the generated pacman root filesystem") - parser.add_option("--nolog", action = "store_true", - dest = "nolog", default = False, - help = "do not log pacman messages") - parser.add_option("--gdb", action = "store_true", - dest = "gdb", default = False, - help = "use gdb while calling pacman") - parser.add_option("--valgrind", action = "store_true", - dest = "valgrind", default = False, - help = "use valgrind while calling pacman") - parser.add_option("--manual-confirm", action = "store_true", - dest = "manualconfirm", default = False, - help = "do not use --noconfirm for pacman calls") - parser.add_option("--scriptlet-shell", type = "string", - dest = "scriptletshell", default = "/bin/sh", - help = "specify path to shell used for install scriptlets") - parser.add_option("--ldconfig", type = "string", - dest = "ldconfig", default = "/sbin/ldconfig", - help = "specify path to ldconfig") - return parser - - -if __name__ == "__main__": - - if sys.hexversion < 0x02070000: - # bailing now with clear message better than mid-run with unhelpful one - tap.bail("Python versions before 2.7 are not supported.") - sys.exit(1) - - # instantiate env and parser objects - root_path = tempfile.mkdtemp() - env = pmenv.pmenv(root=root_path) - opt_parser = create_parser() - (opts, args) = opt_parser.parse_args() - - # add parsed options to env object - util.verbose = opts.verbose - env.pacman["debug"] = opts.debug - env.pacman["bin"] = opts.bin - env.pacman["nolog"] = opts.nolog - env.pacman["gdb"] = opts.gdb - env.pacman["valgrind"] = opts.valgrind - env.pacman["manual-confirm"] = opts.manualconfirm - env.pacman["scriptlet-shell"] = opts.scriptletshell - env.pacman["ldconfig"] = opts.ldconfig - - opts.testcases = [] - for path in args: - opts.testcases += glob.glob(path) - if opts.testcases is None or len(opts.testcases) == 0: - tap.bail("no tests defined, nothing to do") - os.rmdir(root_path) - sys.exit(2) - - for i in opts.testcases: - env.addtest(i) - - # run tests - env.run() - - if not opts.keeproot: - shutil.rmtree(root_path) - else: - tap.diag("pacman testing root saved: %s" % root_path) - - if env.failed > 0: - sys.exit(1) - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/pactest.py.in b/test/pacman/pactest.py.in new file mode 100644 index 0000000..0d9e1f7 --- /dev/null +++ b/test/pacman/pactest.py.in @@ -0,0 +1,128 @@ +#! /usr/bin/python2 +# +# @configure_input@ +# +# pactest : run automated testing on the pacman binary +# +# Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> +# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import glob +from optparse import OptionParser +import os +import shutil +import sys +import tempfile + +BUILDDIR = os.path.dirname(os.path.realpath(__file__)) +SRCDIR = os.path.realpath(os.path.join(BUILDDIR, "@srcdir@")) +if BUILDDIR != SRCDIR: sys.path.insert(0, SRCDIR) +TOP_BUILDDIR = os.path.realpath(os.path.join(BUILDDIR, "@top_builddir@")) +BUILT_EXE = os.path.realpath(os.path.join(TOP_BUILDDIR, "src/pacman/pacman")) + +import pmenv +import tap +import util + +__author__ = "Aurelien FORET" +__version__ = "0.4" + +def resolve_binary_path(option, opt_str, value, parser): + setattr(parser.values, option.dest, os.path.abspath(value)) + +def create_parser(): + usage = "usage: %prog [options] <path/to/testfile.py>..." + description = "Runs automated tests on the pacman binary. Tests are " \ + "described using an easy python syntax, and several can be " \ + "ran at once." + parser = OptionParser(usage = usage, description = description) + + parser.add_option("-v", "--verbose", action = "count", + dest = "verbose", default = 0, + help = "print verbose output") + parser.add_option("-d", "--debug", type = "int", + dest = "debug", default = 0, + help = "set debug level for pacman") + parser.add_option("-p", "--pacman", action = "callback", + callback = resolve_binary_path, type = "string", + dest = "bin", default = BUILT_EXE, + help = "specify location of the pacman binary") + parser.add_option("--keep-root", action = "store_true", + dest = "keeproot", default = False, + help = "don't remove the generated pacman root filesystem") + parser.add_option("--nolog", action = "store_true", + dest = "nolog", default = False, + help = "do not log pacman messages") + parser.add_option("--gdb", action = "store_true", + dest = "gdb", default = False, + help = "use gdb while calling pacman") + parser.add_option("--valgrind", action = "store_true", + dest = "valgrind", default = False, + help = "use valgrind while calling pacman") + parser.add_option("--manual-confirm", action = "store_true", + dest = "manualconfirm", default = False, + help = "do not use --noconfirm for pacman calls") + return parser + + +if __name__ == "__main__": + + if sys.hexversion < 0x02070000: + # bailing now with clear message better than mid-run with unhelpful one + tap.bail("Python versions before 2.7 are not supported.") + sys.exit(1) + + # instantiate env and parser objects + root_path = tempfile.mkdtemp() + env = pmenv.pmenv(root=root_path) + opt_parser = create_parser() + (opts, args) = opt_parser.parse_args() + + # add parsed options to env object + util.verbose = opts.verbose + env.pacman["debug"] = opts.debug + env.pacman["bin"] = opts.bin + env.pacman["nolog"] = opts.nolog + env.pacman["gdb"] = opts.gdb + env.pacman["valgrind"] = opts.valgrind + env.pacman["manual-confirm"] = opts.manualconfirm + # and add configured options + env.pacman["scriptlet-shell"] = "@SCRIPTLET_SHELL@" + env.pacman["ldconfig"] = "@LDCONFIG@" + + opts.testcases = [] + for path in args: + opts.testcases += glob.glob(path) + if opts.testcases is None or len(opts.testcases) == 0: + tap.bail("no tests defined, nothing to do") + os.rmdir(root_path) + sys.exit(2) + + for i in opts.testcases: + env.addtest(i) + + # run tests + env.run() + + if not opts.keeproot: + shutil.rmtree(root_path) + else: + tap.diag("pacman testing root saved: %s" % root_path) + + if env.failed > 0: + sys.exit(1) + +# vim: set ts=4 sw=4 et: -- 1.8.5.2

3 13