- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add --needed option to makepkg
by wgiokas 20 Nov '12

20 Nov '12

Simply add the option to pass the --needed flag to pacman when using -i with makepkg. When using makepkg in scripts, particularly for git packages with the new version functions and not just a date, this can save disk io and time instead of reinstalling. This would mostly be useful with the --noconfirm option. Signed-off-by: wgiokas <1007380(a)gmail.com> --- doc/makepkg.8.txt | 4 ++++ scripts/makepkg.sh.in | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 9d19e38..498c79b 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -173,6 +173,10 @@ Options (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. +*\--needed*:: + (Passed to pacman) Tell pacman not to reinstall a target if it is already + up to date. (used with -i / --install). + *\--asdeps*:: (Passed to pacman) Install packages as non-explicitly installed (used with -i / --install). diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e4bf296..a564a2f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2429,6 +2429,7 @@ usage() { echo printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" + printf -- "$(gettext " --needed Do not reinstall the targets that are already up to date")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" @@ -2464,7 +2465,7 @@ OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' 'source' 'syncdeps' 'version') # Pacman Options -OPT_LONG+=('asdeps' 'noconfirm' 'noprogressbar') +OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 # E_INVALID_OPTION; @@ -2477,6 +2478,7 @@ while true; do # Pacman Options --asdeps) ASDEPS=1;; --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; + --needed) PACMAN_OPTS+=" --needed" ;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; # Makepkg Options -- 1.8.0

1 0

[pacman-dev] [PATCH] Use sentence case in makepkg
by Jason St. John 20 Nov '12

20 Nov '12

From: "Jason St. John" <jstjohn(a)purdue.edu> Most of makepkg already uses sentence case. This cleans up the last few stragglers. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- scripts/makepkg.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..f4ee97d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -645,7 +645,7 @@ download_svn() { } download_sources() { - msg "$(gettext "Retrieving Sources...")" + msg "$(gettext "Retrieving sources...")" local GET_VCS=1 if [[ $1 == "fast" ]]; then @@ -951,7 +951,7 @@ resolve_deps() { [[ -z $deplist ]] && return $R_DEPS_SATISFIED fi - msg "$(gettext "Missing Dependencies:")" + msg "$(gettext "Missing dependencies:")" local dep for dep in $deplist; do msg2 "$dep" @@ -1214,7 +1214,7 @@ check_source_integrity() { } extract_sources() { - msg "$(gettext "Extracting Sources...")" + msg "$(gettext "Extracting sources...")" local netfile for netfile in "${source[@]}"; do local file=$(get_filename "$netfile") @@ -1612,7 +1612,7 @@ find_libprovides() { esac if (( missing )); then - warning "$(gettext "Can not find library listed in %s: %s")" "'provides'" "$p" + warning "$(gettext "Cannot find library listed in %s: %s")" "'provides'" "$p" fi done @@ -1633,7 +1633,7 @@ write_pkginfo() { if [[ -n $PACKAGER ]]; then local packager="$PACKAGER" else - local packager="Unknown Packager" + local packager="Unknown packager" fi # btrfs's delayed allocation causes the stat buffers from the kernel to "lie" -- 1.8.0

2 2

[pacman-dev] [PATCH] Added --needed option to makepkg
by William Giokas 19 Nov '12

19 Nov '12

This helps when using scripts to install VCS packages. If using the --noconfirm and --needed flag, and the package is already up to date, then pacman does not need to do anything. Without, it re-installs the packages, using unneded disk i/o. Signed-off-by: William Giokas <1007380(a)gmail.com> --- doc/makepkg.8.txt | 4 ++++ scripts/makepkg.sh.in | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 9d19e38..d7a434d 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -173,6 +173,10 @@ Options (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. +*\--needed*:: + (Passed to pacman) Do not reinstall the targets that are already up to + date (used with -i / --install). + *\--asdeps*:: (Passed to pacman) Install packages as non-explicitly installed (used with -i / --install). diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e4bf296..a564a2f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2429,6 +2429,7 @@ usage() { echo printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" + printf -- "$(gettext " --needed Do not reinstall the targets that are already up to date")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" @@ -2464,7 +2465,7 @@ OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' 'source' 'syncdeps' 'version') # Pacman Options -OPT_LONG+=('asdeps' 'noconfirm' 'noprogressbar') +OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 # E_INVALID_OPTION; @@ -2477,6 +2478,7 @@ while true; do # Pacman Options --asdeps) ASDEPS=1;; --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; + --needed) PACMAN_OPTS+=" --needed" ;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; # Makepkg Options -- 1.8.0

1 0

[pacman-dev] [PATCH 1/2] Change Vim modeline in prototypes from "ts=2 sw=2 et" to "noet"
by Jason St. John 19 Nov '12

19 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. Bluewind stated on IRC that removing "et" is a bad idea and that it would be better to just turn that setting off with "noet". By "forcing" the use of tabs, this supports better compatibility between various user preferences because the width of tabs/indents is, and should be, an editor setting. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- proto/PKGBUILD-split.proto | 2 ++ proto/PKGBUILD.proto | 2 +- proto/proto.install | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index f873db6..41ee26e 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -70,3 +70,5 @@ package_pkg2() { cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg2 } + +# vim:set noet: diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 98172d8..d0d0412 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir/" install } -# vim:set ts=2 sw=2 et: +# vim:set noet: diff --git a/proto/proto.install b/proto/proto.install index 2a8993d..3234bea 100644 --- a/proto/proto.install +++ b/proto/proto.install @@ -34,4 +34,4 @@ # do something here #} -# vim:set ts=2 sw=2 et: +# vim:set noet: -- 1.8.0

3 5

[pacman-dev] [PATCH] Remove tab width config from Vim modelines in doc/
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> --- doc/Makefile.am | 2 +- doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 2 +- doc/index.txt | 2 +- doc/libalpm.3.txt | 2 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- doc/pacman-key.8.txt | 2 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 2 +- doc/pactree.8.txt | 2 +- doc/pkgdelta.8.txt | 2 +- doc/repo-add.8.txt | 2 +- doc/submitting-patches.txt | 2 +- doc/translation-help.txt | 2 +- doc/vercmp.8.txt | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index bcb05b7..c163ab3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -171,4 +171,4 @@ install-data-hook: uninstall-hook: $(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8 -# vim:set ts=2 sw=2 noet: +# vim:set noet: diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 0dca4a2..20961e0 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// PKGBUILD(5) =========== diff --git a/doc/footer.txt b/doc/footer.txt index 10ef067..e237840 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// See the pacman website at http://www.archlinux.org/pacman/[] for current diff --git a/doc/index.txt b/doc/index.txt index 5d93bb7..8753d0b 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -249,5 +249,5 @@ pacman is Copyright (C) 2006-2012 Pacman Development Team version 2 or later. ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/libalpm.3.txt b/doc/libalpm.3.txt index e2ea32c..0ca5084 100644 --- a/doc/libalpm.3.txt +++ b/doc/libalpm.3.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// libalpm(3) ========== diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 9d19e38..66dfdf9 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// makepkg(8) ========== diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 3dbaea1..a8a0605 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// makepkg.conf(5) =============== diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 8126edb..f235dcd 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// pacman-key(8) ============= diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 24c2243..f620fe7 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// pacman(8) ========= diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index a9c5db3..adb18d7 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// pacman.conf(5) ============== diff --git a/doc/pactree.8.txt b/doc/pactree.8.txt index 669a14b..46a1a4f 100644 --- a/doc/pactree.8.txt +++ b/doc/pactree.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// pactree(8) ========= diff --git a/doc/pkgdelta.8.txt b/doc/pkgdelta.8.txt index 587320a..0b4cd6f 100644 --- a/doc/pkgdelta.8.txt +++ b/doc/pkgdelta.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// pkgdelta(8) ========= diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 79b5a7e..a326ba3 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// repo-add(8) ========== diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt index 3428768..711ca31 100644 --- a/doc/submitting-patches.txt +++ b/doc/submitting-patches.txt @@ -94,5 +94,5 @@ aren't their own. -- ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/translation-help.txt b/doc/translation-help.txt index ef86dbf..74daa6b 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -160,5 +160,5 @@ check there first before undergoing a translation effort to ensure you are not duplicating efforts. ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/vercmp.8.txt b/doc/vercmp.8.txt index 6b94f3e..98fbb8c 100644 --- a/doc/vercmp.8.txt +++ b/doc/vercmp.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +vim:set syntax=asciidoc noet spell spelllang=en_us: ///// vercmp(8) ========= -- 1.8.0

1 0

[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