July 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 0/2] Add support for verifying pgp signatures to makepkg
by Wieland Hoffmann 19 Jul '11

19 Jul '11

Hi, this adds support for verifying pgp signatures provided by upstream to makepkg. A new array pgpsigs is defined holding the URLs to all the signature files. However, there're still a few quirks: * You have to manually import the key which signed the source. Actually that's good, but: * You don't know why the verification failed. It's either a wrong signature or the key is simply not known to gnupg. This is really bad, so I've chosen to make pgp verification optional for now. makepkg --pgp enables it. Wieland Hoffmann (2): Add support for verifying pgp signatures to makepkg And update the manpages accordingly doc/PKGBUILD.5.txt | 5 ++++ doc/makepkg.8.txt | 3 ++ scripts/makepkg.sh.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 2 deletions(-) -- 1.7.5.4

4 24

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-498-g6141081
by dan＠archlinux.org 19 Jul '11

19 Jul '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 61410814c2cb33055e0eb0276444b9073c3a1e7a (commit) via 05f7c0280e31d25e0b9b5c5cca349eb93e24f04f (commit) via f1d25ba2dd2640054b8e2e1c7c39669abb0cc6e8 (commit) via 333269482a08e02d4e730dd739fc9e8625efde32 (commit) via fa3aaa41e3563e8d4632c12cda989a471627aa20 (commit) via 7e5dea5d329a84293fe363ee098aede5aa1825af (commit) via 31c9a521b47a84ae01f3f9c9e25980694e1c472d (commit) via 0c9e86bab17691bf17c4251b2e16d65f517b88c8 (commit) via 0be9e4a4cd2c6a5d5c5246c8dc269931e883c1fe (commit) via df7b390514efa0ae6b84e8404806dee63d3524ad (commit) via 0e85c4989b7a7a20978ba0dcc7b56f0f1853b974 (commit) via fec10d4a65ebfdcac1f0e3dec9e24c1fe67bb52a (commit) via 74f6d717a3e25957ca5f3cf80897b218b990eea8 (commit) via 74e5a494b0cfea7a987fd2b253b765ca4362b456 (commit) via 7963c5d0000a9dc6fe895e0b321cd6f978168c34 (commit) via e37adcd66427acecac934fd97fcf8428080c62e4 (commit) via e458606ad2fce01e973eb02fb44f0a3f27baafa9 (commit) via 15ca6dca5c7be3253f650d615756f3bff1149d35 (commit) via b300b991a7c489731f7e30117be169f69ffb8745 (commit) via 8ee0724558a33e224c06dddd63d6560d6e41cb44 (commit) via 95d7e1616361ab2b2be38ba5283328f6f9312012 (commit) via 7d205a70a26f1c3d283e995ec590b6838eb8283d (commit) via d86a60c6946eeb27ee1092760c8608e207cccb8d (commit) from dad96ccce2eea8b171cd2d14ec20b8185f0009a8 (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 61410814c2cb33055e0eb0276444b9073c3a1e7a Merge: 05f7c02 3332694 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 21:10:56 2011 -0500 Merge remote-tracking branch 'allan/pacman-key' commit 05f7c0280e31d25e0b9b5c5cca349eb93e24f04f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 20:30:28 2011 -0500 Fix test suite when GPGME is disabled As noted by Allan, we failed pretty hard if gpgme was compiled out. With these changes, only sign001.py fails. This can/will be fixed later once we beef up the test suite with more signing tests anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f1d25ba2dd2640054b8e2e1c7c39669abb0cc6e8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 17 11:54:58 2011 -0400 pacman/callback: show .sig suffix on sig download Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 333269482a08e02d4e730dd739fc9e8625efde32 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sun Jul 10 12:26:42 2011 +0800 pacman-key: --init: correct creation of gpg.conf Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fa3aaa41e3563e8d4632c12cda989a471627aa20 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sun Jul 10 12:23:47 2011 +0800 pacman-key: correct spelling mistake Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e5dea5d329a84293fe363ee098aede5aa1825af Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 10 16:53:03 2011 +1000 pacman-key: add dependency on parse_options to Makefile Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 31c9a521b47a84ae01f3f9c9e25980694e1c472d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 21:51:01 2011 +1000 pacman-key: check required permissions on keyring Makes sure that the pacman keyring is readable and that the user has permissions to create a lock file if lock-never is not specified in the gpg.conf file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c9e86bab17691bf17c4251b2e16d65f517b88c8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 17:26:17 2011 +1000 pacman-key: add --init option Add an --init option that ensures that the pacman keyring has all the necessary files and they have the correct permissions for being read as a user. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0be9e4a4cd2c6a5d5c5246c8dc269931e883c1fe Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 9 12:48:41 2011 +1000 pacman-key: tidy up logic for finding pacman keyring directory Signed-off-by: Allan McRae <allan(a)archlinux.org> commit df7b390514efa0ae6b84e8404806dee63d3524ad Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jul 8 22:40:25 2011 -0400 pacman-key: refactor get_from This function had a variety of pitfalls, including the inability to successfully find a key=value pair where no whitespace surrounded the equals sign. Make it more robust by splitting the line on the equals itself, and performing whitespace trimming on the resulting key/value pair. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e85c4989b7a7a20978ba0dcc7b56f0f1853b974 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 11:41:04 2011 +1000 pacman-key: add --verify option Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fec10d4a65ebfdcac1f0e3dec9e24c1fe67bb52a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 11:28:57 2011 +1000 pacman-key: check only a single operation has been specified Follow the example of gpg and only allow a single operation to be specified each time. Prevents having to deal with conflicting variable names and potential issues due to the order in which the operations are run. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 74f6d717a3e25957ca5f3cf80897b218b990eea8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 11:16:12 2011 +1000 pacman-key: move verifying keyring files to own function Also check all files before bailing on errors. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 74e5a494b0cfea7a987fd2b253b765ca4362b456 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 9 11:07:29 2011 +1000 pacman-key: move --edit-key and --receive processing to functions This moves the processing of the --edit-key and --receive options to functions, keeping the final option processing to be all single line statements. Also rework the --edit-key option to validate all input before processing. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7963c5d0000a9dc6fe895e0b321cd6f978168c34 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 8 22:30:09 2011 +1000 pacman-key: update man page Update man page to reflect current options. Also add a description on how to manually interact with the pacman keyring with gpg. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e37adcd66427acecac934fd97fcf8428080c62e4 Author: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Date: Thu Apr 21 16:59:09 2011 +0300 pacman-key: hide output of executed commands on logic checks This commit correctly redirects to /dev/null the output of several commands that get executed on logic checks. Original-patch-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e458606ad2fce01e973eb02fb44f0a3f27baafa9 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 8 21:14:53 2011 +1000 pacman-key: rename --trust to --edit-key This keeps the naming of the option more consistent with what is actually being called by gpg. Original-patch-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15ca6dca5c7be3253f650d615756f3bff1149d35 Author: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Date: Thu Apr 21 16:59:08 2011 +0300 pacman-key: fix quotation on several variable assignments This commit adds quotes to several variable assignments. Unquoted values can cause problems on several occasions if the value is empty. It is safer to have every assignment quoted. Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> commit b300b991a7c489731f7e30117be169f69ffb8745 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 03:41:52 2011 +1000 pacman-key: allow the export of all key ids The gpg --export will exprt all keys if none are specified. Replicate this behavior in pacman-key. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ee0724558a33e224c06dddd63d6560d6e41cb44 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 03:34:04 2011 +1000 pacman-key: rename --del to --delete There is already the short -d alias provided, so stay verbose with the longer option name. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 95d7e1616361ab2b2be38ba5283328f6f9312012 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 03:27:23 2011 +1000 pacman-key: remove the --adv option The conversion to using parse_options causes this option to break. It is preferable to remove the option rather than fix it as it is simply a wrapper for "gpg --homedir @sysconfdir@/pacman.d/gnupg". Any user using more advanced keyring management than provided by pacman-key can manage to point gpg at the right place themselves... How to manually edit the keyring with gpg will instead be documented in the man page in a later commit. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7d205a70a26f1c3d283e995ec590b6838eb8283d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 6 03:05:08 2011 +1000 pacman-key: use our option parser The pacman-key script is complicated enough to warrent usage of the parse_options script. This is especially helpful in dealing with all the configuration file override flags as the no longer need to be specified first. It also allows us to do the right thing early with --help/--version and no option cases cleanly. This change also makde the check for root privileges only occur on operations where they are needed. This patch is inspired by and supercedes some patches submitted by Denis A. Altoé Falqueto and Ivan Kanakarakis who were altering the previous option handling in an attempt to deal with the above issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d86a60c6946eeb27ee1092760c8608e207cccb8d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 17 11:01:59 2011 -0400 PKGBUILD.vim: add new var and assert bash syntax * assert is_bash to pickup more valid syntax * add checkdepends highlighting Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.vim | 7 + doc/pacman-key.8.txt | 67 +++++---- lib/libalpm/be_sync.c | 8 + lib/libalpm/db.c | 1 - lib/libalpm/handle.c | 8 + scripts/Makefile.am | 3 +- scripts/pacman-key.sh.in | 347 +++++++++++++++++++++++++++------------------- src/pacman/callback.c | 11 ++- 8 files changed, 277 insertions(+), 175 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix test suite when GPGME is disabled
by Dan McGee 19 Jul '11

