- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-548-g9a40927
by dan＠archlinux.org 09 Aug '11

09 Aug '11

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 9a409275330bfe6c4865ab3c5ecc384a26d85e45 (commit) via 09f950af073ca82b03ef50dd6402fd72491a4770 (commit) via 8fa330335f9eb465724ed778464502f844e930ae (commit) via ef4757afa5d31ff6a6c09e3410c889f152826f4f (commit) via d9f9b87d3ff6621577aa15bf3304f73219f6d5f1 (commit) via 1d37c19e0492ddd426c7a05c815a45b997b55498 (commit) via 5136df0f393567117b84d4580737e2920cc63f57 (commit) via b283a1e06576821de6b3811a76b43ad081870dab (commit) via 0b57da2a43128dfaf475038eef938cae9cc24de1 (commit) via fab66f157d1b622cb120e21373a4893ad693ff33 (commit) via 1a919a11b85cb882bf5e632036a9030e4a98aba0 (commit) via 67445334e71eaf6138561eee8e5561733a59fc69 (commit) via 1e16b94a85678bc6d055e19f0efbd5bb680c5032 (commit) via 07a1292721c62f44d89a9fe6a0b093b5e6865b8a (commit) via 4c37d74ae50fc7c0f067aca07164fe75516d055b (commit) via 88644e181db49f3f94e6891166823fd5f46acbcc (commit) via 005eab0a080925d0d6f780d751f9019dafbafc64 (commit) from f10aea73e462f05d31de7b55667f58300fb89fa2 (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 9a409275330bfe6c4865ab3c5ecc384a26d85e45 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 17:17:15 2011 -0500 Update all translation files This moves us toward staring translations for the 4.0.0 release, although this should not be interpreted as a string freeze by any means. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 09f950af073ca82b03ef50dd6402fd72491a4770 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 17:11:14 2011 -0500 _alpm_access(): don't call gettext() in debug level loggers This is standard procedure elsewhere and cuts down on translations that won't be seen (and we don't want if we need English debug output anyway). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8fa330335f9eb465724ed778464502f844e930ae Merge: ef4757a 6744533 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 17:05:25 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/dload.c lib/libalpm/po/fi.po lib/libalpm/po/libalpm.pot po/de.po po/fi.po src/pacman/po/pacman.pot src/pacman/util.c commit ef4757afa5d31ff6a6c09e3410c889f152826f4f Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 29 17:03:07 2011 -0500 Store a package info level flag if we fail to load data If we are missing a local database file, we get repeated messages over and over telling us the same thing, rather than being sane and erroring only once. This package adds an INFRQ_ERROR level that is added to the mask if we encounter any errors on a local_db_read() operation, and short circuits future calls if found in the value. This fixes FS#25313. Note that this does not make any behavior changes other than suppressing error messages and repeated code calls to failure cases; we still have more to do in the "local database is hosed" department. Also make a small update to the wrong but unused flags set in be_package; using INFRQ_ALL there was not totally correct. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d9f9b87d3ff6621577aa15bf3304f73219f6d5f1 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 15:24:04 2011 -0500 Add a test harness for new pacsort command Note that this is meant to exercise pacsort more than the underlying version comparsion; that is better left to the standalone vercmptest.sh test script. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d37c19e0492ddd426c7a05c815a45b997b55498 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 8 14:37:30 2011 -0400 mark option structs as const These are never modified and even getopt_long's prototype shows this modifier on the parameter. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5136df0f393567117b84d4580737e2920cc63f57 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 7 19:46:41 2011 -0400 paccache: use pacsort instead of sort -V Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b283a1e06576821de6b3811a76b43ad081870dab Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 7 15:32:06 2011 -0400 src/util/Makefile.am: alphabetize targets Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0b57da2a43128dfaf475038eef938cae9cc24de1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 5 21:20:20 2011 -0400 pacsort: add new utility pacsort is a command line sorting utility that implements libalpm's alpm_pkg_vercmp algorithm. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fab66f157d1b622cb120e21373a4893ad693ff33 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 14:27:31 2011 -0500 Bash-ify test/util/vercmptest.sh Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1a919a11b85cb882bf5e632036a9030e4a98aba0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 8 17:20:53 2011 -0400 makepkg: ignore epoch when undeclared In this case, we skip the epoch versioning entirely, as if it were declared as 0. Prevents errors such as: /usr/bin/makepkg: line 244: ((: ! : syntax error: operand expected (error token is " ") ==> Finished making: cower-git :20110808-1 (Mon Aug 8 17:17:27 EDT 2011) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1e16b94a85678bc6d055e19f0efbd5bb680c5032 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 2 09:02:57 2011 -0400 contrib/paccache: misc cleanup and bugfix * change error verbiage when run as root * delete sigs along with packages * fix bug in diskspace calculations * merge END block in pkgfilter Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07a1292721c62f44d89a9fe6a0b093b5e6865b8a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 12:24:43 2011 -0500 Check return value of rename() calls We did a good job checking this in add.c, but not necessarily anywhere else. Fix this up by adding checks into dload.c, remove.c, and conf.c in the frontend. Also add loggers where appropriate and make the message syntax more consistent. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 + contrib/paccache.in | 39 +++-- doc/PKGBUILD.5.txt | 3 +- lib/libalpm/be_local.c | 14 +- lib/libalpm/be_package.c | 4 +- lib/libalpm/db.h | 3 +- lib/libalpm/dload.c | 7 +- lib/libalpm/po/ca.po | 49 +++-- lib/libalpm/po/cs.po | 49 +++-- lib/libalpm/po/da.po | 46 +++-- lib/libalpm/po/de.po | 49 +++-- lib/libalpm/po/el.po | 49 +++-- lib/libalpm/po/en_GB.po | 49 +++-- lib/libalpm/po/es.po | 49 +++-- lib/libalpm/po/fi.po | 64 ++++-- lib/libalpm/po/fr.po | 49 +++-- lib/libalpm/po/hu.po | 49 +++-- lib/libalpm/po/it.po | 49 +++-- lib/libalpm/po/kk.po | 49 +++-- lib/libalpm/po/libalpm.pot | 44 +++-- lib/libalpm/po/nb.po | 49 +++-- lib/libalpm/po/pl.po | 49 +++-- lib/libalpm/po/pt.po | 49 +++-- lib/libalpm/po/pt_BR.po | 49 +++-- lib/libalpm/po/ro.po | 49 +++-- lib/libalpm/po/ru.po | 49 +++-- lib/libalpm/po/sk.po | 49 +++-- lib/libalpm/po/sr.po | 49 +++-- lib/libalpm/po/sr(a)latin.po | 49 +++-- lib/libalpm/po/sv.po | 46 +++-- lib/libalpm/po/tr.po | 49 +++-- lib/libalpm/po/uk.po | 46 +++-- lib/libalpm/po/zh_CN.po | 49 +++-- lib/libalpm/remove.c | 24 ++- lib/libalpm/util.c | 12 +- scripts/makepkg.sh.in | 2 +- scripts/po/ca.po | 449 ++++++++++++++++++++++++++++------------ scripts/po/cs.po | 442 +++++++++++++++++++++++++++------------ scripts/po/da.po | 446 +++++++++++++++++++++++++++------------- scripts/po/de.po | 459 ++++++++++++++++++++++++++++------------- scripts/po/el.po | 449 +++++++++++++++++++++++++++------------- scripts/po/en_GB.po | 441 +++++++++++++++++++++++++++------------ scripts/po/es.po | 453 ++++++++++++++++++++++++++++------------ scripts/po/fi.po | 454 ++++++++++++++++++++++++++++------------- scripts/po/fr.po | 457 ++++++++++++++++++++++++++++------------ scripts/po/hu.po | 459 ++++++++++++++++++++++++++++------------- scripts/po/it.po | 454 ++++++++++++++++++++++++++++------------- scripts/po/kk.po | 438 +++++++++++++++++++++++++++------------ scripts/po/nb.po | 448 +++++++++++++++++++++++++++------------- scripts/po/pacman-scripts.pot | 294 ++++++++++++++++----------- scripts/po/pl.po | 442 +++++++++++++++++++++++++++------------ scripts/po/pt.po | 459 ++++++++++++++++++++++++++++------------- scripts/po/pt_BR.po | 456 ++++++++++++++++++++++++++++------------- scripts/po/ro.po | 451 ++++++++++++++++++++++++++++------------- scripts/po/ru.po | 448 ++++++++++++++++++++++++++++------------ scripts/po/sk.po | 445 +++++++++++++++++++++++++++------------ scripts/po/sr.po | 445 +++++++++++++++++++++++++++------------- scripts/po/sr(a)latin.po | 445 +++++++++++++++++++++++++++------------- scripts/po/sv.po | 445 +++++++++++++++++++++++++++------------- scripts/po/tr.po | 445 +++++++++++++++++++++++++++------------ scripts/po/uk.po | 446 +++++++++++++++++++++++++++------------ scripts/po/zh_CN.po | 441 +++++++++++++++++++++++++++------------ src/pacman/conf.c | 8 +- src/pacman/pacman.c | 2 +- src/pacman/po/ca.po | 116 ++++++++--- src/pacman/po/cs.po | 115 ++++++++--- src/pacman/po/da.po | 114 ++++++++--- src/pacman/po/de.po | 117 ++++++++--- src/pacman/po/el.po | 112 ++++++++--- src/pacman/po/en_GB.po | 112 ++++++++--- src/pacman/po/es.po | 116 ++++++++--- src/pacman/po/fi.po | 114 ++++++++--- src/pacman/po/fr.po | 120 ++++++++--- src/pacman/po/hu.po | 115 ++++++++--- src/pacman/po/it.po | 116 ++++++++--- src/pacman/po/kk.po | 116 ++++++++--- src/pacman/po/nb.po | 112 ++++++++--- src/pacman/po/pacman.pot | 98 +++++++-- src/pacman/po/pl.po | 113 ++++++++--- src/pacman/po/pt.po | 114 ++++++++--- src/pacman/po/pt_BR.po | 117 ++++++++--- src/pacman/po/ro.po | 117 ++++++++--- src/pacman/po/ru.po | 116 ++++++++--- src/pacman/po/sk.po | 112 ++++++++--- src/pacman/po/sr.po | 112 ++++++++--- src/pacman/po/sr(a)latin.po | 112 ++++++++--- src/pacman/po/sv.po | 114 ++++++++--- src/pacman/po/tr.po | 114 ++++++++--- src/pacman/po/uk.po | 114 ++++++++--- src/pacman/po/zh_CN.po | 112 ++++++++--- src/pacman/sync.c | 11 +- src/pacman/util.c | 38 +++- src/util/.gitignore | 2 + src/util/Makefile.am | 22 +- src/util/pacsort.c | 394 +++++++++++++++++++++++++++++++++++ src/util/pactree.c | 2 +- test/util/Makefile.am | 1 + test/util/pacsorttest.sh | 103 +++++++++ test/util/vercmptest.sh | 18 +- 99 files changed, 11690 insertions(+), 4767 deletions(-) create mode 100644 src/util/pacsort.c create mode 100755 test/util/pacsorttest.sh hooks/post-receive -- The official pacman repository

3 3

[pacman-dev] Checking package validity
by Allan McRae 09 Aug '11

09 Aug '11

I was thinking of how we currently check package validity and had planned to do something like: 1) signature check 2) md5sum check _only_ if no signature to check with the intention of adding an sha256sum check in the middle in the future (perhaps only if pacman is built using openssl to save us having to provide the routines...). But as far as I can tell, _alpm_check_pgp_helper does not allow you to distinguish between a successful signature check and the case where no signature is available and signature checking is not required. Is that correct or am I missing something? Allan

2 3

[pacman-dev] Bad strings for translation
by Dan McGee 09 Aug '11

09 Aug '11

Noticed the following today in makepkg, we should be using warning() calls instead so this same word isn't translated over and over: + +msgid "Warning: Unknown public key" +msgstr "" + +msgid "Warning: the key has been revoked." +msgstr "" + +msgid "Warning: the signature has expired." +msgstr "" + +msgid "Warning: the key has expired." +msgstr "" +

2 1

[pacman-dev] [PATCH] Fix divide by zero when downloading zero length files
by Dan McGee 08 Aug '11

08 Aug '11

