- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove "ts=2 sw=2" from Vim modelines for pacman-contrib
by Jason St. John 17 Nov '12

17 Nov '12

From: "Jason St. John" <jstjohn(a)purdue.edu> There is no reason to force a certain tab width on users. These settings should be configured by the user in their own ~/.vimrc. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- contrib/Makefile.am | 2 +- contrib/bacman.sh.in | 2 +- contrib/paccache.sh.in | 2 +- contrib/pacdiff.sh.in | 2 +- contrib/paclist.sh.in | 2 +- contrib/paclog-pkglist.sh.in | 2 +- contrib/pacscripts.sh.in | 2 ++ contrib/pacsysclean.sh.in | 2 +- contrib/rankmirrors.sh.in | 2 +- contrib/updpkgsums.sh.in | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3641a08..156bfac 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -104,4 +104,4 @@ rankmirrors: $(srcdir)/rankmirrors.sh.in updpkgsums: $(srcdir)/updpkgsums.sh.in zsh_completion: $(srcdir)/zsh_completion.in -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 7895a40..aa210f7 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -304,4 +304,4 @@ echo Done exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index e813655..15b7dff 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -317,4 +317,4 @@ fi summarize "$pkgcount" "${candidates[@]}" -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index bfafda2..721ac90 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -89,4 +89,4 @@ done 3< <(cmd) exit 0 -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in index 7883e21..f6f2eb5 100644 --- a/contrib/paclist.sh.in +++ b/contrib/paclist.sh.in @@ -61,4 +61,4 @@ pacman -Sl $1 | awk -v i="$installed" '$NF == i { print $2,$3 }' # exit with pacman's return value, not awk's exit ${PIPESTATUS[0]} -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in index 222bbc4..3277a16 100644 --- a/contrib/paclog-pkglist.sh.in +++ b/contrib/paclog-pkglist.sh.in @@ -80,4 +80,4 @@ END { } }' | sort -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in index 8468714..ed248d1 100644 --- a/contrib/pacscripts.sh.in +++ b/contrib/pacscripts.sh.in @@ -136,3 +136,5 @@ case "$1" in --version|-V) version; exit 0 ;; *) print_scriptlet $1 ;; esac + +# vim:set noet: diff --git a/contrib/pacsysclean.sh.in b/contrib/pacsysclean.sh.in index 37219ab..2b9c788 100644 --- a/contrib/pacsysclean.sh.in +++ b/contrib/pacsysclean.sh.in @@ -61,4 +61,4 @@ function format_size(size) { printf("%s\t%s\n", format_size($2), $1); }' -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 875a143..5c1c2bf 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -209,4 +209,4 @@ for line in "${linearray[@]}"; do done finaloutput -# vim: set ts=2 sw=2 noet: +# vim: set noet: diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 33e04d9..43735e4 100755 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -90,4 +90,4 @@ fi ' > "$buildfile" } < "$buildfile" -# vim: set ts=2 sw=2 noet: +# vim: set noet: -- 1.8.0

1 0

[pacman-dev] [PATCH 1/2] Remove Vim modelines in prototype files
by Jason St. John 16 Nov '12

16 Nov '12

From: "Jason St. John" <jstjohn(a)purdue.edu> It makes little sense to "force" users to replace tabs with spaces, with a width of 2. These settings should be configured by the user in their own ~/.vimrc. This is a resubmission based on Allan's feedback on the ML. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- proto/PKGBUILD.proto | 2 -- proto/proto.install | 2 -- 2 files changed, 4 deletions(-) diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 98172d8..6e788c1 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -43,5 +43,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } - -# vim:set ts=2 sw=2 et: diff --git a/proto/proto.install b/proto/proto.install index 2a8993d..26d37f8 100644 --- a/proto/proto.install +++ b/proto/proto.install @@ -33,5 +33,3 @@ #post_remove() { # do something here #} - -# vim:set ts=2 sw=2 et: -- 1.8.0

1 1

[pacman-dev] [PATCH] README: update with 4.0 -> 4.1 API changes
by Allan McRae 14 Nov '12

