- Pacman-dev - lists.archlinux.org

[pacman-dev] [translation] Ukrainian pacman translation
by Ivan Kovnatsky 18 Apr '12

18 Apr '12

Fixed a few keywords in translation, please include this patch. -- Ivan

3 4

[pacman-dev] [PATCH 1/2] patch to add zsh completion to pacman-key
by Daniel Wallace 16 Apr '12

16 Apr '12

this patch adds a _pacman_key function to the _pacman zsh site function so that zsh users can have completion for pacman-key <keyids> and other files which may be used with pacman-key Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> --- contrib/zsh_completion.in | 58 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index b30e960..73ce42f 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -1,4 +1,4 @@ -#compdef pacman pacman.static=pacman +#compdef pacman pacman.static=pacman pacman-key # copy this file to /usr/share/zsh/site-functions/_pacman @@ -286,7 +286,7 @@ _pacman_get_command() { } # main dispatcher -_pacman() { +_pacman_zsh_comp() { case $words[2] in -Q*g*) # ipkg groups _arguments -s : \ @@ -332,5 +332,55 @@ _pacman() { esac } -# run the main dispatcher -_pacman "$@" +_pacman_key() { + _arguments \ + '(- :)'{-h,--help}"[show help]" \ + '(-a --add)*'{-a,--add}"[Add the specified keys (empty for stdin)]: :_files" \ + '(-d --delete)*'{-d,--delete}"[Remove the Specified keyids]: :_keys" \ + '(-e --export)*'{-e,--export}"[Export the specified or all keyids]: :_keys" \ + '(-f --finger)*'{-f,--finger}"[List fingreprint for specidied or all keyids]: :_keys" \ + '(-l --list-keys)*'{-l,--list-keys}"[List the specified or all keys]: :_keys" \ + '(-r --recv-keys)*'{-r,--recv-keys}"[Fetch the specified keyids]: :_keys" \ + '(-u --updatedb)*'{-u,--updatedb}"[Update the trustdb of pacman]" \ + '(-v --verify)*'{-v,--verify}"[Verify the file specified by the signature]: :_files -g '*.sig'" \ + '(-V --version)*'{-V,--version}"[Show program version]" \ + '(--config)*'{*,--config}"[Use an alternate config file]: :_files" \ + '(--edit-key)*'{*,--edit-key}"[Present a menu for key management task on keyids]: :_keys" \ + '(--gpgdir)*'{*,--gpgdir}"[Set an alternate directory for GnuPG (instead of '/etc/pacman.d/gnupg')]: :_files -/" \ + '(--import)*'{*,--import}"[Imports pubring.gpg from dir(s)]: :_files -g '*.gpg'" \ + '(--import-trustdb)*'{*,--import-tb}"[Imports ownertrust values from trustdb.gpg in dir(s)]: :_files -g '*.gpg'" \ + '(--init)*'{*,--init}"[Ensure the keyring is properly initialized]" \ + '(--keyserver)*'{*,--keyserver}"[Specify a keyserver to use if necessary]" \ + '(--list-sigs)*'{*,--list-sigs}"[List keys and their signatures]: :_keys" \ + '(--lsign-key)*'{*,--lsign-key}"[Locally sign the specified keyid]: :_keys" \ + '(--populate)*'{*,--populate}"[Reload the default keys from the (given) keyrings in '/usr/share/pacman/keyrings']: :_path_files -W /usr/share/pacman/keyrings" \ + '(--refresh-keys)*'{*,--refresh-keys}"[Update specified or all keys from a keyserver]: :_keys" +} + +_keys() { + local keys + #uses the first \< to the end and remove first \> to the end to get all the emails + #the using the first \/ to end then remove first '\ ' to the end this gets all the keyids (pub and sub) + #the ##uid* removes all the .jpeg pictures with ids, and ##pubbring.gpg removes the beginning line that lists + #where stuff is stored, ##\-\-* removes the line of dashes at the beginning, but doesn't remove email addresses + #with dashes in them + keys=( ${${${${${${${${${(f)"$(pacman-key --list-keys 2>/dev/null)"}}##*\<}%%\>}##*\/}%%\ *}##uid*}##pubring.gpg}##\-\-*} ) + _describe -t modules 'keys in keyring' keys && return 0 +} + +_pacman_comp() { + case "$service" in + pacman-key) + _pacman_key "$@";; + pacman) + _pacman_zsh_comp "$@";; + *) + _message "Error";; + esac +} + +_pacman_comp "$@" + + + +# vim: ft=zsh sw=2 ts=2 et -- 1.7.10

2 4

[pacman-dev] [PATCH 2/2] add zsh completion for makepkg
by Daniel Wallace 16 Apr '12

16 Apr '12

