- Pacman-dev - lists.archlinux.org

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

24 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 5f71570ec48588bf24bfe786f40b500216084d07 (commit) via 133d174e60951dcca39d4c4063a85de75f52f6a8 (commit) via 839953f1113c70d13560bfd05c5e52139c7f562f (commit) via 70d425c1d341e5b3d36e612560f922dbd3b20e63 (commit) via 0fc5aea027d83cc21498e14330d1f0d514a60112 (commit) via b9fc709c55cc24a4b026c2a23d32f6dd901b2d61 (commit) from ded66fbb62cdad37d577dc048e37f7cea7f7a4da (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 5f71570ec48588bf24bfe786f40b500216084d07 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Apr 13 15:40:30 2012 -0400 makepkg: restrict allowed characters in pkgname Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 133d174e60951dcca39d4c4063a85de75f52f6a8 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sat Apr 7 14:18:28 2012 +0200 pkgdelta/repo-add: quoting fixes This removes some unnecessary quotes and adds quotes in a few places to hopefully work correctly if the tempdir has spaces. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 839953f1113c70d13560bfd05c5e52139c7f562f Author: Florian Pritz <bluewind(a)xinu.at> Date: Fri Apr 6 23:37:32 2012 +0200 pkgdelta: implement requirments for delta generation Big deltas or deltas for very small packages are not needed so we should check that and not generate any. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70d425c1d341e5b3d36e612560f922dbd3b20e63 Author: Florian Pritz <bluewind(a)xinu.at> Date: Fri Apr 6 20:51:17 2012 +0200 pkgdelta: rework option/argument parser Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0fc5aea027d83cc21498e14330d1f0d514a60112 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 15 10:27:51 2012 -0400 contrib: remove pactree make rule This is a vestige leftover from the rewrite over a year ago in 622e7fdd4. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b9fc709c55cc24a4b026c2a23d32f6dd901b2d61 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Apr 17 21:36:20 2012 -0400 contrib: remove wget-xdelta from gitignore I removed this in ff713a51 over a year ago. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/.gitignore | 1 - contrib/Makefile.am | 1 - doc/PKGBUILD.5.txt | 5 ++- doc/pkgdelta.8.txt | 12 +++++- scripts/makepkg.sh.in | 5 +++ scripts/pkgdelta.sh.in | 99 +++++++++++++++++++++++++++++++++++++----------- scripts/repo-add.sh.in | 94 ++++++++++++++++++++++----------------------- 7 files changed, 143 insertions(+), 74 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman-key: lookup keys before receiving
by Dave Reisner 23 Apr '12

23 Apr '12

Perform a search for keys that clearly aren't key IDs. This allows receiving keys by name or email address, but only if the key resolves unambiguously. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/pacman-key.sh.in | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index bd2c739..e2e8980 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -116,6 +116,30 @@ get_from() { return 1 } +key_lookup_from_name() { + local ids + + mapfile -t ids < \ + <("${GPG_PACMAN[@]}" --search-keys --batch --with-colons "$1" 2>/dev/null | + awk -F: '$1 == "pub" { print $2 }') + + # only return success on non-ambiguous lookup + case ${#ids[*]} in + 0) + error "$(gettext "Failed to lookup key by name:") %s" "$name" + return 1 + ;; + 1) + printf '%s' "${ids[0]}" + return 0 + ;; + *) + error "$(gettext "Key name is ambiguous:") %s" "$name" + return 1 + ;; + esac +} + generate_master_key() { # Generate the master key, which will be in both pubring and secring "${GPG_PACMAN[@]}" --gen-key --batch <<EOF @@ -424,7 +448,22 @@ lsign_keys() { } receive_keys() { - if ! "${GPG_PACMAN[@]}" --recv-keys "$@" ; then + local name id keyids + + # if the key is not a hex ID, do a lookup + for name; do + if [[ $name = ?(0x)+([0-9a-fA-F]) ]]; then + keyids+=("$name") + else + if id=$(key_lookup_from_name "$name"); then + keyids+=("$id") + fi + fi + done + + (( ${#keyids[*]} > 0 )) || exit 1 + + if ! "${GPG_PACMAN[@]}" --recv-keys "${keyids[@]}" ; then error "$(gettext "Remote key not fetched correctly from keyserver.")" exit 1 fi -- 1.7.10

1 0

[pacman-dev] [PATCH] Append timestamp to .pacsave files; PacsaveDate config option
by Florian Pritz 22 Apr '12

22 Apr '12

This implements FS#7308 Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- The bugreport also suggests that this could be added for .pacnew, but I don't think this make much sense because those will change more often and when you diff them you only really need the most recent version. I'm not too happy about the name of the config option so if you have ideas, please shoot. I'm adding the date after ".pacsave" in order to keep scripts such as pacdiff working. I haven't checked, but they might not be able to deal properly with "foo_<date>.pacsave". doc/pacman.conf.5.txt | 3 +++ lib/libalpm/alpm.h | 2 ++ lib/libalpm/handle.c | 7 +++++++ lib/libalpm/handle.h | 1 + lib/libalpm/remove.c | 29 +++++++++++++++++++++++++++-- src/pacman/conf.c | 3 +++ src/pacman/conf.h | 1 + 7 files changed, 44 insertions(+), 2 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index a9c5db3..36ac223 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -177,6 +177,9 @@ Options Performs an approximate check for adequate available disk space before installing packages. +*PacsaveDate*:: + Append the date to the filename when generating .pacsave files. + *VerbosePkgLists*:: Displays name, version and size of target packages formatted as a table for upgrade, sync and remove operations. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index bb792cf..2a9d0ba 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -547,6 +547,8 @@ int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); +int alpm_option_set_pacsavedate(alpm_handle_t *handle, int pacsavedate); + alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 2db27fb..86ca5eb 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -603,6 +603,13 @@ int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) return 0; } +int SYMEXPORT alpm_option_set_pacsavedate(alpm_handle_t *handle, int pacsavedate) +{ + CHECK_HANDLE(handle, return -1); + handle->pacsavedate = pacsavedate; + return 0; +} + int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index c0ad668..f551b8c 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -91,6 +91,7 @@ struct __alpm_handle_t { double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ + int pacsavedate; /* Append date to .pacsave files */ alpm_siglevel_t siglevel; /* Default signature verification level */ /* error code */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 469ce9b..713018f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -28,6 +28,7 @@ #include <limits.h> #include <unistd.h> #include <sys/stat.h> +#include <time.h> /* libalpm */ #include "remove.h" @@ -322,9 +323,33 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, FREE(filehash); if(cmp != 0) { char *newpath; - size_t len = strlen(file) + 8 + 1; + + // not configurable, makes size calculation of the final string easier + char *date_fmt = "_%Y-%m-%d_%H%M%S"; + char date_string[18 + 1]; + + size_t len = strlen(file) + 8 + 1 + sizeof(date_string); + + if (handle->pacsavedate) { + time_t t; + struct tm *tm; + + t = time(NULL); + tm = localtime(&t); + + if (tm == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, "failed to determine time for pacsave name: localtime: %s\n", strerror(errno)); + date_string[0] = '\0'; + } else { + if (strftime(date_string, sizeof(date_string), date_fmt, tm) == 0) { + _alpm_log(handle, ALPM_LOG_ERROR, "failed to determine time for pacsave name: strftime returned 0: %s\n", strerror(errno)); + date_string[0] = '\0'; + } + } + } + MALLOC(newpath, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(newpath, len, "%s.pacsave", file); + snprintf(newpath, len, "%s.pacsave%s", file, date_string); if(rename(file, newpath)) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), file, newpath, strerror(errno)); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 4aaacb5..4357dc1 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -404,6 +404,8 @@ static int _parse_options(const char *key, char *value, pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); } else if(strcmp(key, "CheckSpace") == 0) { config->checkspace = 1; + } else if(strcmp(key, "PacsaveDate") == 0) { + config->pacsavedate = 1; } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -614,6 +616,7 @@ static int setup_libalpm(void) alpm_option_set_arch(handle, config->arch); alpm_option_set_checkspace(handle, config->checkspace); + alpm_option_set_pacsavedate(handle, config->pacsavedate); alpm_option_set_usesyslog(handle, config->usesyslog); alpm_option_set_deltaratio(handle, config->deltaratio); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 69c955e..0e170ad 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -33,6 +33,7 @@ typedef struct __config_t { unsigned short logmask; unsigned short print; unsigned short checkspace; + unsigned short pacsavedate; unsigned short usesyslog; double deltaratio; char *arch; -- 1.7.10

2 2

[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