If someone did a 'touch bogusrepo.db', we had the potential to throw a SIGFPE or divide by zero, given that the total file size was 0 and getting passed up to the pacman callback. Fix this so we get weird but sane output and don't blow up when downloading: :: Synchronizing package databases... core 35.7K 306.7K/s 00:00:00 [###################] 100% bogusrepo 0.0K 0.0K/s 00:00:00 [###################] 100% Exception as seen in gdb: Program received signal SIGFPE, Arithmetic exception. 0x000000000040cc73 in cb_dl_progress (filename=0x619dfc "bogusrepo.db", file_xfered=0, file_total=0) at callback.c:584 584 file_percent = (file_xfered * 100) / file_total; Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This is for maint, where this can be easily reproduced by adding a file:// URL to a zero-length database and running -Syy. It doesn't show up on master not because the code is different, but because curl never even calls the callback once on a zero length file, so we don't hit the problem. -Dan src/pacman/callback.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 46ff2e8..68672b4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -27,6 +27,7 @@ #include <sys/types.h> /* off_t */ #include <unistd.h> #include <wchar.h> +#include <limits.h> /* UINT_MAX */ #include <alpm.h> @@ -561,10 +562,13 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) diff_sec = current_time.tv_sec - initial_time.tv_sec; diff_usec = current_time.tv_usec - initial_time.tv_usec; timediff = diff_sec + (diff_usec / 1000000.0); - rate = xfered / (timediff * 1024.0); - - /* round elapsed time to the nearest second */ - eta_s = (int)(timediff + 0.5); + if(timediff > 0.0) { + rate = xfered / (timediff * 1024.0); + /* round elapsed time to the nearest second */ + eta_s = (unsigned int)(timediff + 0.5); + } else { + eta_s = 0; + } } else { /* compute current average values */ timediff = get_update_timediff(0); @@ -576,12 +580,20 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) rate = (xfered - xfered_last) / (timediff * 1024.0); /* average rate to reduce jumpiness */ rate = (rate + 2 * rate_last) / 3; - eta_s = (total - xfered) / (rate * 1024.0); + if(rate > 0.0) { + eta_s = (total - xfered) / (rate * 1024.0); + } else { + eta_s = UINT_MAX; + } rate_last = rate; xfered_last = xfered; } - file_percent = (file_xfered * 100) / file_total; + if(file_total) { + file_percent = (file_xfered * 100) / file_total; + } else { + file_percent = 100; + } if(totaldownload) { total_percent = ((list_xfered + file_xfered) * 100) / @@ -658,6 +670,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } /* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */ + /* TODO: if eta_h > 99, formatting gets all messed up */ printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname, padwid, "", f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-549-g21240d4
by dan＠archlinux.org 08 Aug '11

