- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-246-g43787d0
by dan＠archlinux.org 22 Sep '11

22 Sep '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 43787d00678e00adee54c9ab4b8909d26cba3940 (commit) via a78e3e3a232342c5f7d1f05c1dfc2067712e6641 (commit) from 1df9b2aa79c5017d394e26619449ab0a49c65c16 (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 43787d00678e00adee54c9ab4b8909d26cba3940 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 22 11:33:25 2011 -0500 Regenerate message catalogs and translations We've had a bit of churn since the last time this was done. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a78e3e3a232342c5f7d1f05c1dfc2067712e6641 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 22 11:26:21 2011 -0500 Translation file updates from Transifex Pick up any updates before I push new source messages out to the service. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ca.po | 35 ++-- lib/libalpm/po/cs.po | 37 ++-- lib/libalpm/po/da.po | 31 ++- lib/libalpm/po/de.po | 29 ++- lib/libalpm/po/el.po | 29 ++- lib/libalpm/po/en_GB.po | 33 ++- lib/libalpm/po/es.po | 65 ++++--- lib/libalpm/po/fi.po | 35 ++-- lib/libalpm/po/fr.po | 79 ++++--- lib/libalpm/po/hu.po | 33 ++- lib/libalpm/po/it.po | 29 ++- lib/libalpm/po/kk.po | 35 ++-- lib/libalpm/po/libalpm.pot | 18 ++- lib/libalpm/po/lt.po | 27 ++- lib/libalpm/po/nb.po | 33 ++- lib/libalpm/po/pl.po | 33 ++- lib/libalpm/po/pt.po | 33 ++- lib/libalpm/po/pt_BR.po | 66 ++++--- lib/libalpm/po/ro.po | 57 +++-- lib/libalpm/po/ru.po | 35 ++-- lib/libalpm/po/sk.po | 33 ++- lib/libalpm/po/sr.po | 33 ++- lib/libalpm/po/sr(a)latin.po | 33 ++- lib/libalpm/po/sv.po | 25 ++- lib/libalpm/po/tr.po | 35 ++-- lib/libalpm/po/uk.po | 29 ++- lib/libalpm/po/zh_CN.po | 33 ++- lib/libalpm/po/zh_TW.po | 27 ++- scripts/po/ca.po | 102 ++++++---- scripts/po/cs.po | 98 ++++++---- scripts/po/da.po | 98 ++++++---- scripts/po/de.po | 156 ++++++++++---- scripts/po/el.po | 146 +++++++++---- scripts/po/en_GB.po | 182 ++++++++++------ scripts/po/es.po | 399 ++++++++++++++++++++++------------ scripts/po/fi.po | 87 +++++--- scripts/po/fr.po | 480 +++++++++++++++++++++++++++------------- scripts/po/hu.po | 101 ++++++---- scripts/po/it.po | 218 ++++++++++++++----- scripts/po/kk.po | 103 ++++++---- scripts/po/lt.po | 133 +++++++++--- scripts/po/nb.po | 98 ++++++---- scripts/po/pacman-scripts.pot | 75 +++++-- scripts/po/pl.po | 98 ++++++---- scripts/po/pt.po | 102 ++++++---- scripts/po/pt_BR.po | 462 +++++++++++++++++++++++++-------------- scripts/po/ro.po | 192 +++++++++++------ scripts/po/ru.po | 100 ++++++---- scripts/po/sk.po | 98 ++++++---- scripts/po/sr.po | 99 ++++++---- scripts/po/sr(a)latin.po | 99 ++++++---- scripts/po/sv.po | 86 +++++--- scripts/po/tr.po | 97 ++++++--- scripts/po/uk.po | 103 ++++++---- scripts/po/zh_CN.po | 101 ++++++---- scripts/po/zh_TW.po | 78 +++++--- src/pacman/po/ca.po | 142 ++++++++----- src/pacman/po/cs.po | 141 ++++++++----- src/pacman/po/da.po | 125 +++++++---- src/pacman/po/de.po | 131 ++++++++---- src/pacman/po/el.po | 283 ++++++++++++++----------- src/pacman/po/en_GB.po | 161 +++++++++----- src/pacman/po/es.po | 224 ++++++++++++-------- src/pacman/po/fi.po | 222 ++++++++++++------- src/pacman/po/fr.po | 237 ++++++++++++-------- src/pacman/po/hu.po | 139 ++++++++----- src/pacman/po/it.po | 153 +++++++++----- src/pacman/po/kk.po | 141 ++++++++----- src/pacman/po/lt.po | 127 ++++++++---- src/pacman/po/nb.po | 140 ++++++++----- src/pacman/po/pacman.pot | 78 +++++--- src/pacman/po/pl.po | 140 ++++++++----- src/pacman/po/pt.po | 143 ++++++++----- src/pacman/po/pt_BR.po | 216 +++++++++++------- src/pacman/po/ro.po | 165 +++++++++----- src/pacman/po/ru.po | 142 ++++++++----- src/pacman/po/sk.po | 158 +++++++++----- src/pacman/po/sr.po | 140 ++++++++----- src/pacman/po/sr(a)latin.po | 140 ++++++++----- src/pacman/po/sv.po | 113 +++++++---- src/pacman/po/tr.po | 141 ++++++++----- src/pacman/po/uk.po | 130 ++++++++---- src/pacman/po/zh_CN.po | 142 ++++++++----- src/pacman/po/zh_TW.po | 150 +++++++++----- 84 files changed, 6131 insertions(+), 3444 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-244-g1df9b2a
by dan＠archlinux.org 22 Sep '11