14 Nov '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- DRAFT! This assumes everything on my working branch will be committed for the 4.1 release. README | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/README b/README index c4199dd..6fd1fe8 100644 --- a/README +++ b/README @@ -366,6 +366,7 @@ API CHANGES BETWEEN 3.4 AND 3.5 PM_TRANS_EVT_DISKSPACE_DONE, PM_TRANS_CONV_SELECT_PROVIDER, PM_TRANS_PROGRESS_DISKSPACE_START, PM_TRANS_PROGRESS_INTEGRITY_START + API CHANGES BETWEEN 3.5 AND 4.0 =============================== @@ -445,3 +446,59 @@ API CHANGES BETWEEN 3.5 AND 4.0 ALPM_ERR_DB_INVALID, ALPM_ERR_DB_INVALID_SIG, ALPM_ERR_GPGME, ALPM_ERR_PKG_INVALID_CHECKSUM, ALPM_ERR_PKG_INVALID_SIG, ALPM_ERR_SIG_INVALID, ALPM_ERR_SIG_MISSING + + +API CHANGES BETWEEN 4.0 AND 4.1 +=============================== + +[REMOVED] +- alpm_list_getdata() + +[CHANGED] +- alpm_pkgfrom_t members are now prefixed with ALPM_ +- alpm_siglevel_t - added members ALPM_SIG_PACKAGE_SET, ALPM_SIG_PACKAGE_TRUST_SET +- alpm_depend_t - additional desc member +- alpm_filelist_t - additional resolved_path member +- alpm_pgpkey_t - added members length, revoked, pubkey_algo +- function renaming: + - alpm_option_get_localdb -> alpm_get_localdb + - alpm_option_get_syncdbs -> alpm_get_syncdbs + - alpm_db_register_sync -> alpm_register_syncdb + - alpm_db_unregister_all -> alpm_unregister_all_syncdbs + - alpm_db_readgroup -> alpm_db_get_group +- alpm_time_t typedef used for all times + - members of alpm_pgpkey_t + - return types of alpm_pkg_get_builddate and alpm_pkg_get_installdate +- alpm_db_set_pkgreason takes and additional alpm_handle_t argument +- delta options now use required ratio rather than on/off + - alpm_option_get_usedelta -> alpm_option_get_deltaratio + - alpm_option_set_usedelta -> alpm_option_set_deltaratio + +[ADDED] +- tracking of how a package was validated: + - alpm_pkgvalidation_t + - alpm_pkg_get_validation() +- adjustable signature verification levels for upgrade operations: + - alpm_option_get_local_file_siglevel() + - alpm_option_set_local_file_siglevel() + - alpm_option_get_remote_file_siglevel() + - alpm_option_set_remote_file_siglevel() +- sync database usage functions: + - alpm_db_usage_t + - alpm_db_set_usage() + - alpm_db_get_usage() +- wrapper functions for reading mtree files + - alpm_pkg_mtree_open() + - alpm_pkg_mtree_next() + - alpm_pkg_mtree_close() +- utility functions + - alpm_pkg_find() + - alpm_pkg_compute_optionalfor() + - alpm_filelist_contains() +- types + - alpm_time_t + - alpm_errno_t +- flags + ALPM_EVENT_OPTDEP_REQUIRED, ALPM_EVENT_DATABASE_MISSING, + ALPM_EVENT_KEYRING_START, ALPM_EVENT_KEYRING_DONE, ALPM_EVENT_KEY_DOWNLOAD_START, + ALPM_EVENT_KEY_DOWNLOAD_DONE, ALPM_PROGRESS_KEYRING_START -- 1.8.0

2 3

[pacman-dev] [PATCH] doc: PKGBUILD.5 - fix output of bzr command
by Allan McRae 14 Nov '12

14 Nov '12

Add quotes around 'bzr help revisionspec' to make it clearer that this is a command to be run. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This makes the man page output look like: bzr revision (see 'bzr help revisionspec' for details) which seems good to me... but I am not sure whether other generated versions of the documentation will look fine. doc/PKGBUILD.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 178519b..afe6b54 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -433,7 +433,7 @@ The source URL is divided into three components: the VCS being used: *bzr*;; - revision (see `bzr help revisionspec` for details) + revision (see `'bzr help revisionspec'` for details) *git*;; branch, commit, tag -- 1.8.0

1 0

[pacman-dev] [PATCH] Fix future signature timestamp warning
by Allan McRae 13 Nov '12

13 Nov '12

