- Pacman-dev - lists.archlinux.org

[pacman-dev] Pacman Developer Repos
by Dan McGee 14 Jun '11

14 Jun '11

https://wiki.archlinux.org/index.php/Pacman_Development#Developer_Repositor… I updated this page, feel free to add your own if I didn't do it (I started to get lazy). -Dan

1 0

[pacman-dev] [PATCH 1/2] valgrind.supp: add known leak exposed by cURL
by Dan McGee 14 Jun '11

14 Jun '11

This one comes courtesy of OpenSSL and some static initialization. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- valgrind.supp | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/valgrind.supp b/valgrind.supp index 94618c0..1d6952d 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -46,3 +46,13 @@ Memcheck:Value8 fun:BN_mod_exp_mont_consttime } +{ + openssl-supp-load-compressions + Memcheck:Leak + fun:malloc + fun:CRYPTO_malloc + ... + fun:load_builtin_compressions + fun:SSL_COMP_get_compression_methods + fun:SSL_library_init +} -- 1.7.5.4

1 1

[pacman-dev] [PATCH] Rename and rework signing helper methods
by Dan McGee 14 Jun '11

14 Jun '11

* Don't name static methods with a gpgme_ prefix to avoid confusion with methods provided by the library. These are static and local to our file so just give them sane non-prefixed names. * Rework sigsum_test_bit() to not require assignment. * Don't balk if there is more than one signature available (for now, only check the first). * Fix error codes in publicly visible methods to return -1, not 0, if pkg or db are not provided. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/signing.c | 74 ++++++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 38 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 62c8925..ff97d4c 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -42,7 +42,7 @@ if(err != GPG_ERR_NO_ERROR) { goto error; } \ } while(0) -static const char *gpgme_string_validity(gpgme_validity_t validity) +static const char *string_validity(gpgme_validity_t validity) { switch(validity) { case GPGME_VALIDITY_UNKNOWN: @@ -61,43 +61,42 @@ static const char *gpgme_string_validity(gpgme_validity_t validity) return "???"; } -static alpm_list_t *sigsum_test_bit(gpgme_sigsum_t sigsum, alpm_list_t *summary, +static void sigsum_test_bit(gpgme_sigsum_t sigsum, alpm_list_t **summary, gpgme_sigsum_t bit, const char *value) { if(sigsum & bit) { - summary = alpm_list_add(summary, (void *)value); + *summary = alpm_list_add(*summary, (void *)value); } - return summary; } -static alpm_list_t *gpgme_list_sigsum(gpgme_sigsum_t sigsum) +static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum) { alpm_list_t *summary = NULL; /* The docs say this can be a bitmask...not sure I believe it, but we'll code * for it anyway and show all possible flags in the returned string. */ /* The signature is fully valid. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_VALID, "valid"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_VALID, "valid"); /* The signature is good. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_GREEN, "green"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_GREEN, "green"); /* The signature is bad. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_RED, "red"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_RED, "red"); /* One key has been revoked. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_KEY_REVOKED, "key revoked"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_REVOKED, "key revoked"); /* One key has expired. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_KEY_EXPIRED, "key expired"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_EXPIRED, "key expired"); /* The signature has expired. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_SIG_EXPIRED, "sig expired"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SIG_EXPIRED, "sig expired"); /* Can't verify: key missing. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_KEY_MISSING, "key missing"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_MISSING, "key missing"); /* CRL not available. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_CRL_MISSING, "crl missing"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_MISSING, "crl missing"); /* Available CRL is too old. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old"); /* A policy was not met. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_BAD_POLICY, "bad policy"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_BAD_POLICY, "bad policy"); /* A system error occured. */ - summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_SYS_ERROR, "sys error"); + sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SYS_ERROR, "sys error"); /* Fallback case */ if(!sigsum) { summary = alpm_list_add(summary, (void *)"(empty)"); @@ -105,10 +104,10 @@ static alpm_list_t *gpgme_list_sigsum(gpgme_sigsum_t sigsum) return summary; } -static int gpgme_init(pmhandle_t *handle) +static int init_gpgme(pmhandle_t *handle) { static int init = 0; - const char *version; + const char *version, *sigdir; gpgme_error_t err; gpgme_engine_info_t enginfo; @@ -117,7 +116,8 @@ static int gpgme_init(pmhandle_t *handle) return 0; } - if(!alpm_option_get_signaturedir(handle)) { + sigdir = alpm_option_get_signaturedir(handle); + if(!sigdir) { RET_ERR(handle, PM_ERR_SIG_MISSINGDIR, 1); } @@ -142,8 +142,7 @@ static int gpgme_init(pmhandle_t *handle) CHECK_ERR(); /* set and check engine information */ - err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, NULL, - alpm_option_get_signaturedir(handle)); + err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, NULL, sigdir); CHECK_ERR(); err = gpgme_get_engine_info(&enginfo); CHECK_ERR(); @@ -194,12 +193,17 @@ error: } /** - * Check the PGP signature for the given file. + * Check the PGP signature for the given file path. + * If base64_sig is provided, it will be used as the signature data after + * decoding. If base64_sig is NULL, expect a signature file next to path + * (e.g. "%s.sig"). The return value will be 0 if all checked signatures are + * valid, 1 if there was some sort of problem (but not necessarily rejection), + * and -1 if an error occurred while checking signatures. If 1 is returned, + * pm_errno should be checked to see why the signatures did not pass muster. * @param handle the context handle * @param path the full path to a file - * @param base64_sig PGP signature data in base64 encoding; if NULL, expect a - * signature file next to 'path' - * @return a int value : 0 (valid), 1 (invalid), -1 (an error occured) + * @param base64_sig optional PGP signature data in base64 encoding + * @return a int value : 0 (valid), 1 (invalid), -1 (an error occurred) */ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path, const char *base64_sig) @@ -229,7 +233,7 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path, } } - if(gpgme_init(handle)) { + if(init_gpgme(handle)) { /* pm_errno was set in gpgme_init() */ return -1; } @@ -282,14 +286,8 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path, CHECK_ERR(); result = gpgme_op_verify_result(ctx); gpgsig = result->signatures; - if(!gpgsig || gpgsig->next) { - int count = 0; - while(gpgsig) { - count++; - gpgsig = gpgsig->next; - } - _alpm_log(handle, PM_LOG_ERROR, _("Unexpected number of signatures (%d)\n"), - count); + if(!gpgsig) { + _alpm_log(handle, PM_LOG_DEBUG, "no signatures returned\n"); ret = -1; goto error; } @@ -298,7 +296,7 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path, alpm_list_t *summary_list, *summary; _alpm_log(handle, PM_LOG_DEBUG, "fingerprint: %s\n", gpgsig->fpr); - summary_list = gpgme_list_sigsum(gpgsig->summary); + summary_list = list_sigsum(gpgsig->summary); for(summary = summary_list; summary; summary = summary->next) { _alpm_log(handle, PM_LOG_DEBUG, "summary: %s\n", (const char *)summary->data); } @@ -307,7 +305,7 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path, _alpm_log(handle, PM_LOG_DEBUG, "timestamp: %lu\n", gpgsig->timestamp); _alpm_log(handle, PM_LOG_DEBUG, "exp_timestamp: %lu\n", gpgsig->exp_timestamp); _alpm_log(handle, PM_LOG_DEBUG, "validity: %s\n", - gpgme_string_validity(gpgsig->validity)); + string_validity(gpgsig->validity)); _alpm_log(handle, PM_LOG_DEBUG, "validity_reason: %s\n", gpgme_strerror(gpgsig->validity_reason)); _alpm_log(handle, PM_LOG_DEBUG, "pubkey algo: %s\n", @@ -385,7 +383,7 @@ pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db) */ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) { - ASSERT(pkg != NULL, return 0); + ASSERT(pkg != NULL, return -1); pkg->handle->pm_errno = 0; return _alpm_gpgme_checksig(pkg->handle, alpm_pkg_get_filename(pkg), @@ -399,7 +397,7 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) */ int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db) { - ASSERT(db != NULL, return 0); + ASSERT(db != NULL, return -1); db->handle->pm_errno = 0; return _alpm_gpgme_checksig(db->handle, _alpm_db_path(db), NULL); -- 1.7.5.2

1 0

[pacman-dev] [PATCH] Conflict check and skip_remove code cleanups
by Dan McGee 14 Jun '11

14 Jun '11

* Move several variables into better scope * const-ify a few variables * Avoid duplicating filelists if it is unnecessary * Better handling out out of memory condition when adding file conflicts to our list Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/conflict.c | 84 ++++++++++++++++++++++++++++------------------- lib/libalpm/remove.c | 10 +++--- 2 files changed, 55 insertions(+), 39 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 66441a7..d2734d7 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -284,15 +284,15 @@ static alpm_list_t *add_fileconflict(pmhandle_t *handle, const char *name1, const char *name2) { pmfileconflict_t *conflict; - MALLOC(conflict, sizeof(pmfileconflict_t), return NULL); + MALLOC(conflict, sizeof(pmfileconflict_t), goto error); conflict->type = type; - STRDUP(conflict->target, name1, return NULL); - STRDUP(conflict->file, filestr, return NULL); + STRDUP(conflict->target, name1, goto error); + STRDUP(conflict->file, filestr, goto error); if(name2) { - STRDUP(conflict->ctarget, name2, return NULL); + STRDUP(conflict->ctarget, name2, goto error); } else { - STRDUP(conflict->ctarget, "", return NULL); + STRDUP(conflict->ctarget, "", goto error); } conflicts = alpm_list_add(conflicts, conflict); @@ -300,6 +300,9 @@ static alpm_list_t *add_fileconflict(pmhandle_t *handle, filestr, name1, name2 ? name2 : "(filesystem)"); return conflicts; + +error: + RET_ERR(handle, PM_ERR_MEMORY, conflicts); } void _alpm_fileconflict_free(pmfileconflict_t *conflict) @@ -375,7 +378,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, * here as we do when we actually extract files in add.c with our 12 * different cases. */ for(current = 0, i = upgrade; i; i = i->next, current++) { - alpm_list_t *k, *tmpfiles = NULL; + alpm_list_t *k, *tmpfiles; pmpkg_t *p1, *p2, *dbpkg; char path[PATH_MAX]; @@ -391,50 +394,52 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, _alpm_log(handle, PM_LOG_DEBUG, "searching for file conflicts: %s\n", alpm_pkg_get_name(p1)); for(j = i->next; j; j = j->next) { + alpm_list_t *common_files; p2 = j->data; if(!p2) { continue; } - tmpfiles = filelist_operation( alpm_pkg_get_files(p1), + common_files = filelist_operation(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2), INTERSECT); - if(tmpfiles) { - for(k = tmpfiles; k; k = k->next) { + if(common_files) { + for(k = common_files; k; k = k->next) { snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data); - conflicts = add_fileconflict(handle, conflicts, PM_FILECONFLICT_TARGET, path, + conflicts = add_fileconflict(handle, conflicts, + PM_FILECONFLICT_TARGET, path, alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); - if(!conflicts) { + if(handle->pm_errno == PM_ERR_MEMORY) { FREELIST(conflicts); - FREELIST(tmpfiles); - RET_ERR(handle, PM_ERR_MEMORY, NULL); + FREELIST(common_files); + return NULL; } } - FREELIST(tmpfiles); + FREELIST(common_files); } } - /* declarations for second check */ - struct stat lsbuf, sbuf; - char *filestr = NULL; - /* CHECK 2: check every target against the filesystem */ - _alpm_log(handle, PM_LOG_DEBUG, "searching for filesystem conflicts: %s\n", p1->name); + _alpm_log(handle, PM_LOG_DEBUG, "searching for filesystem conflicts: %s\n", + p1->name); dbpkg = _alpm_db_get_pkgfromcache(handle->db_local, p1->name); /* Do two different checks here. If the package is currently installed, * then only check files that are new in the new package. If the package - * is not currently installed, then simply stat the whole filelist */ + * is not currently installed, then simply stat the whole filelist. Note + * that the former list needs to be freed while the latter list should NOT + * be freed. */ if(dbpkg) { /* older ver of package currently installed */ tmpfiles = filelist_operation(alpm_pkg_get_files(p1), alpm_pkg_get_files(dbpkg), DIFFERENCE); } else { /* no version of package currently installed */ - tmpfiles = alpm_list_strdup(alpm_pkg_get_files(p1)); + tmpfiles = alpm_pkg_get_files(p1); } for(j = tmpfiles; j; j = j->next) { - filestr = j->data; + struct stat lsbuf; + const char *filestr = j->data; snprintf(path, PATH_MAX, "%s%s", handle->root, filestr); @@ -442,13 +447,15 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, if(_alpm_lstat(path, &lsbuf) != 0) { continue; } - stat(path, &sbuf); if(path[strlen(path)-1] == '/') { + struct stat sbuf; if(S_ISDIR(lsbuf.st_mode)) { _alpm_log(handle, PM_LOG_DEBUG, "%s is a directory, not a conflict\n", path); continue; - } else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(sbuf.st_mode)) { + } + stat(path, &sbuf); + if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(sbuf.st_mode)) { _alpm_log(handle, PM_LOG_DEBUG, "%s is a symlink to a dir, hopefully not a conflict\n", path); continue; @@ -462,7 +469,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, for(k = remove; k && !resolved_conflict; k = k->next) { pmpkg_t *rempkg = k->data; if(rempkg && alpm_list_find_str(alpm_pkg_get_files(rempkg), filestr)) { - _alpm_log(handle, PM_LOG_DEBUG, "local file will be removed, not a conflict: %s\n", filestr); + _alpm_log(handle, PM_LOG_DEBUG, + "local file will be removed, not a conflict: %s\n", filestr); resolved_conflict = 1; } } @@ -482,7 +490,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, * by its new owner (whether the file is in backup array or not */ handle->trans->skip_remove = alpm_list_add(handle->trans->skip_remove, strdup(filestr)); - _alpm_log(handle, PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr); + _alpm_log(handle, PM_LOG_DEBUG, + "file changed packages, adding to remove skiplist: %s\n", filestr); resolved_conflict = 1; } } @@ -492,7 +501,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, char *dir = malloc(strlen(filestr) + 2); sprintf(dir, "%s/", filestr); if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),dir)) { - _alpm_log(handle, PM_LOG_DEBUG, "check if all files in %s belongs to %s\n", + _alpm_log(handle, PM_LOG_DEBUG, + "check if all files in %s belongs to %s\n", dir, dbpkg->name); resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg); } @@ -506,23 +516,29 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle, continue; } char *filestr = rpath + strlen(handle->root); - if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),filestr)) { + if(alpm_list_find_str(alpm_pkg_get_files(dbpkg), filestr)) { resolved_conflict = 1; } free(rpath); } if(!resolved_conflict) { - conflicts = add_fileconflict(handle, conflicts, PM_FILECONFLICT_FILESYSTEM, - path, p1->name, NULL); - if(!conflicts) { + conflicts = add_fileconflict(handle, conflicts, + PM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL); + if(handle->pm_errno == PM_ERR_MEMORY) { FREELIST(conflicts); - FREELIST(tmpfiles); - RET_ERR(handle, PM_ERR_MEMORY, NULL); + if(dbpkg) { + /* only freed if it was generated from filelist_operation() */ + FREELIST(tmpfiles); + } + return NULL; } } } - FREELIST(tmpfiles); + if(dbpkg) { + /* only freed if it was generated from filelist_operation() */ + FREELIST(tmpfiles); + } } PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", 100, numtargs, current); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 264d79e..eada9b9 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -192,13 +192,13 @@ int _alpm_remove_prepare(pmhandle_t *handle, alpm_list_t **data) } static int can_remove_file(pmhandle_t *handle, const char *path, - alpm_list_t *skip) + alpm_list_t *skip_remove) { char file[PATH_MAX]; snprintf(file, PATH_MAX, "%s%s", handle->root, path); - if(alpm_list_find_str(skip, file)) { + if(alpm_list_find_str(skip_remove, file)) { /* return success because we will never actually remove this file */ return 1; } @@ -209,7 +209,7 @@ static int can_remove_file(pmhandle_t *handle, const char *path, /* only return failure if the file ACTUALLY exists and we can't write to * it - ignore "chmod -w" simple permission failures */ _alpm_log(handle, PM_LOG_ERROR, _("cannot remove file '%s': %s\n"), - file, strerror(errno)); + file, strerror(errno)); return 0; } } @@ -219,7 +219,7 @@ static int can_remove_file(pmhandle_t *handle, const char *path, /* Helper function for iterating through a package's file and deleting them * Used by _alpm_remove_commit. */ -static void unlink_file(pmhandle_t *handle, pmpkg_t *info, char *filename, +static void unlink_file(pmhandle_t *handle, pmpkg_t *info, const char *filename, alpm_list_t *skip_remove, int nosave) { struct stat buf; @@ -279,7 +279,7 @@ static void unlink_file(pmhandle_t *handle, pmpkg_t *info, char *filename, if(unlink(file) == -1) { _alpm_log(handle, PM_LOG_ERROR, _("cannot remove file '%s': %s\n"), - filename, strerror(errno)); + filename, strerror(errno)); } } } -- 1.7.5.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-241-gc206b3a
by dan＠archlinux.org 14 Jun '11