19 Jul '11

As noted by Allan, we failed pretty hard if gpgme was compiled out. With these changes, only sign001.py fails. This can/will be fixed later once we beef up the test suite with more signing tests anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_sync.c | 6 ++++++ lib/libalpm/db.c | 1 - lib/libalpm/handle.c | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d7e14ba..cd69513 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -600,6 +600,12 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, _alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename); +#ifndef HAVE_GPGME + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); + } +#endif + db = _alpm_db_new(treename, 0); if(db == NULL) { RET_ERR(handle, ALPM_ERR_DB_CREATE, NULL); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 0c2b26a..746293f 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -327,7 +327,6 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local) CALLOC(db, 1, sizeof(alpm_db_t), return NULL); STRDUP(db->treename, treename, return NULL); db->is_local = is_local; - db->siglevel = 0; return db; } diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 9bffd4f..be51bfc 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -45,8 +45,10 @@ alpm_handle_t *_alpm_handle_new() CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL); +#ifdef HAVE_GPGME handle->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL | ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; +#endif return handle; } @@ -579,7 +581,13 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { CHECK_HANDLE(handle, return -1); +#ifdef HAVE_GPGME handle->siglevel = level; +#else + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } +#endif return 0; } -- 1.7.6

1 1

[pacman-dev] Added SigLevel parsing code
by Kerrick Staley 19 Jul '11