22 Sep '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 1df9b2aa79c5017d394e26619449ab0a49c65c16 (commit) via 067721cbff9652d5c436d277f9be3f8fa2a71796 (commit) via 33685b960d3f05841cfac5696a0946396c448a34 (commit) via 595e1a437fab8d489736eff4811903aea4f5a38f (commit) via 7d961c849bf4dab481e261bdb91304f6a4744d8c (commit) via 6767de5380d97f6544ca3968b83b74120dfcbeca (commit) via 213950afa370296b921230e6edc626e70a71b499 (commit) via 491b656c548f13658c609784cf02af244ee97b23 (commit) via 03e1b4caa9cf91ac3a3956b82e080dfc72b66a17 (commit) via a7691ba6fd6f87cae6210c304235c709e4f9a60e (commit) via 4b6a5ae1599807d60568bb617483ffe368745ac0 (commit) via 765178c5bafe88e09f33ab67152b9bb3eabe7685 (commit) via 0ef7129a4a7776db9d0c4dd52519e2ca21b428d5 (commit) via 4849a4596d502376f66c327a48c5d78328acdfe0 (commit) via 0a4a5cea97f75d5d38e9cb33d5f47f0c36c0dffb (commit) via 3e4749fe3ec3f14e4107363a85b953b4a0a747f7 (commit) via 361ed6a6001c41f08ee85a94d28ba5a7c79a6154 (commit) via e4690232d61b8b7655df40feb417cf54c489d73c (commit) via ca58e326dc8e7d347c8ce77cba58a8ea1a99fb49 (commit) via 69694edd2cd282b513426cced5d885cec35f612e (commit) via d36d70d2947b1c6a161f6bf55ddd19445f2c81cb (commit) via 33f251853155fd1e04d03fbaffb3849ab8e953dc (commit) via 01f5c9e79ab2e051349f941b7ecce80d9a251603 (commit) via 5e7875ae6a42de40e3a7432ea758b27397a11aa7 (commit) via 3a460a8be650437326507b5604243d8fccbcfe26 (commit) via 47dd31560906fdd87f547940f5c7656d94d52b1b (commit) from 8375ad214a2a8d6e01430f432aa7957688d8ec52 (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 1df9b2aa79c5017d394e26619449ab0a49c65c16 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 17:51:02 2011 -0500 pacman-key: add an additional plain text 'foo-trusted' file This is similar to the 'foo-revoked' file we had. This will be used to inform the user what keys in the shipped keyring need to be explicitly trusted by the user. A distro such as Arch will likely have 3-4 master keys listed in this trusted file, but an additional 25 developer keys present in the keyring that the user shouldn't have to directly sign. We use this list to prompt the user to sign the keys locally. If the key is already signed locally gpg will print a bit of junk but will continue without pestering the user. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 067721cbff9652d5c436d277f9be3f8fa2a71796 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 16:35:07 2011 -0500 pacman-key: factor out validate_with_gpg() method This was copy-pasted code for the most part once the filename was factored out. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 33685b960d3f05841cfac5696a0946396c448a34 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 17:53:44 2011 -0500 pacman-key: remove holdkeys functionality We're putting the cart ahead of the horse a bit here. Given that our keyring is not one where everything is implicitly trusted (ala gpgv), keeping or deleting a key has no bearing on its trusted status, only whether we can actually verify things signed by said key. If we need to address this down the road, we can find a solution that works for the problem at hand rather than trying to solve it now before signing is even widespread. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 595e1a437fab8d489736eff4811903aea4f5a38f Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 16:22:21 2011 -0500 pacman-key: implement promptless lsigning Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7d961c849bf4dab481e261bdb91304f6a4744d8c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 16:19:12 2011 -0500 pacman-key: disable, don't remove, revoked keys Unlike our protégé apt-key, removing a key from our keyring is not sufficient to prevent it from being trusted or used for verification. We are better off flagging it as disabled and leaving it in the keyring so it cannot be reimported or fetched at a later date from a keyserver and continue to be used. Implement the logic to disable the key instead of delete it, figuring out --command-fd in the process. Note that the surefire way to disable a key involves including said key in the keyring package, such that it is both in foobar.gpg and foobar-revoked. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6767de5380d97f6544ca3968b83b74120dfcbeca Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 15:30:12 2011 -0500 Add status and check for key being disabled Because we aren't using gpgv and a dedicated keyring that is known to be all safe, we should honor this flag being set on a given key in the keyring to know to not honor it. This prevents a key from being reimported that a user does not want to be used- instead of deleting, one should mark it as disabled. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 213950afa370296b921230e6edc626e70a71b499 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 14:22:07 2011 -0500 pacman-key: simplify import in populate This finishes the cleanup started in 710e83999bbf. We can do a straight import from another keyring rather than all the funky parsing and piping business we were doing. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 491b656c548f13658c609784cf02af244ee97b23 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 14:06:41 2011 -0500 pacman-key: don't hide --verify details in populate Otherwise we're hiding extremely relevant bits like this one: gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 03e1b4caa9cf91ac3a3956b82e080dfc72b66a17 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 14:04:07 2011 -0500 pacman-key: print message in populate if signature is missing Rather than saying it was invalid, tell the user no signature exists. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7691ba6fd6f87cae6210c304235c709e4f9a60e Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 20 19:36:14 2011 -0500 pacman-key: clean up populate output * Ensure usage message is indented correctly * Show short filenames for both the gpg keyring and revocation file Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4b6a5ae1599807d60568bb617483ffe368745ac0 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 20 19:35:11 2011 -0500 pacman-key: ensure array iterations are quoted When doing something like `pacman-key --edit-key 'Dan McGee'`, one would expect it to work, and not fail. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 765178c5bafe88e09f33ab67152b9bb3eabe7685 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 20 16:54:08 2011 -0500 Implement PGP key search and import Add two new static methods, key_search() and key_import(), to our growing list of signing code. If we come across a key we do not have, attempt to look it up remotely and ask the user if they wish to import said key. If they do, flag the validation process as a potential 'retry', meaning it might succeed the next time it is ran. These depend on you having a 'keyserver hkp://foo.example.com' line in your gpg.conf file in your gnupg home directory to function. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ef7129a4a7776db9d0c4dd52519e2ca21b428d5 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 22 11:02:58 2011 -0500 signing: document most undocumented functions Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4849a4596d502376f66c327a48c5d78328acdfe0 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 20 16:52:18 2011 -0500 Add _alpm_process_siglist() logic to failed package validation This moves the result processing out of the validation check loop itself and into a new loop. Errors will be presented to the user one-by-one after we fully complete the validation loop, so they no longer overlap the progress bar. Unlike the database validation, we may have several errors to process in sequence here, so we use a function-scoped struct to track all the necessary information between seeing an error and asking the user about it. The older prompt_to_delete() callback logic is still kept, but only for checksum failures. It is debatable whether we should do this at all or just delegate said actions to the user. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0a4a5cea97f75d5d38e9cb33d5f47f0c36c0dffb Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 20 16:49:50 2011 -0500 Add new import key question enum value and stub frontend function This is for eventual use by the PGP key import code. Breaking this into a separate commit now makes the following patches a bit easier to understand. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3e4749fe3ec3f14e4107363a85b953b4a0a747f7 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 14:47:17 2011 -0500 Fix signature printing in package info pm_asprintf() does not return a length as asprintf() does. Fail. Make sure it is not -1 as that is the only failure condition. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 361ed6a6001c41f08ee85a94d28ba5a7c79a6154 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 13:31:18 2011 -0500 config parsing: add note if libcurl disabled and no XferCommand Just a helpful warning for those users in this unenviable position. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e4690232d61b8b7655df40feb417cf54c489d73c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 13:20:13 2011 -0500 config parsing: include file and line number in more errors Before: $ pacman -Si pacman error: invalid value for 'SigLevel' : 'FooValue' After: $ ./src/pacman/pacman -Si pacman error: config file /etc/pacman.conf, line 88: invalid value for 'SigLevel' : 'FooValue' Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ca58e326dc8e7d347c8ce77cba58a8ea1a99fb49 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 13:06:19 2011 -0500 Pull option names out of messages in config parsing This allows some message reuse, as well as making it clear to translators what *not* to translate. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69694edd2cd282b513426cced5d885cec35f612e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 12:59:04 2011 -0500 Check capabilities in SigLevel option parsing Only allow turning it on if the backend library has support for it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d36d70d2947b1c6a161f6bf55ddd19445f2c81cb Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 10:31:30 2011 -0500 Add alpm_capabilities() method and enumeration This allows a frontend program to query, at runtime, what the library supports. This can be useful for sanity checking during config- requiring a downloader or disallowing signature settings, for example. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 33f251853155fd1e04d03fbaffb3849ab8e953dc Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 10:14:51 2011 -0500 Move default siglevel value from backend to frontend This takes the libraries hidden default out of the equation: hidden in the sense that we can't even find out what it is until we create a handle. This is a chicken-and-egg problem where we have probably already parsed the config, so it is hard to get the bitmask value right. Move it to the frontend so the caller can do whatever the heck they want. This also exposes a shortcoming where the frontend doesn't know if the library even supports signatures, so we should probably add a alpm_capabilities() method which exposes things like HAS_DOWNLOADER, HAS_SIGNATURES, etc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 01f5c9e79ab2e051349f941b7ecce80d9a251603 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 20 15:23:21 2011 -0500 validate_deltas: split verify/check errors loops This allows us to do all delta verification up front, followed by whatever needs to be done with any found errors. In this case, we call prompt_to_delete() for each error. Add back the missing EVENT(ALPM_EVENT_DELTA_INTEGRITY_DONE) that accidentally got removed in commit 062c391919e93f1d6. Remove use of *data; we never even look at the stuff in this array for the error code we were returning and this would be much better handled by one callback per error anyway, or at least some strongly typed return values. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5e7875ae6a42de40e3a7432ea758b27397a11aa7 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 19:13:43 2011 -0500 Fix possible segfault if siglist was empty If siglist->results wasn't a NULL pointer, we would try to free it anyway, even if siglist->count was zero. Only attempt to free this pointer if we had results and the pointer is valid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a460a8be650437326507b5604243d8fccbcfe26 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 21 09:44:29 2011 -0500 Remove noisy debug logger This one can be overwhelming when reading debug output from a very large package. We already have the output of each extracted file so we probably can do without this in 99.9% of cases. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 47dd31560906fdd87f547940f5c7656d94d52b1b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 20 15:56:20 2011 -0500 Fix int/size_t type in alpm_list_count() call alpm_list_count() returns size_t, which we should use to store the result since it is easy enough to format for printing. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman-key.8.txt | 31 ++++--- lib/libalpm/add.c | 3 - lib/libalpm/alpm.c | 25 +++++- lib/libalpm/alpm.h | 10 ++ lib/libalpm/be_package.c | 1 + lib/libalpm/handle.c | 7 +- lib/libalpm/signing.c | 229 ++++++++++++++++++++++++++++++++++++++++++++-- lib/libalpm/sync.c | 106 +++++++++++++++------- scripts/pacman-key.sh.in | 120 +++++++++++++----------- src/pacman/callback.c | 13 ++- src/pacman/conf.c | 53 +++++++---- src/pacman/util.c | 5 +- 12 files changed, 463 insertions(+), 140 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add alpm_capabilities() method and enumeration
by Dan McGee 21 Sep '11