14 Jun '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 c206b3a6d503e57691664b94e68ba85760bd0b6c (commit) via d3553768652cb99ccc944285bfdf618768223dfa (commit) via fbb44a6e0d5d3c386420dded0442f4771dbaea7c (commit) via 00a1b1deeb390d99c99d942ef4d8bfe1a943b02a (commit) via 07e97a5f2c1e1039f35a7893d2be6abf07af690a (commit) via 8be4db8caf8e534afe7ebea1eb913b34b2414a43 (commit) via f6700d5c9830cc2493d8448bd7af8ab7d649e8e6 (commit) via a775530941f88ccb75a2beb19df238213e433ff3 (commit) via c730ca5997377488d23dafacc98ab47e796fc8dd (commit) via 29ea0fa09fbde915d8abfdda2ee98493cd041239 (commit) via 4d9278f87fffc1d1fe7e6a2f805a2a8df296bb0d (commit) via 52bffd2457b7ba3b6fb08d3aa959ea0b53a45dc8 (commit) via e2aa952689da8763d534d1c19310eb97009f4f76 (commit) via 8b62d9bc0ade64897990b8fc6a1b6a54b629cb5b (commit) via 70a86c14f4462ba59a9d6bbd3c9e9f0c75483777 (commit) via d76341297a089864cf9bb509873bdcff83755f6c (commit) via 895a88886525dd3e6d2d0db996cedb7e73455fbb (commit) via 5689478c68bdda8ecbe0eae9a5bd28b072632b26 (commit) via b0590400111c04e1c6a42052d3f03986b4ad31aa (commit) via 73d5eb1edf03e628ca1d3a09168e4e940adea914 (commit) via 79f1a3c4a17223af2bfe35802c50e1ae431d25b5 (commit) from fb3ad7f8823dd3300528b44427d40e17594b1400 (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 c206b3a6d503e57691664b94e68ba85760bd0b6c Merge: d355376 5689478 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 08:30:23 2011 -0500 Merge remote-tracking branch 'florian/sodeps' commit d3553768652cb99ccc944285bfdf618768223dfa Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Jun 9 23:17:06 2011 +0200 doc/PKGBUILD: misc changes Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fbb44a6e0d5d3c386420dded0442f4771dbaea7c Merge: 00a1b1d 07e97a5 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 08:29:39 2011 -0500 Merge branch 'maint' Conflicts: doc/makepkg.conf.5.txt commit 00a1b1deeb390d99c99d942ef4d8bfe1a943b02a Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 23:22:58 2011 -0500 Remove alpm_db_get_url() This method is old, it doesn't adequately check for a NULL server list, and can easily be done using better API method we provide these days. All former users of this method can get similar results by calling alpm_db_get_servers() and using the data from the returned server list. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8be4db8caf8e534afe7ebea1eb913b34b2414a43 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 21:42:47 2011 -0500 Add a helper method for retrieving the DB signature path Note that is a bit different than the normal _alpm_db_path() method; the caller is expected to free the result. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f6700d5c9830cc2493d8448bd7af8ab7d649e8e6 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 21:39:12 2011 -0500 alpm_db_update(): refactor out sync dir create/check This was a lot of stuff that can stand by itself for the most part. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a775530941f88ccb75a2beb19df238213e433ff3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 19:40:55 2011 -0500 conf: do batch processing of repo sections We now parse an entire repo section and store all information about it. When the next section is encountered or the end of the root config file is reached, we will then process the stored information. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c730ca5997377488d23dafacc98ab47e796fc8dd Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 17:56:57 2011 -0500 conf: _parseconfig() cleanups and documentation * Function doxygen documentation * Reuse a single strlen() call * Prevent infinite recursion (limit to 10 levels) * Other small cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 29ea0fa09fbde915d8abfdda2ee98493cd041239 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 11:37:15 2011 -0500 Always pass data to trans_commit() Even though we currently don't use it here in the backend, we might as well pass it in since we used it earlier. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4d9278f87fffc1d1fe7e6a2f805a2a8df296bb0d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 16:14:35 2011 -0500 Remove global handle variable Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52bffd2457b7ba3b6fb08d3aa959ea0b53a45dc8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 16:13:58 2011 -0500 Switch all logging to use handle directly This is the last user of our global handle object. Once again the diff is large but the functional changes are not. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e2aa952689da8763d534d1c19310eb97009f4f76 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 16:06:16 2011 -0500 Move pm_errno onto the handle This involves some serious changes and a very messy diff, unfortunately. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8b62d9bc0ade64897990b8fc6a1b6a54b629cb5b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 14:05:42 2011 -0500 Add handle argument to two more alpm methods This takes care of alpm_checkdeps() and alpm_find_dbs_satisfier(). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70a86c14f4462ba59a9d6bbd3c9e9f0c75483777 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 13:53:53 2011 -0500 Require handle for alpm_checkconflicts() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d76341297a089864cf9bb509873bdcff83755f6c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 13:46:11 2011 -0500 Require handle for alpm_pkg_load() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5689478c68bdda8ecbe0eae9a5bd28b072632b26 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sat Jun 4 17:28:45 2011 +0200 doc/PKGBUILD: document libdeps Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 73d5eb1edf03e628ca1d3a09168e4e940adea914 Author: Florian Pritz <bluewind(a)xssn.at> Date: Wed Feb 10 17:11:37 2010 +0100 makepkg: add libdepends support The user adds libaries to the depends array without a version. These must end with .so. Example: depends=(glibc libc.so) find_libdepends() looks for ELF files (not symlinks because these could point outside of pkgdir) in $pkgdir, extracts the library sonames the binary links to and outputs depends seperated by spaces. This list contains all libraries needed by the package. Example: libfoo.so=3-64 write_pkginfo() only keeps .so depends with version information and warns the user about unneded ones. Support-by: Thomas Bächler <thomas(a)archlinux.org> Support-by: Christoph Schied <Christoph.Schied(a)uni-ulm.de> Signed-off-by: Florian Pritz <bluewind(a)server-speed.net> commit 79f1a3c4a17223af2bfe35802c50e1ae431d25b5 Author: Florian Pritz <bluewind(a)xssn.at> Date: Wed Feb 10 17:07:30 2010 +0100 makepkg: add libprovides support The user adds libaries to the provides array without a version. These must end with .so. Example: provides=(readline libreadline.so) find_libprovides() looks for .so files (not symlinks because these could point outside of pkgdir) in $pkgdir, extracts the library soname (ld links the binary to this name) and outputs provides seperated by spaces. This list contains all libraries provided by the package. Example: libfoo.so=3-64 write_pkginfo() only keeps .so provides with version information and warns the user about unneded ones. Support-by: Thomas Bächler <thomas(a)archlinux.org> Support-by: Christoph Schied <Christoph.Schied(a)uni-ulm.de> Signed-off-by: Florian Pritz <bluewind(a)server-speed.net> ----------------------------------------------------------------------- Summary of changes: NEWS | 3 +- doc/PKGBUILD.5.txt | 90 ++++++++++++---------- doc/makepkg.conf.5.txt | 2 +- lib/libalpm/add.c | 132 ++++++++++++++++--------------- lib/libalpm/alpm.c | 14 +--- lib/libalpm/alpm.h | 30 +++----- lib/libalpm/be_local.c | 75 ++++++++---------- lib/libalpm/be_package.c | 90 +++++++++++----------- lib/libalpm/be_sync.c | 129 ++++++++++++++++-------------- lib/libalpm/conflict.c | 151 +++++++++++++++++++---------------- lib/libalpm/conflict.h | 3 +- lib/libalpm/db.c | 145 ++++++++++++++++------------------ lib/libalpm/db.h | 1 + lib/libalpm/delta.c | 20 +++-- lib/libalpm/deps.c | 107 ++++++++++++-------------- lib/libalpm/deps.h | 4 +- lib/libalpm/diskspace.c | 36 ++++---- lib/libalpm/dload.c | 55 +++++++------- lib/libalpm/dload.h | 3 +- lib/libalpm/error.c | 16 +--- lib/libalpm/graph.c | 2 +- lib/libalpm/group.c | 9 +-- lib/libalpm/handle.c | 20 ++--- lib/libalpm/handle.h | 3 + lib/libalpm/log.c | 17 ++--- lib/libalpm/log.h | 3 +- lib/libalpm/package.c | 32 ++++---- lib/libalpm/package.h | 6 +- lib/libalpm/pkghash.c | 13 +-- lib/libalpm/remove.c | 114 ++++++++++++++------------- lib/libalpm/signing.c | 64 ++++++++-------- lib/libalpm/sync.c | 156 +++++++++++++++++++------------------ lib/libalpm/trans.c | 84 ++++++++------------ lib/libalpm/trans.h | 1 - lib/libalpm/util.c | 101 ++++++++++++------------ lib/libalpm/util.h | 17 +++-- scripts/makepkg.sh.in | 87 ++++++++++++++++++++- src/pacman/conf.c | 196 +++++++++++++++++++++++++++++++--------------- src/pacman/database.c | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 19 +++-- src/pacman/sync.c | 32 ++++---- src/pacman/upgrade.c | 22 +++--- src/pacman/util.c | 45 ++++++----- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 30 +++----- src/util/testdb.c | 6 +- src/util/testpkg.c | 7 +- 48 files changed, 1170 insertions(+), 1028 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-3-g07e97a5
by dan＠archlinux.org 14 Jun '11