Right now the only completion for zsh for makepkg comes from pkgtool, and the 2 options that come from that are --chown and --linkadd which aren't options for makepkg anyway. This should add completion for all the flags for makepkg sorry about the last email, apparently I had messed with something and forgotten about it, and it had changed in the new zsh_completion.in this should be the correct one and not change stuff in _pacman_comp or in the _pacman_key in [patch 1/2] Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> --- contrib/zsh_completion.in | 154 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 150 insertions(+), 4 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 73ce42f..19082f2 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -1,4 +1,4 @@ -#compdef pacman pacman.static=pacman pacman-key +#compdef pacman pacman.static=pacman pacman-key makepkg # copy this file to /usr/share/zsh/site-functions/_pacman @@ -368,8 +368,156 @@ _keys() { _describe -t modules 'keys in keyring' keys && return 0 } +_makepkg_opts_common=( + '-s[Install missing dependencies with pacman]' + '-i[Install package after successful build]' + '-A[Ignore incomplete arch field in PKGBUILD]' + '-c[Clean up work files after build]' + '-d[Skip all dependency checks]' + '-e[Do not extract source files (use existing src/ dir)]' + '-f[Overwrite existing package]' + '-g[Generate integrity checks for source files]' + '-h[Show help message and exit]' + '-L[Log package build process]' + '-m[Disable colorized output messages]' + '-o[Download and extract files only]' + '-p[Use an alternate build script (instead of 'PKGBUILD')]: :_files' + '-r[Remove installed dependencies after a successful build]' + '-R[Repackage contents of the package without rebuilding]' + '-S[Generate a source-only tarball without downloading sources]' + ) + +_makepkg_action_none(){ + _arguments \ + "$_makepkg_opts_common[@]"\ + "$_double_makepkg[@]" +} +_double_makepkg=( + '--ignorearch[Ignore incomplete arch field in PKGBUILD]' + '--clean[Clean up work files after build]' + '--nodeps[Skip all dependency checks]' + '--noextract[Do not extract source files (use existing src/ dir)]' + '--force[Overwrite existing package]' + '--geninteg[Generate integrity checks for source files]' + '--help[Show help message and exit]' + '--install[Install package after successful build]' + '--log[Log package build process]' + '--nocolor[Disable colorized output messages]' + '--nobuild[Download and extract files only]' + '--rmdeps[Remove installed dependencies after a successful build]' + '--repackage[Repackage contents of the package without rebuilding]' + '--syncdeps[Install missing dependencies with pacman]' + '--source[Generate a source-only tarball without downloading sources]' + '--allsource[Generate a source-only tarball including downloaded source]' + '--asroot[Allow makepkg to run as root user]' + '--check[Run check() function in the PKGBUILD]' + '--config[Use an alternate config file instead of '/etc/makepkg.conf']: :_files' + '--holdver[Prevent automatic version bumping for development PKGBUILDs]' + '--key[Specify key to use for gpg signing instead of the default]: :_keys' + '--nocheck[Do not run the check() function in the PKGBUILD]' + '--nosign[Do not create a signature for the package]' + '--pkg[Only build listed packages from a split package]' + '--sign[Sign the resulting package with gpg]' + '--skipchecksums[Do not verify checksums of the source files]' + '--skipinteg[do not perform any verification checks on source files]' + '--skippgpcheck[Do not verify source files with PGP signatures]' + '--noconfirm[do not ask for confirmation when resolving dependencies]' + '--noprogressbar[Do not show a progress bar when downloading files]' + ) +_makepkg(){ + case $words[2] in + -A*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -c*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -d*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -e*) + _arguments \ + "$_makepkg_opts_common[@]" + "$_double_makepkg[@]" + ;; + -f*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -g*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -h*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -i*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -L*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -m*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -o*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -p*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -r*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -R*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -S*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + -s*) + _arguments \ + "$_makepkg_opts_common[@]" \ + "$_double_makepkg[@]" + ;; + --* ) + _arguments -s \ + "$_double_makepkg[@]" + ;; + - )_makepkg_action_none ;; + * ) return 1;; + esac +} _pacman_comp() { case "$service" in + makepkg) + _makepkg "$@";; pacman-key) _pacman_key "$@";; pacman) @@ -379,8 +527,6 @@ _pacman_comp() { esac } -_pacman_comp "$@" - +_pacman_comp -# vim: ft=zsh sw=2 ts=2 et -- 1.7.10

1 0

[pacman-dev] [PATCH 1/8] scripts/library: introduce parseopts
by Dave Reisner 13 Apr '12

13 Apr '12

