- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] [PATCH] repo-add: Add SOURCE entry
by Allan McRae 21 Apr '12

21 Apr '12

When repo-add is passed a source package, add it to the desc file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This patch is crap... but I want to know if an idea like this would even be considered before I make it suck less and implement the pacman side. The idea is "pacman -B/--build <pkg>" would download the source package file (if provided in the repo) and build the package. Of course this could be extended (e.g. -w to only download, -e allows editing the PKGBUILD prior to building, -u builds an entire update, -d builds a package but not its deps, --nopatch disables patching the build files with the patch found in /etc/pacman.d/build/$pkgbase). Is this the mindless ramblings of a lunatic, or something that would be of interest? scripts/repo-add.sh.in | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5159ea2..80e512b 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -187,6 +187,40 @@ db_remove_delta() { return 1 } # end db_remove_delta +# write a source entry +# arg1 - path to source package file +db_write_source() { + sourcefile="$1" + + pkgbase=${1%-*-*} + + local line + while read -r line; do + # TODO - suck less (leading whitespace, variable usage, split packages...) + [[ ${line} = pkgname=* ]] && declare "$line" + [[ ${line} = pkgver=* ]] && declare "$line" + [[ ${line} = pkgrel=* ]] && declare "$line" + done< <(bsdtar -xOqf "$sourcefile" "$pkgbase/@BUILDSCRIPT@") + + # ensure needed variables were found + if [[ -z $pkgname || -z $pkgver || -z $pkgrel ]]; then + error "$(gettext "Invalid source package file '%s'.")" "$sourcefile" + return 1 + fi + + if [[ ! -f $tmpdir/tree/$pkgname-$pkgver-$pkgrel/desc ]]; then + error "$(gettext "No database entry for package '%s'.")" "$pkgname-$pkgver-$pkgrel" + return 1 + fi + + format_entry "SOURCE" "${1##*/}" >> $tmpdir/tree/$pkgname-$pkgver-$pkgrel/desc + + # TODO - will want some security here... checksum/signature + + return 0 +} + + check_gpg() { if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the gpg binary! Is GnuPG installed?")" @@ -497,6 +531,16 @@ add() { fi fi + if [[ $1 == *.src.tar?(.*) ]]; then + sourcefile=$1 + msg "$(gettext "Adding source '%s'")" "$sourcefile" + if db_write_source "$sourcefile"; then + return 0 + else + return 1 + fi + fi + pkgfile=$1 if ! bsdtar -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" -- 1.7.10

1 0

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

18 Apr '12

Fixed alighment in pacman Query and Sync info options. -- Ivan Kovnatsky

1 0

