- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: normalize whitespace for optdepends in .PKGINFO
by Allan McRae 24 Sep '11

24 Sep '11

Many PKGBUILDs use formatting whitespace when specifying optdepends. This is removed when adding a package to a repo-database so the output of "pacman -Si <package>" and "pacman -Qip <package file>" becomes inconsistent. Instead, do the adjustment when creating the .PKGINFO file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a0b0375..2703177 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1134,7 +1134,7 @@ write_pkginfo() { [[ $license ]] && printf "license = %s\n" "${license[@]}" [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" [[ $groups ]] && printf "group = %s\n" "${groups[@]}" - [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]}" + [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" -- 1.7.6.3

1 0

[pacman-dev] [PATCH] makepkg: allow versioned optdepends with epoch
by Allan McRae 24 Sep '11

24 Sep '11

Allow the specification of versioned optdepends with an epoch. This also (partially) enforces a whitespace between ":" and the description which is required for the future optdepends parsing code. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- There are only four packages in the Arch repos that do not use a ":" followed by some whitespace before the description in their optdepends. This catches 3/4 of them, with the following is incorrectly seen as valid: optdepends=('pyglet:plotting') It is probably possible to separate a single word description from a version with epoch with a much more complicated regex... scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6304a25..a0b0375 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1529,8 +1529,8 @@ check_sanity() { eval $(awk '/^[[:space:]]*optdepends=$/,/$[[:space:]]*(#.*)?$/' "$BUILDFILE" | \ sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//') for i in "${optdepends_list[@]}"; do - local pkg=${i%%:*} - if [[ $pkg != +([[:alnum:]><=.+_-]) ]]; then + local pkg=${i%%:[[:space:]]*} + if [[ $pkg != +([[:alnum:]><=.+_-:]) ]]; then error "$(gettext "Invalid syntax for %s : '%s'")" "optdepend" "$i" ret=1 fi -- 1.7.6.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-5-g2517ba3
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 2517ba3303489ed35512cdaf2493ec81efd145e7 (commit) via c406949226fe5759473f13b5eb1fcf48c32d67ea (commit) via 1e0ed133f471c35fe6979612a4cb57926223c9b9 (commit) via 907e8af5be7579129a257b4c9952e86a22df9bb9 (commit) via f1beb050a305f4e363d09579359957097c5baed5 (commit) from 43787d00678e00adee54c9ab4b8909d26cba3940 (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 2517ba3303489ed35512cdaf2493ec81efd145e7 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 22 16:29:03 2011 -0500 Update Doxyfile and fix some documentation errors caught by Doxygen A few parameters were outdated or wrongly named, and a few things were explicitly linked that Doxygen wasn't able to resolve. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c406949226fe5759473f13b5eb1fcf48c32d67ea Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 22 15:59:18 2011 -0500 Ensure database validity flags are set in invalid signature case We returned the right error code but never set the flags accordingly. Also, now that we can bail early, ensure we set the error code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1e0ed133f471c35fe6979612a4cb57926223c9b9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 22 15:47:57 2011 -0500 Handle key import errors correctly and with good error messages This adds calls to gpgme_op_import_result() which we were not looking at before to ensure the key was actually imported. Additionally, we do some preemptive checks to ensure the keyring is even writable if we are going to prompt the user to add things to it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 907e8af5be7579129a257b4c9952e86a22df9bb9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 22 14:40:51 2011 -0500 signing: be consistent with returning -1 for error cases This also fixes a segfault found by dave when key_search is unsuccessful; the key_search return code documentation has also been updated to reflect reality. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f1beb050a305f4e363d09579359957097c5baed5 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 22 12:08:35 2011 -0500 Update configure.ac version to rc2 Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/Doxyfile | 143 +++++++++++++++++++++++++++++++--------------- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 13 +++-- lib/libalpm/alpm_list.c | 1 - lib/libalpm/be_sync.c | 3 + lib/libalpm/deps.c | 1 + lib/libalpm/signing.c | 73 ++++++++++++++++++------ lib/libalpm/sync.c | 2 +- 9 files changed, 165 insertions(+), 75 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] signing: fix segfault on unknown key
by Dave Reisner 22 Sep '11

22 Sep '11

Jump to the error label here, the same as other cases when we don't have valid key data to work with. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/signing.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 66607fc..2c26f4e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -247,6 +247,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr, err = gpgme_get_key(ctx, fpr, &key, 0); if(gpg_err_code(err) == GPG_ERR_EOF) { _alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed, unknown key\n"); + CHECK_ERR(); } else if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err)); -- 1.7.6.3

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v4.0.0rc2, created. v4.0.0rc2
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 annotated tag, v4.0.0rc2 has been created at 58b4f02d2e0f46c6694f701998e549c6cf17f5ed (tag) tagging 43787d00678e00adee54c9ab4b8909d26cba3940 (commit) replaces v4.0.0rc1 tagged by Dan McGee on Thu Sep 22 11:51:26 2011 -0500 - Log ----------------------------------------------------------------- 4.0.0 RC2- import keys, fully test signing -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk57Z58ACgkQXC5GoPU6du2y0wCgooXA6y4dtDn0uQN3FGsed2np xLoAoLq8Mr5CViBLqnIj4RQBDKHMM1UU =fKRN -----END PGP SIGNATURE----- Allan McRae (12): repo-add: indicate whether package signature is found repo-add: fix creation of signature symlink configure.ac: add checks for more types, functions and headers makepkg: deal with variable substitution when checking sanity Print callback messages to stderr pacman-key: rework importing distro/repo provided keyrings pacman-key: import everything then revoke on --populate pacman-key: update trust database for relevant operations pacman-key: Improve documentation for --populate pacman-key: rework and document holding keys in keyring Run pacman test-suite with LC_ALL=C Remove outdated comment for _alpm_outerconflicts Dan McGee (148): scripts/pkgdelta: fix `make distcheck` pacman/query.c: avoid variable redeclaration Update MD5 routines with changes from PolarSSL Update base64 PolarSSL code Add sha2 (sha256) routines from PolarSSL Add ALPM sha256sum routines Load and allow access to sha256sum Remove checksum access indirection decode_signature: guess signature data length for efficiency Show 'None' in Signatures -Qip/-Si output if none found Validate the sha256sum if available Parse conflicts/provides/replaces at database load time Add short example signature config to pacman.conf Further fixes to replacement iteration Only check necessary signatures and checksums repo-add: reorganize output messages for clarity Update translations from Transifex Update message catalogs Update authors and contributors doc/PKGBUILD: fix Asciidoc formatting issues Fix compilation using --without-gpgme Fix trailing whitespace in whole codebase Enhance and utilize database status flags Remove use of no-op accessor functions in library Remove usages of alpm_list_next() in backend Replacements refactor: extract check_literal() Replacements refactor: extract check_replacers() Add an _alpm_depcmp_literal() function Fix replacement of provider issue Convert resolvedep() to use _alpm_depcmp_literal() doc/PKGBUILD: update regarding versioned package fields Be more robust when copying package data Rework finding a writable cache directory Remove alpm_option_get_* usage from backend pacsort: ensure list is freed if size is 0 Print debug timestamps to same stream as rest of output dload: prevent need to copy struct in mask_signal() Retrieve default SigLevel value from backend after initial setting Style-match rpmvercmp code with upstream vercmp: ensure 2.0a and 2.0.a do not compare equal Update existing translations from Transifex Add new 'lt' and 'zh_TW' translations from transifex Use off_t rather than double where possible Finish large file download attack prevention Add a few more sizes to humanize_sizes() Slight refresh of the download progress callback Remove short/long label distinction Remove trans is NULL check in QUESTION/EVENT/PROGRESS macros Remove argument from check_pgp_helper strtrim: don't move empty string Fix small memory leak in sig check code Always process validity value returned by gpgme Fix possible mismatched type with several curl arguments Make sync error message smarter on unfound targets Check local database status flag in db_write sanity check block Refactor signature result return format Add more info to debug key display Refactor some args out of pkg_load_internal Better error handling out of package load method pacman-key: refine permission and locking checks pacman-key: have --init add more options to default gpg.conf Allow access to package origin data Database read optimizations _alpm_splitdep(): don't pass bogus length value to strndup Merge branch 'allan/pacman-key' Rework scriptlet tests to not depend on pacman output Streamline alpm_splitdep() comparisons pacman-key: fix broken logic around updating trust database Ensure progress callback updates if XX/YY numerator changes Parse > 2GiB file sizes correctly Scale package integrity progress bar/percentage by package size pacman-key master key generation pacman-key: add --lsign-key operation makepkg: fix overzealous PGP signature file matching Add pactest for overflowing date (year 2038 problem) _alpm_parsedate(): return time_t and not long pactest: remove PACMAN_OUTPUT from ldconfig tests Clean up handling of size fields pacman-key: document --lsign-key doc: consistency when referencing other options pacman-key help and documentation cleanup pacman-key: split keyserver to a separate option pacman-key: add --refresh-keys operation Make delta validation/application more logical Be fully silent on any -Sp operation Move all callbacks up to the handle level Former transaction callback rename refactor Add -p/--print tip for -Q operations on filepath More package operations cleanup dload: use intmax_t when printing off_t Ensure PackageRequired works as expected Remove unnecessary cast query check: use provided filelist count instead of keeping track Use more correct integer types in diskspace checks Print 'loading packages' message on -U operations Move download callback static vars into function download callback: show decimal places in rate if we have room Don't duplicate header strings Fix build without gpgme Ensure entire struct is zeroed in _alpm_parsedate() Add a random pactest Remove dead changelog_feof() code Remove const specifier from changelog_read() void parameter be_local: cope with a desc file without trailing newline Search for non-prefixed paths in skip_remove list Be smarter about running ldconfig during removal transactions Reduce path allocation on the stack in local database Use more efficient way of restoring working directory Flip getcwd()/chdir() for open()/fchdir() in the frontend Access db->pkgcache directly in db_free_pkgcache() _alpm_runscriptlet(): remove clean_tmpdir variable Remove all usages of alpm_list_getdata() from the library utils/cleanupdelta: remove unneeded syncdbpath pacman: use dynamic string allocation where it makes sense Extract an _alpm_pkg_validate_internal() method Split package validation and load loops Allow our PGP helper method to pass back the signature results signing: add a process and retry loop for database signatures Pass package signature data up one more level _alpm_sync_commit: extract two static methods Fix int/size_t type in alpm_list_count() call Remove noisy debug logger Fix possible segfault if siglist was empty validate_deltas: split verify/check errors loops Move default siglevel value from backend to frontend Add alpm_capabilities() method and enumeration Check capabilities in SigLevel option parsing Pull option names out of messages in config parsing config parsing: include file and line number in more errors config parsing: add note if libcurl disabled and no XferCommand Fix signature printing in package info Add new import key question enum value and stub frontend function Add _alpm_process_siglist() logic to failed package validation signing: document most undocumented functions Implement PGP key search and import pacman-key: ensure array iterations are quoted pacman-key: clean up populate output pacman-key: print message in populate if signature is missing pacman-key: don't hide --verify details in populate pacman-key: simplify import in populate Add status and check for key being disabled pacman-key: disable, don't remove, revoked keys pacman-key: implement promptless lsigning pacman-key: remove holdkeys functionality pacman-key: factor out validate_with_gpg() method pacman-key: add an additional plain text 'foo-trusted' file Translation file updates from Transifex Regenerate message catalogs and translations Dave Reisner (67): lib/dload: avoid deleting .part file on too-slow xfer pactest/sync200: check for curl instead of fetch add pactest for replacing a shared provider alpm.h: fix inconsistency in function prototype makepkg: don't hardcode path to strip README: update with 3.5.0 -> 4.0.0 API changes pacman/package: show presence of signature in in -Si lib/sync: reset flag after rejecting a replace dist: preserve symlinks on installation build-sys: always use $(RM) instead of rm -f lib/sync: ignore download errors for as long as possible dload: zero out pm_errno in curl_download_internal lib/dload: avoid renaming download to 0 length destfile lib/dload: refactor deletion on failure sync: fix garbled output in conflict prompt lib/dload: prevent possible NULL dereference makepkg: quote re-evaluation of simple vars dload: add 'unlink_on_fail' to payload struct lib/dload: unlink on response code >=400 bash_completion: add dbonly to sync options dload: remove code duplication dload: rename payload->filename to payload->remote_name dload: delete zero length downloads on curl error dload: remove unused macro pacman/util: use string_length to calculate line length dload: move tempfile and destfile to payload struct dload: rename cd_filename to content_disp_name dload: add open_mode to payload struct dload: move curl option setting to static function dload: move (un)masking of signals to separate functions dload: extract tempfile creation to its own function sync: halt file discovery if repo has no servers pacsort: use boolean, not binary OR operation makepkg: fix breakage in eval'ing quoted strings makepkg: read filenames in a while loop makepkg: fix sanity checking in versioning pacman/callback: reuse strlen calculation avoid blowing out the filecache list when using tmpdir sync: add missing newline in warning message dload: improve debug output dload: abstract dload_interrupted reasons rankmirrors: properly sort resulting times makepkg: unset variables as per !{make,build}flags makepkg: use globs in place of regex makepkg: refactor check_pgpsigs output makepkg: act on function return value, not output makepkg: avoid for loop in deleting manpage hardlinks makepkg: use more awk'ish syntax in sanity checks diskspace: fix memory leak on root mount not found paccache: escape . in trimming of diskspace string makepkg: unset errexit when sourcing /etc/profile dload: provide optional netrc support make compute_download_size consider .part files account for partial delta files in download size makepkg: check for var existance before file existance makepkg: add missing newline on passing gpg sourcecheck makepkg: fix recreation of hardlinks to .gz manpages buildsys: remove existing symlinks before installing include ldconfig.stub in EXTRA_DIST pacman: add short opt '-p' for --print to -{S,R}h paccache: remove unnecessary if check dload: remove user:pass@ definition from hostname configure: Fix quoting in SEDINPLACE on Darwin pactree: include missing ctype.h header dload: avoid using memrchr src/util: provide strndup definitions where needed pacman/upgrade: print 'loading packages...' only once Diogo Sousa (3): Improved alpm_list_mmerge() performance (fixed coding style) lib/libalpm/signing.c: Fix memory leak in decode_signature() in case of error. Removed multiple definitions of pkgfrom_t Helder Martins (1): lib/libalpm/handle.c: Removed redundant if condition Jakob Gruber (1): Fix formatting in pacman-key manpage Lukas Fleischer (7): Skip rename() on NULL destfile in curl_download_internal() Avoid stat() on NULL path in curl_download_internal() lib/libalpm/dload.c: Add ASSERT() to alpm_fetch_pkgurl() lib/libalpm/dload.c: Use STRDUP() instead of strdup() pacman.c: Remove redundant strdup() in parsearg_global() be_sync.c: Fix memory leak in alpm_db_update() lib/libalpm/util.c: Fix two memory leaks Pang Yan Han (4): pactest: -U --recursive pacsort: correct pointer type in list_new pacsort: correct list freeing Improve advice for sync ops when db.lck is present Rémy Oudompheng (1): libalpm: fix a remaining old syntax of RET_ERR() macro Sebastien Luttringer (2): Update PKGBUILD manpage about startdir deprecation Add makepkg -S which is an alias to makepkg --source ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[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

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-192-g223a92c
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 223a92ca9da2efecefb200a828618747c0f5b03e (commit) via 7ad78c2c88ea3a7a1a33c4d09c2e6e4c772da25e (commit) via a7d779803239a1dca43a6879f3938c5e63811992 (commit) from f883efe2cb105a397edc0b892f5fa06c98f2208f (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 223a92ca9da2efecefb200a828618747c0f5b03e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 11 15:27:57 2011 -0400 dload: remove user:pass@ definition from hostname Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7ad78c2c88ea3a7a1a33c4d09c2e6e4c772da25e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 13 18:22:46 2011 -0400 paccache: remove unnecessary if check This is superfluous as the ensuing for loop will exit immediately on the same condition avoided by the if. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a7d779803239a1dca43a6879f3938c5e63811992 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 18 15:34:28 2011 -0500 Fix build without gpgme Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 6 ++---- lib/libalpm/dload.c | 10 +++++++++- lib/libalpm/signing.c | 4 +++- 3 files changed, 14 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Is there a release schedule for pacman-4?
by kachelaqa 17 Sep '11

17 Sep '11

i had a look at the pacman4-rc1 that was put out for testing last month, but judging from the activity on this list there still seems to be a quite lot of new features being added. my searches for a release schedule have drawn a blank, so am i right to assume pacman-4 is still quite a long way away from it's first release? by "long way away" i mean more than, say, two months?

2 1

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

14 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 f883efe2cb105a397edc0b892f5fa06c98f2208f (commit) via e01dbcc06848c135af5beba069ad99bc5dd8deaf (commit) via 68856755c4f18affb513d93ec94fa9307c31473a (commit) via a2356d5ae3cdc6ac28ed614e0e5e7e75174728e9 (commit) via 4a02350ded318bdc1da5421551784ab2a10dd96b (commit) via d1e04c1b677d733262a0436ed9b25b2e7eada15e (commit) via 0f69e2ec0b3958167a2ea7a5fcef40cb966d05d1 (commit) from 3905ada993bacba31a1a9005fe4a0023890296d9 (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 f883efe2cb105a397edc0b892f5fa06c98f2208f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 12 19:47:05 2011 -0400 pacman: add short opt '-p' for --print to -{S,R}h Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e01dbcc06848c135af5beba069ad99bc5dd8deaf Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 14 13:30:29 2011 -0400 include ldconfig.stub in EXTRA_DIST Since c51b9ca, ldconfig.stub is required by pactest so we need to include it as part of the dist tarball. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68856755c4f18affb513d93ec94fa9307c31473a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 13 07:47:11 2011 -0400 buildsys: remove existing symlinks before installing This fixes build errors when performing a manual install straight to a filesystem where the files already exist. Reported-by: Sergej Pupykin <ml(a)sergej.pp.ru> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2356d5ae3cdc6ac28ed614e0e5e7e75174728e9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 12 09:55:47 2011 -0500 Don't duplicate header strings There is no need to print them into buffers; we can use the values returned by gettext() directly without issue. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a02350ded318bdc1da5421551784ab2a10dd96b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 13 23:02:36 2011 -0400 makepkg: fix recreation of hardlinks to .gz manpages 4ed12ae tightened up the logic to use only find, but ignored the fact that since the manpage hard link names were no longer captured. They were created as separate compressed manpages, rather than as hardlinks. This also introduces a minor efficiency of deleting all hardlinks at once and using proper iteration over an array rather than a string. Note to anyone else touching this code: e2fsprogs and libpcap are useful for testing this. If that changes in the future, you can use the below bash to locate others: IFS=$'\n' read -rd '' -a a < <(find /usr/share/man -type f \! -links 1) pacman -Qqo "${a[@]}" | sort -u I broke it! Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit d1e04c1b677d733262a0436ed9b25b2e7eada15e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 13 16:19:46 2011 -0400 makepkg: add missing newline on passing gpg sourcecheck When a sourceball passes this check without any warnings, a newline is omitted. Similar to the if clause of this else block, print a single new line at the end of the clause instead of accounting for each output. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 0f69e2ec0b3958167a2ea7a5fcef40cb966d05d1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 12 08:27:13 2011 -0400 makepkg: check for var existance before file existance This prevents makepkg from aborting with 'file not found' when changelog= or install= are declared in a PKGBUILD, but empty. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 1 + scripts/Makefile.am | 2 ++ scripts/makepkg.sh.in | 20 +++++++++++--------- src/pacman/pacman.c | 2 +- src/pacman/util.c | 10 +++++----- test/pacman/Makefile.am | 1 + 6 files changed, 21 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] buildsys: remove existing symlinks before installing
by Dave Reisner 14 Sep '11

14 Sep '11

This fixes build errors when performing a manual install straight to a filesystem where the files already exist. Reported-by: Sergej Pupykin <ml(a)sergej.pp.ru> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- We probably could also just add in the -f flag to the ln/cp calls, but I feel safer doing it this way. $(RM) will unconditionally expand to 'rm -f'. doc/Makefile.am | 1 + scripts/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a9aa78f..aa27b50 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -153,6 +153,7 @@ repo-remove.8: repo-add.8 install-data-hook: cd $(DESTDIR)$(mandir)/man8 && \ + $(RM) repo-remove.8 && \ ( $(LN_S) repo-add.8 repo-remove.8 || \ ln repo-add.8 repo-remove.8 || \ cp repo-add.8 repo-remove.8 ) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 52a784a..d89fd30 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -106,10 +106,12 @@ repo-elephant: $(srcdir)/repo-add.sh.in install-data-hook: cd $(DESTDIR)$(bindir) && \ + $(RM) repo-elephant && \ ( $(LN_S) repo-add repo-elephant || \ ln repo-add repo-elephant || \ cp repo-add repo-elephant ) cd $(DESTDIR)$(bindir) && \ + $(RM) repo-remove && \ ( $(LN_S) repo-add repo-remove || \ ln repo-add repo-remove || \ cp repo-add repo-remove ) -- 1.7.6.1

2 2

[pacman-dev] make install fails to replace repo-add
by Sergej Pupykin 13 Sep '11

13 Sep '11

Hi, I have got following from "make install DESTDIR=..." cd /home/sergej/extent/pacman.git/PKG/usr/bin && \ ( ln -s repo-add repo-elephant || \ ln repo-add repo-elephant || \ cp repo-add repo-elephant ) ln: failed to create symbolic link `repo-elephant': File exists ln: failed to create hard link `repo-elephant': File exists cp: `repo-add' and `repo-elephant' are the same file make[4]: *** [install-data-hook] Error 1 make[4]: Leaving directory `/home2/home/sergej/pacman.git/scripts' make[3]: *** [install-data-am] Error 2 make[3]: Leaving directory `/home2/home/sergej/pacman.git/scripts' make[2]: *** [install-am] Error 2 make[2]: Leaving directory `/home2/home/sergej/pacman.git/scripts' make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory `/home2/home/sergej/pacman.git/scripts' make: *** [install-recursive] Error 1 Problem probably here: scripts/Makefile.am install-data-hook: cd $(DESTDIR)$(bindir) && \ ( $(LN_S) repo-add repo-elephant || \ ln repo-add repo-elephant || \ cp repo-add repo-elephant ) cd $(DESTDIR)$(bindir) && \ ( $(LN_S) repo-add repo-remove || \ ln repo-add repo-remove || \ cp repo-add repo-remove )

4 5

[pacman-dev] Repositories management in enterprise
by Thomas Baquet 12 Sep '11

12 Sep '11

Hi there, While I was thinking how to deploy an ArchLinux like distribution in enterprise, I pointed that the biggest problem is the management of the updates. I though it could be interesting if there is way system like: Master ArchLinux repos → Enterprise repositories → Users, employees When is there an update to the master repos, the update will be done in a testing repos in the enterprise repositories; Then, administrators can verify if there is no problem for compatibility with the deployed machines, and if is okay, update the main repository of the enterprise. So my question is: is there a mechanism to do it automatically? -- Thomas Baquet Jabber ID: me lordblackfox net Website: http://lordblackfox.net/

2 1

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

12 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 3905ada993bacba31a1a9005fe4a0023890296d9 (commit) via d8eacae7bc1465b725e6b1c3b7ad8c27c52437f4 (commit) via befddfc3e6a1f61b0bb2b6c377f3a394a7620b81 (commit) via c736a12e86b826f3079f3cccde86d497528f85f3 (commit) via 7f1235ccbc3a81a4f8a50de96cea512353d6773e (commit) via 4737a87b84742e6d704e1a59792aed9427cbf620 (commit) via f7653e582bc499b0c2d16968220c63615ddb9a56 (commit) from db70c9da153c4767bfd96a15d40e086184bd5402 (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 3905ada993bacba31a1a9005fe4a0023890296d9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 7 17:01:00 2011 -0400 account for partial delta files in download size Similar to an earlier commit which accounts for .part files for full packages, calculate the download_size for deltas keeping mind the possibility of a partial transfer. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8eacae7bc1465b725e6b1c3b7ad8c27c52437f4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 7 16:01:43 2011 -0400 make compute_download_size consider .part files Check for the existance of a partial download of a package file before jumping to delta calculations. Currently, if there were 10MiB remaining in a 100MiB the values passed to the front end do not reflect this. Refactored from an old patch originally by Dan. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit befddfc3e6a1f61b0bb2b6c377f3a394a7620b81 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 11 15:11:24 2011 -0400 dload: provide optional netrc support if ~/.netrc exists and has credentials for the hostname requested in a download, they will be provided in an http auth request. This can still be overridden by explcitly declaring user:pass in the URL. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c736a12e86b826f3079f3cccde86d497528f85f3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Sep 10 23:21:22 2011 -0400 makepkg: unset errexit when sourcing /etc/profile This is a fix for a bash3 specific bug, where a file sourced by /etc/profile would exit non-zero and make its way back up to makepkg, forcing it to exit after package installation. Along with unsetting the ERR handler, temporarily unset errexit to avoid this. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7f1235ccbc3a81a4f8a50de96cea512353d6773e Author: Dave Reisner <d(a)falconindy.com> Date: Sat Sep 10 22:47:42 2011 -0400 paccache: escape . in trimming of diskspace string Before: ==> finished dry run: 2 candidates (diskspace saved: 7. MiB) After: ==> finished dry run: 2 candidates (diskspace saved: 7.8 MiB) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 4737a87b84742e6d704e1a59792aed9427cbf620 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Sep 10 09:31:15 2011 -0500 download callback: show decimal places in rate if we have room Display now looks like this, whereas before we would have just showed '2M/s' for the extra repository download. The cutoff is placed at 100.0 to ensure we only use 4 character slots of width (e.g. '99.9', '100'). :: Synchronizing package databases... testing 39.9 KiB 470K/s 00:00 [######################] 100% core 51.4 KiB 469K/s 00:00 [######################] 100% extra 768.8 KiB 2.1M/s 00:00 [######################] 100% community-testing 1941.0 B 54.4M/s 00:00 [######################] 100% multilib 26.6 KiB 458K/s 00:00 [######################] 100% community 449.8 KiB 1649K/s 00:00 [######################] 100% Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f7653e582bc499b0c2d16968220c63615ddb9a56 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Sep 10 09:31:14 2011 -0500 Move download callback static vars into function Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 2 +- lib/libalpm/delta.c | 26 +++++++++++++++++++++----- lib/libalpm/dload.c | 1 + lib/libalpm/sync.c | 27 ++++++++++++++++++++++++--- scripts/makepkg.sh.in | 4 +++- src/pacman/callback.c | 16 +++++++++++----- 6 files changed, 61 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 00/15] Full optdep support with all the bells and whistles
by Benedikt Morbach 11 Sep '11

11 Sep '11

Hi there! This should implement everything that's listed on this page: https://wiki.archlinux.org/index.php/User:Allan/Pacman_OptDepends I know that this is probably 4.1 material and will most likely need quite a bit of polish, but I'd like to gather some comments now before the bit-rot creeps in. If you like, you can also get the code at https://github.com/moben/pacman on the optdep branch. Please take a look and comment. --- Benedikt Benedikt Morbach (15): 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 --optdeps is specified Make package info show optional requirements Make recursive removal consider optdepends Show list of optrequires with -Qtdn Add config option for showing all optdeps again Warn on optdep removal Add flag to recurse through optdepends Show status on optdepends that are part of transaction Add option to install all optdepends by default Add option to ask which optdeps to install Make both HandleOptdeps settings work together doc/pacman.8.txt | 11 +++ doc/pacman.conf.5.txt | 14 ++++ etc/pacman.conf.in | 3 + lib/libalpm/add.c | 4 +- lib/libalpm/alpm.h | 25 ++++++- lib/libalpm/be_local.c | 12 +++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 8 ++- lib/libalpm/deps.c | 127 ++++++++++++++++++++++++++++++---- lib/libalpm/deps.h | 5 +- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 40 ++++++++--- lib/libalpm/remove.c | 22 +++++-- lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 10 ++- src/pacman/conf.c | 28 ++++++++ src/pacman/conf.h | 10 +++ src/pacman/package.c | 24 +++++-- src/pacman/pacman.c | 7 ++ src/pacman/query.c | 27 ++++++- src/pacman/remove.c | 35 ++++++++-- src/pacman/sync.c | 125 ++++++++++++++++++++++++++++++++-- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 172 +++++++++++++++++++++++++++++++++++++++------ src/pacman/util.h | 5 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- 27 files changed, 635 insertions(+), 94 deletions(-) -- 1.7.6.1

1 15

[pacman-dev] pacman -Qs first-run performance
by Philipp 11 Sep '11

11 Sep '11

Hi there, pacman works very well for me, with one exception: searching for installed packages. For me a -Ss takes about 5 seconds, a -Qs 25 seconds. I also noticed that this seems to be true for the first search run only, the following ones are less than a second, no matter whether it's a repo or local search. But if you want to just quickly find out a thing, 25 seconds or so is a long time. Anyway, I had a very brief look at the code and am far from understanding it, but I think libalpm/db.c handles the search, the package names, descriptions, etc. are stored in a linked list of structs, the whole thing is cached in memory only and regex wizardry is used for the search. If that's true, the bottleneck I experience is the caching. 5 seconds for -Ss is acceptable for me, but I wonder whether there's a reasonably easy way to improve the 25 seconds of -Qs. My knowledge of pacman internals is non-existant and my C skills are minimal, so I don't think I can be a lot of help with this one, but maybe there's something else I can be of help with instead. Best regards, Philipp

5 13

[pacman-dev] [PATCH] makepkg: unset errexit when sourcing /etc/profile
by Dave Reisner 11 Sep '11

11 Sep '11

This is a fix for a bash3 specific bug, where a file sourced by /etc/profile would exit non-zero and make its way back up to makepkg, forcing it to exit after package installation. Along with unsetting the ERR handler, temporarily unset errexit to avoid this. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5981603..a130557 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,11 +474,13 @@ handle_deps() { fi # we might need the new system environment - # avoid triggering the ERR trap + # avoid triggering the ERR trap and exiting + set +x local restoretrap=$(trap -p ERR) trap - ERR source /etc/profile &>/dev/null eval $restoretrap + set -x return $R_DEPS_SATISFIED } -- 1.7.6.1

1 1