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

[pacman-dev] [PATCH] Ensure fileconflict value is actually a string
by Dan McGee 27 Sep '11

27 Sep '11

When we switched to a file object and not just a simple string, we missed an update along the way here in target-target conflicts. This patch looks large, but it really comes down to one errant (char *) cast before that has been reworked to explicitly point to the alpm_file_t object. The rest is simply code cleanup. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Should we take this opportunity to rework the file conflict struct type to be well typed instead of using strings everywhere? struct new_fileconflict_t { alpm_fileconflict_t *type; alpm_file_t *file; (frontend would be responsible for root path prepend) alpm_pkg_t *target; alpm_pkg_t *ctarget; }; could change package1 and package2 in _alpm_conflict_t also to be actual packages as well instead of strings. Thoughts? -Dan lib/libalpm/conflict.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 1c02f18..14c23f4 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -276,30 +276,29 @@ static alpm_list_t *filelist_operation(alpm_filelist_t *filesA, return ret; } -/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, type - * (either ALPM_FILECONFLICT_TARGET or ALPM_FILECONFLICT_FILESYSTEM), a file - * string, and either two package names or one package name and NULL. This is - * a wrapper for former functionality that was done inline. +/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, the + * conflicting file path, and either two packages or one package and NULL. */ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, - alpm_list_t *conflicts, alpm_fileconflicttype_t type, const char *filestr, - const char *name1, const char *name2) + alpm_list_t *conflicts, const char *filestr, + alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) { alpm_fileconflict_t *conflict; MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error); - conflict->type = type; - STRDUP(conflict->target, name1, goto error); + STRDUP(conflict->target, pkg1->name, goto error); STRDUP(conflict->file, filestr, goto error); - if(name2) { - STRDUP(conflict->ctarget, name2, goto error); + if(pkg2) { + conflict->type = ALPM_FILECONFLICT_TARGET; + STRDUP(conflict->ctarget, pkg2->name, goto error); } else { + conflict->type = ALPM_FILECONFLICT_FILESYSTEM; STRDUP(conflict->ctarget, "", goto error); } conflicts = alpm_list_add(conflicts, conflict); _alpm_log(handle, ALPM_LOG_DEBUG, "found file conflict %s, packages %s and %s\n", - filestr, name1, name2 ? name2 : "(filesystem)"); + filestr, pkg1->name, pkg2 ? pkg2->name : "(filesystem)"); return conflicts; @@ -416,9 +415,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_t *k; char path[PATH_MAX]; for(k = common_files; k; k = k->next) { - snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data); - conflicts = add_fileconflict(handle, conflicts, - ALPM_FILECONFLICT_TARGET, path, p1->name, p2->name); + alpm_file_t *file = k->data; + snprintf(path, PATH_MAX, "%s%s", handle->root, file->name); + conflicts = add_fileconflict(handle, conflicts, path, p1, p2); if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); FREELIST(common_files); @@ -567,8 +566,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } if(!resolved_conflict) { - conflicts = add_fileconflict(handle, conflicts, - ALPM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL); + conflicts = add_fileconflict(handle, conflicts, path, p1, NULL); if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); if(dbpkg) { -- 1.7.6.4

1 1

[pacman-dev] [PATCH] Revamp pacman signal handler
by Dan McGee 26 Sep '11

26 Sep '11

* All errors now go to stdout, so do the same here and simplify the writing of the error message. * Add SIGHUP to the handled signal list, and don't repeat code. * Attempt to release the transaction (e.g. remove the lock file) for all of HUP, INT, and TERM. Signals HUP and INT respects transaction state, TERM will immediately terminate the process. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/pacman.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 061d593..40aa444 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -299,26 +299,29 @@ static void handler(int signum) { int out = fileno(stdout); int err = fileno(stderr); + const char *msg; if(signum == SIGSEGV) { - const char *msg1 = "error: segmentation fault\n"; - const char *msg2 = "Internal pacman error: Segmentation fault.\n" + msg = "\nerror: segmentation fault\n" "Please submit a full bug report with --debug if appropriate.\n"; - /* write a error message to out, the rest to err */ - xwrite(out, msg1, strlen(msg1)); - xwrite(err, msg2, strlen(msg2)); + xwrite(err, msg, strlen(msg)); exit(signum); - } else if(signum == SIGINT) { - const char *msg = "\nInterrupt signal received\n"; + } else if(signum == SIGINT || signum == SIGHUP) { + if(signum == SIGINT) { + msg = "\nInterrupt signal received\n"; + } else { + msg = "\nHangup signal received\n"; + } xwrite(err, msg, strlen(msg)); if(alpm_trans_interrupt(config->handle) == 0) { /* a transaction is being interrupted, don't exit pacman yet. */ return; } - /* no commiting transaction, we can release it now and then exit pacman */ - alpm_trans_release(config->handle); - /* output a newline to be sure we clear any line we may be on */ - xwrite(out, "\n", 1); } + /* SIGINT: no commiting transaction, release it now and then exit pacman + * SIGHUP, SIGTERM: release no matter what */ + alpm_trans_release(config->handle); + /* output a newline to be sure we clear any line we may be on */ + xwrite(out, "\n", 1); cleanup(128 + signum); } @@ -757,8 +760,9 @@ static void cl_to_log(int argc, char* argv[]) */ int main(int argc, char *argv[]) { - int ret = 0; + int i, ret = 0; struct sigaction new_action, old_action; + const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; #if defined(HAVE_GETEUID) && !defined(CYGWIN) /* geteuid undefined in CYGWIN */ uid_t myuid = geteuid(); @@ -775,17 +779,13 @@ int main(int argc, char *argv[]) sigemptyset(&new_action.sa_mask); new_action.sa_flags = 0; - sigaction(SIGINT, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGINT, &new_action, NULL); - } - sigaction(SIGTERM, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGTERM, &new_action, NULL); - } - sigaction(SIGSEGV, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGSEGV, &new_action, NULL); + /* assign our handler to any signals we care about */ + for(i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) { + int signal = signals[i]; + sigaction(signal, NULL, &old_action); + if(old_action.sa_handler != SIG_IGN) { + sigaction(signal, &new_action, NULL); + } } /* i18n init */ -- 1.7.6.3

3 2

[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