19 Jul '11

-Kerrick Staley

4 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-475-gdad96cc
by dan＠archlinux.org 18 Jul '11

18 Jul '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 dad96ccce2eea8b171cd2d14ec20b8185f0009a8 (commit) via 89c070b263a9e1e4e0734b25c8bc33367a34e504 (commit) via 29a96bcfe179a82adbd575057e2ef9d48a6a72fb (commit) via 48e2a1a119ce84681f25855221b6e2fc2689a760 (commit) via 297cd7897bfe060ce46d703e15ad7cbe37aedced (commit) via c0fe1743e5ba034f70f0740a8f0863d64d0e480a (commit) via f0e34be9903e5523c4bffd35f2659303f80c22fc (commit) via 36db8c50471b4860f6f492c618053bce2559ab73 (commit) via 49427d1fb4f7cb9cfb76e430343510fba5f09e6a (commit) via bf120635a7fdbb2caeb73fa0774bf718f2a127ae (commit) via 3934a842b8121d6fe950fcac323e92e5e35f1538 (commit) via 3294039a00f3aa65181ed23518dc5c73e0201268 (commit) via 0b92d9ed9c6bffcf4b47645a365ea6c3d162e89e (commit) via 1c39e4fbade29d570858ca6eca4958ab72cfbdd0 (commit) via 3a04267cdd0b1324c8153c813e9bc5726b005670 (commit) via 65847fad44216e290986b40b404701432c17ff5a (commit) from e20995560640d11491905bfa80aa993c2efde7c4 (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 dad96ccce2eea8b171cd2d14ec20b8185f0009a8 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 18:26:56 2011 +0200 replace access() calls for debug info where applicable Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c070b263a9e1e4e0734b25c8bc33367a34e504 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 17:24:19 2011 +0200 signing.c: check if needed files are readable If we can't read the keyring, gpgme will output confusing debug information and fail to verify the signature, so we should log some debug information. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 29a96bcfe179a82adbd575057e2ef9d48a6a72fb Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Jul 6 17:22:59 2011 +0200 add _alpm_access() wrapper This is a wrapper function for access() which logs some debug information and eases handling in case of split directory and filename. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 48e2a1a119ce84681f25855221b6e2fc2689a760 Merge: c0fe174 297cd78 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 10:41:37 2011 -0500 Merge branch 'maint' commit c0fe1743e5ba034f70f0740a8f0863d64d0e480a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 01:48:47 2011 +1000 Fix compilation without gpgme Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f0e34be9903e5523c4bffd35f2659303f80c22fc Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 09:12:18 2011 +1000 configure: output more compile settings Add information on CPPFLAGS, LDFLAGS and LIBS to the end of the configure output. This is very helpful in tracing issues when adjusting the configure file and also will allow us to more easily replicate any issues discovered due to a users build environment. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36db8c50471b4860f6f492c618053bce2559ab73 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 01:27:45 2011 +1000 makepkg.conf: remove curl from other common tools It is now set as the main tool, so make wget another common one. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49427d1fb4f7cb9cfb76e430343510fba5f09e6a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 14:28:04 2011 +1000 repo-add: do not print full path of signature file The full path to the signature file when it is created is in a temporary directory so only print the filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf120635a7fdbb2caeb73fa0774bf718f2a127ae Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 18 21:05:51 2011 +1000 repo-add: always remove repo signature symlink This prevents a dangling symlink being left behind if the repo goes from being signed to unsigned. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3934a842b8121d6fe950fcac323e92e5e35f1538 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 18 10:33:45 2011 -0400 contrib/paclog-pkglist: whitespace cleanup add a modeline and change 2 space indent to a tab. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3294039a00f3aa65181ed23518dc5c73e0201268 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 17 11:04:03 2011 -0400 contrib/paclog-pkglist: rework as bash wrapping awk Avoid some pain in awk's limited handling of command line arguments by wrapping this in a Bash script. We also default to @localstatedir@/log/pacman.log when no args are specified, meaning that -h or --help is required to get the help message. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0b92d9ed9c6bffcf4b47645a365ea6c3d162e89e Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 18 10:34:39 2011 -0500 Add a new epoch pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1c39e4fbade29d570858ca6eca4958ab72cfbdd0 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jul 16 10:07:25 2011 -0500 Handle removal of empty directories properly This addresses FS#25141. We shouldn't remove every empty directory we come across during the removal process unless it is truly not known to any other package. This will prevent removal of essential directories such as '/var/lock/'. This is accomplished by first checking the empty/non-empty status of a directory, which was previously done implicitly by calling rmdir() and ignoring errors. We do this to avoid the next (new) check in most cases, which is to look at all local packages to see if the to-be-removed directory is present in another packages' filelist. If we do not find it anywhere, then we remove it, else we keep the file around. The pactest has been updated to test more cases, as well as finding a flaw in the original expected to fail case- we need separate DIR and FILE based EXIST rules. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a04267cdd0b1324c8153c813e9bc5726b005670 Author: Rogutės Sparnuotos <rogutes(a)googlemail.com> Date: Thu Jun 16 11:40:40 2011 +0300 makepkg: only test for writable PKGDEST when needed. There is no need for a writable PKGDEST when using the --nobuild or --geninteg flags. Allan: added --geninteg Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 65847fad44216e290986b40b404701432c17ff5a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 16 23:01:39 2011 +1000 Move some .gitignore entries Put a .gitignore entry at the right level and sort that file alphabetically. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - configure.ac | 4 + contrib/Makefile.am | 4 +- contrib/{paclog-pkglist => paclog-pkglist.in} | 61 ++++++++++------- etc/makepkg.conf.in | 2 +- lib/libalpm/remove.c | 47 +++++++++++-- lib/libalpm/signing.c | 14 +++- lib/libalpm/trans.c | 3 +- lib/libalpm/util.c | 89 +++++++++++++++++++++++++ lib/libalpm/util.h | 2 + scripts/.gitignore | 5 +- scripts/makepkg.sh.in | 4 +- scripts/repo-add.sh.in | 5 +- test/pacman/pmrule.py | 8 ++ test/pacman/tests/epoch005.py | 25 +++++++ test/pacman/tests/remove070.py | 24 +++++-- 16 files changed, 242 insertions(+), 56 deletions(-) rename contrib/{paclog-pkglist => paclog-pkglist.in} (53%) create mode 100644 test/pacman/tests/epoch005.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-8-g297cd78
by dan＠archlinux.org 18 Jul '11