The warning given for a signature timstamp being in the future compared to the system time stated the opposite. Also, move this warning to debug output. It is useless in its current form as the package or database that is giving the error is not mentioned and so other debug output is needed to find the offending signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/signing.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 8d70b61..ae9775b 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -570,16 +570,17 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, alpm_list_free(summary_list); _alpm_log(handle, ALPM_LOG_DEBUG, "status: %s\n", gpgme_strerror(gpgsig->status)); _alpm_log(handle, ALPM_LOG_DEBUG, "timestamp: %lu\n", gpgsig->timestamp); + + if((time_t)gpgsig->timestamp > time(NULL)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "signature timestamp is greater than system time.\n"); + } + _alpm_log(handle, ALPM_LOG_DEBUG, "exp_timestamp: %lu\n", gpgsig->exp_timestamp); _alpm_log(handle, ALPM_LOG_DEBUG, "validity: %s; reason: %s\n", string_validity(gpgsig->validity), gpgme_strerror(gpgsig->validity_reason)); - if((time_t)gpgsig->timestamp > time(NULL)) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("System time is greater than signature timestamp.\n")); - } - result = siglist->results + sigcount; err = gpgme_get_key(ctx, gpgsig->fpr, &key, 0); if(gpg_err_code(err) == GPG_ERR_EOF) { -- 1.8.0

1 0

[pacman-dev] [PATCH] makepkg: save path to PACMAN and test availability
by Allan McRae 13 Nov '12

13 Nov '12

After we install dependencies, we source /etc/profile so that new elements get added to the path. As this can override any local setting of PATH, we store the full path of the PACMAN variable passed to makepkg. Also, add a check for PACMAN availability if it is needed to deal with any dependency operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a replacement for the patch provided by Martin Panter. While dealing with patches today, I decided that the check for the full pacman path was being done in the wrong place and we should do the usual check of software availability if "pacman" is needed. scripts/makepkg.sh.in | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f650b1b..16e421b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -875,9 +875,9 @@ source_has_signatures() { run_pacman() { local cmd if [[ ! $1 = -@(T|Qq) ]]; then - cmd=("$PACMAN" $PACMAN_OPTS "$@") + cmd=("$PACMAN_PATH" $PACMAN_OPTS "$@") else - cmd=("$PACMAN" "$@") + cmd=("$PACMAN_PATH" "$@") fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then @@ -2191,6 +2191,14 @@ check_software() { # check for needed software local ret=0 + # check for PACMAN if we need it + if (( ! NODEPS || DEP_BIN || RMDEPS || INSTALL )); then + if [[ -z $PACMAN_PATH ]]; then + error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN" + ret=1 + fi + fi + # check for sudo if we will need it during makepkg execution if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then if ! type -p sudo >/dev/null; then @@ -2548,6 +2556,8 @@ fi # set pacman command if not already defined PACMAN=${PACMAN:-pacman} +# save full path to command as PATH may change when sourcing /etc/profile +PACMAN_PATH=$(type -P $PACMAN) || true # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW @@ -2825,7 +2835,7 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif type -p "$PACMAN" >/dev/null; then +else if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi @@ -2853,8 +2863,6 @@ elif type -p "$PACMAN" >/dev/null; then error "$(gettext "Could not resolve all dependencies.")" exit 1 fi -else - warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "$PACMAN" "PATH" fi # ensure we have a sane umask set -- 1.8.0

2 4

[pacman-dev] [PATCH 2/2 v2] Save path to $PACMAN, to avoid losing access due to --syncdeps
by Martin Panter 13 Nov '12

13 Nov '12

Unmangled version: https://github.com/vadmium/pacman-arch/commit/3992a1d.patch >From 3992a1dc7a40c4eefed99ae82e7c682babb4d01b Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 31 Oct 2012 02:45:36 +0000 Subject: [PATCH] Save path to $PACMAN, to avoid losing access due to --syncdeps --- scripts/makepkg.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0f266df..9c6c0ae 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2728,7 +2728,12 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif type -p "$PACMAN" >/dev/null; then +elif output="$(command -v "$PACMAN")"; then + # Save full path in case the --syncdeps operation resets the $PATH by + # invoking /etc/profile. If $PACMAN refers to a command in ~/bin/ it + # could become inaccessible. + PACMAN="$output" + if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi -- 1.8.0

2 4

[pacman-dev] [PATCH 1/2 v2] Remove last traces of handling command arguments in $PACMAN
by Martin Panter 11 Nov '12

11 Nov '12

New version removing the arguments rather than adding them back. Unmangled version: https://github.com/vadmium/pacman-arch/commit/7d15a05.patch >From 7d15a057e37defece4c93bf17e4bbdac1db4106d Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 31 Oct 2012 03:05:42 +0000 Subject: [PATCH] Remove last traces of handling command arguments in $PACMAN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This resolves an inconsistency with how the $PACMAN variable was interpreted. Previously “makepkg” would extract the first word from the $PACMAN variable and check that it existed as a command. This appears to have been happening ever since the variable was implemented in revision 66c6d28 (makepkg: allow to specify an alternative pacman command). Thus it looks like command arguments were originally allowed in the variable. However the run_pacman() function now quotes $PACMAN, so the whole variable has to be just the command name. This quoting was introduced more recently, perhaps in revision 622326b (makepkg: fix sudo/su calling of pacman). --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..0f266df 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2728,7 +2728,7 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif type -p "${PACMAN%% *}" >/dev/null; then +elif type -p "$PACMAN" >/dev/null; then if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi @@ -2757,7 +2757,7 @@ elif type -p "${PACMAN%% *}" >/dev/null; then exit 1 fi else - warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "${PACMAN%% *}" "PATH" + warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "$PACMAN" "PATH" fi # ensure we have a sane umask set -- 1.8.0

1 0

[pacman-dev] [PATCH 0/8] [RFC] Signature checking overhaul
by Allan McRae 07 Nov '12

07 Nov '12

The main change here is that pacman will now check the needed keys are in the keyring before doing package validation. Example output: :: Retrieving packages ... systemd-sysvcompat-... 5.4 KiB 671K/s 00:00 [######################] 100% (1/1) checking keys in keyring [######################] 100% :: Import PGP key 2048R/F56C0C53, "Dave Reisner <d(a)falconindy.com>", created: 2011-06-26? [Y/n] (1/1) checking package integrity [######################] 100% (1/1) loading package files [######################] 100% This removed the repeat validation after key downloading and made the following much easier to implement: 1) packages with bad signatures get the "pkg is corrupt, delete?" type message 2) pacman -U now downloads a signature if needed. These patches need a very good review... Allan McRae (8): Make key_in_keychain available in library Move key importing into separate function Add function to extract key id from signatures Make decode_signature available to the library Check keys are in keyring before package validation Remove retry path from signature validation Prompt to delete packages with signature fails Import key if needed when installing package from file lib/libalpm/alpm.h | 9 ++- lib/libalpm/be_package.c | 40 ++++++++++ lib/libalpm/signing.c | 197 ++++++++++++++++++++++++++++++++++++++--------- lib/libalpm/signing.h | 7 ++ lib/libalpm/sync.c | 87 ++++++++++++++++++--- src/pacman/callback.c | 9 +++ 6 files changed, 300 insertions(+), 49 deletions(-) -- 1.8.0

3 14

[pacman-dev] [PATCH 1/2] Restore ability for $PACMAN to include arguments and document it
by Martin Panter 03 Nov '12

03 Nov '12

Unmangled version: https://github.com/vadmium/pacman-arch/commit/70b1327.patch >From 70b1327c0443818d163e10b649ba882a4fd5a0f3 Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 31 Oct 2012 03:05:42 +0000 Subject: [PATCH] Restore ability for $PACMAN to include arguments and document it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Judging by the “${PACMAN%% *}” incantation from revision 66c6d28 (makepkg: allow to specify an alternative pacman command), it looks like this was consciously intended. Currently, including arguments in $PACMAN means the --syncdeps operation may be attempted, but each Pacman invocation will probably fail. However in other cases the operation would be skipped if $PACMAN cannot be found. Looks like this inconsistency comes from revision 622326b (makepkg: fix sudo/su calling of pacman). --- doc/makepkg.8.txt | 3 ++- scripts/makepkg.sh.in | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 9d19e38..8b440a3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -196,7 +196,8 @@ Environment Variables The command that will be used to check for missing dependencies and to install and remove packages. Pacman's -Qq, -Rns, -S, -T, and -U operations must be supported by this command. If the variable is not - set or empty, makepkg will fall back to `pacman'. + set or empty, makepkg will fall back to `pacman'. The variable may + include command arguments, separated with spaces. **PKGDEST=**"/path/to/folder":: Folder where the resulting packages will be stored. Overrides the diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..3b4f27f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -873,9 +873,9 @@ source_has_signatures() { run_pacman() { local cmd if [[ ! $1 = -@(T|Qq) ]]; then - cmd=("$PACMAN" $PACMAN_OPTS "$@") + cmd=($PACMAN $PACMAN_OPTS "$@") else - cmd=("$PACMAN" "$@") + cmd=($PACMAN "$@") fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then -- 1.7.12

2 3