This will replace our current options parser used in pacman-key and makepkg. It follows heuristics closer to that of GNU getopt long (and thus pacman itself), with the exception that it does not allow for options with optional arguments. Due to the way this parser will be used, this sort of functionality will not be needed. Instead of relying on eval+set, options are normalized into an array, OPTRET, which callers should expect to be populated after returning from parseopts. This avoids problems with quotes and spaces in arguments, assuming that the user quotes properly when passing into the application. A new test harness for parseopts is added in test/scripts. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Makefile.am | 6 +- configure.ac | 1 + scripts/Makefile.am | 1 + scripts/library/README | 12 ++++ scripts/library/parseopts.sh | 113 ++++++++++++++++++++++++++++++++++++ scripts/po/POTFILES.in | 1 + test/scripts/Makefile.am | 9 +++ test/scripts/parseopts_test.sh | 123 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 264 insertions(+), 2 deletions(-) create mode 100644 scripts/library/parseopts.sh create mode 100644 test/scripts/Makefile.am create mode 100755 test/scripts/parseopts_test.sh diff --git a/Makefile.am b/Makefile.am index a024a2e..e08b809 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libalpm src/util src/pacman scripts etc test/pacman test/util +SUBDIRS = lib/libalpm src/util src/pacman scripts etc test/pacman test/util test/scripts if WANT_DOC SUBDIRS += doc endif @@ -23,7 +23,7 @@ dist_pkgdata_DATA = \ proto/ChangeLog.proto # run the pactest test suite and vercmp tests -check-local: test/pacman test/util src/pacman src/util +check-local: test/pacman test/scripts test/util src/pacman src/util LC_ALL=C $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ --test $(top_srcdir)/test/pacman/tests/*.py \ -p $(top_builddir)/src/pacman/pacman @@ -31,6 +31,8 @@ check-local: test/pacman test/util src/pacman src/util $(top_builddir)/src/util/pacsort $(SH) $(top_srcdir)/test/util/vercmptest.sh \ $(top_builddir)/src/util/vercmp + $(BASH_SHELL) $(top_srcdir)/test/scripts/parseopts_test.sh \ + $(top_srcdir)/scripts/library/parseopts.sh # create the pacman DB and cache directories upon install install-data-local: diff --git a/configure.ac b/configure.ac index eccf425..a6114f8 100644 --- a/configure.ac +++ b/configure.ac @@ -442,6 +442,7 @@ doc/Makefile etc/Makefile test/pacman/Makefile test/pacman/tests/Makefile +test/scripts/Makefile test/util/Makefile contrib/Makefile Makefile diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 328fbff..7662fba 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST = \ LIBRARY = \ library/output_format.sh \ + library/parseopts.sh \ library/parse_options.sh # Files that should be removed, but which Automake does not know. diff --git a/scripts/library/README b/scripts/library/README index 1e9c962..33f6321 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -13,3 +13,15 @@ A getopt replacement to avoids portability issues, in particular the lack of long option name support in the default getopt provided by some platforms. Usage: parse_option $SHORT_OPTS $LONG_OPTS "$@" + +parseopts.sh: +A getopt_long-like parser which portably supports longopts and shortopts +with some GNU extensions. It does not allow for options with optional +arguments. For both short and long opts, options requiring an argument +should be suffixed with a colon. Long opts must be passed comma +separated. +Usage: + parseopts "fb:z" "foo,bar:,baz" "$@"; set -- "${OPTRET[@]}" +Returns: + 0: parse success + 1: parse failure (error message supplied) diff --git a/scripts/library/parseopts.sh b/scripts/library/parseopts.sh new file mode 100644 index 0000000..912bb49 --- /dev/null +++ b/scripts/library/parseopts.sh @@ -0,0 +1,113 @@ +# getopt-like parser +parseopts() { + local opt= optarg= i= shortopts=$1 + local -a longopts unused_argv + + # split the longopt array on commas for easier parsing + IFS=, read -ra longopts <<< "$2" + shift 2 + + get_argreq() { + local o re="^($1)(:?:?)$" + for o in "${longopts[@]}"; do + # found option, return number of colons (0 = none, 1 = required) + [[ $o =~ $re ]] && return ${#BASH_REMATCH[2]} + done + # failure + return 255 + } + + while (( $# )); do + case $1 in + --) # explicit end of options + shift + break + ;; + -[!-]*) # short option + for (( i = 1; i < ${#1}; i++ )); do + opt=${1:i:1} + + # option doesn't exist + if [[ $shortopts != *$opt* ]]; then + echo "@SCRIPTNAME@: $(gettext "unrecognized option") '-$opt'" >&2 + OPTRET=(--) + return 1 + fi + + OPTRET+=("-$opt") + # option requires optarg + if [[ $shortopts = *$opt:* ]]; then + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("${1:i+1}") + break + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("$2") + shift + break + # parse failure + else + printf "@SCRIPTNAME@: %s '-%s'\n" "$(gettext "option %s requires an argument")" "$opt" >&2 + OPTRET=(--) + return 1 + fi + fi + done + ;; + --?*=*|--?*) # long option + IFS='=' read -r opt optarg <<< "${1#--}" + get_argreq "$opt" + case $? in + *) + opt=${opt%%:} + ;;& + # intentional fallthrough + 0) + if [[ $optarg ]]; then + printf "@SCRIPTNAME@: %s '--%s'\n" "$(gettext "option %s does not allow an argument")" "$opt" >&2 + OPTRET=(--) + return 1 + else + OPTRET+=("--$opt") + shift + continue 2 + fi + ;; + 1) + # --longopt=optarg + if [[ $optarg ]]; then + OPTRET+=("--$opt" "$optarg") + shift + # --longopt optarg + elif [[ $2 ]]; then + OPTRET+=("--$opt" "$2" ) + shift 2 + else + printf "@SCRIPTNAME@: %s '--%s'\n" "$(gettext "option %s requires an argument")" "$opt" >&2 + OPTRET=(--) + return 1 + fi + continue 2 + ;; + 255) + printf "@SCRIPTNAME@: %s '--%s'\n" "$(gettext "unrecognized option")" "$opt" >&2 + OPTRET=(--) + return 1 + ;; + *) + printf "@SCRIPTNAME@: $(gettext "internal error: invalid option in longopt array") '--$opt'" >&2 + esac + ;; + *) # non-option arg encountered, add it as a parameter + unused_argv+=("$1") + ;; + esac + shift + done + + # add end-of-opt terminator and any leftover positional parameters + OPTRET+=('--' "${unused_argv[@]}" "$@") + + return 0 +} diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 007e535..01cc235 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -9,3 +9,4 @@ scripts/pkgdelta.sh.in scripts/repo-add.sh.in scripts/library/output_format.sh scripts/library/parse_options.sh +scripts/library/parseopts.sh diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am new file mode 100644 index 0000000..b949e88 --- /dev/null +++ b/test/scripts/Makefile.am @@ -0,0 +1,9 @@ +check_SCRIPTS = \ + parseopts_test.sh + +noinst_SCRIPTS = $(check_SCRIPTS) + +EXTRA_DIST = \ + $(check_SCRIPTS) + +# vim:set ts=2 sw=2 noet: diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh new file mode 100755 index 0000000..58f2a8e --- /dev/null +++ b/test/scripts/parseopts_test.sh @@ -0,0 +1,123 @@ +#!/bin/bash + +declare -i testcount=0 pass=0 fail=0 + +# source the library function +if [[ -z $1 || ! -f $1 ]]; then + printf "error: path to parse_option library not provided or does not exist\n" + exit 1 +fi +. "$1" + +if ! type -t parseopts >/dev/null; then + printf 'parse_options function not found\n' + exit 1 +fi + +# borrow opts from makepkg +OPT_SHORT="AcdefFghiLmop:rRsV" +OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps" +OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" +OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" +OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" +OPT_LONG+=",noconfirm,noprogressbar" + +parse() { + local result=$1 tokencount=$2; shift 2 + + (( ++testcount )) + parseopts "$OPT_SHORT" "$OPT_LONG" "$@" 2>/dev/null + test_result "$result" "$tokencount" "$*" "${OPTRET[@]}" + unset OPTRET +} + +test_result() { + local result=$1 tokencount=$2 input=$3; shift 3 + + if { [[ $result = "$*" ]] || [[ $2 = NULL && -z $1 ]]; } && (( tokencount == $# )); then + (( ++pass )) + else + printf '[TEST %3s]: FAIL\n' "$testcount" + printf ' input: %s\n' "$input" + printf ' output: %s (%s tokens)\n' "$*" "$#" + printf ' expected: %s (%s tokens)\n' "$result" "$tokencount" + echo + (( ++fail )) + fi +} + +summarize() { + if (( !fail )); then + printf 'All %s tests successful\n' "$testcount" + exit 0 + else + printf '%s of %s tests failed\n' "$fail" "$testcount" + exit 1 + fi +} +trap 'summarize' EXIT + +printf 'Beginning parse_options tests\n' + +# usage: parse <expected result> <token count> test-params... +# a failed parse will match only the end of options marker '--' + +# no options +parse '--' 1 + +# short options +parse '-s -r --' 3 -s -r + +# short options, no spaces +parse '-s -r --' 3 -sr + +# short opt missing an opt arg +parse '--' 1 -s -p + +# short opt with an opt arg +parse '-p PKGBUILD -L --' 4 -p PKGBUILD -L + +# short opt with an opt arg, no space +parse '-p PKGBUILD --' 3 -pPKGBUILD + +# valid shortopts as a long opt +parse '--' 1 --sir + +# long opt wiht no optarg +parse '--log --' 2 --log + +# long opt with missing optarg +parse '--' 1 -sr --pkg + +# long opt with optarg +parse '--pkg foo --' 3 --pkg foo + +# long opt with optarg with whitespace +parse '--pkg foo bar -- baz' 4 --pkg "foo bar" baz + +# long opt with optarg with = +parse '--pkg foo=bar -- baz' 4 --pkg foo=bar baz + +# long opt with explicit optarg +parse '--pkg bar -- foo baz' 5 foo --pkg=bar baz + +# long opt with explicit optarg, with whitespace +parse '--pkg foo bar -- baz' 4 baz --pkg="foo bar" + +# long opt with explicit optarg that doesn't take optarg +parse '--' 1 --force=always -s + +# long opt with explicit optarg with = +parse '--pkg foo=bar --' 3 --pkg=foo=bar + +# explicit end of options with options after +parse '-s -r -- foo bar baz' 6 -s -r -- foo bar baz + +# non-option parameters mixed in with options +parse '-s -r -- foo baz' 5 -s foo baz -r + +# optarg with whitespace +parse '-p foo bar -s --' 4 -p'foo bar' -s + +# non-option parameter with whitespace +parse '-i -- foo bar' 3 -i 'foo bar' -- 1.7.10