[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

[pacman-dev] [PATCH 1/2] pacman-key: verify TRUST_ULTIMATE keys as good
by Dave Reisner 08 Apr '12

08 Apr '12

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> --- pacman-key would exit with an error here, but still show the success message from gpg itself, e.g. if my key is TRUST_ULTIMATE: $ pacman-key --verify curl-7.25.0-1-x86_64.pkg.tar.xz.sig gpg: Signature made Thu 22 Mar 2012 07:51:44 PM EDT using RSA key ID F56C0C53 gpg: NOTE: trustdb not writable gpg: Good signature from "Dave Reisner <d(a)falconindy.com>" gpg: aka "Dave Reisner <dreisner(a)archlinux.org>" ==> ERROR: The signature identified by curl-7.25.0-1-x86_64.pkg.tar.xz.sig could not be verified. scripts/pacman-key.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 9a77a19..1a2bac3 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -441,7 +441,7 @@ refresh_keys() { verify_sig() { local fd="$(mktemp)" "${GPG_PACMAN[@]}" --status-file "${fd}" --verify $SIGNATURE - if ! grep -q TRUST_FULLY "${fd}"; then + if ! grep -qE 'TRUST_(FULLY|ULTIMATE)' "${fd}"; then rm -f "${fd}" error "$(gettext "The signature identified by %s could not be verified.")" "$SIGNATURE" exit 1 -- 1.7.10

2 2

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

08 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 569876f9309fc04d6f77f852c5ca096721d6044b (commit) via ecd6eddf13f0fc24a281b2af9725896492bb6ad4 (commit) via 87c4fb51a460b10153c10297bfaea7e5c16a811b (commit) from 62e8812fb9002bf2d737375003652bc6becc9f54 (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 569876f9309fc04d6f77f852c5ca096721d6044b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Mar 11 15:40:11 2012 -0400 makepkg: treat lib{provides,depends} returns as proper arrays Make these functions more whitespace space by treating newlines as the element delimiter rather than every form of whitespace. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ecd6eddf13f0fc24a281b2af9725896492bb6ad4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Mar 11 15:33:13 2012 -0400 makepkg: use proper array addition in libdeps Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 87c4fb51a460b10153c10297bfaea7e5c16a811b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 8 18:28:39 2012 -0400 makepkg: add missing newline from libprovides output This was a small oversight from 1917c845 which causes makepkg to write provides entries to the .PKGINFO file improperly, e.g. provides = systemdlibsystemdudev=999 Add a newline in the printf format to ensure that these are spaced appropriately. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: add missing newline from libprovides output
by Dave Reisner 08 Apr '12

08 Apr '12

This was a small oversight from 1917c845 which causes makepkg to write provides entries to the .PKGINFO file improperly, e.g. provides = systemdlibsystemdudev=999 Add a newline in the printf format to ensure that these are spaced appropriately. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Dan: this is on my libdeps branch for lack of a better place to put it. scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ffa3a34..3345cbd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1145,7 +1145,7 @@ find_libprovides() { fi done - printf "%s" "${libprovides[@]}" + printf '%s\n' "${libprovides[@]}" } check_license() { -- 1.7.10

1 0

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

07 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 62e8812fb9002bf2d737375003652bc6becc9f54 (commit) via 3be02aa27c892b2bcc76a8883a0087b51c0e768b (commit) via 42d408e0c253beca56f640729a85badffedd8a3f (commit) via cb5ae428b63c9807f855638c00720f54ea73413f (commit) via b5043dd6c3e2a9da637dfefbbd2b6a89cda600f0 (commit) via 923214497f1873a5bd1989aad867b629166d89b1 (commit) via 1917c845f74640262e452b67836b41faca52eb4e (commit) via d11192c73ad6cfc6de1aa9dc4add6fa54b23fb8f (commit) via bb71d254e2a2fbd641ce73392727762904189723 (commit) via 0fd477238f190976efffabd04110fb1d79448be3 (commit) via 0666b1366990064b0f9b47fe321be8e6593336ce (commit) via 80a811ec9641ae0a94a6dcee3dbaeb42afb27afc (commit) via 6310bb5fbe841c4957dddce6a8ee97f2c6a10fc5 (commit) via 4ca6590af58177964910588a6d0406f0d009bd0e (commit) via 3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (commit) via 0145604728360acaf56e6d50bc03e78bfab7585c (commit) via b5b9860a2e7f73b0445131a51006c8c95f1f1b91 (commit) via b752561a52a88f8e9cc3bcc9c2079eb685245110 (commit) via 3c5d5a19b36c5ea3638de263cb7cd1be6289cb44 (commit) via 297916e6a2ad91bbd4cbd0173cac79937b93a393 (commit) via a8f03d07c7eaae02a55065a4a2f098ef6d8b5bff (commit) via 114d121001d8c3e901d5330b864d58870c6e917b (commit) via 391769ff8914b1aa94fd8daa87da0d2bfc2cc328 (commit) via 969dcddbdf9d5dbd91aa414cdd193f3fb26b644b (commit) via 72ba4fb83ff99031f58169beeb1daa80ffd8cdb4 (commit) via d7f4e8fbccb1506697d2c9f70c32326c01c05cb3 (commit) via ed353d91b7fe5ab397cc6c649ceca2f0ea507023 (commit) via 1eeab12228b1d133b40ec44ac47b318379331deb (commit) via 7f258619c6c0e9f441aacbabfc1a2f5980c5cb9b (commit) via be0e0444040dc7d84e86c5b5e60b786441c4d97e (commit) via c571bd7afbbe05449558d861a6ec82c559771739 (commit) via e66edf817b045375645fbd4645eddb15daded4d0 (commit) via 38c0ec868be6e2f45ffcc61d95cfb85294f623c1 (commit) via 8da489eac53513841d62380a72aae1baecc44e61 (commit) via 0972b7acfd7c8fadb6aeec6606ea85bf6c5d3d3d (commit) from e6f72c61a098b52ea29e54b8eb4739a2ff81e6b0 (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 62e8812fb9002bf2d737375003652bc6becc9f54 Author: Florian Pritz <bluewind(a)xinu.at> Date: Fri Apr 6 18:17:06 2012 +0200 repo-remove: remove deltas file if it becomes empty Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3be02aa27c892b2bcc76a8883a0087b51c0e768b Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 1 15:37:19 2012 +1000 Prefix alpm_pkgfrom_t members with ALPM_ Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 42d408e0c253beca56f640729a85badffedd8a3f Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 7 11:29:11 2012 -0500 Return more useful error codes on package open failures Failure isn't always due to the package file location not existing; permission issues can also play a part on something like a FUSE-based filesystem inaccessible to root. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cb5ae428b63c9807f855638c00720f54ea73413f Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 28 20:30:53 2012 +1000 Check minimum required gpgme version We use interfaces first introduced in gpgme-1.3.0 so test we have at least that version. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b5043dd6c3e2a9da637dfefbbd2b6a89cda600f0 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 24 00:08:24 2012 +1000 Make selecting scriptlet shell work The initial patch to implement this achieved nothing apart from adding a configure option. This patch makes that configure option do what it advertises. Note that specifing any shell apart from /bin/sh causes testsuite failures as /bin/sh is the only shell in the testing environment. Bug-found-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 923214497f1873a5bd1989aad867b629166d89b1 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 9 17:43:47 2012 +1000 makepkg: safely change directories In preparation for the removal of the global error trap we need a way to ensure changing directories succeeds. Add a "cd_safe" wrapper that performs the necessary check. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1917c845f74640262e452b67836b41faca52eb4e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 9 16:39:01 2012 +1000 makepkg: use printf rather than echo to output variable Also make sure the strings passed to %s in printf are always quoted. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d11192c73ad6cfc6de1aa9dc4add6fa54b23fb8f Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 9 16:19:53 2012 +1000 makepkg: the rhs in string comparisons should be quoted Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bb71d254e2a2fbd641ce73392727762904189723 Author: Matthew Monaco <matthew.monaco(a)0x01b.net> Date: Mon Mar 12 19:14:22 2012 -0600 makepkg: devel_check(): cleanup for hg version Use pushd/popd, quote args, handle some more errors commit 0fd477238f190976efffabd04110fb1d79448be3 Author: Matthew Monaco <matthew.monaco(a)0x01b.net> Date: Mon Mar 12 19:14:21 2012 -0600 makepkg: devel_check(): set newpkgver (cleanup) The case structure allows the syntax to focus on what's actually being done here. commit 0666b1366990064b0f9b47fe321be8e6593336ce Author: Matthew Monaco <matthew.monaco(a)0x01b.net> Date: Mon Mar 12 19:14:20 2012 -0600 makepkg: devel_check(): consolidate common code commit 80a811ec9641ae0a94a6dcee3dbaeb42afb27afc Author: Matthew Monaco <matthew.monaco(a)0x01b.net> Date: Mon Mar 12 19:14:19 2012 -0600 makepkg: devel_check(): determine vcs Rather than prioritizing an arbitrary VCS, collect all development directives. If there is more than one, give a warning and abort. commit 6310bb5fbe841c4957dddce6a8ee97f2c6a10fc5 Author: Matthew Monaco <matthew.monaco(a)0x01b.net> Date: Mon Mar 12 12:53:10 2012 -0600 makepkg: remove unused variable Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4ca6590af58177964910588a6d0406f0d009bd0e Merge: 3f1ea8b b752561 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 7 11:23:55 2012 -0500 Merge branch 'maint' Conflicts: lib/libalpm/signing.c lib/libalpm/sync.c commit 3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 7 11:20:08 2012 -0500 Revert "makepkg: calculate exact total file size" This reverts commit b264fb9e9ddcc31dc8782390309421965e507383. With our "fix" of sleeping for BTRFS, we can go back to using `du` to calculate total installed size. commit 0145604728360acaf56e6d50bc03e78bfab7585c Author: Pierre <pierre(a)spotify.com> Date: Mon Apr 2 04:16:28 2012 +0200 pacman: show groups once with -Sg Only displays groups that haven't appeared yet.. Previously 'pacman -Sg' iterated over syncs, printed every group. This change does not affect '-Sgg' which still orders by sync first. To reproduce, on a current Arch Linux with [extra] and [community]: $ pacman -Sg|sort|uniq -c|sort -n [...] 1 xorg-fonts 2 vim-plugins 2 xfce4-goodies Signed-off-by: Pierre <pierre(a)spotify.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b5b9860a2e7f73b0445131a51006c8c95f1f1b91 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Mar 28 20:22:18 2012 -0400 makepkg.conf: enable curl's cookie engine for http Implements FS#28098. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c571bd7afbbe05449558d861a6ec82c559771739 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Mar 27 19:29:48 2012 -0500 bash_completion: complete pacman-key options right away pacman-key requires at least one dashed option, so complete them right away, rather than falling back to default completion. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e66edf817b045375645fbd4645eddb15daded4d0 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Mar 27 19:25:50 2012 -0500 Drop bash 3.2 completion support This is pretty old at this point, and upstream bash completions project uses compopt heavily. Completions are by no means a make-or-break feature anyway, so this is not critical. This basically reverts commit 6f4f9c1b66ed85 made in 2010. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 38c0ec868be6e2f45ffcc61d95cfb85294f623c1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 16 18:08:22 2012 -0500 Change table_display() to be static It is only used inside util.c. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8da489eac53513841d62380a72aae1baecc44e61 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 16 17:57:04 2012 -0500 Reduce calls to getcols This dramatically improves upon a much older attempt in 2008 in commit ce3d70aa99ab86. We don't need to call it once per line we print unless there is a reasonable expectation of being able to resize the terminal mid-operation; this is really only the case during our callback progress bars. Some before and after numbers of ioctl() calls, gleaned from strace of the following operations (no targets to any of them to maximize the amount of output): pacman -Qii : 37768 -> 2616 (93.1% decrease) pacman -Qs : 2616 -> 4 (99.8%) pacman -Sii : 133036 -> 10926 (91.8%) pacman -Ss : 10926 -> 14 (99.9%) Obviously the search results are astounding; we only call getcols() once in the case of -Qs, and once per repo in the case of -Ss. For -Qii and -Sii we are still calling it once per package, but this is much better than once per line of info output. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0972b7acfd7c8fadb6aeec6606ea85bf6c5d3d3d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Mar 16 17:05:06 2012 -0500 Pass a file descriptor to getcols and flush_term_input This makes these methods a bit more flexible. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 26 ++- configure.ac | 13 +- contrib/bash_completion.in | 27 +- doc/index.txt | 1 + etc/makepkg.conf.in | 4 +- lib/libalpm/alpm.h | 6 +- lib/libalpm/be_local.c | 4 +- lib/libalpm/be_package.c | 15 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/package.c | 18 +- lib/libalpm/po/ca.po | 6 +- lib/libalpm/po/cs.po | 6 +- lib/libalpm/po/da.po | 93 +++--- lib/libalpm/po/de.po | 6 +- lib/libalpm/po/el.po | 6 +- lib/libalpm/po/en_GB.po | 4 +- lib/libalpm/po/es.po | 4 +- lib/libalpm/po/fi.po | 6 +- lib/libalpm/po/fr.po | 4 +- lib/libalpm/po/hu.po | 6 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/lt.po | 4 +- lib/libalpm/po/nb.po | 6 +- lib/libalpm/po/pl.po | 6 +- lib/libalpm/po/pt.po | 6 +- lib/libalpm/po/pt_BR.po | 11 +- lib/libalpm/po/ro.po | 6 +- lib/libalpm/po/ru.po | 4 +- lib/libalpm/po/sk.po | 4 +- lib/libalpm/po/sr.po | 6 +- lib/libalpm/po/sr(a)latin.po | 6 +- lib/libalpm/po/sv.po | 6 +- lib/libalpm/po/tr.po | 6 +- lib/libalpm/po/uk.po | 6 +- lib/libalpm/po/zh_CN.po | 6 +- lib/libalpm/po/zh_TW.po | 6 +- lib/libalpm/signing.c | 15 +- lib/libalpm/sync.c | 14 +- lib/libalpm/trans.c | 2 +- scripts/Makefile.am | 1 + scripts/library/parse_options.sh | 30 ++- scripts/makepkg.sh.in | 252 +++++++++-------- scripts/pacman-key.sh.in | 16 +- scripts/pkgdelta.sh.in | 6 +- scripts/po/ca.po | 16 +- scripts/po/cs.po | 16 +- scripts/po/da.po | 580 +++++++++++++++++++++----------------- scripts/po/de.po | 74 +++--- scripts/po/el.po | 16 +- scripts/po/en_GB.po | 16 +- scripts/po/es.po | 75 +++-- scripts/po/fi.po | 16 +- scripts/po/fr.po | 20 +- scripts/po/hu.po | 16 +- scripts/po/it.po | 14 +- scripts/po/kk.po | 16 +- scripts/po/lt.po | 16 +- scripts/po/nb.po | 16 +- scripts/po/pacman-scripts.pot | 16 +- scripts/po/pl.po | 16 +- scripts/po/pt.po | 16 +- scripts/po/pt_BR.po | 23 +-- scripts/po/ro.po | 16 +- scripts/po/ru.po | 60 ++--- scripts/po/sk.po | 51 ++-- scripts/po/sr.po | 16 +- scripts/po/sr(a)latin.po | 16 +- scripts/po/sv.po | 122 ++++---- scripts/po/tr.po | 16 +- scripts/po/uk.po | 62 +++-- scripts/po/zh_CN.po | 16 +- scripts/po/zh_TW.po | 16 +- scripts/repo-add.sh.in | 5 + src/pacman/callback.c | 6 +- src/pacman/package.c | 85 +++--- src/pacman/pacman.c | 2 +- src/pacman/po/ca.po | 32 +-- src/pacman/po/cs.po | 33 +-- src/pacman/po/da.po | 170 ++++++----- src/pacman/po/de.po | 29 +-- src/pacman/po/el.po | 35 +-- src/pacman/po/en_GB.po | 13 +- src/pacman/po/es.po | 36 +-- src/pacman/po/fi.po | 20 +- src/pacman/po/fr.po | 18 +- src/pacman/po/hu.po | 31 +-- src/pacman/po/it.po | 33 +-- src/pacman/po/kk.po | 32 +-- src/pacman/po/lt.po | 18 +- src/pacman/po/nb.po | 31 +-- src/pacman/po/pl.po | 32 +-- src/pacman/po/pt.po | 36 +-- src/pacman/po/pt_BR.po | 26 +- src/pacman/po/ro.po | 35 +-- src/pacman/po/ru.po | 34 +-- src/pacman/po/sk.po | 40 ++-- src/pacman/po/sr.po | 33 +-- src/pacman/po/sr(a)latin.po | 33 +-- src/pacman/po/sv.po | 34 +-- src/pacman/po/tr.po | 33 +-- src/pacman/po/uk.po | 16 +- src/pacman/po/zh_CN.po | 32 +-- src/pacman/po/zh_TW.po | 32 +-- src/pacman/query.c | 8 +- src/pacman/sync.c | 18 +- src/pacman/util.c | 90 ++++--- src/pacman/util.h | 16 +- 110 files changed, 1504 insertions(+), 1738 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v4.0.3, created. v4.0.3
by dan＠archlinux.org 07 Apr '12

07 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 annotated tag, v4.0.3 has been created at 8f6a4f6c2c94d9bea9aacf7801b72d5e7c5f99b7 (tag) tagging b752561a52a88f8e9cc3bcc9c2079eb685245110 (commit) replaces v4.0.2 tagged by Dan McGee on Sat Apr 7 11:07:35 2012 -0500 - Log ----------------------------------------------------------------- 4.0.3 maint release -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAk+AZk4ACgkQXC5GoPU6du10CwCgvzrC+CKsvWl9UBPWthEUZ/XR EmoAmwUdjxCU5T+/WLY47KYMbKx16BQz =iHO5 -----END PGP SIGNATURE----- Allan McRae (5): Do not dereference symlinks when calculating size Skip special files when cleaning package cache makepkg: quote removed filename as it can have spaces pacman-key: make the -e option work as advertised pacman-key: change to more reliable default keyserver Christoph Vigano (1): makepkg: fix syntax error in remove_deps Dan McGee (16): scripts: unset CDPATH if cd is used Update SIGPIPE signal handler comment Revert "Enable recursive/needed sync on SyncFirst" Revert "Add -S --recursive operation" diskspace: ensure we match only full path components Give better error messages on database locking failures Don't check diskspace when using --dbonly Database cleanup enhancements Fix a memory leak when loading an invalid package Fix a potential memory leak in filelist creation Translation updates from Transifex Add 3.0.x versions to doc/index.txt Update all translation files Updates from Transifex pkgdelta: use bsdtar -q option 4.0.3 release NEWS, version bumps, etc. Dave Reisner (10): lib/sync: use full delta size as max download size parseopts: normalize options into an array makepkg: exit via default signal handler in trap_exit dload: reset payload filename members before download lib/sync: avoid unwanted unlink after download fail signing: cope with gpg2's failure at life makepkg: avoid reporting bogus install size on btrfs parse_options: initialize unused_options as array sync: fix crash on failed downloads Revert "parseopts: normalize options into an array" Eric Bélanger (1): pacsysclean: Fix script description and accept -o option without hyphen Florian Pritz (3): makepkg: fix extraction of soname in find_libdepends makepkg: fix false error with multiple libdeps pkgdelta: exit 1 upon error Pierre Schmitz (2): pacman-key: Remove useless signature verification in --populate command pacman-key: Actually verify signatures and exit with correct codes ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.2-38-gb752561
by dan＠archlinux.org 07 Apr '12

07 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 b752561a52a88f8e9cc3bcc9c2079eb685245110 (commit) via 3c5d5a19b36c5ea3638de263cb7cd1be6289cb44 (commit) via 297916e6a2ad91bbd4cbd0173cac79937b93a393 (commit) via a8f03d07c7eaae02a55065a4a2f098ef6d8b5bff (commit) from 114d121001d8c3e901d5330b864d58870c6e917b (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 b752561a52a88f8e9cc3bcc9c2079eb685245110 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 7 11:04:00 2012 -0500 4.0.3 release NEWS, version bumps, etc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3c5d5a19b36c5ea3638de263cb7cd1be6289cb44 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Apr 7 11:54:02 2012 -0400 Revert "parseopts: normalize options into an array" This was really only half a fix for FS#28445, as it still doesn't correctly handle the case of filenames with spaces. In the short term, there is no obvious fix for this. In the long term, I believe the correct decision is to rewrite the options parser to be more in line with GNU getopt_long. This reverts commits: ca4142714137b16feabac09c4cda86b0a75036f8. 969dcddbdf9d5dbd91aa414cdd193f3fb26b644b. commit 297916e6a2ad91bbd4cbd0173cac79937b93a393 Author: Florian Pritz <bluewind(a)xinu.at> Date: Fri Apr 6 23:50:37 2012 +0200 pkgdelta: exit 1 upon error This has been 0 since 9fa18d9a4b4ce5217842c71d8a45676e3fb9d3f4, but it doesn't makes sense because we are raising an error. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8f03d07c7eaae02a55065a4a2f098ef6d8b5bff Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Sat Mar 31 15:55:14 2012 +0200 pacman-key: Actually verify signatures and exit with correct codes We cannot rely on gpg's exit code. Instead we have to check the status-fd to figure out whether a signature is valid or not. In addition to this pacman-key --verify can now be used in scripts as it will return an exit code of 1 if the signature is invalid. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 26 +++++++++++++++++++++++++- configure.ac | 4 ++-- doc/index.txt | 1 + scripts/library/parse_options.sh | 32 +++++++++++++++++++++----------- scripts/makepkg.sh.in | 6 +++--- scripts/pacman-key.sh.in | 12 ++++++++---- scripts/pkgdelta.sh.in | 4 ++-- 7 files changed, 62 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.2-34-g114d121
by dan＠archlinux.org 07 Apr '12

07 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 114d121001d8c3e901d5330b864d58870c6e917b (commit) via 391769ff8914b1aa94fd8daa87da0d2bfc2cc328 (commit) via 969dcddbdf9d5dbd91aa414cdd193f3fb26b644b (commit) via 72ba4fb83ff99031f58169beeb1daa80ffd8cdb4 (commit) via d7f4e8fbccb1506697d2c9f70c32326c01c05cb3 (commit) via ed353d91b7fe5ab397cc6c649ceca2f0ea507023 (commit) via 1eeab12228b1d133b40ec44ac47b318379331deb (commit) via 7f258619c6c0e9f441aacbabfc1a2f5980c5cb9b (commit) via be0e0444040dc7d84e86c5b5e60b786441c4d97e (commit) from f988aa6b32503f5d4003b1402089df74adf8b485 (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 114d121001d8c3e901d5330b864d58870c6e917b Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 7 10:09:57 2012 -0500 pkgdelta: use bsdtar -q option This matches the optimization made to repo-add in commit 8bbaf045b9ce way back in 2009. We don't need to read the whole package file to ensure multiple .PKGINFO entries don't exist, as well-formed packages should have this file first in the archive. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 391769ff8914b1aa94fd8daa87da0d2bfc2cc328 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Apr 4 21:40:29 2012 -0400 sync: fix crash on failed downloads Dan was right. This should have been FREE(), not free(). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 969dcddbdf9d5dbd91aa414cdd193f3fb26b644b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Mar 20 09:02:56 2012 -0400 parse_options: initialize unused_options as array Since we treat this as an array, we need to initialize it as one. This avoids addition of an empty element to the option string when we set the option array from the calling program, e.g. +/usr/bin/makepkg[2033]: set -- -i --pkg vim -- '' Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 72ba4fb83ff99031f58169beeb1daa80ffd8cdb4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 2 14:08:39 2012 -0500 Updates from Transifex This encompasses a few languages that have had changes since 4.0.2 available on Transifex. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d7f4e8fbccb1506697d2c9f70c32326c01c05cb3 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 28 11:55:39 2012 +1000 pacman-key: change to more reliable default keyserver User reports indicate that the SKS keyservers are more reliable than both the gnupg.net and mit.edu ones. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed353d91b7fe5ab397cc6c649ceca2f0ea507023 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 27 00:20:05 2012 +1000 pacman-key: make the -e option work as advertised Using -e without arguments failed to export all keys. Using --export worked as expected. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1eeab12228b1d133b40ec44ac47b318379331deb Author: Dan McGee <dan(a)archlinux.org> Date: Wed Mar 28 18:05:04 2012 -0500 Update all translation files Pull updates from transifex, run update-po on all files, fix a few errors, and push them back to Transifex. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f258619c6c0e9f441aacbabfc1a2f5980c5cb9b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Mar 27 23:43:46 2012 -0400 makepkg: avoid reporting bogus install size on btrfs delayed allocation hoses us here and causes erroenous install sizes to be reported. Add a short sleep to allow the transaction to be committed to the filesystem and the stat buffers to be updated. This is apparently a "feature", as per to some of the denizens of #btrfs on freenode. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit be0e0444040dc7d84e86c5b5e60b786441c4d97e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Mar 27 23:10:34 2012 -0400 signing: cope with gpg2's failure at life For key searches only, gpg2 will fail to lookup any and all keys that are not prefixed with 0x. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ca.po | 6 +- lib/libalpm/po/cs.po | 6 +- lib/libalpm/po/da.po | 93 +++--- lib/libalpm/po/de.po | 6 +- lib/libalpm/po/el.po | 6 +- lib/libalpm/po/en_GB.po | 4 +- lib/libalpm/po/es.po | 4 +- lib/libalpm/po/fi.po | 6 +- lib/libalpm/po/fr.po | 4 +- lib/libalpm/po/hu.po | 6 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/lt.po | 4 +- lib/libalpm/po/nb.po | 6 +- lib/libalpm/po/pl.po | 6 +- lib/libalpm/po/pt.po | 6 +- lib/libalpm/po/pt_BR.po | 11 +- lib/libalpm/po/ro.po | 6 +- lib/libalpm/po/ru.po | 4 +- lib/libalpm/po/sk.po | 4 +- lib/libalpm/po/sr.po | 6 +- lib/libalpm/po/sr(a)latin.po | 6 +- lib/libalpm/po/sv.po | 6 +- lib/libalpm/po/tr.po | 6 +- lib/libalpm/po/uk.po | 6 +- lib/libalpm/po/zh_CN.po | 6 +- lib/libalpm/po/zh_TW.po | 6 +- lib/libalpm/signing.c | 15 +- lib/libalpm/sync.c | 2 +- scripts/library/parse_options.sh | 2 +- scripts/makepkg.sh.in | 6 + scripts/pacman-key.sh.in | 4 +- scripts/pkgdelta.sh.in | 2 +- scripts/po/ca.po | 16 +- scripts/po/cs.po | 16 +- scripts/po/da.po | 580 +++++++++++++++++++++----------------- scripts/po/de.po | 74 +++--- scripts/po/el.po | 16 +- scripts/po/en_GB.po | 16 +- scripts/po/es.po | 75 +++-- scripts/po/fi.po | 16 +- scripts/po/fr.po | 20 +- scripts/po/hu.po | 16 +- scripts/po/it.po | 14 +- scripts/po/kk.po | 16 +- scripts/po/lt.po | 16 +- scripts/po/nb.po | 16 +- scripts/po/pacman-scripts.pot | 16 +- scripts/po/pl.po | 16 +- scripts/po/pt.po | 16 +- scripts/po/pt_BR.po | 23 +-- scripts/po/ro.po | 16 +- scripts/po/ru.po | 60 ++--- scripts/po/sk.po | 51 ++-- scripts/po/sr.po | 16 +- scripts/po/sr(a)latin.po | 16 +- scripts/po/sv.po | 122 ++++---- scripts/po/tr.po | 16 +- scripts/po/uk.po | 62 +++-- scripts/po/zh_CN.po | 16 +- scripts/po/zh_TW.po | 16 +- src/pacman/po/ca.po | 32 +-- src/pacman/po/cs.po | 33 +-- src/pacman/po/da.po | 170 ++++++----- src/pacman/po/de.po | 29 +-- src/pacman/po/el.po | 35 +-- src/pacman/po/en_GB.po | 13 +- src/pacman/po/es.po | 36 +-- src/pacman/po/fi.po | 20 +- src/pacman/po/fr.po | 18 +- src/pacman/po/hu.po | 31 +-- src/pacman/po/it.po | 33 +-- src/pacman/po/kk.po | 32 +-- src/pacman/po/lt.po | 18 +- src/pacman/po/nb.po | 31 +-- src/pacman/po/pl.po | 32 +-- src/pacman/po/pt.po | 36 +-- src/pacman/po/pt_BR.po | 26 +- src/pacman/po/ro.po | 35 +-- src/pacman/po/ru.po | 34 +-- src/pacman/po/sk.po | 40 ++-- src/pacman/po/sr.po | 33 +-- src/pacman/po/sr(a)latin.po | 33 +-- src/pacman/po/sv.po | 34 +-- src/pacman/po/tr.po | 33 +-- src/pacman/po/uk.po | 16 +- src/pacman/po/zh_CN.po | 32 +-- src/pacman/po/zh_TW.po | 32 +-- 89 files changed, 1137 insertions(+), 1452 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pkgdelta/repo-add rework
by Florian Pritz 07 Apr '12

07 Apr '12

Patch 1 to 4 should be good now, patch 5 is new. Although it should be fine and doesn't cause syntax errors, I'd like a sign off from Dave here.

2 6

[pacman-dev] [PATCH] repo-remove: remove deltas file is it becomes empty
by Florian Pritz 07 Apr '12

07 Apr '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/repo-add.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 043a0b8..147da69 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -176,6 +176,11 @@ db_remove_delta() { if grep -q "$filename" $deltas; then sed -i.backup "/$filename/d" $deltas && rm -f $deltas.backup msg2 "$(gettext "Removing existing entry '%s'...")" "$filename" + # empty deltas file contains only "%DELTAS%" + if [[ $(wc -l "$deltas" | cut -d\ -f1) = 1 ]]; then + msg2 "$(gettext "Removing empty deltas file ...")" + rm $deltas + fi return 0 fi -- 1.7.9.6

3 3

[pacman-dev] [PATCH v2 1/3] pkgdelta: rework option/argument parser
by Florian Pritz 07 Apr '12

07 Apr '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/pkgdelta.sh.in | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 5a2e6a3..0986986 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -38,11 +38,14 @@ m4_include(library/output_format.sh) # print usage instructions usage() { printf "pkgdelta (pacman) %s\n\n" "$myver" - printf -- "$(gettext "Usage: pkgdelta [-q] <package1> <package2>\n")" + printf -- "$(gettext "Usage: pkgdelta [options] <package1> <package2>\n")" printf -- "$(gettext "\ pkgdelta will create a delta file between two packages.\n\ This delta file can then be added to a database using repo-add.\n\n")" printf -- "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n" + echo + printf -- "$(gettext "Options:\n")" + printf -- " -q ""$(gettext "quiet\n")" } version() { @@ -123,32 +126,38 @@ create_xdelta() return 0 } -case "$1" in - -h|--help) usage; exit 0 ;; - -V|--version) version; exit 0 ;; - -q|--quiet) QUIET=1; shift ;; -esac - -if (( $# != 2 )); then +declare -a args + +# parse arguments +while (( $# )); do + case "$1" in + -h|--help) usage; exit 0 ;; + -V|--version) version; exit 0 ;; + -q|--quiet) QUIET=1;; + --) shift; args+=("$@"); break 2 ;; + -*) echo "invalid option -- '$1'"; usage; exit 1 ;; + *) args+=("$1");; + esac + shift +done + +if (( ${#args[@]} != 2 )); then usage exit 1 fi -if [[ ! -f $1 ]]; then - error "$(gettext "File '%s' does not exist")" "$1" - exit 0 -fi - -if [[ ! -f $2 ]]; then - error "$(gettext "File '%s' does not exist")" "$2" - exit 0 -fi +for i in "${args[@]}"; do + if [[ ! -f $i ]]; then + error "$(gettext "File '%s' does not exist")" "$i" + exit 0 + fi +done if ! type xdelta3 &>/dev/null; then error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" exit 1 fi -create_xdelta "$1" "$2" +create_xdelta "${args[@]}" # vim: set ts=2 sw=2 noet: -- 1.7.9.6

2 3

[pacman-dev] [PATCH 1/2] pkgdelta: rework option/argument parser
by Florian Pritz 06 Apr '12

06 Apr '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/pkgdelta.sh.in | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 5a2e6a3..806ae23 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -38,11 +38,14 @@ m4_include(library/output_format.sh) # print usage instructions usage() { printf "pkgdelta (pacman) %s\n\n" "$myver" - printf -- "$(gettext "Usage: pkgdelta [-q] <package1> <package2>\n")" + printf -- "$(gettext "Usage: pkgdelta [options] <package1> <package2>\n")" printf -- "$(gettext "\ pkgdelta will create a delta file between two packages.\n\ This delta file can then be added to a database using repo-add.\n\n")" printf -- "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n" + echo + printf -- "$(gettext "Options:\n")" + printf -- " -q ""$(gettext "quiet\n")" } version() { @@ -123,32 +126,36 @@ create_xdelta() return 0 } -case "$1" in - -h|--help) usage; exit 0 ;; - -V|--version) version; exit 0 ;; - -q|--quiet) QUIET=1; shift ;; -esac +declare -a args -if (( $# != 2 )); then +# parse arguments +while (( $# )); do + case "$1" in + -h|--help) usage; exit 0 ;; + -V|--version) version; exit 0 ;; + -q|--quiet) QUIET=1;; + *) args+=("$1");; + esac + shift +done + +if (( ${#args[@]} != 2 )); then usage exit 1 fi -if [[ ! -f $1 ]]; then - error "$(gettext "File '%s' does not exist")" "$1" - exit 0 -fi - -if [[ ! -f $2 ]]; then - error "$(gettext "File '%s' does not exist")" "$2" - exit 0 -fi +for i in "${args[@]}"; do + if [[ ! -f $i ]]; then + error "$(gettext "File '%s' does not exist")" "$i" + exit 0 + fi +done if ! type xdelta3 &>/dev/null; then error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" exit 1 fi -create_xdelta "$1" "$2" +create_xdelta "${args[0]}" "${args[1]}" # vim: set ts=2 sw=2 noet: -- 1.7.9.6

2 3

[pacman-dev] distclean and *.po
by Arokux B. 04 Apr '12

04 Apr '12

Hi, I've executed `make distclean' but there are still modified *.po files. Is there a way to revert those changes other than doing `git reset --hard HEAD', i.e. make <some>clean? Thanks

2 1

[pacman-dev] [PATCH] pacman: show groups once with -Sg
by Pierre 03 Apr '12

03 Apr '12

Only displays groups that haven't appeared yet.. Previously 'pacman -Sg' iterated over syncs, printed every group. This change does not affect '-Sgg' which still orders by sync first. To reproduce, on a current Arch Linux with [extra] and [community]: $ pacman -Sg|sort|uniq -c|sort -n [...] 1 xorg-fonts 2 vim-plugins 2 xfce4-goodies Signed-off-by: Pierre <pierre(a)spotify.com> --- src/pacman/sync.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index d782a94..7d73cc4 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -418,7 +418,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j, *k, *s = NULL; if(targets) { for(i = targets; i; i = alpm_list_next(i)) { @@ -454,10 +454,14 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) } } else { /* print grp names only, no package names */ - printf("%s\n", grp->name); + if(!alpm_list_find_str (s, grp->name)) { + s = alpm_list_add (s, grp->name); + printf("%s\n", grp->name); + } } } } + alpm_list_free(s); } return 0; -- 1.7.9.5

2 1