18 Jul '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 297cd7897bfe060ce46d703e15ad7cbe37aedced (commit) from e378170c2555b656ef87715d8284d038037ced5f (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 297cd7897bfe060ce46d703e15ad7cbe37aedced Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 17 00:09:19 2011 +1000 makepkg: fix issue with filenames with spaces and noextract Specifying a filename with spaces in a PKGBUILDs noextract array fails due to a lack of quoting. Fixes FS#25100. Reported-by: Thomas Weißschuh <thomas_weissschuh(a)lavabit.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Handle removal of empty directories properly
by Dan McGee 18 Jul '11

18 Jul '11

This addresses FS#25141. We shouldn't remove every empty directory we come across during the removal process unless it is truly not known to any other package. This will prevent removal of essential directories such as '/var/lock/'. This is accomplished by first checking the empty/non-empty status of a directory, which was previously done implicitly by calling rmdir() and ignoring errors. We do this to avoid the next (new) check in most cases, which is to look at all local packages to see if the to-be-removed directory is present in another packages' filelist. If we do not find it anywhere, then we remove it, else we keep the file around. The pactest has been updated to test more cases, as well as finding a flaw in the original expected to fail case- we need separate DIR and FILE based EXIST rules. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 41 ++++++++++++++++++++++++++++++++++----- lib/libalpm/util.c | 29 ++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + test/pacman/pmrule.py | 8 +++++++ test/pacman/tests/remove070.py | 24 +++++++++++++++------- 5 files changed, 89 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index b15dbaa..b946abc 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -232,8 +232,8 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, * see the big comment block in db_find_fileconflicts() for an * explanation. */ if(alpm_list_find_str(skip_remove, fileobj->name)) { - _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n", - file); + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s is in skip_remove, skipping removal\n", file); return; } @@ -247,11 +247,40 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, } if(S_ISDIR(buf.st_mode)) { - if(rmdir(file)) { - /* this is okay, other packages are probably using it (like /usr) */ - _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s\n", file); + ssize_t filecount = _alpm_files_in_directory(handle, file); + /* if we have files, no need to remove the directory */ + if(filecount > 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (%zd files)\n", + file, filecount); + } else if(filecount < 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (could not count files)\n", file); } else { - _alpm_log(handle, ALPM_LOG_DEBUG, "removing directory %s\n", file); + /* one last check- does any other package own this file? */ + alpm_list_t *local, *local_pkgs; + int found = 0; + local_pkgs = _alpm_db_get_pkgcache(handle->db_local); + for(local = local_pkgs; local && !found; local = local->next) { + alpm_pkg_t *local_pkg = local->data; + alpm_list_t *files; + + /* we duplicated the package when we put it in the removal list, so we + * so we can't use direct pointer comparison here. */ + if(_alpm_pkg_cmp(info, local_pkg) == 0) { + continue; + } + files = alpm_pkg_get_files(local_pkg); + if(_alpm_filelist_contains(files, fileobj->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (owned by %s)\n", file, local_pkg->name); + found = 1; + } + } + if(!found) { + rmdir(file); + _alpm_log(handle, ALPM_LOG_DEBUG, + "removing directory %s (no remaining owners)\n", file); + } } } else { /* if the file needs backup and has been modified, back it up to .pacsave */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index cd7f19c..af2db76 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -388,6 +388,35 @@ int _alpm_rmrf(const char *path) return 0; } +ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path) +{ + ssize_t files = 0; + struct dirent *ent; + DIR *dir = opendir(path); + + if(!dir) { + if(errno == ENOTDIR) { + _alpm_log(handle, ALPM_LOG_DEBUG, "%s was not a directory\n", path); + } else { + _alpm_log(handle, ALPM_LOG_DEBUG, "could not read directory %s\n", + path); + } + return -1; + } + while((ent = readdir(dir)) != NULL) { + const char *name = ent->d_name; + + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + continue; + } + + files++; + } + + closedir(dir); + return files; +} + int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args) { int ret = 0; diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 450dac9..2b71c5c 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -100,6 +100,7 @@ int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); int _alpm_rmrf(const char *path); +ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path); int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args); int _alpm_run_chroot(alpm_handle_t *handle, const char *path, char *const argv[]); int _alpm_ldconfig(alpm_handle_t *handle); diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 0f6ae60..cb7ae88 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -146,6 +146,14 @@ def check(self, test): else: print "FILE rule '%s' not found" % case success = -1 + elif kind == "DIR": + filename = os.path.join(test.root, key) + if case == "EXIST": + if not os.path.isdir(filename): + success = 0 + else: + print "DIR rule '%s' not found" % case + success = -1 elif kind == "LINK": filename = os.path.join(test.root, key) if case == "EXIST": diff --git a/test/pacman/tests/remove070.py b/test/pacman/tests/remove070.py index e0587e1..898e2f5 100644 --- a/test/pacman/tests/remove070.py +++ b/test/pacman/tests/remove070.py @@ -1,21 +1,29 @@ -self.description = "Remove a package with an empty directory needed by another package" +self.description = "Remove a package with various directory overlaps" + +self.filesystem = ["lib/alsoonfs/randomfile"] p1 = pmpkg("pkg1") -p1.files = ["bin/pkg1", "opt/"] +p1.files = ["bin/pkg1", + "opt/", + "lib/onlyinp1/", + "lib/alsoonfs/"] p2 = pmpkg("pkg2") -p2.files = ["bin/pkg2", "opt/"] +p2.files = ["bin/pkg2", + "opt/", + "lib/onlyinp2/"] for p in p1, p2: - self.addpkg2db("local", p) + self.addpkg2db("local", p) self.args = "-R %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") -self.addrule("!FILE_EXIST=bin/pkg1") -self.addrule("FILE_EXIST=bin/pkg2") -self.addrule("FILE_EXIST=opt/") -self.expectfailure = True +self.addrule("DIR_EXIST=bin/") +self.addrule("DIR_EXIST=opt/") +self.addrule("!DIR_EXIST=lib/onlyinp1/") +self.addrule("DIR_EXIST=lib/onlyinp2/") +self.addrule("DIR_EXIST=lib/alsoonfs/") -- 1.7.6