08 Aug '11

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 21240d4746be470b2cdabf106289034cbd27c579 (commit) from 9a409275330bfe6c4865ab3c5ecc384a26d85e45 (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 21240d4746be470b2cdabf106289034cbd27c579 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 17:45:44 2011 -0500 Update transifex config for new translation layout Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .tx/config | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-12-g6744533
by dan＠archlinux.org 08 Aug '11

08 Aug '11

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, maint has been updated via 67445334e71eaf6138561eee8e5561733a59fc69 (commit) via 4c37d74ae50fc7c0f067aca07164fe75516d055b (commit) via 88644e181db49f3f94e6891166823fd5f46acbcc (commit) via 005eab0a080925d0d6f780d751f9019dafbafc64 (commit) from 297cd7897bfe060ce46d703e15ad7cbe37aedced (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 3 +-- lib/libalpm/dload.c | 1 + lib/libalpm/po/fi.po | 17 +++++++++++------ lib/libalpm/po/libalpm.pot | 4 ++-- po/de.po | 18 +++++++++++------- po/fi.po | 13 ++++++++----- po/pacman.pot | 4 ++-- src/pacman/sync.c | 11 ++++++++++- src/pacman/util.c | 38 +++++++++++++++++++++++++++++++++++--- 9 files changed, 81 insertions(+), 28 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Check return value of rename() calls
by Dan McGee 08 Aug '11

08 Aug '11

We did a good job checking this in add.c, but not necessarily anywhere else. Fix this up by adding checks into dload.c, remove.c, and conf.c in the frontend. Also add loggers where appropriate and make the message syntax more consistent. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Dave- any memories/reasoning as to why you didn't port this bit over when you added the curl backend stuff? (commit 96e458b705eda4ddff) The remove.c changes pretty much parallel the checks and logging done in add.c, if you're looking to see where the basic stuff from this patch came from. conf.c is the only user of rename() in the frontend, so this does add a new message there, but it seems like a worthwhile addition. -Dan lib/libalpm/dload.c | 7 +++++-- lib/libalpm/remove.c | 24 ++++++++++++++++++------ src/pacman/conf.c | 8 ++++++-- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 23b8db7..dc4f91e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -373,8 +373,11 @@ cleanup: } if(ret == 0) { - rename(tempfile, destfile); - if(final_file) { + if(rename(tempfile, destfile)) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), + tempfile, destfile, strerror(errno)); + ret = -1; + } else if(final_file) { *final_file = strdup(strrchr(destfile, '/') + 1); } } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 83c437f..3c19c90 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -220,7 +220,7 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, /* Helper function for iterating through a package's file and deleting them * Used by _alpm_remove_commit. */ -static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, +static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, const alpm_file_t *fileobj, alpm_list_t *skip_remove, int nosave) { struct stat buf; @@ -234,7 +234,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, if(alpm_list_find_str(skip_remove, fileobj->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n", file); - return; + return 1; } /* we want to do a lstat here, and not a _alpm_lstat. @@ -243,7 +243,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, * actual symlink */ if(lstat(file, &buf)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file %s does not exist\n", file); - return; + return 1; } if(S_ISDIR(buf.st_mode)) { @@ -280,6 +280,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, if(rmdir(file)) { _alpm_log(handle, ALPM_LOG_DEBUG, "directory removal of %s failed: %s\n", file, strerror(errno)); + return -1; } else { _alpm_log(handle, ALPM_LOG_DEBUG, "removed directory %s (no remaining owners)\n", file); @@ -299,10 +300,16 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, if(cmp != 0) { char newpath[PATH_MAX]; snprintf(newpath, PATH_MAX, "%s.pacsave", file); - rename(file, newpath); + if(rename(file, newpath)) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), + file, newpath, strerror(errno)); + alpm_logaction(handle, "error: could not rename %s to %s (%s)\n", + file, newpath, strerror(errno)); + return -1; + } _alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath); alpm_logaction(handle, "warning: %s saved as %s\n", file, newpath); - return; + return 0; } } } @@ -310,10 +317,14 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, _alpm_log(handle, ALPM_LOG_DEBUG, "unlinking %s\n", file); if(unlink(file) == -1) { - _alpm_log(handle, ALPM_LOG_ERROR, _("cannot remove file '%s': %s\n"), + _alpm_log(handle, ALPM_LOG_ERROR, _("cannot remove %s (%s)\n"), file, strerror(errno)); + alpm_logaction(handle, "error: cannot remove %s (%s)\n", + file, strerror(errno)); + return -1; } } + return 0; } int _alpm_remove_single_package(alpm_handle_t *handle, @@ -397,6 +408,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, for(i = filelist->count; i > 0; i--) { alpm_file_t *file = filelist->files + i - 1; int percent; + /* TODO: check return code and handle accordingly */ unlink_file(handle, oldpkg, file, skip_remove, handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index a580406..29e835c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -184,10 +184,14 @@ static int download_with_xfercommand(const char *url, const char *localpath, ret = -1; } else { /* download was successful */ + ret = 0; if(usepart) { - rename(tempfile, destfile); + if(rename(tempfile, destfile)) { + pm_printf(ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), + tempfile, destfile, strerror(errno)); + ret = -1; + } } - ret = 0; } cleanup: -- 1.7.6

2 1

[pacman-dev] [PATCH 1/3] pacsort: add new utility
by Dave Reisner 07 Aug '11

07 Aug '11

pacsort is a command line sorting utility that implements libalpm's alpm_pkg_vercmp algorithm. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- On Dan's prodding and enthusiasm, I cleaned this up into a real thing: * no hard coded buffer sizes. Everything grows on demand. My initial values and growth may be a little off, but they seemed reasonable for my use cases. * support for null delimited data. Was easy enough, so why not. * support for sorting on specific column. As a necessary evil with it, support for changing the field delimiter. The default is a single space, as that's what pacman -Q uses. Unlike GNU sort, -d '\t' does what you think it does. src/util/.gitignore | 2 + src/util/Makefile.am | 6 +- src/util/pacsort.c | 397 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 403 insertions(+), 2 deletions(-) create mode 100644 src/util/pacsort.c diff --git a/src/util/.gitignore b/src/util/.gitignore index 2880ce2..1813506 100644 --- a/src/util/.gitignore +++ b/src/util/.gitignore @@ -2,6 +2,8 @@ .libs cleanupdelta cleanupdelta.exe +pacsort +pacsort.exe pactree pactree.exe testdb diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 30a2ee3..f277465 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -3,7 +3,7 @@ conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ cachedir = ${localstatedir}/cache/pacman/pkg/ -bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pactree +bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree DEFS = -DLOCALEDIR=\"@localedir@\" \ -DCONFFILE=\"$(conffile)\" \ @@ -27,8 +27,10 @@ testdb_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la cleanupdelta_SOURCES = cleanupdelta.c cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la +pacsort_SOURCES = pacsort.c +pacsort_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la + pactree_SOURCES = pactree.c pactree_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la - # vim:set ts=2 sw=2 noet: diff --git a/src/util/pacsort.c b/src/util/pacsort.c new file mode 100644 index 0000000..04815b8 --- /dev/null +++ b/src/util/pacsort.c @@ -0,0 +1,397 @@ +/* + * pacsort.c - a sort utility implementing alpm_pkg_vercmp + * + * Copyright (c) 2010-2011 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/>. + */ + +#include "config.h" + +#include <errno.h> +#include <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <alpm.h> + +#define DELIM ' ' + +struct buffer_t { + char *mem; + size_t len; + size_t maxlen; +}; + +struct list_t { + char **list; + size_t count; + size_t maxcount; +}; + +static struct options_t { + int order; + int sortkey; + int null; + char delim; +} opts; + +static struct buffer_t *buffer_new(size_t initial_size) +{ + struct buffer_t *buf; + + buf = calloc(1, sizeof(*buf)); + if(!buf) { + return NULL; + } + + buf->mem = calloc(initial_size, sizeof(char)); + if(!buf->mem) { + free(buf); + return NULL; + } + + buf->len = 0; + buf->maxlen = initial_size; + + return buf; +} + +static void buffer_free(struct buffer_t *buf) +{ + if(!buf) { + return; + } + + if(buf->mem) { + free(buf->mem); + } + + free(buf); +} + +static int buffer_grow(struct buffer_t *buffer) +{ + size_t newsz = buffer->maxlen * 2.5; + buffer->mem = realloc(buffer->mem, newsz * sizeof(char)); + if(!buffer->mem) { + return 1; + } + buffer->maxlen = newsz; + + return 0; +} + +static struct list_t *list_new(size_t initial_size) +{ + struct list_t *list; + + list = calloc(1, sizeof(struct list_t)); + if(!list) { + return NULL; + } + + list->list = calloc(initial_size, sizeof(char **)); + if(!list->list) { + free(list); + return NULL; + } + + list->maxcount = initial_size; + + return list; +} + +static int list_grow(struct list_t *list) +{ + size_t newsz = list->maxcount * 2.5; + list->list = realloc(list->list, newsz * sizeof(char*)); + if(!list->list) { + return 1; + } + + list->maxcount = newsz; + + return 0; +} + +static int list_add(struct list_t *list, char *name) +{ + if(!list|!name) { + return 1; + } + + if(list->count + 1 >= list->maxcount) { + if(list_grow(list) != 0) { + return 1; + } + } + + list->list[list->count] = name; + list->count++; + + return 0; +} + +static void list_free(struct list_t *list) +{ + size_t i; + + if(!list) { + return; + } + + if(list->list) { + for(i = 0; i < list->count; i++) { + free(list->list[i]); + } + free(list->list); + free(list); + } +} + +static char *explode(struct buffer_t *buffer, struct list_t *list) +{ + char *name, *ptr, *end; + const char linedelim = opts.null ? '\0' : '\n'; + + ptr = buffer->mem; + while((end = memchr(ptr, linedelim, &buffer->mem[buffer->len] - ptr))) { + *end = '\0'; + name = strdup(ptr); + list_add(list, name); + ptr = end + 1; + } + + return ptr; +} + +static int splitfile(FILE *stream, struct buffer_t *buffer, struct list_t *list) +{ + size_t nread; + char *ptr; + + while(1) { + /* check if a read of BUFSIZ chars will overflow */ + if (buffer->len + BUFSIZ + 1 >= buffer->maxlen) { + if(buffer_grow(buffer) != 0) { + return 1; + } + } + + nread = fread(&buffer->mem[buffer->len], 1, BUFSIZ, stream); + if(nread == 0) { + if(feof(stream)) { + if(buffer->len) { + char *name = strndup(buffer->mem, buffer->len + 1); + if(list_add(list, name) != 0) { + return 1; + } + } + break; /* EOF */ + } else { + continue; + } + } + buffer->len += nread; + + if((ptr = explode(buffer, list)) == NULL) { + return 1; + } + + if(ptr != buffer->mem) { + /* realign the data in the buffer */ + buffer->len = &buffer->mem[buffer->len] - ptr; + memmove(&buffer->mem[0], ptr, buffer->len + 1); + } + } + + return 0; +} + +/* returns a pointer to the nth column of a string without being destructive */ +static const char *nth_column(const char *string) +{ + const char *prev, *ptr; + int col; + + ptr = prev = string; + for(col = 1; ptr && col <= opts.sortkey; col++) { + prev = ptr; + ptr = strchr(ptr, opts.delim); + if(ptr) { + ptr++; + } + } + + return prev; +} + +static int vercmp(const void *p1, const void *p2) +{ + const char *name1, *name2; + + name1 = *(const char **)p1; + name2 = *(const char **)p2; + + if(opts.sortkey == 0) { + return opts.order * alpm_pkg_vercmp(name1, name2); + } else { + return opts.order * alpm_pkg_vercmp(nth_column(name1), nth_column(name2)); + } +} + +static char escape_char(const char *string) +{ + const size_t len = strlen(string); + + if(!string || len > 2) { + return -1; + } + + if(len == 1) { + return *string; + } + + if(*string != '\\') { + return -1; + } + + switch(string[1]) { + case 't': + return '\t'; + case 'n': + return '\n'; + case 'v': + return '\v'; + case '0': + return '\0'; + default: + return -1; + } +} + +static void usage(void) +{ + fprintf(stderr, "pacsort v" PACKAGE_VERSION "\n" + "Usage: pacsort [options] [files...]\n\n" + " -d, --delim DELIM field separator instead of a space\n" + " -h, --help this help message\n" + " -k, --key INDEX sort input starting on column\n" + " -r, --reverse sort in reverse order\n" + " -z, --null lines end with null bytes, not newlines\n\n"); +} + +static int parse_options(int argc, char **argv) +{ + int opt; + + static struct option opttable[] = { + {"delim", required_argument, 0, 'd'}, + {"help", no_argument, 0, 'h'}, + {"key", required_argument, 0, 'k'}, + {"reverse", no_argument, 0, 'r'}, + {"null", no_argument, 0, 'z'}, + {0, 0, 0, 0} + }; + + while((opt = getopt_long(argc, argv, "d:hk:rz", opttable, NULL)) != -1) { + switch(opt) { + case 'd': + opts.delim = escape_char(optarg); + if(opts.delim == -1) { + fprintf(stderr, "error: invalid field delimiter -- `%s'\n", optarg); + return 1; + } + break; + case 'h': + return 1; + case 'k': + opts.sortkey = (int)strtol(optarg, NULL, 10); + if(opts.sortkey <= 0) { + fprintf(stderr, "error: invalid sort key -- %s\n", optarg); + return 1; + } + break; + case 'r': + opts.order = -1; + break; + case 'z': + opts.null = 1; + break; + default: + return 1; + } + } + + return 0; +} + +int main(int argc, char *argv[]) +{ + struct list_t *list; + struct buffer_t *buffer; + size_t i; + + /* option defaults */ + opts.order = 1; + opts.delim = DELIM; + opts.sortkey = 0; + opts.null = 0; + + if(parse_options(argc, argv) != 0) { + usage(); + return 2; + } + + list = list_new(100); + buffer = buffer_new(BUFSIZ * 3); + + if(optind == argc) { + if(splitfile(stdin, buffer, list) != 0) { + fprintf(stderr, "%s: memory exhausted\n", argv[0]); + return ENOMEM; + } + } else { + while(optind < argc) { + FILE *input = fopen(argv[optind], "r"); + if(input) { + if(splitfile(input, buffer, list) != 0) { + fprintf(stderr, "%s: memory exhausted\n", argv[0]); + return ENOMEM; + } + fclose(input); + } else { + fprintf(stderr, "%s: %s: %s\n", argv[0], argv[optind], strerror(errno)); + } + optind++; + } + } + + if(list->count) { + const char linedelim = opts.null ? '\0' : '\n'; + qsort(list->list, list->count, sizeof(char *), vercmp); + for(i = 0; i < list->count; i++) { + printf("%s%c", list->list[i], linedelim); + } + list_free(list); + } + + buffer_free(buffer); + + return 0; +} + +/* vim: set ts=2 sw=2 noet: */ -- 1.7.6

1 2

[pacman-dev] [PATCH] doc/PKGBUILD: fix pkgver for -git packages
by Florian Pritz 05 Aug '11

05 Aug '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- doc/PKGBUILD.5.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index d9cf623..69913dd 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -401,8 +401,7 @@ from (e.g., 'makepkg-git', 'mplayer-svn'). The SVN module to fetch. *Git*:: - The generated pkgver will be one formatted by the 'git-describe' - command, with '-' characters converted to '_' characters. + The generated pkgver will be the date the package is built. *_gitroot*;; The URL (all protocols supported) to the GIT repository. -- 1.7.6

1 0

[pacman-dev] portable package sorting for shell scripts
by Dave Reisner 05 Aug '11

05 Aug '11

So it occurs to me that while it's all well and good to have a portable package cache cleaner, it's no good at all if it all hinges on a GNU sort flag (-V) which poorly approximates what vercmp does. Would we have room for sort tool that implements alpm_pkg_vercmp? A simple implementation could be as easy as the below... I think this would get a lot of mileage out of the AUR/pacman wrapper crowd. thoughts? d #include <alpm.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #define MAXLEN 4096 int vercmp(const void *p1, const void *p2) { return alpm_pkg_vercmp(*(const char**)p1, *(const char**)p2); } int main(void) { char **pkglist = NULL; char *pkg; char buf[MAXLEN + 1]; int i, pkgcount = 0; while (fgets(buf, MAXLEN + 1, stdin)) { pkg = strndup(buf, MAXLEN); *(pkg + strlen(pkg) - 1) = '\0'; pkglist = realloc(pkglist, ++pkgcount * sizeof(*pkglist)); *(pkglist + pkgcount - 1) = pkg; } qsort(pkglist, pkgcount, sizeof(char*), vercmp); for (i = 0; i < pkgcount; i++) { printf("%s\n", *(pkglist + i)); free(*(pkglist + i)); } if (pkgcount > 0) { free(pkglist); } return 0; }

2 2

[pacman-dev] makepkg: keep PACMAN_OPTS in environment
by Matthew Farkas-Dyck 04 Aug '11

04 Aug '11

Patch to make makepkg keep PACMAN_OPTS environment variable, thus allowing operation to be better controlled, e.g. by an AUR- or other helper script to build packages on and install packages to a mounted guest filesystem. --- pacman-3.5.3_/scripts/makepkg.sh.in 2011-06-07 10:49:28.000000000 -0500 +++ pacman-3.5.3/scripts/makepkg.sh.in 2011-07-27 09:33:11.413361098 -0500 @@ -80,8 +80,6 @@ # when dealing with svn/cvs/etc PKGBUILDs. FORCE_VER="" -PACMAN_OPTS= - ### SUBROUTINES ### plain() { Cheers, Matthew Farkas-Dyck

3 4

[pacman-dev] [PATCH v2 2/2] Save backup files with extension .pacsave.n
by Pang Yan Han 03 Aug '11

03 Aug '11

Teach pacman to save backup files with extension .pacsave.n, where n is a positive integer. The current backup file shall be saved as <name>.pacsave, while existing .pacsave.n files will be renamed to <name>.pacsave.n+1 Example: 1. You have subversion installed in your local repo. /etc/conf.d/svnserve is a file to be backed up. It contains local modifications 2. You remove subversion from your repo. /etc/conf.d/svnserve is backed up as /etc/conf.d/svnserve.pacsave 2. You install subversion again 3. You edit /etc/conf.d/svnserve 4. You remove subversion. The existing /etc/conf.d/svnserve.pacsave is renamed to /etc/conf.d/svnserve.pacsave.1 and /etc/conf.d/svnserve is backed up as /etc/conf.d/svnserve.pacsave Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/remove.c | 75 ++++++++++++++++++++++++++++++++++++++++ test/pacman/tests/remove012.py | 20 +++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/remove012.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 83c437f..22c4e23 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -28,8 +28,11 @@ #include <errno.h> #include <string.h> #include <limits.h> +#include <dirent.h> +#include <regex.h> #include <unistd.h> #include <sys/stat.h> +#include <sys/types.h> /* libalpm */ #include "remove.h" @@ -218,6 +221,77 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, return 1; } +static void shift_pacsave(alpm_handle_t *handle, const char *file) +{ + DIR *dir = NULL; + struct dirent *ent; + struct stat st; + regex_t reg; + + const char *basename; + char *dirname; + char oldfile[PATH_MAX]; + char newfile[PATH_MAX]; + char regstr[PATH_MAX]; + + unsigned long log_max = 0; + size_t basename_len; + + dirname = _alpm_mdirname(file); + if (!dirname) { + return; + } + + basename = _alpm_mbasename(file); + basename_len = strlen(basename); + + snprintf(regstr, PATH_MAX, "^%s\\.pacsave\\.([[:digit:]]+)$", basename); + if (regcomp(&reg, regstr, REG_EXTENDED | REG_NEWLINE) != 0) { + goto cleanup; + } + + dir = opendir(dirname); + if (dir == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open directory: %s: %s\n"), + dirname, strerror(errno)); + goto cleanup; + } + + while ((ent = readdir(dir)) != NULL) { + if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) { + continue; + } + + if (regexec(&reg, ent->d_name, 0, 0, 0) == 0) { + unsigned long cur_log; + cur_log = strtoul(ent->d_name + basename_len + strlen(".pacsave."), NULL, 10); + if (cur_log > log_max) { + log_max = cur_log; + } + } + } + + /* Shift pacsaves */ + unsigned long i; + for (i = log_max + 1; i > 1; i--) { + snprintf(oldfile, PATH_MAX, "%s.pacsave.%lu", file, i-1); + snprintf(newfile, PATH_MAX, "%s.pacsave.%lu", file, i); + rename(oldfile, newfile); + } + + snprintf(oldfile, PATH_MAX, "%s.pacsave", file); + if (stat(oldfile, &st) == 0) { + snprintf(newfile, PATH_MAX, "%s.1", oldfile); + rename(oldfile, newfile); + } + + regfree(&reg); + +cleanup: + free(dirname); + closedir(dir); +} + /* Helper function for iterating through a package's file and deleting them * Used by _alpm_remove_commit. */ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, @@ -298,6 +372,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, FREE(filehash); if(cmp != 0) { char newpath[PATH_MAX]; + shift_pacsave(handle, file); snprintf(newpath, PATH_MAX, "%s.pacsave", file); rename(file, newpath); _alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath); diff --git a/test/pacman/tests/remove012.py b/test/pacman/tests/remove012.py new file mode 100644 index 0000000..4274487 --- /dev/null +++ b/test/pacman/tests/remove012.py @@ -0,0 +1,20 @@ +self.description = "Remove a package with a modified file marked for backup and has existing pacsaves" + +self.filesystem = ["etc/dummy.conf.pacsave", + "etc/dummy.conf.pacsave.1", + "etc/dummy.conf.pacsave.2"] + +p1 = pmpkg("dummy") +p1.files = ["etc/dummy.conf*"] +p1.backup = ["etc/dummy.conf"] +self.addpkg2db("local", p1) + +self.args = "-R %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_EXIST=etc/dummy.conf") +self.addrule("FILE_PACSAVE=etc/dummy.conf") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.1") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.2") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.3") -- 1.7.6

1 0

[pacman-dev] [PATCH v2 1/2] libalpm: Introduce _alpm_mbasename and _alpm_mdirname
by Pang Yan Han 03 Aug '11

03 Aug '11

_alpm_mbasename and _alpm_mdirname are the same functions as mbasename and mdirname in src/pacman/util.c . Borrow them over to libalpm to prepare for the next patch which teaches pacman to save backup files with .pacsave.n extension. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 2 ++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 123cd24..413e406 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -175,6 +175,48 @@ cleanup: return ret; } +/** Parse the basename of a program from a path. +* @param path path to parse basename from +* +* @return everything following the final '/' +*/ +const char *_alpm_mbasename(const char *path) +{ + const char *last = strrchr(path, '/'); + if(last) { + return last + 1; + } + return path; +} + +/** Parse the dirname of a program from a path. +* The path returned should be freed. +* @param path path to parse dirname from +* +* @return everything preceding the final '/' +*/ +char *_alpm_mdirname(const char *path) +{ + char *ret, *last; + + /* null or empty path */ + if(path == NULL || path == '\0') { + return strdup("."); + } + + ret = strdup(path); + last = strrchr(ret, '/'); + + if(last != NULL) { + /* we found a '/', so terminate our string */ + *last = '\0'; + return ret; + } + /* no slash found */ + free(ret); + return strdup("."); +} + /* Trim whitespace and newlines from a string */ char *_alpm_strtrim(char *str) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 9ee6370..febfef9 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -94,6 +94,8 @@ struct archive_read_buffer { int _alpm_makepath(const char *path); int _alpm_makepath_mode(const char *path, mode_t mode); int _alpm_copyfile(const char *src, const char *dest); +const char *_alpm_mbasename(const char *path); +char *_alpm_mdirname(const char *path); char *_alpm_strtrim(char *str); size_t _alpm_strip_newline(char *str); int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, -- 1.7.6

1 0

[pacman-dev] [PATCH] contrib/paccache: misc cleanup and bugfix
by Dave Reisner 03 Aug '11

03 Aug '11

* add paccache to .gitignore * change error verbiage when run as root * delete sigs along with packages * fix bug in diskspace calculations Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This should cover Allan and Dan's concerns, as well as addressing a silly bug I found in counting diskspace saved. contrib/paccache.in | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/contrib/paccache.in b/contrib/paccache.in index 0bd0cf7..34ca06b 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -110,10 +110,11 @@ pkgfilter() { size_to_human() { awk -v size="$1" ' BEGIN { - suffix[1] = "KiB" - suffix[2] = "MiB" - suffix[3] = "GiB" - suffix[4] = "TiB" + suffix[1] = "B" + suffix[2] = "KiB" + suffix[3] = "MiB" + suffix[4] = "GiB" + suffix[5] = "TiB" count = 1 while (size > 1024) { @@ -142,7 +143,7 @@ runcmd() { } summarize() { - local -i filecount=$# + local -i filecount=$1; shift local seenarch= seen= arch= name= local -r pkg_re='(.+)-[^-]+-[0-9]+-([^.]+)\.pkg.*' @@ -204,7 +205,7 @@ EOF } if (( ! UID )); then - error "Bad dog, no biscuit. You will be prompted for privilege escalation." + error "Do not run this script as root. You will be prompted for privilege escalation." exit 42 fi @@ -277,8 +278,19 @@ if (( ! ${#candidates[*]} )); then exit 1 fi +# grab this prior to signature scavenging +pkgcount=${#candidates[*]} + +# copy the list, merging in any found sigs +for cand in "${candidates[@]}"; do + candtemp+=("$cand") + [[ -f $cand.sig ]] && candtemp+=("$cand.sig") +done +candidates=("${candtemp[@]}") +unset candtemp + # do this before we destroy anything -totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum = $1 } END { print sum }') +totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum += $1 } END { print sum }') # crush. kill. destroy. (( verbose )) && cmdopts+=(-v) @@ -288,4 +300,4 @@ elif (( move )); then runcmd mv "${cmdopts[@]}" "${candidates[@]}" "$movedir" fi -summarize "${candidates[@]}" +summarize "$pkgcount" "${candidates[@]}" -- 1.7.6

2 3

[pacman-dev] [PATCH] cachemoney: add new contrib script
by Dave Reisner 02 Aug '11

02 Aug '11

cachemoney is a robust and flexible package cache cleaner with a variety of options. Much credit goes to DJ Mills and Pat Brisbin for the ideas behind this script. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This sort of functionality has been in a few feature requests, and there exist a number of tools that already provide this, but none flexible enough (or portable enough) to be to my liking. This is all bash3 compat with awk, tested on gawk 3.1.8, gawk 4.0.0, bwk (the one true), mawk, and busybox awk (which fscking _sucks_) to do the heavy lifting (rather than bash4). It ends up being insanely fast, with the drawback being that its dependent on the format of the filename to find and consider packages for deletion. In other words, a valid package tarball that isn't compliant with the extglob *.pkg.tar?(.+([^.])) isn't going to be considered. I'm a fan of the name, but I'm also happy to hear alternatives. contrib/Makefile.am | 4 + contrib/cachemoney.in | 294 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 298 insertions(+), 0 deletions(-) create mode 100755 contrib/cachemoney.in diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 69304a4..301de41 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,5 +1,6 @@ OURSCRIPTS = \ bacman \ + cachemoney \ pacdiff \ paclist \ paclog-pkglist \ @@ -14,6 +15,7 @@ EXTRA_DIST = \ PKGBUILD.vim \ bacman.in \ bash_completion.in \ + cachemoney.in \ paclog-pkglist.in \ pacdiff.in \ paclist.in \ @@ -29,6 +31,7 @@ MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' $(OURSCRIPTS): Makefile @@ -50,6 +53,7 @@ all-am: $(OURSCRIPTS) $(OURFILES) bacman: $(srcdir)/bacman.in bash_completion: $(srcdir)/bash_completion.in +cachemoney: $(srcdir)/cachemoney.in pacdiff: $(srcdir)/pacdiff.in paclist: $(srcdir)/paclist.in paclog-pkglist: $(srcdir)/paclog-pkglist.in diff --git a/contrib/cachemoney.in b/contrib/cachemoney.in new file mode 100755 index 0000000..794ae45 --- /dev/null +++ b/contrib/cachemoney.in @@ -0,0 +1,294 @@ +#!/bin/bash +# +# cachemoney - clean yo pacman cache, dawg +# +# Copyright (C) 2011 Dave Reisner <dreisner(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/>. + + +shopt -s extglob + +declare -a candidates=() cmdopts=() whitelist=() blacklist=() +declare -i delete=0 diskspace=0 dryrun=0 filecount=0 keep=3 move=0 totalsaved=0 +declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' movedir= scanarch= + +msg() { + local mesg=$1; shift + printf "==> $mesg\n" "$@" +} >&2 + +error() { + local mesg=$1; shift + printf "==> ERROR: $mesg\n" "$@" +} >&2 + +die() { + error "$@" + exit 1 +} + +# reads a list of files on stdin and prints out deletion candidates +pkgfilter() { + # there's whitelist and blacklist parameters passed to this + # script after the block of awk. + + awk -v keep="$1" -v scanarch="$2" ' + function parse_filename(filename, parts, count, i, pkgname, arch) { + + count = split(filename, parts, "-") + + i = 1 + pkgname = parts[i++] + while (i <= count - 3) { + pkgname = pkgname "-" parts[i++] + } + + arch = substr(parts[count], 1, index(parts[count], ".") - 1) + + # filter on whitelist or blacklist + if (wlen && !whitelist[pkgname]) return + if (blen && blacklist[pkgname]) return + + if ("" == packages[pkgname,arch]) { + packages[pkgname,arch] = filename + } else { + packages[pkgname,arch] = packages[pkgname,arch] SUBSEP filename + } + } + + BEGIN { + # create whitelist + wlen = ARGV[1]; delete ARGV[1] + for (i = 2; i < 2 + wlen; i++) { + whitelist[ARGV[i]] = 1 + delete ARGV[i] + } + + # create blacklist + blen = ARGV[i]; delete ARGV[i] + while (i++ < ARGC) { + blacklist[ARGV[i]] = 1 + delete ARGV[i] + } + + # read package filenames + while (getline < "/dev/stdin") { + parse_filename($0) + } + } + + END { + for (pkglist in packages) { + # idx[1,2] = idx[pkgname,arch] + split(pkglist, idx, SUBSEP) + + # enforce architecture match if specified + if (!scanarch || scanarch == idx[2]) { + count = split(packages[idx[1], idx[2]], pkgs, SUBSEP) + if (count > keep) { + for(i = 1; i <= count - keep; i++) { + print pkgs[i] + } + } + } + } + }' "${@:3}" +} + +size_to_human() { + awk -v size="$1" ' + BEGIN { + suffix[1] = "KiB" + suffix[2] = "MiB" + suffix[3] = "GiB" + suffix[4] = "TiB" + count = 1 + + while (size > 1024) { + size /= 1024 + count++ + } + + sizestr = sprintf("%.2f", size) + sub(/.?0+$/, "", sizestr) + printf("%s %s", sizestr, suffix[count]) + }' +} + +runcmd() { + if (( needsroot )); then + msg "Privilege escalation required" + if sudo -v &>/dev/null && sudo -l &>/dev/null; then + sudo "$@" + else + printf '%s ' 'root' + su -c "$(printf '%q ' "$@")" + fi + else + "$@" + fi +} + +summarize() { + local -i filecount=$# + local seenarch= seen= arch= name= + local -r pkg_re='(.+)-[^-]+-[0-9]+-([^.]+)\.pkg.*' + + if (( delete )); then + printf -v output 'finished: %d packages removed' "$filecount" + elif (( move )); then + printf -v output "finished: %d packages moved to \`%s'" "$filecount" "$movedir" + elif (( dryrun )); then + if (( verbose )); then + msg "Candidate packages:" + while read -r pkg; do + if (( verbose >= 3 )); then + [[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]} + if [[ -z $seen || $seenarch != $arch || $seen != $name ]]; then + printf '%s (%s):\n' "$name" "$arch" + fi + printf ' %s\n' "$pkg" + elif (( verbose >= 2 )); then + printf "$PWD/%s$delim" "$pkg" + else + printf "%s$delim" "$pkg" + fi + done < <(printf '%s\n' "$@" | sort -V) + printf '\n' >&2 + fi + + printf -v output 'finished dry run: %d candidates' "$filecount" + fi + + if (( diskspace )); then + output+=" (diskspace saved: $(size_to_human "$totalsaved"))" + fi + + msg "$output" +} +usage() { + cat <<EOF +usage: ${0##*/} <operation> [options] [targets...] + + Operations: + -d perform a dry run, only finding candidate packages. + -m <movedir> move candidate packages to 'movedir'. + -r remove candidate packages. + + Options: + -a <arch> scan for 'arch' (default: all architectures). + -c <cachedir> scan 'cachedir' for packages (default: @localstatedir@/cache/pacman/pkg). + -f apply force to mv(1) and rm(1) operations. + -h display this help message. + -i <pkgs> ignore 'pkgs', which is a comma separated. Alternatively, + specify '-' to read package names from stdin, newline delimited. + -k <num> keep 'num' of each package in 'cachedir' (default: 3). + -s show diskspace saved by the operation. + -u target uninstalled packages. + -v increase verbosity. specify up to 3 times. + -z use null delimiters for candidate names (only with -v and -vv) + +EOF +} + +if (( ! UID )); then + error "Bad dog, no biscuit. You will be prompted for privilege escalation." + exit 42 +fi + +while getopts ':a:c:dfhi:k:m:rsuvz' opt; do + case $opt in + a) scanarch=$OPTARG ;; + c) cachedir=$OPTARG ;; + d) dryrun=1 ;; + f) cmdopts=(-f) ;; + h) usage + exit 0 ;; + i) if [[ $OPTARG = '-' ]]; then + [[ ! -t 0 ]] && IFS=$'\n' read -r -d '' -a ign + else + IFS=',' read -r -a ign <<< "$OPTARG" + fi + blacklist+=("${ign[@]}") + unset i ign ;; + k) keep=$OPTARG + if [[ $keep != $OPTARG ]] || (( keep < 0 )); then + die 'argument to option -k must be a non-negative integer' + fi ;; + m) move=1 movedir=$OPTARG ;; + r) delete=1 ;; + s) diskspace=1 ;; + u) IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq) + blacklist+=("${ign[@]}") + unset ign ;; + v) (( ++verbose )) ;; + z) delim='\0' ;; + :) die "option '--%s' requires an argument" "$OPTARG" ;; + ?) die "invalid option -- '%s'" "$OPTARG" ;; + esac +done +shift $(( OPTIND - 1 )) + +# remaining args are a whitelist +whitelist=("$@") + +# sanity checks +case $(( dryrun+delete+move )) in + 0) die "no operation specified (use -h for help)" ;; + [^1]) die "only one operation may be used at a time" ;; +esac + +[[ -d $cachedir ]] || + die "cachedir \`%s' does not exist or is not a directory" "$cachedir" + +[[ $movedir && ! -d $movedir ]] && + die "move-to directory \`%s' does not exist or is not a directory" "$movedir" + +if (( move || delete )); then + # make it an absolute path since we're about to chdir + [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir + [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 +fi + +# unlikely that this will fail, but better make sure +cd "$cachedir" || die "failed to chdir to \`%s'" "$cachedir" + +# note that these results are returned in an arbitrary order from awk, but +# they'll be resorted (in summarize) iff we have a verbosity level set. +IFS=$'\n' read -r -d '' -a candidates < \ + <(printf '%s\n' *.pkg.tar?(.+([^.])) | sort -V | + pkgfilter "$keep" "$scanarch" \ + "${#whitelist[*]}" "${whitelist[@]}" \ + "${#blacklist[*]}" "${blacklist[@]}") + +if (( ! ${#candidates[*]} )); then + msg 'no candidate packages found for pruning' + exit 1 +fi + +# do this before we destroy anything +if (( diskspace )); then + totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum = $1 } END { print sum }') +fi + +# crush. kill. destroy. +(( verbose )) && cmdopts+=(-v) +if (( delete )); then + runcmd rm "${cmdopts[@]}" "${candidates[@]}" +elif (( move )); then + runcmd mv "${cmdopts[@]}" "${candidates[@]}" "$movedir" +fi + +summarize "${candidates[@]}" -- 1.7.6

4 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-531-gf10aea7
by dan＠archlinux.org 02 Aug '11

02 Aug '11

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 f10aea73e462f05d31de7b55667f58300fb89fa2 (commit) via b03b06cfd3afc95c328a166cfb8305a3df97819e (commit) via 6997a738bbca209cc6a8a29cdb71830bfb912f18 (commit) via c55cbfbd5f3659ee5c105bbdb932cdb7afab5f2a (commit) via cbaff216b3eca57b4fd717da53f43a6713722e95 (commit) via 573260556db49c62f5cf751f53812b7e06c1decb (commit) via 66d99957114e98ce41052fcd33200d8fbfbd9f26 (commit) via aecd0740cfa8f547b0e65e0ab7535c35a2b80beb (commit) via a3def7ac8745799e833b93f33954a02fd7efd83b (commit) via dffff9659be91d6f31c9e4cea1d9de06b00d5d6c (commit) via e42d97b7370c9e30d9ae66a33f42d27460eaf137 (commit) via e99b6a131ea08829da26d62d498c33f3129683e3 (commit) via cd8747ba6d6b4068331c921ee65260424c6d9699 (commit) from 804e2505cf4474791537a9f0ae8e9b6c274cb0c2 (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 f10aea73e462f05d31de7b55667f58300fb89fa2 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 21 17:14:32 2011 -0500 docs/pacman.conf: Document SigLevel option This adds docs for SigLevel, which can exist in both [options] and [repository] sections. It also does a bit of reworking of the structure of this manpage and adds a labeled list under the repo sections where we didn't have one before. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b03b06cfd3afc95c328a166cfb8305a3df97819e Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 22 10:48:13 2011 -0500 Implement parsing of the new SigLevel directive Add code to conf.c that parses the new SigLevel directive. An overwhelming number of options are presented, but most users will still be fine with the Never/Optional/Required trio. More advanced users can combine these or any of the other options on a 'SigLevel = ' line, which is parsed in a left-to-right fashion and flags turned on and off accordingly. For example, all three of these will net the same config: SigLevel = Required PackageOptional SigLevel = Optional DatabaseRequired SigLevel = DatabaseRequired PackageOptional Additionally, database-specific lines assume you wish to start with any global default that has been set. For example, if any of the above lines were in the [options] section, something such as: SigLevel = PackageRequired PackageAllowMarginal Would continue to enforce required database signatures. Inspiration-by: Kerrick Staley <mail(a)kerrickstaley.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6997a738bbca209cc6a8a29cdb71830bfb912f18 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 27 14:36:27 2011 -0400 paccache: add new contrib script paccache is a robust and flexible package cache cleaner with a variety of options. Much credit goes to DJ Mills and Pat Brisbin for ideas behind this script. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> [Dan: add .gitignore entry] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c55cbfbd5f3659ee5c105bbdb932cdb7afab5f2a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 30 12:24:46 2011 +1000 pacman-key: follow gpg options for listing keys The current --list option outputed the keys and all their signatures which can be overly verbose. It also did not take a list of keys on the command line to limit its output (although the code suggests that was intended). That patch brings consistency with gpg, providing --list-keys and --list-sigs options that function equivalently to those provided by gpg. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cbaff216b3eca57b4fd717da53f43a6713722e95 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 29 18:49:38 2011 -0500 Don't trim whitespace when reading database entries We don't write with extra or unknown whitespace, so there is little reason for us to trim it when reading either. This also fixes the hopefully never encountered "paths that start or end with spaces" issue, for which two pactests have been added. The tests also contain other evil characters that we have encountered before and handle just fine, but it doesn't hurt to ensure we don't break such support in the future. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 573260556db49c62f5cf751f53812b7e06c1decb Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 29 18:49:37 2011 -0500 pactest: use subprocess module instead of os.system This is more in line with standard Python practice, and makes keyboard interrupts behave a lot more sanely. It also prevents the useless spawning of a shell as well as simplifies the command building and working directory stuff. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 66d99957114e98ce41052fcd33200d8fbfbd9f26 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 22 10:48:13 2011 -0500 Revamp signing checks This ensures we are actually making correct use of the information gpgme is returning to us. Marginal being allowed was obvious before, but Unknown should deal with trust level, and not the presence or lack thereof of a public key to validate the signature with. Return status and validity information in two separate values so check methods and the frontend can use them independently. For now, we treat expired keys as valid, while expired signatures are invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aecd0740cfa8f547b0e65e0ab7535c35a2b80beb Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 8 14:44:58 2011 -0500 Tidy up testdb to match coding styles Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a3def7ac8745799e833b93f33954a02fd7efd83b Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 6 13:40:03 2011 -0500 Make free_groupcache() private Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dffff9659be91d6f31c9e4cea1d9de06b00d5d6c Merge: cd8747b e42d97b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 28 12:48:38 2011 -0500 Merge remote-tracking branch 'dave/scripts-fixup' commit e42d97b7370c9e30d9ae66a33f42d27460eaf137 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 28 13:08:37 2011 -0400 scripts/pkgdelta: exit properly on missing args Removes usage of 'nounset' which, when combined with 'errexit' can cause undesirable early exits. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e99b6a131ea08829da26d62d498c33f3129683e3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 28 13:07:25 2011 -0400 scripts/repo-add: show usage when no DB file specified Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit cd8747ba6d6b4068331c921ee65260424c6d9699 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 11:06:34 2011 -0500 Unify modelines in Asciidoc files This gets us close to using the same modeline in all files we run through Asciidoc, as well as adding the spell and spelllang declarations, just as we had in NEWS already. The choice of 'en_us' is mainly for consistency and because the body of work already uses these spellings. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 2 +- contrib/.gitignore | 1 + contrib/Makefile.am | 4 + contrib/paccache.in | 291 ++++++++++++++++++++++++++++++++++++++++ doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 2 +- doc/index.txt | 10 +- doc/libalpm.3.txt | 2 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- doc/pacman-key.8.txt | 9 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 94 ++++++++++++-- doc/pkgdelta.8.txt | 2 +- doc/repo-add.8.txt | 2 +- doc/submitting-patches.txt | 6 +- doc/translation-help.txt | 34 +++--- doc/vercmp.8.txt | 2 +- lib/libalpm/alpm.h | 22 +++- lib/libalpm/be_local.c | 12 +- lib/libalpm/be_package.c | 7 +- lib/libalpm/be_sync.c | 12 +- lib/libalpm/db.c | 46 +++--- lib/libalpm/db.h | 2 - lib/libalpm/signing.c | 122 +++++++++++------ lib/libalpm/util.c | 20 +++ lib/libalpm/util.h | 1 + scripts/pacman-key.sh.in | 21 ++- scripts/pkgdelta.sh.in | 3 +- scripts/repo-add.sh.in | 6 +- src/pacman/conf.c | 136 ++++++++++++++----- src/pacman/util.c | 42 +++++-- src/util/testdb.c | 12 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 46 +++--- test/pacman/tests/remove071.py | 33 +++++ test/pacman/tests/sync600.py | 51 +++++++ test/pacman/util.py | 2 +- 38 files changed, 850 insertions(+), 217 deletions(-) create mode 100755 contrib/paccache.in create mode 100644 test/pacman/tests/remove071.py create mode 100644 test/pacman/tests/sync600.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Save backup files with extension .pacsave.timestamp
by Pang Yan Han 02 Aug '11

02 Aug '11

Teach pacman to save backup files using extension of .pacsave.timestamp "timestamp" is the time of removal of the backup file. It is in <year>-<month>-<day>-<HHMMSS> format, where: - year is either the year with century or a 2 digit number from 00 to 99 (year without century) if the timestamp string exceeds 20 characters - month is a 2 digit number from 01 to 12 - day is a 2 digit number from 01 to 31 - HH is a 2 digit number from 00 to 23 representing the hour - MM and SS are 2 digit numbers from 00 to 59 representing minutes and seconds respectively An example of such a pacsave file is /etc/pacman.conf.pacsave.2011-07-29-145035 This addresses FS#24192 (pacman overwrites .pacsave files) FILE_PACSAVE rule for the test suite is updated to reflect the change in .pacsave file extension. FILE_PACSAVE rules can be used as per before this patch. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- doc/pacman.8.txt | 13 ++++++++++++- lib/libalpm/remove.c | 20 ++++++++++++++++++-- test/pacman/pmrule.py | 21 +++++++++++++++++++-- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 64b1ff3..d029294 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -54,8 +54,19 @@ Operations removed, in which case every package in that group will be removed. Files belonging to the specified package will be deleted, and the database will be updated. Most configuration files will be saved - with a '.pacsave' extension unless the '\--nosave' option is used. + with a '.pacsave-<timestamp>' extension unless the '\--nosave' option is used. See <<RO,Remove Options>> below. ++ +'<timestamp>' is the time of removal of the configuration file. It is in +<year>-<month>-<day>-<HHMMSS> format, where: ++ + - year is either the year with century or a 2 digit number from 00 to 99 + (year without century) if the string exceeds 20 characters + - month is a 2 digit number from 01 to 12 + - day is a 2 digit number from 01 to 31 + - HH is a 2 digit number from 00 to 23 representing the hour + - MM and SS are 2 digit numbers from 00 to 59 representing minutes and seconds + respectively *-S, \--sync*:: Synchronize packages. Packages are installed directly from the ftp diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 83c437f..a39a154 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -27,6 +27,7 @@ #include <stdlib.h> #include <errno.h> #include <string.h> +#include <time.h> #include <limits.h> #include <unistd.h> #include <sys/stat.h> @@ -287,7 +288,8 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, } } } else { - /* if the file needs backup and has been modified, back it up to .pacsave */ + /* if the file needs backup and has been modified, back it up to + * .pacsave.YYYY-MM-DD-HHMMSS */ alpm_backup_t *backup = _alpm_needbackup(fileobj->name, info); if(backup) { if(nosave) { @@ -298,7 +300,21 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, FREE(filehash); if(cmp != 0) { char newpath[PATH_MAX]; - snprintf(newpath, PATH_MAX, "%s.pacsave", file); + char timestr[21]; + time_t curtime; + struct tm tm; + size_t ret; + + curtime = time(NULL); + localtime_r(&curtime, &tm); + ret = strftime(timestr, 21, "%Y-%m-%d-%H%M%S", &tm); + if (ret == 0) { + /* Year with century can't fit. + * So we print year without century (00 to 99) */ + strftime(timestr, 21, "%y-%m-%d-%H%M%S", &tm); + } + + snprintf(newpath, PATH_MAX, "%s.pacsave.%s", file, timestr); rename(file, newpath); _alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath); alpm_logaction(handle, "warning: %s saved as %s\n", file, newpath); diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index cb7ae88..44cee8a 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -17,6 +17,7 @@ import os import stat +import re import util @@ -141,8 +142,24 @@ def check(self, test): if not os.path.isfile("%s.pacorig" % filename): success = 0 elif case == "PACSAVE": - if not os.path.isfile("%s.pacsave" % filename): - success = 0 + # pacsave.YYYY-MM-DD-HHMMSS + saved_re = re.compile(filename + ".pacsave." + "\d{2,}-\d{2}-\d{2}-\d{6}") + + # Extract directory component of pacsave file + dir_ = "" + dir_re = re.compile('(.*)/[^/]*') + dir_match = dir_re.match(filename) + if dir_match is not None: + dir_ = dir_match.group(1) + dir_ = os.path.join(test.root, dir_) + + success = 0 + files = os.listdir(dir_) + for f in files: + fullname = os.path.join(dir_, f) + if saved_re.match(fullname): + success = 1 + break else: print "FILE rule '%s' not found" % case success = -1 -- 1.7.6.178.g55272

2 1

[pacman-dev] [PATCH v3 0/8] Patches for better optdep support
by Benedikt Morbach 02 Aug '11

02 Aug '11

I'm flooding your inbox one last time (for the next two weeks), so you can all bitch about how crappy my patches are while I'm away ;-) This implements most features from https://wiki.archlinux.org/index.php/User:Allan/Pacman_OptDepends (I've added some things regarding package removal there) I'v also added this here: https://wiki.archlinux.org/index.php/Pacman_Roadmap Github link: https://github.com/moben/pacman/tree/optdep What is there: - No regressions afaics - Only show uninstalled optdepends during install/upgrade - In package info, show [installed] after installed optdepends - In package info (local or -ii) show packages which optionally depend on the queried package - '-Qt' doesn't consider optdepends to be orphans, unless '--nooptdeps/-n' is given if it is given, display them like this: 'sqlite3 3.7.7.1-1 (optdepend for: dbmail, python)' - Recursive removal of unneeded optdeps What is still missing: - In package info display the description alongside the "reverse optdeps" [1] - Cascading to optdepends on package removal with an optional flag [2] - Warn when removing optdepends for installed packages [3] - Anything listed under "Other Ideas" - Tests (mainly needed for the package removal stuff I think) - Docs with less sucky english ;-) [1] Not sure if this would be to much and clutter the whole thing, especially for sync repos [2] Maybe '--optdeps/-o' (Related: make 'pacman -So foobar' install all optdepends) [3] like ':: foo: requires bar', but nonfatal Suggestions on how to implement [3]? I've looked at how it works for normal requires by getting ALPM_ERR_UNSATISFIED_DEPS from libalpm, but we don't want to raise an error here, so what to do? I'm still not sure about http://mailman.archlinux.org/pipermail/pacman-dev/2011-July/013886.html It sounds like a good idea, but would also mean changing (some|many|most|all) dep allocating functions from alpm_depend_t *func(foo) to int func(foo, alpm_depend_t *WriteThis) and make them not allocate the alpm_depend_t themselves. An alternative would be to create a new set of functions and make the current ones thin wrappers around those, so most code can stay as simple as it is now and use the allocated object. Comments? --- Benedikt Benedikt Morbach (8): Split optdep into alpm_depend_t and description Hook new optdepend structures up Only display uninstalled optdepends during install/upgrade Show optdep install status in package info optdepends are not orphans unless --nooptdepends is specified Make package info show optional requirements Make recursive removal consider optdepends Show list of optrequires with -Qtdn doc/pacman.8.txt | 6 ++ lib/libalpm/alpm.h | 14 +++++- lib/libalpm/be_local.c | 11 ++++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 7 ++- lib/libalpm/deps.c | 86 ++++++++++++++++++++++++++++++++- lib/libalpm/deps.h | 3 + lib/libalpm/package.c | 40 +++++++++++----- src/pacman/conf.h | 1 + src/pacman/package.c | 13 ++++- src/pacman/pacman.c | 3 + src/pacman/query.c | 27 +++++++++-- src/pacman/util.c | 120 +++++++++++++++++++++++++++++++++++++++------- src/pacman/util.h | 2 + src/util/pactree.c | 2 +- 15 files changed, 296 insertions(+), 44 deletions(-) -- 1.7.6

2 9

[pacman-dev] [PATCH v2 0/6] Patches for better optdep support
by Benedikt Morbach 31 Jul '11

31 Jul '11

Resend, as I've incorporated Dan's suggestions from last time. The feature set is still the same, but I've thought about how removal of optdepends should work. See https://wiki.archlinux.org/index.php/User:Moben/Pacman_OptDepends This implements most features from https://wiki.archlinux.org/index.php/User:Allan/Pacman_OptDepends What is there: - No regressions afaics - Only show uninstalled optdepends during install/upgrade - In package info, show [installed] after installed optdepends - In package info (local or -ii) show packages which optionally depend on the queried package - '-Qt' doesn't consider optdepends to be orphans, unless '--nooptdeps/-n' is given What is still missing: - Show which of the packages listed by '-Qtn' is an optdepend and what optdeps on it - In package info display the description alongside the "reverse optdeps" - Recursive removal of unneeded optdeps - Anything listed under "Other Ideas" - Tests (mainly needed for the package removal stuff I think) - Docs with less sucky english ;-) --- Benedikt PS: I'll start working on the rest soon, but that might be delayed due to me going on vacation in the first two weeks of August ;-) Benedikt Morbach (6): Split optdep into alpm_depend_t and description Hook new optdepend structures up Only display uninstalled optdepends during install/upgrade Show optdep install status in package info optdepends are not orphans unless --nooptdepends is specified Make package info show optional requirements doc/pacman.8.txt | 6 +++ lib/libalpm/alpm.h | 14 ++++++- lib/libalpm/be_local.c | 11 ++++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 7 +++- lib/libalpm/deps.c | 68 +++++++++++++++++++++++++++++++ lib/libalpm/deps.h | 3 + lib/libalpm/package.c | 39 ++++++++++++------ src/pacman/conf.h | 1 + src/pacman/package.c | 13 +++++- src/pacman/pacman.c | 3 + src/pacman/query.c | 16 ++++++- src/pacman/util.c | 99 ++++++++++++++++++++++++++++++++++++++++------ src/pacman/util.h | 1 + src/util/pactree.c | 2 +- 15 files changed, 251 insertions(+), 37 deletions(-) -- 1.7.6

2 9

[pacman-dev] SigLevel options redux
by Dan McGee 31 Jul '11

31 Jul '11

So this is a bit messy. My last patch gets us close to what we need, but turns out, I didn't fully understand what the ramifications of my options were in the last patch here: http://mailman.archlinux.org/pipermail/pacman-dev/2011-July/013856.html * The Package/Database/(implicit all) stuff is fine. * The optional/required stuff is fine (for the most part). * Not so great is the marginal and unknown OK stuff. Basically, there are three facets to every signature that we can examine. * Validity: Is this signature signing the data it says it is? This is basically three-valued- good, bad, or unknown. In GPGME, the unknown case comes up if we don't have a copy of the public key in our keyring, for instance. * Trust: Do we trust this key? Note that this is very different than the above "is this signature valid" question. This brings in the whole web of trust business, the blackhole discussions regarding CACert, signing each other's keys, etc. * "Timeliness" (not sure what to call it): aka is this signature expired, key expired, or key revoked. So the important fact that my prior implementation did not handle above was the missing public key. I'm thinking we should not allow for this case, and attempt to tell the user to import the key (or prompt them to do so, or something). Regarding "Optional" signature level, if we find a sig, we should not proceed if we cannot verify. As far as options go, here is what is likely worth providing: * Validity- nothing. The signature has to be good if it exists, nothing else is valid. * Trust- nix what we had before. I think just one coarse-grained option would be good here, and that is 'AlwaysTrustworthy' (naming suggestions welcome if that isn't clear, came from gpgv man page). This would replace the AllowMarginal/AllowUnknown options and basically cover the bases of both. With this option, we will trust every key *except* those marked "never trust"; without it the web of trust will kick in and the key will need to have a certain level of trust that way. This basically replicates what the stripped-down gpgv does. * Timeliness- I'm not totally sure what to do here. Maybe we shouldn't even worry about this yet, and go with reasonably sane defaults: - expired signature: don't allow. Since sigs have infinite lifetime by default, there is probably a good reason to not allow one that has gone sour. - expired key: allow it (as long as the above expired sig case doesn't apply too). Many keys are created with expiration dates, but this doesn't make valid signatures created with them immediately invalid. - revoked key: obviously don't allow it. Thoughts? I'm just going to go ahead with this scheme unless I hear vastly different ideas on this. -Dan

2 1

[pacman-dev] [PATCH] pacman-key: follow gpg options for listing keys
by Allan McRae 31 Jul '11

31 Jul '11

The current --list option outputed the keys and all their signatures which can be overly verbose. It also did not take a list of keys on the command line to limit its output (although the code suggests that was intended). That patch brings consistency with gpg, providing --list-keys and --list-sigs options that function equivalently to those provided by gpg. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman-key.8.txt | 7 +++++-- scripts/pacman-key.sh.in | 21 +++++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 14f3cb9..8adce8c 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -71,8 +71,11 @@ Options Ensure the keyring is properly initialized and has the required access permissions. -*-l, \--list*:: - Equivalent to --list-sigs from GnuPG. +*-l, \--list-keys* [keyid(s)]:: + Lists all or specified keys from the public keyring. + +*--list-sigs* [keyid(s)]:: + Same as --list-keys, but the signatures are listed too. *-r, \--receive* <keyserver> <keyid(s)>:: Fetch the specified keyids from the specified key server URL. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index e6a4691..1fc1ab5 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -35,7 +35,8 @@ FINGER=0 IMPORT=0 IMPORT_TRUSTDB=0 INIT=0 -LIST=0 +LISTKEYS=0 +LISTSIGS=0 RECEIVE=0 RELOAD=0 UPDATEDB=0 @@ -58,7 +59,7 @@ usage() { echo "$(gettext " -e, --export [<keyid(s)>] Export the specified or all keyids")" echo "$(gettext " -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids")" echo "$(gettext " -h, --help Show this help message and exit")" - echo "$(gettext " -l, --list List keys")" + echo "$(gettext " -l, --list-keys [<keyid(s)>] List the specified or all keys")" echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" echo "$(gettext " -v, --verify <signature> Verify the file specified by the signature")" @@ -71,6 +72,7 @@ usage() { echo "$(gettext " --import <dir(s)> Imports pubring.gpg and trustdb.gpg from dir(s)")" echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" + echo "$(gettext " --list-sigs [<keyid(s)>] List keys and their signatures")" echo "$(gettext " --reload Reload the default keys")" } @@ -317,10 +319,10 @@ if ! type gettext &>/dev/null; then } fi -OPT_SHORT="a::d:e:f::hlr:uv:V" +OPT_SHORT="a::d:e:f::hl::r:uv:V" OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" -OPT_LONG+=",help,import:,import-trustdb:,init,list,receive:,reload,updatedb" -OPT_LONG+=",verify:,version" +OPT_LONG+=",help,import:,import-trustdb:,init,list-keys::,list-sigs::,,receive:" +OPT_LONG+=",reload,updatedb,verify:,version" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; fi @@ -344,7 +346,8 @@ while true; do --import) IMPORT=1; shift; IMPORT_DIRS=($1) ;; --import-trustdb) IMPORT_TRUSTDB=1; shift; IMPORT_DIRS=($1) ;; --init) INIT=1 ;; - -l|--list) LIST=1 ;; + -l|--list-keys) LISTKEYS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; + --list-sigs) LISTSIGS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; -r|--receive) RECEIVE=1; shift; TMP=($1); KEYSERVER=${TMP[0]}; KEYIDS=(${TMP[@]:1}); unset TMP;; --reload) RELOAD=1 ;; -u|--updatedb) UPDATEDB=1 ;; @@ -383,7 +386,8 @@ PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" || echo " GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) # check only a single operation has been given -numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + IMPORT + IMPORT_TRUSTDB + INIT + LIST + RECEIVE + RELOAD + UPDATEDB + VERIFY )) +numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + IMPORT + IMPORT_TRUSTDB + + INIT + LISTKEYS + LISTSIGS + RECEIVE + RELOAD + UPDATEDB + VERIFY )) case $numopt in 0) @@ -407,7 +411,8 @@ esac (( IMPORT )) && import (( IMPORT_TRUSTDB)) && import_trustdb (( INIT )) && initialize -(( LIST )) && "${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}" +(( LISTKEYS )) && "${GPG_PACMAN[@]}" --batch --list-keys "${KEYIDS[@]}" +(( LISTSIGS )) && "${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}" (( RECEIVE )) && receive_keys (( RELOAD )) && reload_keyring (( UPDATEDB )) && "${GPG_PACMAN[@]}" --batch --check-trustdb -- 1.7.6

1 0

[pacman-dev] pyalpm/pycman -- how to check if a package is installed?
by Kwpolska 30 Jul '11

30 Jul '11

Hi, I'd like to use pyalpm and pycman in my project. I need to get the database. Unfortunately, when I run the code, I get an exception saying "data is not initialized". How to fix that? Code (a segment) (imported: pyalpm pacman AUR argparse): db = pyalpm.get_localdb() pargs = db.get_pkg(dep) oargs = argparse.Namespace(package=False, quiet=False, info=0, listfiles=0) localInstalled = pycman.action_query.display_pkg(pargs, oargs) pyalpm.release() -- -- Kwpolska (http://kwpolska.co.cc) stop html mail | always bottom-post www.asciiribbon.org | www.netmeister.org/news/learn2quote.html GPG KEY: 5EAAEA16 | Arch Linux x86_64, zsh, mutt, vim. # vim:set textwidth=70:

2 1

[pacman-dev] [PATCH 1/2] Combine add and removal package list display
by Dan McGee 30 Jul '11

30 Jul '11

There was no real reason for these to be done separately. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- A bit of WIP here. Try it out to see what it does, but it addresses Allan's issue with upgrade size being all whacky when replaces are involved, among other things. http://paste.pocoo.org/show/444372/ for some example output with VerbosePkgLists on, http://paste.pocoo.org/show/444368/ with them off. Not sure what to do with the corny '[removal]' tag bit though. Notes: * The size column is now net changed size per package, so only new packages or totally removed packages will usually have big values (wireshark-cli is buggy in the package itself, as noticed by Dave and I). * Packages are now always sorted in alpha order, rather than the half-sorted, dep resolved mess we had before. * -R ops will show the same format as -U, even though the new version column will now always be blank. I think the consistency win is worth it. They will also always show the '[removal]' tag bit, so suggestions for that are welcome. * Yes, you get 4 different totals now on -S operations, but since the damn package list is so long anyway, who cares. Feedback/thoughts definitely welcome. I'll improve the commit message too before any final version goes live. -Dan src/pacman/remove.c | 2 +- src/pacman/sync.c | 3 +- src/pacman/upgrade.c | 3 +- src/pacman/util.c | 163 +++++++++++++++++++++++++++++++------------------ src/pacman/util.h | 7 ++- 5 files changed, 112 insertions(+), 66 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index f0ac04e..95a728e 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -156,7 +156,7 @@ int pacman_remove(alpm_list_t *targets) } /* print targets and ask user confirmation */ - display_targets(pkglist, 0); + display_targets(); printf("\n"); if(yesno(_("Do you want to remove these packages?")) == 0) { retval = 1; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 5e1643e..0facd6c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -795,8 +795,7 @@ static int sync_trans(alpm_list_t *targets) goto cleanup; } - display_targets(alpm_trans_get_remove(config->handle), 0); - display_targets(alpm_trans_get_add(config->handle), 1); + display_targets(); printf("\n"); int confirm; diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index a99b137..55b5fa9 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -152,8 +152,7 @@ int pacman_upgrade(alpm_list_t *targets) trans_release(); return retval; } - display_targets(alpm_trans_get_remove(config->handle), 0); - display_targets(alpm_trans_get_add(config->handle), 1); + display_targets(); printf("\n"); int confirm = yesno(_("Proceed with installation?")); if(!confirm) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 7065abd..a300f14 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -711,7 +711,7 @@ void signature_display(const char *title, alpm_sigresult_t *result) } /* creates a header row for use with table_display */ -static alpm_list_t *create_verbose_header(int install) +static alpm_list_t *create_verbose_header(void) { alpm_list_t *res = NULL; char *str; @@ -720,10 +720,8 @@ static alpm_list_t *create_verbose_header(int install) res = alpm_list_add(res, str); pm_asprintf(&str, "%s", _("Old Version")); res = alpm_list_add(res, str); - if(install) { - pm_asprintf(&str, "%s", _("New Version")); - res = alpm_list_add(res, str); - } + pm_asprintf(&str, "%s", _("New Version")); + res = alpm_list_add(res, str); pm_asprintf(&str, "%s", _("Size")); res = alpm_list_add(res, str); @@ -731,125 +729,170 @@ static alpm_list_t *create_verbose_header(int install) } /* returns package info as list of strings */ -static alpm_list_t *create_verbose_row(alpm_pkg_t *pkg, int install) +static alpm_list_t *create_verbose_row(pm_target_t *target) { char *str; - double size; + off_t size = 0; + double human_size; const char *label; alpm_list_t *ret = NULL; - alpm_db_t *ldb = alpm_option_get_localdb(config->handle); /* a row consists of the package name, */ - pm_asprintf(&str, "%s", alpm_pkg_get_name(pkg)); + if(target->install) { + pm_asprintf(&str, "%s", alpm_pkg_get_name(target->install)); + } else { + pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove)); + } ret = alpm_list_add(ret, str); /* old and new versions */ - if(install) { - alpm_pkg_t *oldpkg = alpm_db_get_pkg(ldb, alpm_pkg_get_name(pkg)); - pm_asprintf(&str, "%s", - oldpkg != NULL ? alpm_pkg_get_version(oldpkg) : ""); - ret = alpm_list_add(ret, str); - } + pm_asprintf(&str, "%s", + target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); + ret = alpm_list_add(ret, str); - pm_asprintf(&str, "%s", alpm_pkg_get_version(pkg)); + pm_asprintf(&str, "%s", + target->install != NULL ? alpm_pkg_get_version(target->install) : ""); ret = alpm_list_add(ret, str); /* and size */ - size = humanize_size(alpm_pkg_get_size(pkg), 'M', 1, &label); - pm_asprintf(&str, "%.2f %s", size, label); + size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; + size += target->install ? alpm_pkg_get_isize(target->install) : 0; + human_size = humanize_size(size, 'M', 1, &label); + pm_asprintf(&str, "%.2f %s", human_size, label); ret = alpm_list_add(ret, str); return ret; } /* prepare a list of pkgs to display */ -void display_targets(const alpm_list_t *pkgs, int install) +static void _display_targets(alpm_list_t *targets) { char *str; - const char *title, *label; + const char *label; double size; - const alpm_list_t *i; off_t isize = 0, rsize = 0, dlsize = 0; - alpm_list_t *j, *lp, *header = NULL, *targets = NULL; - alpm_db_t *db_local = alpm_option_get_localdb(config->handle); + alpm_list_t *i, *header = NULL, *rows = NULL; - if(!pkgs) { + if(!targets) { return; } - /* gather pkg infos */ - for(i = pkgs; i; i = alpm_list_next(i)) { - alpm_pkg_t *pkg = alpm_list_getdata(i); + /* gather package info */ + for(i = targets; i; i = alpm_list_next(i)) { + pm_target_t *target = alpm_list_getdata(i); - if(install) { - alpm_pkg_t *lpkg = alpm_db_get_pkg(db_local, alpm_pkg_get_name(pkg)); - dlsize += alpm_pkg_download_size(pkg); - if(lpkg) { - /* add up size of all removed packages */ - rsize += alpm_pkg_get_isize(lpkg); - } + if(target->install) { + dlsize += alpm_pkg_download_size(target->install); + isize += alpm_pkg_get_isize(target->install); + } + if(target->remove) { + /* add up size of all removed packages */ + rsize += alpm_pkg_get_isize(target->remove); } - isize += alpm_pkg_get_isize(pkg); if(config->verbosepkglists) { - targets = alpm_list_add(targets, create_verbose_row(pkg, install)); + rows = alpm_list_add(rows, create_verbose_row(target)); } else { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); - targets = alpm_list_add(targets, str); + if(target->install) { + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), + alpm_pkg_get_version(target->install)); + } else { + pm_asprintf(&str, "%s-%s [removal]", alpm_pkg_get_name(target->remove), + alpm_pkg_get_version(target->remove)); + } + rows = alpm_list_add(rows, str); } } /* print to screen */ - title = install ? _("Targets (%d):") : _("Remove (%d):"); - pm_asprintf(&str, title, alpm_list_count(pkgs)); + pm_asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); printf("\n"); if(config->verbosepkglists) { - header = create_verbose_header(install); - if(table_display(str, header, targets) != 0) { + header = create_verbose_header(); + if(table_display(str, header, rows) != 0) { config->verbosepkglists = 0; - display_targets(pkgs, install); + _display_targets(targets); goto out; } } else { - list_display(str, targets); + list_display(str, rows); } printf("\n"); - if(install) { + if(dlsize > 0) { size = humanize_size(dlsize, 'M', 1, &label); printf(_("Total Download Size: %.2f %s\n"), size, label); - if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) { + } + if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) { + if(isize > 0) { size = humanize_size(isize, 'M', 1, &label); printf(_("Total Installed Size: %.2f %s\n"), size, label); - /* only show this net value if different from raw installed size */ - if(rsize > 0) { - size = humanize_size(isize - rsize, 'M', 1, &label); - printf(_("Net Upgrade Size: %.2f %s\n"), size, label); - } } - } else { - size = humanize_size(isize, 'M', 1, &label); - printf(_("Total Removed Size: %.2f %s\n"), size, label); + if(rsize > 0) { + size = humanize_size(rsize, 'M', 1, &label); + printf(_("Total Removed Size: %.2f %s\n"), size, label); + } + /* only show this net value if different from raw installed size */ + if(isize > 0 && rsize > 0) { + size = humanize_size(isize - rsize, 'M', 1, &label); + printf(_("Net Upgrade Size: %.2f %s\n"), size, label); + } } out: /* cleanup */ if(config->verbosepkglists) { - /* targets is a list of lists of strings, free inner lists here */ - for(j = targets; j; j = alpm_list_next(j)) { - lp = alpm_list_getdata(j); + /* rows is a list of lists of strings, free inner lists here */ + for(i = rows; i; i = alpm_list_next(i)) { + alpm_list_t *lp = alpm_list_getdata(i); FREELIST(lp); } - alpm_list_free(targets); + alpm_list_free(rows); FREELIST(header); } else { - FREELIST(targets); + FREELIST(rows); } free(str); } +static int target_cmp(const void *p1, const void *p2) +{ + const pm_target_t *targ1 = p1; + const pm_target_t *targ2 = p2; + const char *name1 = targ1->install ? + alpm_pkg_get_name(targ1->install) : alpm_pkg_get_name(targ1->remove); + const char *name2 = targ2->install ? + alpm_pkg_get_name(targ2->install) : alpm_pkg_get_name(targ2->remove); + return strcmp(name1, name2); +} + +void display_targets(void) +{ + alpm_list_t *i, *targets = NULL; + alpm_db_t *db_local = alpm_option_get_localdb(config->handle); + + for(i = alpm_trans_get_add(config->handle); i; i = alpm_list_next(i)) { + alpm_pkg_t *pkg = alpm_list_getdata(i); + pm_target_t *targ = calloc(1, sizeof(pm_target_t)); + if(!targ) return; + targ->install = pkg; + targ->remove = alpm_db_get_pkg(db_local, alpm_pkg_get_name(pkg)); + targets = alpm_list_add(targets, targ); + } + for(i = alpm_trans_get_remove(config->handle); i; i = alpm_list_next(i)) { + alpm_pkg_t *pkg = alpm_list_getdata(i); + pm_target_t *targ = calloc(1, sizeof(pm_target_t)); + if(!targ) return; + targ->remove = pkg; + targets = alpm_list_add(targets, targ); + } + + targets = alpm_list_msort(targets, alpm_list_count(targets), target_cmp); + _display_targets(targets); + FREELIST(targets); +} + static off_t pkg_get_size(alpm_pkg_t *pkg) { switch(config->op) { diff --git a/src/pacman/util.h b/src/pacman/util.h index ee3dbd1..54c941d 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -39,6 +39,11 @@ /* update speed for the fill_progress based functions */ #define UPDATE_SPEED_SEC 0.2f +typedef struct _pm_target_t { + alpm_pkg_t *remove; + alpm_pkg_t *install; +} pm_target_t; + int trans_init(alpm_transflag_t flags, int check_valid); int trans_release(void); int needs_root(void); @@ -58,7 +63,7 @@ int table_display(const char *title, const alpm_list_t *header, const alpm_list_ void list_display(const char *title, const alpm_list_t *list); void list_display_linebreak(const char *title, const alpm_list_t *list); void signature_display(const char *title, alpm_sigresult_t *result); -void display_targets(const alpm_list_t *pkgs, int install); +void display_targets(void); int str_cmp(const void *s1, const void *s2); void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg); void display_optdepends(alpm_pkg_t *pkg); -- 1.7.6

4 7

[pacman-dev] Scripts bombing with no args
by Dan McGee 30 Jul '11

30 Jul '11

Allan or Dave, mind taking a look at this? We should show usage info, as rankmirrors and pacman-key do without args, instead of this silly behavior. -Dan dmcgee@galway ~/projects/pacman (master) $ ./scripts/repo-add ==> ERROR: '' does not have a valid archive extension. dmcgee@galway ~/projects/pacman (master) $ ./scripts/pkgdelta ./scripts/pkgdelta: line 147: $1: unbound variable

3 6

[pacman-dev] [PATCH 1/3] Revamp signing checks
by Dan McGee 30 Jul '11

30 Jul '11

This ensures we are actually making correct use of the information gpgme is returning to us. Marginal being allowed was obvious before, but Unknown should deal with trust level, and not the presence or lack thereof of a public key to validate the signature with. Return status and validity information in two separate values so check methods and the frontend can use them independently. For now, we treat expired keys as valid, while expired signatures are invalid. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 22 +++++++-- lib/libalpm/signing.c | 122 +++++++++++++++++++++++++++++++----------------- src/pacman/util.c | 42 ++++++++++++---- 3 files changed, 127 insertions(+), 59 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index d9f3504..a91b00f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -104,15 +104,26 @@ typedef enum _alpm_siglevel_t { } alpm_siglevel_t; /** - * PGP signature verification return codes + * PGP signature verification status return codes */ typedef enum _alpm_sigstatus_t { - ALPM_SIGSTATUS_VALID = 0, - ALPM_SIGSTATUS_MARGINAL, - ALPM_SIGSTATUS_UNKNOWN, - ALPM_SIGSTATUS_BAD + ALPM_SIGSTATUS_VALID, + ALPM_SIGSTATUS_KEY_EXPIRED, + ALPM_SIGSTATUS_SIG_EXPIRED, + ALPM_SIGSTATUS_KEY_UNKNOWN, + ALPM_SIGSTATUS_INVALID } alpm_sigstatus_t; +/** + * PGP signature verification status return codes + */ +typedef enum _alpm_sigvalidity_t { + ALPM_SIGVALIDITY_FULL, + ALPM_SIGVALIDITY_MARGINAL, + ALPM_SIGVALIDITY_NEVER, + ALPM_SIGVALIDITY_UNKNOWN +} alpm_sigvalidity_t; + /* * Structures */ @@ -202,6 +213,7 @@ typedef struct _alpm_backup_t { typedef struct _alpm_sigresult_t { int count; alpm_sigstatus_t *status; + alpm_sigvalidity_t *validity; char **uid; } alpm_sigresult_t; diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 275851c..78e6264 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -305,8 +305,9 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, _alpm_log(handle, ALPM_LOG_DEBUG, "%d signatures returned\n", sigcount); result->status = calloc(sigcount, sizeof(alpm_sigstatus_t)); + result->validity = calloc(sigcount, sizeof(alpm_sigvalidity_t)); result->uid = calloc(sigcount, sizeof(char*)); - if(!result->status || !result->uid) { + if(!result->status || !result->validity || !result->uid) { handle->pm_errno = ALPM_ERR_MEMORY; goto error; } @@ -316,6 +317,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, gpgsig = gpgsig->next, sigcount++) { alpm_list_t *summary_list, *summary; alpm_sigstatus_t status; + alpm_sigvalidity_t validity; gpgme_key_t key; _alpm_log(handle, ALPM_LOG_DEBUG, "fingerprint: %s\n", gpgsig->fpr); @@ -335,6 +337,8 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, if(gpg_err_code(err) == GPG_ERR_EOF) { _alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed, unknown key\n"); err = GPG_ERR_NO_ERROR; + STRDUP(result->uid[sigcount], gpgsig->fpr, + handle->pm_errno = ALPM_ERR_MEMORY; goto error); } else { CHECK_ERR(); if(key->uids) { @@ -346,34 +350,52 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, gpgme_key_unref(key); } - if(gpgsig->summary & GPGME_SIGSUM_VALID) { - /* definite good signature */ - _alpm_log(handle, ALPM_LOG_DEBUG, "result: valid signature\n"); - status = ALPM_SIGSTATUS_VALID; - } else if(gpgsig->summary & GPGME_SIGSUM_GREEN) { - /* good signature */ - _alpm_log(handle, ALPM_LOG_DEBUG, "result: green signature\n"); - status = ALPM_SIGSTATUS_VALID; - } else if(gpgsig->summary & GPGME_SIGSUM_RED) { - /* definite bad signature, error */ - _alpm_log(handle, ALPM_LOG_DEBUG, "result: red signature\n"); - status = ALPM_SIGSTATUS_BAD; - } else if(gpgsig->summary & GPGME_SIGSUM_KEY_MISSING) { - _alpm_log(handle, ALPM_LOG_DEBUG, "result: signature from unknown key\n"); - status = ALPM_SIGSTATUS_UNKNOWN; - } else if(gpgsig->summary & GPGME_SIGSUM_KEY_EXPIRED) { - _alpm_log(handle, ALPM_LOG_DEBUG, "result: key expired\n"); - status = ALPM_SIGSTATUS_BAD; - } else if(gpgsig->summary & GPGME_SIGSUM_SIG_EXPIRED) { - _alpm_log(handle, ALPM_LOG_DEBUG, "result: signature expired\n"); - status = ALPM_SIGSTATUS_BAD; + switch(gpg_err_code(gpgsig->status)) { + /* good cases */ + case GPG_ERR_NO_ERROR: + status = ALPM_SIGSTATUS_VALID; + break; + case GPG_ERR_KEY_EXPIRED: + status = ALPM_SIGSTATUS_KEY_EXPIRED; + break; + /* bad cases */ + case GPG_ERR_SIG_EXPIRED: + status = ALPM_SIGSTATUS_SIG_EXPIRED; + break; + case GPG_ERR_NO_PUBKEY: + status = ALPM_SIGSTATUS_KEY_UNKNOWN; + break; + case GPG_ERR_BAD_SIGNATURE: + default: + status = ALPM_SIGSTATUS_INVALID; + break; + } + + if(status == ALPM_SIGSTATUS_VALID + || status == ALPM_SIGSTATUS_KEY_EXPIRED) { + switch(gpgsig->validity) { + case GPGME_VALIDITY_ULTIMATE: + case GPGME_VALIDITY_FULL: + validity = ALPM_SIGVALIDITY_FULL; + break; + case GPGME_VALIDITY_MARGINAL: + validity = ALPM_SIGVALIDITY_MARGINAL; + break; + case GPGME_VALIDITY_NEVER: + validity = ALPM_SIGVALIDITY_NEVER; + break; + case GPGME_VALIDITY_UNKNOWN: + case GPGME_VALIDITY_UNDEFINED: + default: + validity = ALPM_SIGVALIDITY_UNKNOWN; + break; + } } else { - /* we'll capture everything else here */ - _alpm_log(handle, ALPM_LOG_DEBUG, "result: invalid signature\n"); - status = ALPM_SIGSTATUS_BAD; + validity = ALPM_SIGVALIDITY_NEVER; } result->status[sigcount] = status; + result->validity[sigcount] = validity; } ret = 0; @@ -429,31 +451,45 @@ int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, /* ret will already be -1 */ } else { int num; - for(num = 0; num < result.count; num++) { - /* fallthrough in this case block is on purpose. if one allows unknown - * signatures, then a marginal signature should be allowed as well, and - * if neither of these are allowed we fall all the way through to bad. */ + for(num = 0; !ret && num < result.count; num++) { switch(result.status[num]) { case ALPM_SIGSTATUS_VALID: + case ALPM_SIGSTATUS_KEY_EXPIRED: _alpm_log(handle, ALPM_LOG_DEBUG, "signature is valid\n"); - break; - case ALPM_SIGSTATUS_MARGINAL: - if(marginal) { - _alpm_log(handle, ALPM_LOG_DEBUG, "allowing marginal signature\n"); - break; - } - case ALPM_SIGSTATUS_UNKNOWN: - if(unknown) { - _alpm_log(handle, ALPM_LOG_DEBUG, "allowing unknown signature\n"); - break; + switch(result.validity[num]) { + case ALPM_SIGVALIDITY_FULL: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is fully trusted\n"); + break; + case ALPM_SIGVALIDITY_MARGINAL: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is marginal trust\n"); + if(!marginal) { + ret = -1; + } + break; + case ALPM_SIGVALIDITY_UNKNOWN: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is unknown trust\n"); + if(!unknown) { + ret = -1; + } + break; + case ALPM_SIGVALIDITY_NEVER: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature should never be trusted\n"); + ret = -1; + break; } - case ALPM_SIGSTATUS_BAD: - default: - _alpm_log(handle, ALPM_LOG_DEBUG, "signature is invalid\n"); - handle->pm_errno = invalid_err; + break; + case ALPM_SIGSTATUS_SIG_EXPIRED: + case ALPM_SIGSTATUS_KEY_UNKNOWN: + case ALPM_SIGSTATUS_INVALID: + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is not valid\n"); ret = -1; + break; } } + + if(ret) { + handle->pm_errno = invalid_err; + } } alpm_sigresult_cleanup(&result); diff --git a/src/pacman/util.c b/src/pacman/util.c index 7065abd..8765da7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -678,7 +678,7 @@ void signature_display(const char *title, alpm_sigresult_t *result) int i; for(i = 0; i < result->count; i++) { char sigline[PATH_MAX]; - const char *validity, *name; + const char *status, *validity, *name; /* Don't re-indent the first result */ if(i != 0) { int j; @@ -688,22 +688,42 @@ void signature_display(const char *title, alpm_sigresult_t *result) } switch(result->status[i]) { case ALPM_SIGSTATUS_VALID: - validity = _("Valid signature"); + status = _("Valid"); break; - case ALPM_SIGSTATUS_MARGINAL: - validity = _("Marginal signature"); + case ALPM_SIGSTATUS_KEY_EXPIRED: + status = _("Key expired"); break; - case ALPM_SIGSTATUS_UNKNOWN: - validity = _("Unknown signature"); + case ALPM_SIGSTATUS_SIG_EXPIRED: + status = _("Expired"); break; - case ALPM_SIGSTATUS_BAD: - validity = _("Invalid signature"); + case ALPM_SIGSTATUS_INVALID: + status = _("Invalid"); break; + case ALPM_SIGSTATUS_KEY_UNKNOWN: + status = _("Key unknown"); + break; + default: + status = _("Signature error"); + break; + } + switch(result->validity[i]) { + case ALPM_SIGVALIDITY_FULL: + validity = _("fully trusted"); + break; + case ALPM_SIGVALIDITY_MARGINAL: + validity = _("marginal trusted"); + break; + case ALPM_SIGVALIDITY_NEVER: + validity = _("never trusted"); + break; + case ALPM_SIGVALIDITY_UNKNOWN: default: - validity = _("Signature error"); + validity = _("unknown trust"); + break; } - name = result->uid[i] ? result->uid[i] : _("<Key Unknown>"); - snprintf(sigline, PATH_MAX, _("%s from \"%s\""), validity, name); + name = result->uid[i] ? result->uid[i] : _("{Key Unknown}"); + snprintf(sigline, PATH_MAX, _("%s, %s from \"%s\""), + status, validity, name); indentprint(sigline, len); printf("\n"); } -- 1.7.6

2 4