- Pacman-dev - lists.archlinux.org

[pacman-dev] Pacman build is currently broken
by Dan McGee 10 Feb '13

10 Feb '13

Using the superior warnings of clang: dmcgee@galway ~/projects/pacman $ make make --no-print-directory all-recursive Making all in lib/libalpm Making all in po CC libalpm_la-signing.lo signing.c:195:5: error: variable 'ctx' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if(init_gpgme(handle)) { ^~~~~~~~~~~~~~~~~~ signing.c:219:16: note: uninitialized use occurs here gpgme_release(ctx); ^~~ signing.c:195:2: note: remove the 'if' if its condition is always false if(init_gpgme(handle)) { ^~~~~~~~~~~~~~~~~~~~~~~~ signing.c:191:17: note: initialize the variable 'ctx' to silence this warning gpgme_ctx_t ctx; ^ = NULL 1 error generated. make[3]: *** [libalpm_la-signing.lo] Error 1 make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 dmcgee@galway ~/projects/pacman $ git show-ref HEAD 390b08f18b4ef550230f9f4749fb52254ccba6e5 refs/remotes/origin/HEAD

2 1

[pacman-dev] [PATCH] Fix compilation error on clang
by Allan McRae 10 Feb '13

10 Feb '13

This also lead me to notice that in _alpm_gpgme_checksig many things were not being cleaned up. Fix this by having CHECK_ERR goto gpg_error and make the required adjustments. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/signing.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index a57c946..5711f82 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -37,7 +37,7 @@ #if HAVE_LIBGPGME #define CHECK_ERR(void) do { \ - if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto error; } \ + if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto gpg_error; } \ } while(0) /** @@ -174,7 +174,7 @@ static int init_gpgme(alpm_handle_t *handle) init = 1; return 0; -error: +gpg_error: _alpm_log(handle, ALPM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err)); RET_ERR(handle, ALPM_ERR_GPGME, -1); } @@ -188,7 +188,7 @@ error: int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr) { gpgme_error_t err; - gpgme_ctx_t ctx; + gpgme_ctx_t ctx = NULL; gpgme_key_t key; int ret = -1; @@ -215,8 +215,10 @@ int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr) } gpgme_key_unref(key); -error: +gpg_error: gpgme_release(ctx); + +error: return ret; } @@ -279,9 +281,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr, } } - if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { - goto error; - } + CHECK_ERR(); /* should only get here if key actually exists */ pgpkey->data = key; @@ -319,7 +319,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr, ret = 1; -error: +gpg_error: if(ret != 1) { _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err)); } @@ -371,7 +371,7 @@ static int key_import(alpm_handle_t *handle, alpm_pgpkey_t *key) ret = 0; } -error: +gpg_error: gpgme_release(ctx); return ret; } -- 1.8.1.3

1 1

[pacman-dev] [PATCH] [makepkg] fix -r and --needed conflict
by William Giokas 09 Feb '13

09 Feb '13

In makepkg, passing -sr --needed causes there to be a conflict when pacman goes to remove the dependencies, as the --needed flag is not an option for pacman -R. This patch sanitizes the PACMAN_OPTS in the remove_deps() function so that it can still run even with the --needed option passed to makepkg. (Useful when doing `makepkg -sir --needed` to get rid of unneeded {make,check}depends automatically). At the end of the remove_deps() function, PACMAN_OPTS is restored to its original value. Signed-off-by: William Giokas <1007380(a)gmail.com> --- Noticed this today when building a series of git packges on my system. Sorry for not catching this earlier. scripts/makepkg.sh.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c464ec7..fc1976a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -984,10 +984,23 @@ remove_deps() { msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully + + opts_backup="${PACMAN_OPTS[@]}" + for i in ${PACMAN_OPTS[@]}; do + if [[ $i == "--needed" ]]; then + opts2=("${rm_opts[@]}") + else + opts2=("${rm_opts[@]}" "$i") + fi + done + PACMAN_OPTS="${rm_opts[@]}" + if ! run_pacman -Rn ${deplist[@]}; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi + + PACMAN_OPTS="${opts_backup[@]}" } get_integlist() { -- 1.8.1.3.535.ga923c31

3 4

[pacman-dev] [PATCH] makepkg: add lrzip compression support
by Allan McRae 09 Feb '13

09 Feb '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This will be available with libarchive-3.1. Although, we pipe the tarball to stdin for compression, so lrzip will not perform as well as some may hope... doc/makepkg.conf.5.txt | 8 +++++--- scripts/makepkg.sh.in | 12 +++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 052b342..34748de 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -240,14 +240,16 @@ Options This value is used when querying a package to see who was the builder. It is recommended you change this to your name and email address. -**COMPRESSGZ=**"(gzip -c -f -n)", **COMPRESSBZ2=**"(bzip2 -c -f)", **COMPRESSXZ=**"(xz -c -z -)", **COMPRESSZ=**"(compress -c -f)":: +**COMPRESSGZ=**"(gzip -c -f -n)", **COMPRESSBZ2=**"(bzip2 -c -f)", +**COMPRESSXZ=**"(xz -c -z -)", **COMPRESSLRZ=**"(lrzip -q)", +**COMPRESSZ=**"(compress -c -f)":: Sets the command and options used when compressing compiled or source packages in the named format. **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. The - current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, and - `.tar.Z`. + current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, + `.tar.lrz` and `.tar.Z`. Do not touch these unless you know what you are doing. See Also diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c464ec7..e79a468 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1826,6 +1826,7 @@ create_package() { *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; + *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; *tar) cat ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ @@ -1938,10 +1939,11 @@ create_srcpackage() { local TAR_OPT case "$SRCEXT" in - *tar.gz) TAR_OPT="z" ;; - *tar.bz2) TAR_OPT="j" ;; - *tar.xz) TAR_OPT="J" ;; - *tar.Z) TAR_OPT="Z" ;; + *tar.gz) TAR_OPT="-z" ;; + *tar.bz2) TAR_OPT="-j" ;; + *tar.xz) TAR_OPT="-J" ;; + *tar.lrz) TAR_OPT="--lrzip" ;; + *tar.Z) TAR_OPT="-Z" ;; *tar) TAR_OPT="" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; @@ -1953,7 +1955,7 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" cd_safe "${srclinks}" - if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then + if ! bsdtar -cL ${TAR_OPT} -f "$pkg_file" ${pkgbase}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 1.8.1.3

1 0

[pacman-dev] Do we need the force option?
by Allan McRae 09 Feb '13

09 Feb '13

So... I was looking through the bug tracker and I noticed this: https://bugs.archlinux.org/task/30179#comment105772 Essentially, directory on filesystem being replaced by a file. pacman ignores the conflict and then sees it is trying to replace a directory with a file and aborts. The choices are: 1) we modify force to delete the directory before installing the file - this can screw over the local db if the directory is owned. 2) we look at the conflicts and stop the transaction in non-file-to-file conflicts even with --force I think #2 is the better option here. OR... 3) get rid of --force altogether! I have good feelings about #3. When do we actually NEED --force? In most cases a simple rm will fix the conflict and it forces (pun!) the user to think about what is being done. There is only one case I can think of where that is not appropriate - when a user is trying to recover from deleting their local pacman database. But then they can use --dbonly to get the initial fix done, and will need to -Qk and rm etc as necessary... Would anyone object to removing the option completely? Allan

4 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-562-g390b08f
by allan＠archlinux.org 09 Feb '13

09 Feb '13

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 390b08f18b4ef550230f9f4749fb52254ccba6e5 (commit) via 9aead554bca6c95fe0ef6ec86c408e3300485024 (commit) via d2ce93bc5477ede279bcf20d0a5f8d876f27ddb7 (commit) via 17d4ec5ed8d9b71df3dbd50cbc5f633bfd1b0404 (commit) via 711b6d39111347489e40c1a637c15b3d22f01d3d (commit) via 3068b52f9a670dfa2534999b5fe9cf247442be4e (commit) via 829aeb2c2c4e5fdc28d02498d2b2ef59956dcfdf (commit) via 5f5469c7746ee1699433060030bbd2e6ee43ced7 (commit) via 0d89c10f4b12cb574223a23776c26144c6bceccd (commit) via 4ccf16dff589ce9f369d377bb5d3f490bd27c624 (commit) via 31b9b264c1df2fc9a4f5c846d5d1735b5fbd7050 (commit) via 198154962beca8707b19f5efb773f1a3ad10e154 (commit) via 05745089ac7009e5de84d676dd0823acd8c4d1fc (commit) via 4ec6848f91ed85ab113185bb74b83a5faf21160f (commit) via 45b6d36cf7f228190dc3d20952d1e001c91bd12d (commit) from c0835ff08e3228c748c57784869401d50421930c (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 390b08f18b4ef550230f9f4749fb52254ccba6e5 Author: Martin Panter <vadmium à gmail·com> Date: Tue Oct 23 13:32:56 2012 +0000 Exit with failure status if download or installation is not confirmed Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9aead554bca6c95fe0ef6ec86c408e3300485024 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 7 14:51:45 2012 +1000 pacman: print version information in debug output Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d2ce93bc5477ede279bcf20d0a5f8d876f27ddb7 Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 8 16:51:02 2012 +1000 Quieten the build process some more Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 17d4ec5ed8d9b71df3dbd50cbc5f633bfd1b0404 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 18:07:52 2012 +1000 Skip reading sync db deltas files if UseDelta is unset Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 711b6d39111347489e40c1a637c15b3d22f01d3d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Nov 14 14:32:11 2012 +1000 Update NEWS for pacman-4.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3068b52f9a670dfa2534999b5fe9cf247442be4e Author: Allan McRae <allan(a)archlinux.org> Date: Wed Nov 14 13:10:31 2012 +1000 README: update with 4.0 -> 4.1 API changes Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 829aeb2c2c4e5fdc28d02498d2b2ef59956dcfdf Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 18 19:34:06 2013 -0500 README: update alpm options Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5f5469c7746ee1699433060030bbd2e6ee43ced7 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 3 01:16:32 2012 +1000 Import key if needed when installing package from file When installing a package with "pacman -U" that has a detached signature, check if the needed key is in the keyring and download if necessary. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0d89c10f4b12cb574223a23776c26144c6bceccd Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 3 00:34:54 2012 +1000 Prompt to delete packages with signature fails Offer to remove the bad package when a signature fails to validate as is done for checksum failures. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4ccf16dff589ce9f369d377bb5d3f490bd27c624 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 3 00:29:11 2012 +1000 Remove retry path from signature validation Now that the keyring is checked for all needed keys before the validation, we can not reach a point of a missing key when doing validity checks for sync operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 31b9b264c1df2fc9a4f5c846d5d1735b5fbd7050 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 3 00:21:48 2012 +1000 Check keys are in keyring before package validation Keys used to create signatures are checked for presence in the keyring before package validation is performed. Signed-off-by: Allan McRae <allan(a)archlinux.org> Conflicts: lib/libalpm/alpm.h Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 198154962beca8707b19f5efb773f1a3ad10e154 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 2 23:44:11 2012 +1000 Make decode_signature available to the library Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05745089ac7009e5de84d676dd0823acd8c4d1fc Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 2 23:06:45 2012 +1000 Add function to extract key id from signatures This does not support all possibilities of RFC4880, but it does cover every key currently used in Arch Linux. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4ec6848f91ed85ab113185bb74b83a5faf21160f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 29 22:24:55 2012 +1000 Move key importing into separate function This will be useful for checking the availablity of all keys before perfoming validation in sync operations and for downloading a needed key in upgrade operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 45b6d36cf7f228190dc3d20952d1e001c91bd12d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 29 20:51:04 2012 +1000 Make key_in_keychain available in library In preparation for checking key presence and downloading needed keys before conflict checking. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 + NEWS | 80 ++++++++++++++++++ README | 79 ++++++++++++++++-- lib/libalpm/alpm.h | 13 ++- lib/libalpm/be_package.c | 64 ++++++++++++++ lib/libalpm/be_sync.c | 4 +- lib/libalpm/signing.c | 211 ++++++++++++++++++++++++++++++++++++++--------- lib/libalpm/signing.h | 8 ++ lib/libalpm/sync.c | 92 ++++++++++++++++++--- src/pacman/callback.c | 13 +++ src/pacman/pacman.c | 2 + src/pacman/sync.c | 1 + 12 files changed, 509 insertions(+), 59 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Patch decisions required
by Allan McRae 07 Feb '13

07 Feb '13

Dan/Dave, I'd like comments on these patches - which at least to me are not obvious whether to include or not. A simple yes/no/fix would be good. >From patchwork: * pacman: print version information in debug output https://patchwork.archlinux.org/patch/114/ * removed duplicate macros SYMEXPORT and SYMHIDDEN from alpm_list.c, using them from util.h https://patchwork.archlinux.org/patch/304/ * Remove "ts=2 sw=2" from Vim modelines for pacman-contrib https://patchwork.archlinux.org/patch/689/ (I think this was approved - Dan?) * Remove tab width config from Vim modelines in doc/ https://patchwork.archlinux.org/patch/690/ (I think this was approved - Dan?) * Log if dbs are up to date, synced, or failed to sync https://patchwork.archlinux.org/patch/760/ * Move logging of sysupgrade start, add log when done https://patchwork.archlinux.org/patch/761/ * Exit with failure status if download or installation is not confirmed https://patchwork.archlinux.org/patch/876/ >From the days before patchwork...: * Skip reading sync db deltas files if UseDelta is unset https://projects.archlinux.org/users/allan/pacman.git/commit/?h=working&id=… * Quieten the build process some more https://projects.archlinux.org/users/allan/pacman.git/commit/?h=working&id=…

2 1

[pacman-dev] [PATCH] README: update alpm options
by Andrew Gregory 07 Feb '13

07 Feb '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Includes local_file_siglevel and remote_file_siglevel, still in Allan's working branch. README | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/README b/README index 54e8dd6..b4c9978 100644 --- a/README +++ b/README @@ -53,8 +53,16 @@ library is initialized. * dlcb: The callback function for download progress of each package. * fetchcb: Callback for custom download function. * totaldlcb: The callback function for overall download progress. -* root: The root directory for pacman to install to (Default: /) -* dbpath: The toplevel database directory (Default: /var/lib/pacman) +* eventcb: Callback for transaction messages. +* questioncb: Callback for selecting amongst choices. +* progresscb: Callback to handle display of transaction progress. +* gpgdir: Directory where GnuPG files are stored. +* arch: Allowed package architecture. +* deltaratio: Download deltas if possible; a ratio value. +* checkspace: Check disk space before installing. +* default_siglevel: Default signature verification level. +* local_file_siglevel: Signature verification level for local file upgrades. +* remote_file_siglevel: Signature verification level for remote file upgrades. * logfile: The base path to pacman's log file (Default: /var/log/pacman.log) * usesyslog: Log to syslog instead of `logfile` for file-base logging. @@ -71,14 +79,10 @@ alpm_option_{get,set}_noupgrades -> alpm_option_{add,remove}_noupgrade. The following options are read-only, having ONLY alpm_option_get_* functions: -* lockfile: The file used for locking the database - (Default: <dbpath>/db.lck) -* localdb: A alpm_db_t structure for the local (installed) database -* syncdbs: A list of alpm_db_t structures to which pacman can sync from. +* root: The root directory for pacman to install to +* dbpath: The toplevel database directory +* lockfile: The file used for locking the database (Default: <dbpath>/db.lck) -The following options are write-only, having ONLY alpm_option_set_* functions: - -* usedelta: Download delta files instead of complete packages if possible. [Transactions] -- 1.8.1.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-547-gc0835ff
by allan＠archlinux.org 07 Feb '13

07 Feb '13

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 c0835ff08e3228c748c57784869401d50421930c (commit) via defa56155828c3f8c8fb5a08a90190532aed2ca9 (commit) via fc0ec7644ca55f16c81b2f037cfccbfe79679019 (commit) via 2d832adf08ea428a956cf9e070a347fc01fb67de (commit) via 2f137fdd39d1441f961757ccb1f1e6f6670ac72a (commit) via 1631255357c248ed827c14ce51e3648c74d0adbf (commit) via ec339969d9479d21256ac3954d9292fa83f9a017 (commit) via 7956441350f0de11394de9afdcf95a54d608bc47 (commit) via 5c5cdb0eb964e1806c868e4deb84afa04c13bb75 (commit) via f170a94c137d355cfebb7d1623b685f34a09081b (commit) via 274c3890b07bdb6faae7bbbd7535f73c26565f24 (commit) via 529cf928ab10050fb43935f5065f5052496438aa (commit) via 66171822295741fea7d00500ca4924c187f7bb4c (commit) via 7edd262a060c508a3a08b73dc18158eeac16c053 (commit) via 05d83c46fd0ae6fce3e220dd77d113cb448e068f (commit) via 33b3b6d9b854687f0fc3030eba134aad1485546f (commit) from 3aece8f0eedd703349bcd7bd6bf4b221d9f5775c (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 c0835ff08e3228c748c57784869401d50421930c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 5 11:35:47 2013 +1000 Additions to .mailmap Standardize on the most common name for email addresses with multiple name variants. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit defa56155828c3f8c8fb5a08a90190532aed2ca9 Author: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Date: Sun Feb 3 14:46:05 2013 +1000 Document fakeroot and fakechroot as dependencies Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fc0ec7644ca55f16c81b2f037cfccbfe79679019 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 3 14:36:53 2013 +1000 Remove outdated instructions in pactest README Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d832adf08ea428a956cf9e070a347fc01fb67de Author: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Date: Thu Jan 31 22:24:23 2013 -0500 Remove conditional checks for fakechroot from test files We don't want test files to do any checks for fakechroot since we will print a warning if it is not found. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2f137fdd39d1441f961757ccb1f1e6f6670ac72a Author: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Date: Thu Jan 31 22:24:22 2013 -0500 Print a warning if fakechroot is not found Fixes FS#33551. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1631255357c248ed827c14ce51e3648c74d0adbf Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 2 10:16:19 2013 -0500 use strtok_r to parse multi-value config options This prevents multiple spaces between values from being parsed as empty values. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec339969d9479d21256ac3954d9292fa83f9a017 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 29 21:38:48 2013 -0500 document that stdin must not be a tty to read from it Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7956441350f0de11394de9afdcf95a54d608bc47 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 2 19:58:50 2013 +1000 Better error message with "-" is specified without stdin Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c5cdb0eb964e1806c868e4deb84afa04c13bb75 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 2 12:40:01 2013 +1000 doc: update PKGBUILD man page Rearrange the functions section of the PKGBUILD man package. Clarify that the package() function is a requirement and the rest are all optional. Note that $pkgdir should only be used in the package() function. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f170a94c137d355cfebb7d1623b685f34a09081b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 2 12:13:41 2013 +1000 makepkg: make $pkgdir non-accessible during build() The idea of having separate build() and package() functions is that build() is run as a normal uses and package() as (fake)root. Any files placed in $pkgdir during build() can have the wrong permissions. Restrict access to $pkgdir during build() - unless there is no package() function. Also, set $pkgdir to something "useful" during build(). For split packages, this uses "<path>/pkg/$pkgbase" because it is not obvious which $pkgdir is being referred to. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 274c3890b07bdb6faae7bbbd7535f73c26565f24 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Jan 30 20:33:09 2013 -0500 make test/scripts/human_to_size.sh executable Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 529cf928ab10050fb43935f5065f5052496438aa Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 29 21:23:31 2013 -0500 add missing utilities to contrib/README Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 66171822295741fea7d00500ca4924c187f7bb4c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 29 21:23:30 2013 -0500 unset executable bit on updpkgsums.sh.in No other contrib script is executable. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7edd262a060c508a3a08b73dc18158eeac16c053 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jan 29 09:25:18 2013 -0500 inline libarchive compat wrappers Suggested-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05d83c46fd0ae6fce3e220dd77d113cb448e068f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 5 10:55:55 2013 +1000 Document LocalFileSigLevel and RemoteFileSigLevel Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 33b3b6d9b854687f0fc3030eba134aad1485546f Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 22 20:19:18 2011 +1000 Add configuration option for Upgrade operation SigLevel Add LocalFileSigLevel and RemoteFileSigLevel to control the signature checking for "pacman -U <file>" and "pacman -U <url>" operations respectively. The starting value for both these options is SigLevel, if it is specified in the [options] section, or the built-in system default. The specified values override and/or supplement this initial value. Note there is no distinction between setting "Required" and "PackageRequired" as there are no database options for Upgrade operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .mailmap | 4 ++ contrib/README | 18 +++++-- doc/PKGBUILD.5.txt | 101 ++++++++++++++++++++------------------ doc/pacman.8.txt | 4 +- doc/pacman.conf.5.txt | 8 +++ lib/libalpm/Makefile.am | 2 +- lib/libalpm/alpm.h | 9 ++++ lib/libalpm/handle.c | 52 +++++++++++++++++--- lib/libalpm/handle.h | 4 ++ lib/libalpm/libarchive-compat.c | 65 ------------------------ lib/libalpm/libarchive-compat.h | 60 ++++++++++++++++++---- scripts/makepkg.sh.in | 42 +++++++++------- src/pacman/conf.c | 67 +++++++++++++++++++++---- src/pacman/conf.h | 2 + src/pacman/pacman.c | 95 ++++++++++++++++++----------------- src/pacman/upgrade.c | 21 ++++++-- test/pacman/README | 23 +++------ test/pacman/pmtest.py | 4 +- test/pacman/tests/scriptlet001.py | 4 -- test/pacman/tests/scriptlet002.py | 4 -- 20 files changed, 354 insertions(+), 235 deletions(-) mode change 100755 => 100644 contrib/updpkgsums.sh.in delete mode 100644 lib/libalpm/libarchive-compat.c mode change 100644 => 100755 test/scripts/human_to_size_test.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Document LocalFileSigLevel and RemoveFileSigLevel
by Allan McRae 05 Feb '13

05 Feb '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.conf.5.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index f003db9..45a3383 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -155,6 +155,14 @@ Options Set the default signature verification level. For more information, see <<SC,Package and Database Signature Checking>> below. +LocalFileSigLevel =* ...:: + Set the signature verification level for installing packages using the "-U" + operation on a local file. Uses the value from SigLevel as the default. + +RemoteFileSigLevel =* ...:: + Set the signature verification level for installing packages using the "-U" + operation on a remote file URL. Uses the value from SigLevel as the default. + *UseSyslog*:: Log action messages through syslog(). This will insert log entries into +{localstatedir}/log/messages+ or equivalent. -- 1.8.1.2

2 1