4 22

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-211-gd7b7285
by dan＠archlinux.org 12 Apr '12

12 Apr '12

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 d7b728591ad68712be2c0ade7c2dd8e45bc2dfed (commit) via 6a8e50a69ec419cc95ee513cd2e73944c4ac57f9 (commit) via ded66fbb62cdad37d577dc048e37f7cea7f7a4da (commit) via 8fb1948cd05eb90d8c61c7ab4873c90eea0e9f09 (commit) via c27a9467692616900189fce43cd18d14bbda7929 (commit) from d158dde30c378acc8e88d5208aa837f92331af9e (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 d7b728591ad68712be2c0ade7c2dd8e45bc2dfed Merge: 6a8e50a ded66fb Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 12 08:57:26 2012 -0500 Merge branch 'maint' commit 6a8e50a69ec419cc95ee513cd2e73944c4ac57f9 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 14 12:32:25 2012 -0600 Remove SyncFirst option This has outlived its usefulness and causes more problems than it solves. It has historically only ever been used to install pacman first. That should not be needed given we provide the vercmp utility (which has no library dependencies) and so calling pacman in install scripts is a sign of poor packaging. Work-duplicated-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8fb1948cd05eb90d8c61c7ab4873c90eea0e9f09 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 9 13:55:09 2012 +1000 Add more warning flags Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c27a9467692616900189fce43cd18d14bbda7929 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 8 22:32:49 2012 -0500 Fix a signed overflow error on i686 with GCC 4.7.0 Not sure why this one wasn't showing up on x86_64, but this fixes the compile on i686. diskspace.c: In function 'calculate_removed_size': diskspace.c:247:4: error: assuming signed overflow does not occur when negating a division [-Werror=strict-overflow] cc1: all warnings being treated as errors Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + doc/pacman.conf.5.txt | 9 ------ etc/pacman.conf.in | 2 - lib/libalpm/diskspace.c | 10 ++++-- lib/libalpm/dload.c | 11 ++++--- lib/libalpm/signing.c | 4 +- src/pacman/conf.c | 3 -- src/pacman/conf.h | 1 - src/pacman/sync.c | 53 +---------------------------------- test/pacman/README | 1 - test/pacman/tests/sync301.py | 27 ----------------- test/pacman/tests/sync302.py | 49 -------------------------------- test/pacman/tests/sync303.py | 35 ----------------------- test/pacman/tests/sync304.py | 25 ---------------- test/pacman/tests/sync305.py | 64 ------------------------------------------ 15 files changed, 16 insertions(+), 279 deletions(-) delete mode 100644 test/pacman/tests/sync301.py delete mode 100644 test/pacman/tests/sync302.py delete mode 100644 test/pacman/tests/sync303.py delete mode 100644 test/pacman/tests/sync304.py delete mode 100644 test/pacman/tests/sync305.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-3-gded66fb
by dan＠archlinux.org 12 Apr '12

12 Apr '12

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 ded66fbb62cdad37d577dc048e37f7cea7f7a4da (commit) from ca090e10d264e4999e321b0a0b43736a34aa11d9 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 11 ++++++----- lib/libalpm/signing.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove SyncFirst option
by Allan McRae 12 Apr '12

12 Apr '12

The SyncFirst option has caused more trouble than it is worth. It has historically only ever been used to install pacman first. That should not be needed given we provide the vercmp utility (which has no library dependencies) and so calling pacman in install scripts is a sign of poor packaging. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.conf.5.txt | 9 ------ etc/pacman.conf.in | 2 -- src/pacman/conf.c | 3 -- src/pacman/conf.h | 1 - src/pacman/sync.c | 47 ------------------------------- test/pacman/README | 1 - test/pacman/tests/sync301.py | 27 ------------------ test/pacman/tests/sync302.py | 49 -------------------------------- test/pacman/tests/sync303.py | 35 ----------------------- test/pacman/tests/sync304.py | 25 ----------------- test/pacman/tests/sync305.py | 64 ------------------------------------------ 11 files changed, 263 deletions(-) delete mode 100644 test/pacman/tests/sync301.py delete mode 100644 test/pacman/tests/sync302.py delete mode 100644 test/pacman/tests/sync303.py delete mode 100644 test/pacman/tests/sync304.py delete mode 100644 test/pacman/tests/sync305.py diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 3913292..a9c5db3 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -93,15 +93,6 @@ Options Instructs pacman to ignore any upgrades for this package when performing a '\--sysupgrade'. Shell-style glob patterns are allowed. -*SyncFirst =* package ...:: - Instructs pacman to check for newer version of these packages before any - sync operation. The user will have the choice to either cancel the current - operation and upgrade these packages first or go on with the current - operation. This option is typically used with the 'pacman' package. - *NOTE*: when a `SyncFirst` transaction takes place, no command line flags - (e.g. '\--force') are honored. If this is not ideal, disabling `SyncFirst` - and performing a manual sync of the involved packages may be required. - *IgnoreGroup =* group ...:: Instructs pacman to ignore any upgrades for all packages in this group when performing a '\--sysupgrade'. Shell-style glob patterns are diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 7f9db1b..4c72724 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -15,8 +15,6 @@ #LogFile = @localstatedir@/log/pacman.log #GPGDir = @sysconfdir@/pacman.d/gnupg/ HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled diff --git a/src/pacman/conf.c b/src/pacman/conf.c index b3e6f2c..2fffd92 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -73,7 +73,6 @@ int config_free(config_t *oldconfig) alpm_list_free(oldconfig->explicit_removes); FREELIST(oldconfig->holdpkg); - FREELIST(oldconfig->syncfirst); FREELIST(oldconfig->ignorepkg); FREELIST(oldconfig->ignoregrp); FREELIST(oldconfig->noupgrade); @@ -453,8 +452,6 @@ static int _parse_options(const char *key, char *value, setrepeatingoption(value, "IgnoreGroup", &(config->ignoregrp)); } else if(strcmp(key, "HoldPkg") == 0) { setrepeatingoption(value, "HoldPkg", &(config->holdpkg)); - } else if(strcmp(key, "SyncFirst") == 0) { - setrepeatingoption(value, "SyncFirst", &(config->syncfirst)); } else if(strcmp(key, "CacheDir") == 0) { setrepeatingoption(value, "CacheDir", &(config->cachedirs)); } else if(strcmp(key, "Architecture") == 0) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 95b2305..7fc15b3 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -86,7 +86,6 @@ typedef struct __config_t { /* select -Sc behavior */ unsigned short cleanmethod; alpm_list_t *holdpkg; - alpm_list_t *syncfirst; alpm_list_t *ignorepkg; alpm_list_t *ignoregrp; alpm_list_t *noupgrade; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 9c17f45..fd8df10 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -591,26 +591,6 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) return 0; } -static alpm_list_t *syncfirst(void) { - alpm_list_t *i, *res = NULL; - alpm_db_t *db_local = alpm_get_localdb(config->handle); - alpm_list_t *syncdbs = alpm_get_syncdbs(config->handle); - - for(i = config->syncfirst; i; i = alpm_list_next(i)) { - const char *pkgname = i->data; - alpm_pkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); - if(pkg == NULL) { - continue; - } - - if(alpm_sync_newversion(pkg, syncdbs)) { - res = alpm_list_add(res, strdup(pkgname)); - } - } - - return res; -} - static alpm_db_t *get_db(const char *dbname) { alpm_list_t *i; @@ -1002,33 +982,6 @@ int pacman_sync(alpm_list_t *targets) } alpm_list_t *targs = alpm_list_strdup(targets); - if(!config->op_s_downloadonly && !config->print) { - /* check for newer versions of packages to be upgraded first */ - alpm_list_t *packages = syncfirst(); - if(packages) { - /* Do not ask user if all the -S targets are SyncFirst packages, see FS#15810 */ - alpm_list_t *tmp = NULL; - if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) { - alpm_list_free(tmp); - printf(_(":: The following packages should be upgraded first :\n")); - list_display(" ", packages, getcols(fileno(stdout))); - if(yesno(_(":: Do you want to cancel the current operation\n" - ":: and upgrade these packages now?"))) { - FREELIST(targs); - targs = packages; - config->flags = 0; - config->op_s_upgrade = 0; - } else { - FREELIST(packages); - } - printf("\n"); - } else { - pm_printf(ALPM_LOG_DEBUG, "skipping SyncFirst dialog\n"); - FREELIST(packages); - } - } - } - int ret = sync_trans(targs); FREELIST(targs); diff --git a/test/pacman/README b/test/pacman/README index a3c36fc..ae3303a 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -108,7 +108,6 @@ is not necessarily complete: - HoldPkg - IgnorePkg - IgnoreGroup - - SyncFirst - NoExtract - NoUpgrade - XferCommand diff --git a/test/pacman/tests/sync301.py b/test/pacman/tests/sync301.py deleted file mode 100644 index 96402fc..0000000 --- a/test/pacman/tests/sync301.py +++ /dev/null @@ -1,27 +0,0 @@ -self.description = "Sysupgrade : pacman needs to be upgraded and has new deps" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["dep"] -self.addpkg2db("sync", sp) - -spdep = pmpkg("dep") -self.addpkg2db("sync", spdep) - -sp1 = pmpkg("pkg1", "1.0-2") -self.addpkg2db("sync", sp1) - -lp = pmpkg("pacman", "1.0-1") -self.addpkg2db("local", lp) - -lp1 = pmpkg("pkg1", "1.0-1") -self.addpkg2db("local", lp1) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_VERSION=pkg1|1.0-1") -self.addrule("PKG_EXIST=dep") diff --git a/test/pacman/tests/sync302.py b/test/pacman/tests/sync302.py deleted file mode 100644 index 78e45c3..0000000 --- a/test/pacman/tests/sync302.py +++ /dev/null @@ -1,49 +0,0 @@ -self.description = "Sysupgrade : pacman needs to be upgraded and has updated deps" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["zlib", "curl", "libarchive"] -self.addpkg2db("sync", sp) - -libcdep = pmpkg("glibc", "2.15-1") -self.addpkg2db("sync", libcdep) - -curldep = pmpkg("curl", "7.22-1") -self.addpkg2db("sync", curldep) - -libadep = pmpkg("libarchive", "2.8.5-1") -self.addpkg2db("sync", libadep) - -zlibdep = pmpkg("zlib", "1.2.5-3") -zlibdep.depends = ["glibc"] -self.addpkg2db("sync", zlibdep) - - -lp = pmpkg("pacman", "1.0-1") -self.addpkg2db("local", lp) - -lp1 = pmpkg("curl", "7.21.7-1") -self.addpkg2db("local", lp1) - -lp2 = pmpkg("glibc", "2.13-1") -self.addpkg2db("local", lp2) - -lp3 = pmpkg("libarchive", "2.8.4-1") -self.addpkg2db("local", lp3) - -lp4 = pmpkg("zlib", "1.2.5-3") -self.addpkg2db("local", lp4) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_EXIST=glibc") -self.addrule("PKG_EXIST=curl") -self.addrule("PKG_EXIST=libarchive") -# TODO: when SyncFirst recursive comes back, re-enable these -#self.addrule("PKG_VERSION=glibc|2.15-1") -#self.addrule("PKG_VERSION=curl|7.22-1") -#self.addrule("PKG_VERSION=libarchive|2.8.5-1") -self.addrule("PKG_EXIST=zlib") diff --git a/test/pacman/tests/sync303.py b/test/pacman/tests/sync303.py deleted file mode 100644 index 9d7bab5..0000000 --- a/test/pacman/tests/sync303.py +++ /dev/null @@ -1,35 +0,0 @@ -self.description = "Sysupgrade: upgrade pacman with deps as provisions" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["zlib"] -self.addpkg2db("sync", sp) - -glibcdep = pmpkg("glibc", "2.13-1") -self.addpkg2db("sync", glibcdep) - -zlibdep = pmpkg("zlib", "1.2.5-3") -zlibdep.depends = ["glibc"] -self.addpkg2db("sync", zlibdep) - - -lp = pmpkg("pacman", "1.0-1") -lp.depends = ["zlib"] -self.addpkg2db("local", lp) - -lp2 = pmpkg("glibc-awesome", "2.13-2") -lp2.provides = ["glibc=2.13"] -lp2.conflicts = ["glibc"] -self.addpkg2db("local", lp2) - -lp3 = pmpkg("zlib", "1.2.5-3") -self.addpkg2db("local", lp3) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_EXIST=glibc-awesome") -self.addrule("PKG_VERSION=glibc-awesome|2.13-2") -self.addrule("PKG_EXIST=zlib") diff --git a/test/pacman/tests/sync304.py b/test/pacman/tests/sync304.py deleted file mode 100644 index 18058c9..0000000 --- a/test/pacman/tests/sync304.py +++ /dev/null @@ -1,25 +0,0 @@ -self.description = "Sysupgrade: upgrade pacman being depended on" - -sp = pmpkg("pacman", "4.0.1-1") -self.addpkg2db("sync", sp) - -sp2 = pmpkg("pyalpm", "2-1") -sp2.depends = ["pacman>=4.0", "pacman<4.1"] -self.addpkg2db("sync", sp2) - -lp = pmpkg("pacman", "3.5.4-1") -self.addpkg2db("local", lp) - -lp2 = pmpkg("pyalpm", "1-1") -lp2.depends = ["pacman>=3.5", "pacman<3.6"] -self.addpkg2db("local", lp2) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=pacman|4.0.1-1") -self.addrule("PKG_VERSION=pyalpm|2-1") - -self.expectfailure = True diff --git a/test/pacman/tests/sync305.py b/test/pacman/tests/sync305.py deleted file mode 100644 index 62005b5..0000000 --- a/test/pacman/tests/sync305.py +++ /dev/null @@ -1,64 +0,0 @@ -self.description = "Sysupgrade: syncfirst with recursive/cascading deps" - -sp = pmpkg("pacman", "4.0.1-2") -sp.depends = ["glibc>=2.15", "curl"] -self.addpkg2db("sync", sp) - -glibcdep = pmpkg("glibc", "2.15-1") -self.addpkg2db("sync", glibcdep) - -gcldep = pmpkg("gcc-libs", "4.6.2-5") -gcldep.depends = ["glibc>=2.14"] -self.addpkg2db("sync", gcldep) - -curldep = pmpkg("curl", "7.23.1-2") -curldep.depends = ["openssl"] -self.addpkg2db("sync", curldep) - -openssldep = pmpkg("openssl", "1.0.0.e-1") -openssldep.depends = ["perl"] -self.addpkg2db("sync", openssldep) - -gccdep = pmpkg("gcc", "4.6.2-5") -gccdep.depends = ["gcc-libs=4.6.2-5"] -self.addpkg2db("sync", gccdep) - -perldep = pmpkg("perl", "5.14.2-5") -perldep.depends = ["db"] -self.addpkg2db("sync", perldep) - -dbdep = pmpkg("db", "5.2.36-2") -dbdep.depends = ["gcc-libs"] -self.addpkg2db("sync", dbdep) - - -lp = pmpkg("pacman", "4.0.1-1") -lp.depends = ["glibc>=2.14", "curl"] -self.addpkg2db("local", lp) - -lp2 = pmpkg("glibc", "2.14-2") -self.addpkg2db("local", lp2) - -lp3 = pmpkg("curl", "7.23.1-2") -self.addpkg2db("local", lp3) - -lp4 = pmpkg("gcc-libs", "4.6.2-3") -self.addpkg2db("local", lp4) - -lp5 = pmpkg("gcc", "4.6.2-3") -lp5.depends = ["gcc-libs=4.6.2-3"] -self.addpkg2db("local", lp5) - -lp6 = pmpkg("perl", "5.14.2-5") -lp6.depends = ["db"] -self.addpkg2db("local", lp6) - -lp7 = pmpkg("db", "5.2.36-2") -lp7.depends = ["gcc-libs"] -self.addpkg2db("local", lp7) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=pacman|4.0.1-2") -- 1.7.10

1 0

Re: [pacman-dev] [arch-general] SOLVED - Re: Need help understanding new "make install" failures - libtool: install: error: relink `blah...la' ??
by Martti Kühne 10 Apr '12

10 Apr '12

On Tue, Apr 10, 2012 at 10:47:35AM +0300, Bogdan Ionuț wrote: > On Mon, Apr 9, 2012 at 17:02, David C. Rankin < > drankinatty(a)suddenlinkmail.com> wrote: > > > On 04/07/2012 06:54 PM, David C. Rankin wrote: > > > Guys, > > > > > > After the latest updates, I'm getting a number of package() "make > > install" > > > failures on packages that have, until now, packaged just fine. Is > > anybody else > > > experiencing this on packages you build? If so, do you know what is > > causing it > > > -- and how to fix? I've searched and found that sometimes reordering > > the link > > > commands in the Makefile can help, but I can't figure out why things have > > > packaged just fine up until now and are now failing. Since everything > > built fine > > > with the build() command -- why the failure on package()?? > > > > > > I've also read another solution is to do away with the .la files > > completely > > > and replace with a package config setup. However, before I try and tackle > > > something like that, I want to figure out what broke. The failures > > during "make > > > install" look like this (gwenview and tdegames examples:) > > > > > > the failure: > > > > > > /usr/bin/ld: cannot find -ltdeinit_gwenview > > > collect2: error: ld returned 1 exit status > > > libtool: install: error: relink `gwenview.la' with the above command > > before > > > installing it > > > > > > > All, > > > > The answer was provided in an AUR post for spice-gtk: > > > > Try editing the PKBUILD in package() > > > > make -j1 DESTDIR="$pkgdir/" install > > > > It seems that parallel building during package was the culprit. The build > > of > > tdegames went fine after adding -j1. > > > > -- > > David C. Rankin, J.D.,P.E. > > > > Or options=(!makeflags) Moving thread over here from aur-general, I think -j<something> is a great makeflag to build a kernel with, but there's no way to tell what packages will break with the flag. This kind of taints the /etc/makepkg.conf MAKEFLAGS variable, which is meant as a convenience. I followed the discussion earlier when someone tried to include a dynamic value for -j into a pkgbuild based on the number of cpus that could be located. Yeah, I too told him to use makepkg.conf, which is now under the impression of being a bad idea. Ideas? Let the people rot with inserting !makeflags into all PKGBUILDs that break on their config? cheers! mar77i

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-206-gd158dde
by dan＠archlinux.org 09 Apr '12

09 Apr '12

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 d158dde30c378acc8e88d5208aa837f92331af9e (commit) via 31091963edaa505d00642aecb9950ce087a40b73 (commit) via 468270ce4f3b47e93e7c25796e499dc30d3ce74a (commit) via 8fe67919284446a0d83755df3b7d64f54d4a4962 (commit) via dca10b062f27a67dd2daafbe73641b1b7279408e (commit) via 3a82885348d90a4b11184559a577359c2930b212 (commit) via ca090e10d264e4999e321b0a0b43736a34aa11d9 (commit) via b729ed01093312cef7ce48d07b13e225b25446db (commit) via a8a1b093eb23450244418232c9e30c4be035fc0b (commit) via ec91133e38cb7c486ec995d4183f30e84f3ca736 (commit) via 30ca48df4ca51b57ca8bc0e45f78d3eac8c15b40 (commit) via 4b95967bd04360d448296fe9fe15709cc4751e35 (commit) via 5f774025774b85c92a7e8ebf69738221d92cd72d (commit) via 793eff37047dbceedaf3443311bc826566685181 (commit) via 7fcb445f35d70d6dd4fa14e9d7b5de35625b0811 (commit) via cb5b66367ddf4af05953a9486bddaaf105fb4f38 (commit) via b2226ed11bca158ab32199b5899802a78a42f5aa (commit) via 059c572ca5c0f3ac9d90c53f0c0bdc8e4fb0336f (commit) via c5d951846d6b803909cbd7cfeac643f5feb42911 (commit) via bcfc2155a0c58c8c208aa58425b36f9bcb1e7b6d (commit) via f053141c8744b3f15ffdf488705fb7606cf1ab35 (commit) from 569876f9309fc04d6f77f852c5ca096721d6044b (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 d158dde30c378acc8e88d5208aa837f92331af9e Merge: 3109196 b729ed0 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 8 21:55:30 2012 -0500 Merge remote-tracking branch 'dave/buildsys' Oh god, what are we thinking thinking merging this. Hopefully this works with only a few follow-up patches necessary. commit 31091963edaa505d00642aecb9950ce087a40b73 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 31 17:26:39 2012 +1000 makepkg: save and restore shopts when sourcing /etc/profile Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 468270ce4f3b47e93e7c25796e499dc30d3ce74a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Feb 13 22:30:15 2012 -0500 makepkg: complain when the buildfile isn't writeable If the PKGBUILD isn't writeable for devel_update, throw a warning instead of silently ignoring it. Some logical reordering is present in this patch to reduce the number of nested if's. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8fe67919284446a0d83755df3b7d64f54d4a4962 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Feb 10 15:10:32 2012 -0500 makepkg: catch errors sourcing files create source_safe() function which temporarily disables extglob and exits on error. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit dca10b062f27a67dd2daafbe73641b1b7279408e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jan 26 10:28:31 2012 -0500 makepkg: restrict usage of errexit to user functions It's expected that this will lead to unwanted behavior, and needs widespread testing. It's desirable to commit this for a few reasons: - there's no reason we can't do our own error checking for code that we write. - it avoids the need for ||true hacks scattered about in the code. - it makes us immune to upstream changes in exit codes (FS#28248) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 3a82885348d90a4b11184559a577359c2930b212 Merge: 569876f ca090e1 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 8 21:51:24 2012 -0500 Merge branch 'maint' commit b729ed01093312cef7ce48d07b13e225b25446db Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 7 13:03:41 2012 -0500 Add a new configure option for excessive compiler warning flags This adds a bunch of warning flags to the list used when compiling. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8a1b093eb23450244418232c9e30c4be035fc0b Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 7 13:01:13 2012 -0500 Various tweaks to support building with excessive GCC warning flags This fixes a bunch of small issues in order to enable a clean successful build with a crazy number of GCC warning flags. A lot of these changes are covered by -Wshadow, -Wformat-security, and -Wstrict-overflow=5. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ec91133e38cb7c486ec995d4183f30e84f3ca736 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 31 22:17:30 2012 -0400 autoclean.sh: abide by POSIX shebang Avoid non-POSIX brace expansion and rely on find to locate and destroy files outside the root. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 30ca48df4ca51b57ca8bc0e45f78d3eac8c15b40 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 31 21:52:08 2012 -0400 buildsys: move autotools bloat to build-aux Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 4b95967bd04360d448296fe9fe15709cc4751e35 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 31 16:16:45 2012 -0400 buildsys: move acinclude.m4 to m4/ Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 5f774025774b85c92a7e8ebf69738221d92cd72d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 31 15:51:47 2012 -0400 buildsys: cleanup libtool and autoconf initialization - Use LT_INIT over AC_PROG_LIBTOOL, as the latter is a deprecated alias for the former. - Remove redundant macros which are called implicitly by LT_INIT. - Remove unneeded AC_PROG_CXX call (we don't use c++ anywhere) - Add AC_CONFIG_MACRO_DIR([m4]) -- not strictly necessary, but added for consistency with autogen.sh and Makefile.am ref: http://www.gnu.org/software/libtool/manual/html_node/LT_005fINIT.html Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 793eff37047dbceedaf3443311bc826566685181 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 30 23:26:32 2012 -0400 buildsys: define warning CFLAGS in separate var Continue the trend of not touching the environment CFLAGS, ensuring that the user always has the final say. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7fcb445f35d70d6dd4fa14e9d7b5de35625b0811 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 30 23:23:45 2012 -0400 buildsys: use AC_DEFINE for CYGWIN macro Instead of directly modifying CFLAGS, use config.h for its intended purpose. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit cb5b66367ddf4af05953a9486bddaaf105fb4f38 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 30 23:08:31 2012 -0400 buildsys: cleanup gpgme compile time check - handle gpgme libs and cflags separately rather than appending to CFLAGS and LDFLAGS - be consistent in AC_LINK_IFELSE check for gpgme 1.3.0 (though this is irrelephant since we don't actually run) - be consistent with usage of "have" and "with" variables (this actually ends up reducing SLOC) - when voluntary detection fails, unset GPGME_CFLAGS and GPGME_LIBS - when requested support fails the version check, complain about the min version. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit b2226ed11bca158ab32199b5899802a78a42f5aa Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 30 14:37:06 2012 -0400 buildsys: use pkg-config for libcurl detection Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 059c572ca5c0f3ac9d90c53f0c0bdc8e4fb0336f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 30 14:30:08 2012 -0400 buildsys: use pkg-config for libarchive detection This also introduces a versioned dependency of >=2.8.0. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c5d951846d6b803909cbd7cfeac643f5feb42911 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 30 14:26:35 2012 -0400 buildsys: use pkg-config for openssl detection Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit bcfc2155a0c58c8c208aa58425b36f9bcb1e7b6d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 30 15:45:46 2012 -0400 buildsys: add pkg-config m4 macros We'll need these for a small revamp to library detection. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: autoclean.sh | 24 +-- config.guess => build-aux/config.guess | 0 config.rpath => build-aux/config.rpath | 0 config.sub => build-aux/config.sub | 0 depcomp => build-aux/depcomp | 0 install-sh => build-aux/install-sh | 0 ltmain.sh => build-aux/ltmain.sh | 0 missing => build-aux/missing | 0 mkinstalldirs => build-aux/mkinstalldirs | 0 configure.ac | 143 ++++++++++++------ lib/libalpm/Makefile.am | 19 ++- lib/libalpm/deps.c | 10 +- lib/libalpm/trans.c | 7 +- lib/libalpm/util.c | 17 ++- lib/libalpm/util.h | 2 +- acinclude.m4 => m4/acinclude.m4 | 20 +++ m4/libcurl.m4 | 250 ------------------------------ m4/pkg.m4 | 159 +++++++++++++++++++ scripts/makepkg.sh.in | 85 ++++++----- scripts/pacman-key.sh.in | 6 +- src/pacman/Makefile.am | 2 +- src/pacman/conf.c | 6 +- src/pacman/pacman.c | 9 +- src/pacman/sync.c | 4 +- src/pacman/util.c | 2 +- src/util/Makefile.am | 4 +- 26 files changed, 383 insertions(+), 386 deletions(-) rename config.guess => build-aux/config.guess (100%) rename config.rpath => build-aux/config.rpath (100%) rename config.sub => build-aux/config.sub (100%) rename depcomp => build-aux/depcomp (100%) rename install-sh => build-aux/install-sh (100%) rename ltmain.sh => build-aux/ltmain.sh (100%) rename missing => build-aux/missing (100%) rename mkinstalldirs => build-aux/mkinstalldirs (100%) rename acinclude.m4 => m4/acinclude.m4 (86%) delete mode 100644 m4/libcurl.m4 create mode 100644 m4/pkg.m4 hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-2-gca090e1
by dan＠archlinux.org 09 Apr '12

09 Apr '12

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 ca090e10d264e4999e321b0a0b43736a34aa11d9 (commit) via f053141c8744b3f15ffdf488705fb7606cf1ab35 (commit) from b752561a52a88f8e9cc3bcc9c2079eb685245110 (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 ca090e10d264e4999e321b0a0b43736a34aa11d9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 14:03:27 2012 -0400 pacman-key: avoid use of tempfile in verify_sig Use --status-fd rather than --status-file to keep this contained in a pipeline. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit f053141c8744b3f15ffdf488705fb7606cf1ab35 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 14:02:39 2012 -0400 pacman-key: verify TRUST_ULTIMATE keys as good Extend our grep pattern to match TRUST_ULTIMATE, not just TRUST_FULLY, as these keys are to be trusted as well. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/pacman-key.sh.in | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0