14 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 07e97a5f2c1e1039f35a7893d2be6abf07af690a (commit) via 895a88886525dd3e6d2d0db996cedb7e73455fbb (commit) via b0590400111c04e1c6a42052d3f03986b4ad31aa (commit) from e62566a7635449e3e35d757c4b3bb768479689ab (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 07e97a5f2c1e1039f35a7893d2be6abf07af690a Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Mon Jun 13 21:44:32 2011 -0400 Added check option to BUILDENV array in makepkg.conf man page Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 895a88886525dd3e6d2d0db996cedb7e73455fbb Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 13 17:04:35 2011 -0500 Fix list_display on non-ttys and other output fixes commit c1f742d7750a14 broke what was one of the tenants of out output- if piping pacman output somewhere else, we shouldn't ever try to line-wrap and indent print our output. This makes it easier for tools to use output from pacman -Ss, -Qs, -Qi, etc. list_display() unfortunately was given a default value of 80 rather than 0, so fix this. Next, make some additional changes that ensure we don't insert an unnecessary blank line if for some crazy reason the indent level (such as on -Qi output) is greater than the number of columns. Accomplish this by printing the first item unconditionally as we do in list_display_linebreak(). Finally, teach indentprint to not wrap if the number of columns is less than the indent level, this prevents some forms of ridiculous output such as the following: Install Date : Wed 08 Jun 2011 04:39:19 AM CDT Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b0590400111c04e1c6a42052d3f03986b4ad31aa Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 15:05:37 2011 -0500 Add late-breaking 3.5.3 NEWS Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 3 ++- doc/makepkg.conf.5.txt | 2 +- src/pacman/util.c | 19 ++++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: move option parsing code to separte file
by Allan McRae 14 Jun '11

14 Jun '11

This move the getopt replacement function parse_options out of makepkg.sh.in and into a separate file. The code is inserted into the relevant place in makepkg using m4. This will allow the reuse of the option parsing code in other scripts (i.e. pacman-key) while avoiding code duplication. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 10 +++- scripts/library/parse_options.sh | 87 +++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 88 +------------------------------------- 3 files changed, 95 insertions(+), 90 deletions(-) create mode 100644 scripts/library/parse_options.sh diff --git a/scripts/Makefile.am b/scripts/Makefile.am index daa5b2a..74ee180 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -23,6 +23,9 @@ EXTRA_DIST = \ rankmirrors.sh.in \ repo-add.sh.in +LIBRARY = \ + library/parse_options.sh + # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp @@ -47,6 +50,7 @@ edit = sed \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@DUPATH[@]|$(DUPATH)|g' \ + -e 's|@SCRIPTNAME[@]|$@|g' \ -e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g' ## All the scripts depend on Makefile so that they are rebuilt when the @@ -54,11 +58,11 @@ edit = sed \ ## wrong file by accident. # two 'test' lines- make sure we can handle both sh and py type scripts # third 'test' line- make sure one of the two checks succeeded -$(OURSCRIPTS): Makefile +$(OURSCRIPTS): Makefile $(LIBRARY) @echo ' ' GEN $@; @rm -f $@ $@.tmp - @test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true - @test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true + @test -f $(srcdir)/$@.sh.in && m4 -P $(srcdir)/$@.sh.in | $(edit) >$@.tmp || true + @test -f $(srcdir)/$@.py.in && m4 -P $(srcdir)/$@.py.in | $(edit) >$@.tmp || true @test -f $@.tmp || false @chmod +x $@.tmp @chmod a-w $@.tmp diff --git a/scripts/library/parse_options.sh b/scripts/library/parse_options.sh new file mode 100644 index 0000000..32aa0be --- /dev/null +++ b/scripts/library/parse_options.sh @@ -0,0 +1,87 @@ +# getopt like parser +parse_options() { + local short_options=$1; shift; + local long_options=$1; shift; + local ret=0; + local unused_options="" + local i + + while [[ -n $1 ]]; do + if [[ ${1:0:2} = '--' ]]; then + if [[ -n ${1:2} ]]; then + local match="" + for i in ${long_options//,/ }; do + if [[ ${1:2} = ${i//:} ]]; then + match=$i + break + fi + done + if [[ -n $match ]]; then + if [[ ${1:2} = $match ]]; then + printf ' %s' "$1" + else + if [[ -n $2 ]]; then + printf ' %s' "$1" + shift + printf " '%s'" "$1" + else + echo "@SCRIPTNAME@: option '$1' $(gettext "requires an argument")" >&2 + ret=1 + fi + fi + else + echo "@SCRIPTNAME@: $(gettext "unrecognized option") '$1'" >&2 + ret=1 + fi + else + shift + break + fi + elif [[ ${1:0:1} = '-' ]]; then + for ((i=1; i<${#1}; i++)); do + if [[ $short_options =~ ${1:i:1} ]]; then + if [[ $short_options =~ ${1:i:1}: ]]; then + if [[ -n ${1:$i+1} ]]; then + printf ' -%s' "${1:i:1}" + printf " '%s'" "${1:$i+1}" + else + if [[ -n $2 ]]; then + printf ' -%s' "${1:i:1}" + shift + printf " '%s'" "${1}" + else + echo "@SCRIPTNAME@: option $(gettext "requires an argument") -- '${1:i:1}'" >&2 + ret=1 + fi + fi + break + else + printf ' -%s' "${1:i:1}" + fi + else + echo "@SCRIPTNAME@: $(gettext "invalid option") -- '${1:i:1}'" >&2 + ret=1 + fi + done + else + unused_options="${unused_options} '$1'" + fi + shift + done + + printf " --" + if [[ -n $unused_options ]]; then + for i in ${unused_options[@]}; do + printf ' %s' "$i" + done + fi + if [[ -n $1 ]]; then + while [[ -n $1 ]]; do + printf " '%s'" "${1}" + shift + done + fi + printf "\n" + + return $ret +} \ No newline at end of file diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b3081fc..0639fbd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1506,93 +1506,7 @@ canonicalize_path() { fi } -# getopt like parser -parse_options() { - local short_options=$1; shift; - local long_options=$1; shift; - local ret=0; - local unused_options="" - local i - - while [[ -n $1 ]]; do - if [[ ${1:0:2} = '--' ]]; then - if [[ -n ${1:2} ]]; then - local match="" - for i in ${long_options//,/ }; do - if [[ ${1:2} = ${i//:} ]]; then - match=$i - break - fi - done - if [[ -n $match ]]; then - if [[ ${1:2} = $match ]]; then - printf ' %s' "$1" - else - if [[ -n $2 ]]; then - printf ' %s' "$1" - shift - printf " '%s'" "$1" - else - echo "makepkg: option '$1' $(gettext "requires an argument")" >&2 - ret=1 - fi - fi - else - echo "makepkg: $(gettext "unrecognized option") '$1'" >&2 - ret=1 - fi - else - shift - break - fi - elif [[ ${1:0:1} = '-' ]]; then - for ((i=1; i<${#1}; i++)); do - if [[ $short_options =~ ${1:i:1} ]]; then - if [[ $short_options =~ ${1:i:1}: ]]; then - if [[ -n ${1:$i+1} ]]; then - printf ' -%s' "${1:i:1}" - printf " '%s'" "${1:$i+1}" - else - if [[ -n $2 ]]; then - printf ' -%s' "${1:i:1}" - shift - printf " '%s'" "${1}" - else - echo "makepkg: option $(gettext "requires an argument") -- '${1:i:1}'" >&2 - ret=1 - fi - fi - break - else - printf ' -%s' "${1:i:1}" - fi - else - echo "makepkg: $(gettext "invalid option") -- '${1:i:1}'" >&2 - ret=1 - fi - done - else - unused_options="${unused_options} '$1'" - fi - shift - done - - printf " --" - if [[ -n $unused_options ]]; then - for i in ${unused_options[@]}; do - printf ' %s' "$i" - done - fi - if [[ -n $1 ]]; then - while [[ -n $1 ]]; do - printf " '%s'" "${1}" - shift - done - fi - printf "\n" - - return $ret -} +m4_include(library/parse_options.sh) usage() { printf "makepkg (pacman) %s\n" "$myver" -- 1.7.5.4

2 7

[pacman-dev] Differences between the makepkg/pacman config in pacman's git and the ones in the pacman package
by Eric Bélanger 14 Jun '11

14 Jun '11

Hi, I noticed several differences between the makepkg.conf and pacman.conf in pacman'git compared to the ones that are provided by the pacman package. I realize that some of these changes are Arch specific but some of them seem to be generic enough to be added to pacman' git. Here's a list of these differences. Once there is an agreement on what to change, I could submit a proper git patch. makepkg.conf: @@ -39,15 +39,16 @@ # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD # -BUILDENV=(fakeroot !distcc color !ccache) +BUILDENV=(fakeroot !distcc color !ccache check) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. ===> If we decide to include the check option in the BUILDENV array, we'll need to do the same in the makepkg.conf man page @@ -61,7 +62,7 @@ # Default: OPTIONS=(strip docs libtool emptydirs zipman purge) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- strip: Strip symbols from binaries/libraries #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages @@ -72,12 +73,16 @@ #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Directories to be searched for the strip option (if strip is specified) -STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) ===> This is definitely a bug as makepkg no longer refers to STRIP_DIRS. @@ -91,6 +96,8 @@ #PKGDEST=/home/packages #-- Source cache: specify a fixed directory where source files will be cached #SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john(a)doe.com>" ===> Adding this wouldn't hurt. Looks general enough and is commented out by default. pacman.conf: @@ -17,7 +17,7 @@ # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl %u > %o +#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -33,6 +33,7 @@ #ShowSize #UseDelta #TotalDownload +#CheckSpace # # REPOSITORIES ===> These looks general enough to be in pacman's git and are commented out by default. Any comments, objections? Eric

3 6

Re: [pacman-dev] [PATCH 00/13] global handle removal patch series
by Rémy Oudompheng 14 Jun '11

14 Jun '11

On 2011/6/14 Dan McGee <dpmcgee(a)gmail.com> wrote: > Rémy, > > Just wanted to ping you as I hadn't heard back from you on this- let > me know your take on what I said. Looking to clear up my pending > patches a bit if I can. Seems OK to me: it's clear enough that I won't be ever satisfied with either solution, and the proposed setup is handy as long as you get a bit used to it. -- Rémy.

1 0

[pacman-dev] [PATCH] Added check option to BUILDENV array in makepkg.conf man page
by Eric Bélanger 14 Jun '11

14 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- doc/makepkg.conf.5.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 6130249..30ddf0a 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -70,7 +70,7 @@ Options This is often used to set the number of jobs used, for example, `-j2`. Other flags that make accepts can also be passed. -**BUILDENV=(**fakeroot !distcc color !ccache**)**:: +**BUILDENV=(**fakeroot !distcc color !ccache check**)**:: This array contains options that affect the build environment, the defaults are shown here. All options should always be left in the array; to enable or disable an option simply remove or place an ``!'' at the front of the -- 1.7.5.4

2 1