21 Sep '11

This allows a frontend program to query, at runtime, what the library supports. This can be useful for sanity checking during config- requiring a downloader or disallowing signature settings, for example. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.c | 25 +++++++++++++++++++++++-- lib/libalpm/alpm.h | 8 ++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 585c6a8..84d9eaf 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -133,9 +133,30 @@ int SYMEXPORT alpm_release(alpm_handle_t *myhandle) * @brief Various libalpm functions */ -/* Get the version of library */ -const char SYMEXPORT *alpm_version(void) { +/** Get the version of library. + * @return the library version, e.g. "6.0.4" + * */ +const char SYMEXPORT *alpm_version(void) +{ return LIB_VERSION; } +/** Get the capabilities of the library. + * @return a bitmask of the capabilities + * */ +enum alpm_caps alpm_capabilities(void) +{ + return 0 +#ifdef ENABLE_NLS + | ALPM_CAPABILITY_NLS +#endif +#ifdef HAVE_LIBCURL + | ALPM_CAPABILITY_DOWNLOADER +#endif +#ifdef HAVE_GPGME + | ALPM_CAPABILITY_SIGNATURES +#endif + | 0; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 853cb8b..3b6b279 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1187,7 +1187,15 @@ const char *alpm_strerror(enum _alpm_errno_t err); alpm_handle_t *alpm_initialize(const char *root, const char *dbpath, enum _alpm_errno_t *err); int alpm_release(alpm_handle_t *handle); + +enum alpm_caps { + ALPM_CAPABILITY_NLS = (1 << 0), + ALPM_CAPABILITY_DOWNLOADER = (1 << 1), + ALPM_CAPABILITY_SIGNATURES = (1 << 2) +}; + const char *alpm_version(void); +enum alpm_caps alpm_capabilities(void); /* End of alpm_api */ /** @} */ -- 1.7.6.3

1 0

[pacman-dev] [PATCH 1/4] pacman-key: ensure array iterations are quoted
by Dan McGee 21 Sep '11

21 Sep '11

When doing something like `pacman-key --edit-key 'Dan McGee'`, one would expect it to work, and not fail. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/pacman-key.sh.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 2a78803..b3f5259 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -203,7 +203,7 @@ verify_keyring_input() { # Verify signatures of keyring files and association revocation files if they exist msg "$(gettext "Verifying keyring file signatures...")" local keyring - for keyring in ${KEYRINGIDS[@]}; do + for keyring in "${KEYRINGIDS[@]}"; do if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}.gpg.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" ret=1 @@ -239,7 +239,7 @@ populate_keyring() { fi else # verify listed keyrings exist - for keyring in ${KEYRINGIDS[@]}; do + for keyring in "${KEYRINGIDS[@]}"; do if [[ ! -f "$KEYRING_IMPORT_DIR/$keyring.gpg" ]]; then error "$(gettext "The keyring file %s does not exist.")" "$KEYRING_IMPORT_DIR/$keyring.gpg" ret=1 @@ -258,7 +258,7 @@ populate_keyring() { local key_id # Add keys from requested keyrings - for keyring in ${KEYRINGIDS[@]}; do + for keyring in "${KEYRINGIDS[@]}"; do msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --with-colons --list-keys | grep ^pub | cut -d: -f5)" for key_id in ${add_keys}; do @@ -270,7 +270,7 @@ populate_keyring() { # to key ids is important, because key ids are the only guarantee of identification # for the keys. local -A removed_ids - for keyring in ${KEYRINGIDS[@]}; do + for keyring in "${KEYRINGIDS[@]}"; do if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then while read key; do local key_values name @@ -313,7 +313,7 @@ populate_keyring() { edit_keys() { local errors=0; - for key in ${KEYIDS[@]}; do + for key in "${KEYIDS[@]}"; do # Verify if the key exists in pacman's keyring if ! "${GPG_PACMAN[@]}" --list-keys "$key" &>/dev/null; then error "$(gettext "The key identified by %s does not exist")" "$key" @@ -322,7 +322,7 @@ edit_keys() { done (( errors )) && exit 1; - for key in ${KEYIDS[@]}; do + for key in "${KEYIDS[@]}"; do "${GPG_PACMAN[@]}" --edit-key "$key" done } -- 1.7.6.3

1 3

[pacman-dev] [RFC] makepkg: output commands ran in build/check/package functions
by Florian Pritz 21 Sep '11

21 Sep '11

This might help to locate a failing command which causes makepkg to abort. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- This is a request for comments and not a final patch. It's only been tested shortly. I just want to know if people like the idea. scripts/makepkg.sh.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6304a25..409c4cc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -851,6 +851,7 @@ extract_sources() { } error_function() { + set +x if [[ -p $logpipe ]]; then rm "$logpipe" fi @@ -912,7 +913,9 @@ run_function() { restoretrap=$(trap -p ERR) trap 'error_function $pkgfunc' ERR + set -x $pkgfunc &>"$logpipe" + set +x eval $restoretrap wait $teepid @@ -920,7 +923,9 @@ run_function() { else restoretrap=$(trap -p ERR) trap 'error_function $pkgfunc' ERR + set -x $pkgfunc 2>&1 + set +x eval $restoretrap fi # reset our shell options -- 1.7.6.1

6 5

[pacman-dev] [PATCH 1/4] validate_deltas: split verify/check errors loops
by Dan McGee 20 Sep '11

20 Sep '11

This allows us to do all delta verification up front, followed by whatever needs to be done with any found errors. In this case, we call prompt_to_delete() for each error. Add back the missing EVENT(ALPM_EVENT_DELTA_INTEGRITY_DONE) that accidentally got removed in commit 062c391919e93f1d6. Remove use of *data; we never even look at the stuff in this array for the error code we were returning and this would be much better handled by one callback per error anyway, or at least some strongly typed return values. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/sync.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2092912..dda4b24 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -753,11 +753,9 @@ static int prompt_to_delete(alpm_handle_t *handle, const char *filepath, return doremove; } -static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas, - alpm_list_t **data) +static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas) { - int errors = 0; - alpm_list_t *i; + alpm_list_t *i, *errors = NULL; if(!deltas) { return 0; @@ -765,19 +763,25 @@ static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas, /* Check integrity of deltas */ EVENT(handle, ALPM_EVENT_DELTA_INTEGRITY_START, NULL, NULL); - for(i = deltas; i; i = i->next) { alpm_delta_t *d = i->data; char *filepath = _alpm_filecache_find(handle, d->delta); if(_alpm_test_checksum(filepath, d->delta_md5, ALPM_CSUM_MD5)) { - prompt_to_delete(handle, filepath, ALPM_ERR_DLT_INVALID); - errors++; - *data = alpm_list_add(*data, strdup(d->delta)); + errors = alpm_list_add(errors, filepath); + } else { + FREE(filepath); } - FREE(filepath); } + EVENT(handle, ALPM_EVENT_DELTA_INTEGRITY_DONE, NULL, NULL); + if(errors) { + for(i = errors; i; i = i->next) { + char *filepath = i->data; + prompt_to_delete(handle, filepath, ALPM_ERR_DLT_INVALID); + FREE(filepath); + } + alpm_list_free(errors); handle->pm_errno = ALPM_ERR_DLT_INVALID; return -1; } @@ -1024,7 +1028,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return -1; } - if(validate_deltas(handle, deltas, data)) { + if(validate_deltas(handle, deltas)) { alpm_list_free(deltas); return -1; } -- 1.7.6.3

1 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-218-g8375ad2
by dan＠archlinux.org 20 Sep '11

20 Sep '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 8375ad214a2a8d6e01430f432aa7957688d8ec52 (commit) via b7ebacc576ea63fd35861f374dd345f6aa8feb8c (commit) via ec790ced7cee00269234cb1ed476e29256433923 (commit) via 994cb4da4f6bc8efbb6a649cb7d99d95bce5c37a (commit) via a27f993600a518ef6a15bd7fb29575b218b58a0a (commit) via afdbfc05f771f2c684ee195b46d26b3d08a67085 (commit) via 7eb2f0cd151998d36746e2eb14cad2a3f8fb708b (commit) via 8e3b39a9e0c2fbc268919a57fb1e3cf7aa2aedf4 (commit) via 0f92fc59638e5d053966c8f39afd615a870141cc (commit) via 79cbce60ac4a40bf11d039e9bdcd09c852ce3292 (commit) via 70e2c34f0f5db329b8e92fe3fc3043e495272f14 (commit) via 37961648486ca44a92eefe454cd6f1f091c4fe6d (commit) via 95119d46d486168e7fddd5e8eece93be8e9ca719 (commit) via 288a81d8470b1fd2e8a8f0814abe4cbfed71497c (commit) via bfe36c2ddf869e2ebc44bec1e35c0319263ac386 (commit) via e1899cbc64c6b634107f09c3a3e8152c63078636 (commit) via a94ad2974031138dbb4d42a939dfc0cd15a75ce7 (commit) from 41d8deff88ed7bdaf1820882687fb99107f60d2a (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 8375ad214a2a8d6e01430f432aa7957688d8ec52 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 23:47:06 2011 -0500 _alpm_sync_commit: extract two static methods This adds two new static methods, check_validity() and load_packages(), to sync.c which are simply code fragments pulled out of our do-everything sync commit code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b7ebacc576ea63fd35861f374dd345f6aa8feb8c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 23:28:05 2011 -0500 Pass package signature data up one more level Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ec790ced7cee00269234cb1ed476e29256433923 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 22:53:15 2011 -0500 signing: add a process and retry loop for database signatures In reality, there is no retrying that happens as of now because we don't have any import or changing of the keyring going on, but the code is set up so we can drop this in our new _alpm_process_siglist() function. Wire up the basics to the sync database validation code, so we see something like the following: $ pacman -Ss unknowntrust error: core: signature from "Dan McGee <dpmcgee(a)gmail.com>" is unknown trust error: core: signature from "Dan McGee <dpmcgee(a)gmail.com>" is unknown trust error: database 'core' is not valid (invalid or corrupted database (PGP signature)) $ pacman -Ss missingsig error: core: missing required signature error: core: missing required signature error: database 'core' is not valid (invalid or corrupted database (PGP signature)) Yes, there is some double output, but this should be fixable in the future. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 994cb4da4f6bc8efbb6a649cb7d99d95bce5c37a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 21:51:30 2011 -0500 Allow our PGP helper method to pass back the signature results This will make its way up the call chain eventually to allow trusting and importing of keys as necessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a27f993600a518ef6a15bd7fb29575b218b58a0a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 21:01:26 2011 -0500 Split package validation and load loops This adds a some new callback event and progress codes for package loading, which was formerly bundled in with package validation before. The main sync.c loop where loading occurred is now two loops running sequentially. The behavior should not change with this patch outside of progress and event display; more changes will come in following patches. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afdbfc05f771f2c684ee195b46d26b3d08a67085 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 20:40:32 2011 -0500 Extract an _alpm_pkg_validate_internal() method _alpm_pkg_load_internal() was becoming a monster. Extract the top bit of the method that dealt with checksum and signature validation into a separate method that should be called before one loads a package to ensure it is valid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7eb2f0cd151998d36746e2eb14cad2a3f8fb708b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 19 22:09:15 2011 -0400 pacman/upgrade: print 'loading packages...' only once Do this outside the loop to prevent the message from being displayed (and pluralized!) for each individual package. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8e3b39a9e0c2fbc268919a57fb1e3cf7aa2aedf4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 19:57:29 2011 -0500 pacman: use dynamic string allocation where it makes sense None of these are hot-code paths, and at least the target reading has little need for an arbitrary length limitation (however crazy it might be to have longer arguments). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0f92fc59638e5d053966c8f39afd615a870141cc Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 19:15:16 2011 -0500 utils/cleanupdelta: remove unneeded syncdbpath This variable was totally unused. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 79cbce60ac4a40bf11d039e9bdcd09c852ce3292 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 14:32:53 2011 -0500 Remove all usages of alpm_list_getdata() from the library No need for the indirection; just access ->data instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70e2c34f0f5db329b8e92fe3fc3043e495272f14 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 14:28:18 2011 -0500 _alpm_runscriptlet(): remove clean_tmpdir variable This is always true at the end since we return early if we couldn't create the tmpdir, so it is totally unnecessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 37961648486ca44a92eefe454cd6f1f091c4fe6d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 14:27:21 2011 -0500 Access db->pkgcache directly in db_free_pkgcache() We shouldn't be going through the accessor that does a bunch of unnecessary legwork, including potentially loading the pkgcache right before we free it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 95119d46d486168e7fddd5e8eece93be8e9ca719 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 19:55:16 2011 -0500 Flip getcwd()/chdir() for open()/fchdir() in the frontend Just like we did in libalpm in commit 288a81d8470b1. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 288a81d8470b1fd2e8a8f0814abe4cbfed71497c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 14:08:14 2011 -0500 Use more efficient way of restoring working directory Rather than using a string-based path, we can restore the working directory via a file descriptor and use of fchdir(). From the getcwd manpage: Opening the current directory (".") and calling fchdir(2) to return is usually a faster and more reliable alternative when sufficiently many file descriptors are available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bfe36c2ddf869e2ebc44bec1e35c0319263ac386 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 13:43:13 2011 -0500 Reduce path allocation on the stack in local database We did a lot of both malloc-ing and stack printing to form some paths in this code. Attempt to unify it all into the one get_pkgpath() method by adding an optional third "filename" parameter, and form the necessary path string all in one go. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e1899cbc64c6b634107f09c3a3e8152c63078636 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 13:18:42 2011 -0500 Be smarter about running ldconfig during removal transactions 1. Don't run it if something failed in package removal- this mirrors what we already do in sync transactions. 2. Don't run it if we are invoking it for the replaces removal bit of a sync transaction- it doesn't make sense to run ldconfig halfway through a sync install; we should only run it once at the end. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a94ad2974031138dbb4d42a939dfc0cd15a75ce7 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 19 13:17:16 2011 -0500 Search for non-prefixed paths in skip_remove list We add them to this list with the root path not appended; we should be searching for them this way as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 19 ++++-- lib/libalpm/alpm.h | 5 ++ lib/libalpm/be_local.c | 67 ++++++++++--------- lib/libalpm/be_package.c | 93 +++++++++++++++++---------- lib/libalpm/be_sync.c | 18 +++++- lib/libalpm/db.c | 6 +- lib/libalpm/deps.c | 3 +- lib/libalpm/handle.c | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 8 ++- lib/libalpm/remove.c | 20 +++--- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 87 +++++++++++++++++++++++--- lib/libalpm/signing.h | 6 ++- lib/libalpm/sync.c | 158 +++++++++++++++++++++++++++++++--------------- lib/libalpm/trans.c | 13 ++--- lib/libalpm/util.c | 44 ++++++++----- src/pacman/callback.c | 9 +++ src/pacman/conf.c | 24 ++++--- src/pacman/pacman.c | 25 ++++++-- src/pacman/sync.c | 8 ++- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 10 +++- src/util/cleanupdelta.c | 15 ++--- 24 files changed, 437 insertions(+), 209 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] utils/cleanupdelta: remove unneeded syncdbpath
by Dan McGee 20 Sep '11

20 Sep '11

This variable was totally unused. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/util/cleanupdelta.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index a45efdc..8ce74f9 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -22,7 +22,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <limits.h> /* PATH_MAX */ #include <alpm.h> #include <alpm_list.h> @@ -68,19 +67,17 @@ static void checkpkgs(alpm_list_t *pkglist) } static void checkdbs(const char *dbpath, alpm_list_t *dbnames) { - char syncdbpath[PATH_MAX]; alpm_db_t *db = NULL; alpm_list_t *i; const alpm_siglevel_t level = ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; for(i = dbnames; i; i = alpm_list_next(i)) { - char *dbname = alpm_list_getdata(i); - snprintf(syncdbpath, PATH_MAX, "%s/sync/%s", dbpath, dbname); + const char *dbname = alpm_list_getdata(i); db = alpm_db_register_sync(handle, dbname, level); if(db == NULL) { - fprintf(stderr, "error: could not register sync database (%s)\n", - alpm_strerror(alpm_errno(handle))); - return; + fprintf(stderr, "error: could not register sync database '%s' (%s)\n", + dbname, alpm_strerror(alpm_errno(handle))); + continue; } checkpkgs(alpm_db_get_pkgcache(db)); } -- 1.7.6.1

1 0

[pacman-dev] [PATCH 1/7] Search for non-prefixed paths in skip_remove list
by Dan McGee 19 Sep '11

19 Sep '11

We add them to this list with the root path not appended; we should be searching for them this way as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 8021702..c6a3efc 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -216,12 +216,12 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, { char filepath[PATH_MAX]; - snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); - - if(alpm_list_find_str(skip_remove, filepath)) { + if(alpm_list_find_str(skip_remove, file->name)) { /* return success because we will never actually remove this file */ return 1; } + + snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); /* If we fail write permissions due to a read-only filesystem, abort. * Assume all other possible failures are covered somewhere else */ if(_alpm_access(handle, NULL, filepath, W_OK) == -1) { -- 1.7.6.1

1 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-201-g41d8def
by dan＠archlinux.org 18 Sep '11

18 Sep '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 41d8deff88ed7bdaf1820882687fb99107f60d2a (commit) via 86d9fcbfff6d806bcb6d0a19d73d09e1af4e1733 (commit) via 69a3558b75948e4b1592a060a58f6c1d58b7d459 (commit) via 49dff4c80b70f73f55cd8968e83d4ea3727c2ae3 (commit) via 83ee9708b1c0ed3c262e0148ea8cdc880f177d0d (commit) via 07e89c1e5db2769c1128f5d99fead151a4afc751 (commit) via 52c65fdfea7d174ad2f4d895c5783d936fdac7d7 (commit) via c12fa4ab192da0a1cd5c61b2f70e154205401e6b (commit) via b1a09b93ef626995a009ae3144fc130cc60a4078 (commit) from 223a92ca9da2efecefb200a828618747c0f5b03e (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 41d8deff88ed7bdaf1820882687fb99107f60d2a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 17:32:15 2011 -0500 be_local: cope with a desc file without trailing newline We checked the (fgets == NULL and !feof) case, but never actually bailed out of the loop if we were at the end of the file, causing infinite looping. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 86d9fcbfff6d806bcb6d0a19d73d09e1af4e1733 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 17:07:05 2011 -0500 Remove const specifier from changelog_read() void parameter This shouldn't really be declared with const, and causes a compile error when -Wcast-qual is used. Remove the const specifier from the function specification and all implementations. Also fix one other trivial -Wcast-qual warning in _alpm_db_cmp(). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69a3558b75948e4b1592a060a58f6c1d58b7d459 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 17:03:54 2011 -0500 Remove dead changelog_feof() code We never ended up using or really needing this; kill it for now knowing it is in git history if ever needed again. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49dff4c80b70f73f55cd8968e83d4ea3727c2ae3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 17:00:21 2011 -0500 Add a random pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 83ee9708b1c0ed3c262e0148ea8cdc880f177d0d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 18 16:22:38 2011 -0400 src/util: provide strndup definitions where needed Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07e89c1e5db2769c1128f5d99fead151a4afc751 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 18 17:22:18 2011 -0400 dload: avoid using memrchr This function doesn't exist on OSX. Since there aren't any other candidates in alpm for which this function would make sense to use, simply replace the function call with a loop that does the equivalent. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 52c65fdfea7d174ad2f4d895c5783d936fdac7d7 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 16:55:23 2011 -0500 Ensure entire struct is zeroed in _alpm_parsedate() Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c12fa4ab192da0a1cd5c61b2f70e154205401e6b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 18 16:19:32 2011 -0400 pactree: include missing ctype.h header needed for isspace() -- avoids warnings on OSX. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b1a09b93ef626995a009ae3144fc130cc60a4078 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 18 16:35:00 2011 -0400 configure: Fix quoting in SEDINPLACE on Darwin single quotes expanded to nothing, leaving us with a command that assumed the sed expression was the backup suffix. Use a pair of escaped double quotes, which survives automake and ends up properly in makepkg. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- lib/libalpm/alpm.h | 4 +--- lib/libalpm/be_local.c | 10 +++++++--- lib/libalpm/be_package.c | 2 +- lib/libalpm/db.c | 4 ++-- lib/libalpm/dload.c | 12 +++++++++--- lib/libalpm/package.c | 11 ++--------- lib/libalpm/package.h | 2 +- lib/libalpm/util.c | 3 ++- src/util/pacsort.c | 22 ++++++++++++++++++++++ src/util/pactree.c | 23 +++++++++++++++++++++++ test/pacman/tests/replace104.py | 25 +++++++++++++++++++++++++ 12 files changed, 96 insertions(+), 24 deletions(-) create mode 100644 test/pacman/tests/replace104.py hooks/post-receive -- The official pacman repository

1 0