4 3

[pacman-dev] [PATCH 1/3] contrib/paclog-pkglist: fix script name in usage
by Dave Reisner 18 Jul '11

18 Jul '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Just an oversight when I renamed the script, as pointed out by Allan. Sadly, awk doesn't have an equivalent of ${0##*/} when excuted under a #!/bin/awk shebang (ARGV[0] will always show 'awk'), so we just hard code it. contrib/paclog-pkglist | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/paclog-pkglist b/contrib/paclog-pkglist index 2c66e63..5948a0d 100755 --- a/contrib/paclog-pkglist +++ b/contrib/paclog-pkglist @@ -19,8 +19,8 @@ BEGIN { if (ARGC < 2) { - printf "usage: log2pkglist <pacman log>\n" - printf "example: log2pkglist /var/log/pacman.log\n" + printf "usage: paclog-pkglist <pacman log>\n" + printf "example: paclog-pkglist /var/log/pacman.log\n" exit } } -- 1.7.6

2 5

[pacman-dev] [PATCH] repo-add: always remove repo signature symlink
by Allan McRae 18 Jul '11

18 Jul '11

This prevents a dangling symlink being left behind if the repo goes from being signed to unsigned. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index db8f6b0..c598ad9 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -652,12 +652,11 @@ if (( success )); then [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" dblink="${REPO_DB_FILE%.tar*}" target=${REPO_DB_FILE##*/} - rm -f "$dblink" + rm -f "$dblink" "$dblink.sig" ln -s "$target" "$dblink" 2>/dev/null || \ ln "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" if [[ -f "$target.sig" ]]; then - rm -f "$dblink.sig" ln -s "$target.sig" "$dblink.sig" 2>/dev/null || \ ln "$target.sig" "$dblink.sig" 2>/dev/null || \ cp "$REPO_DB_FILE.sig" "$dblink.sig" -- 1.7.6

1 0

[pacman-dev] [PATCH] makepkg: refactor checking source integrity
by Allan McRae 18 Jul '11

18 Jul '11

Move the source integrity checking into its own function as the code was duplicated and is now more complicated with the separation of the two checks types. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 296bab3..0682e4f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -753,6 +753,21 @@ check_pgpsigs() { fi } +check_source_integrity() { + if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then + warning "$(gettext "Skipping all source file integrity checks.")" + elif (( SKIPCHECKSUMS )); then + warning "$(gettext "Skipping verification of source file checksums.")" + check_pgpsigs + elif (( SKIPPGPCHECK )); then + warning "$(gettext "Skipping verification of source file PGP signatures.")" + check_checksums + else + check_checksums + check_pgpsigs + fi +} + extract_sources() { msg "$(gettext "Extracting Sources...")" local netfile @@ -2214,18 +2229,7 @@ if (( SOURCEONLY )); then (( SOURCEONLY == 2 )); then download_sources fi - if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then - warning "$(gettext "Skipping all source file integrity checks.")" - elif (( SKIPCHECKSUMS )); then - warning "$(gettext "Skipping verification of source file checksums.")" - check_pgpsigs - elif (( SKIPPGPCHECK )); then - warning "$(gettext "Skipping verification of source file PGP signatures.")" - check_checksums - else - check_checksums - check_pgpsigs - fi + check_source_integrity cd "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it @@ -2299,18 +2303,7 @@ elif (( REPKG )); then fi else download_sources - if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then - warning "$(gettext "Skipping all source file integrity checks.")" - elif (( SKIPCHECKSUMS )); then - warning "$(gettext "Skipping verification of source file checksums.")" - check_pgpsigs - elif (( SKIPPGPCHECK )); then - warning "$(gettext "Skipping verification of source file PGP signatures.")" - check_checksums - else - check_checksums - check_pgpsigs - fi + check_source_integrity extract_sources fi -- 1.7.6

1 0