- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] redirect scriptlet stderr through alpm
by Jonathan Conder 17 May '10

17 May '10

Fixes FS#18770, and hopefully an occasional deadlock in my frontend as well. This introduces a new EVENT: PM_TRANS_EVT_SCRIPTLET_ERROR, and moves all scriptlet-related callbacks into the parent process. I modelled my work on the GLib function g_spawn_sync, but I am quite unfamiliar with POSIX so there could be some issues with the implementation. However, all the tests I have performed so far (against v3.3.3) seemed to work fine (even the kernel installed and gave me the right warnings). This patch might also make it easier to configure the shell used for install scriptlets. I'm not 100% happy with the code structure at the moment, so any suggestions would be welcome. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/alpm.h | 4 + lib/libalpm/util.c | 162 ++++++++++++++++++++++++++++++++++++++----------- src/pacman/callback.c | 3 + 3 files changed, 133 insertions(+), 36 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 3329132..2692777 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -364,6 +364,10 @@ typedef enum _pmtransevt_t { * A line of text is passed to the callback. */ PM_TRANS_EVT_SCRIPTLET_INFO, + /** Scriptlet has printed information to stderr. + * A line of text is passed to the callback. + */ + PM_TRANS_EVT_SCRIPTLET_ERROR, /** Files will be downloaded from a repository. * The repository's tree name is passed to the callback. */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 32eaa44..1f76372 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -444,10 +444,52 @@ int _alpm_logaction(int usesyslog, FILE *f, const char *fmt, va_list args) return(ret); } +static int _fddup2(int fds[2], int i, int fd) +{ + while(dup2(fds[i], fd) == -1) { + if(errno != EINTR) { + return(-1); + } + } + return(0); +} + +static int _fdselect(int fdout, int fderr, fd_set *fds) +{ + int nfds = -1; + FD_ZERO(fds); + + if(fdout >= 0) { + FD_SET(fdout, fds); + if(fdout > nfds) { + nfds = fdout; + } + } + if(fderr >= 0) { + FD_SET(fderr, fds); + if(fderr > nfds) { + nfds = fderr; + } + } + if(++nfds == 0) { + return(2); + } + + if(select(nfds, fds, NULL, NULL, NULL) == -1) { + if(errno == EINTR) { + FD_ZERO(fds); + } else { + return(1); + } + } + return(0); +} + int _alpm_run_chroot(const char *root, const char *cmd) { char cwd[PATH_MAX]; pid_t pid; + int fdout[2], fderr[2]; int restore_cwd = 0; int retval = 0; @@ -471,6 +513,13 @@ int _alpm_run_chroot(const char *root, const char *cmd) /* Flush open fds before fork() to avoid cloning buffers */ fflush(NULL); + /* Create pipes to redirect stderr and stdout */ + if(pipe(fdout) == -1 || pipe(fderr) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not create a pipe (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + /* fork- parent and child each have seperate code blocks below */ pid = fork(); if(pid == -1) { @@ -480,56 +529,97 @@ int _alpm_run_chroot(const char *root, const char *cmd) } if(pid == 0) { - FILE *pipe; /* this code runs for the child only (the actual chroot/exec) */ - _alpm_log(PM_LOG_DEBUG, "chrooting in %s\n", root); + close(fdout[0]); + close(fderr[0]); + + /* redirect standard output and error */ + _fddup2(fdout, 1, 1); + _fddup2(fderr, 1, 2); + close(fdout[1]); + close(fderr[1]); + if(chroot(root) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change the root directory (%s)\n"), - strerror(errno)); + fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); exit(1); } + if(chdir("/") != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change directory to / (%s)\n"), - strerror(errno)); + fprintf(stderr, _("could not change directory to / (%s)\n"), strerror(errno)); exit(1); } + + /* run the scriptlet and exit */ umask(0022); - pipe = popen(cmd, "r"); - if(!pipe) { - _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)\n"), - strerror(errno)); - exit(1); - } - while(!feof(pipe)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe) == NULL) - break; - alpm_logaction("%s", line); - EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); - } - retval = pclose(pipe); - exit(WEXITSTATUS(retval)); + execl("/bin/sh", "sh", "-c", cmd, (char *) NULL); + fprintf(stderr, _("call to execl failed (%s)\n"), strerror(errno)); + exit(1); } else { - /* this code runs for the parent only (wait on the child) */ - pid_t retpid; + /* this code runs for the parent only (process output from the child) */ + fd_set fds; + FILE *fout, *ferr; int status; - do { - retpid = waitpid(pid, &status, 0); - } while(retpid == -1 && errno == EINTR); - if(retpid == -1) { - _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), - strerror(errno)); + + close(fdout[1]); + close(fderr[1]); + + /* use buffered streams to read line by line */ + if((fout = fdopen(fdout[0], "r")) == NULL || (ferr = fdopen(fderr[0], "r")) == NULL) { retval = 1; - goto cleanup; + close(fdout[0]); + close(fderr[0]); } else { - /* check the return status, make sure it is 0 (success) */ - if(WIFEXITED(status)) { - _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); - if(WEXITSTATUS(status) != 0) { - _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); - retval = 1; + while((retval = _fdselect(fdout[0], fderr[0], &fds)) == 0) { + char line[PATH_MAX]; + + if(FD_ISSET(fdout[0], &fds)) { + if(fgets(line, PATH_MAX, fout) != NULL) { + alpm_logaction("%s", line); + EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); + } else { + fdout[0] = -1; + } + } + + if(FD_ISSET(fderr[0], &fds)) { + if(fgets(line, PATH_MAX, ferr) != NULL) { + alpm_logaction("%s", line); + EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_ERROR, line, NULL); + } else { + fderr[0] = -1; + } } } + + fclose(fout); + fclose(ferr); + } + + while(waitpid(pid, &status, 0) == -1) { + if (errno != EINTR) { + _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), + strerror(errno)); + retval = 1; + goto cleanup; + } + } + + /* report error from above after the child has exited */ + if(retval == 1) { + _alpm_log(PM_LOG_ERROR, _("could not read from pipe (%s)\n"), + strerror(errno)); + goto cleanup; + } else { + retval = 0; + } + + /* check the return status, make sure it is 0 (success) */ + if(WIFEXITED(status)) { + _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); + if(WEXITSTATUS(status) != 0) { + _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); + retval = 1; + } } } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f5bf17d..a33178e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,6 +226,9 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) case PM_TRANS_EVT_SCRIPTLET_INFO: printf("%s", (char*)data1); break; + case PM_TRANS_EVT_SCRIPTLET_ERROR: + fprintf(stderr, "%s", (char*)data1); + break; case PM_TRANS_EVT_RETRIEVE_START: printf(_(":: Retrieving packages from %s...\n"), (char*)data1); break; -- 1.7.1

2 4

[pacman-dev] [PATCH] fix for incorrect checking of return code, which causes syntax errors
by Dieter Plaetinck 16 May '10

16 May '10

--- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e8aaa8b..9741879 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -693,10 +693,10 @@ extract_sources() { local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" if [[ $cmd = bsdtar ]]; then - $cmd -xf "$file" || ret=? + $cmd -xf "$file" || ret=$? else rm -f "${file%.*}" - $cmd -dcf "$file" > "${file%.*}" || ret=? + $cmd -dcf "$file" > "${file%.*}" || ret=$? fi if (( ret )); then error "$(gettext "Failed to extract %s")" "$file" -- 1.7.1

3 4

[pacman-dev] [PATCH] Fix a serious bug in the download code
by Nagy Gabor 15 May '10

15 May '10

After commit df99495b82 pacman downloaded files from the first repo only, and reported corrupted packages for all files from other repos. The download_size was set to 0 for _all_ transaction packages after downloading some files from the first repo. This code-block was moved to its correct place. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/sync.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6bc0b37..6b625ed 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -857,12 +857,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL); errors = _alpm_download_files(files, current->servers, cachedir); - for(j = trans->add; j; j = j->next) { - pmpkg_t *pkg = j->data; - pkg->infolevel &= ~INFRQ_DSIZE; - pkg->download_size = 0; - } - if (errors) { _alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"), current->treename); @@ -875,6 +869,12 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) } } + for(j = trans->add; j; j = j->next) { + pmpkg_t *pkg = j->data; + pkg->infolevel &= ~INFRQ_DSIZE; + pkg->download_size = 0; + } + /* clear out value to let callback know we are done */ if(handle->totaldlcb) { handle->totaldlcb(0); -- 1.7.1

3 2

[pacman-dev] [PATCH] rankmirrors: Add a --repo option to target a specific repo
by Daenyth 15 May '10

15 May '10

Signed-off-by: Daenyth <Daenyth+Arch(a)gmail.com> --- scripts/rankmirrors.sh.in | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index d5cbadd..9b4e973 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -35,6 +35,7 @@ usage() { echo " -t, --times only output mirrors and their response times" echo " -u, --url test a specific url" echo " -v, --verbose be verbose in ouptut" + echo " -r, --repo specify a specific repo name instead of guessing" exit 0 } @@ -69,13 +70,18 @@ ARCH="$(uname -m)" getfetchurl() { local strippedurl="${1%/}" - local replacedurl="${strippedurl//'$repo'/core}" - replacedurl="${replacedurl//'$arch'/$ARCH}" + local replacedurl="${replacedurl//'$arch'/$ARCH}" + if [[ ! $TARGETREPO ]]; then + replacedurl="${strippedurl//'$repo'/core}" + local tmp="${replacedurl%/*}" + tmp="${tmp%/*}" - local tmp="${replacedurl%/*}" - tmp="${tmp%/*}" + local reponame="${tmp##*/}" + else + replacedurl="${strippedurl//'$repo'/$TARGETREPO}" + local reponame="$TARGETREPO" + fi - local reponame="${tmp##*/}" if [[ -z $reponame || $reponame = $replacedurl ]]; then echo "fail" else @@ -119,6 +125,7 @@ while [[ $1 ]]; do times) TIMESONLY=1 ; shift ;; verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; + repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; *) err "\`$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -136,6 +143,7 @@ while [[ $1 ]]; do t) TIMESONLY=1 ;; v) VERBOSE=1 ;; u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; + r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; *) err "\`-$1' is an invald argument." ;; esac @@ -182,6 +190,7 @@ for line in "${linearray[@]}"; do # Getting values and times and such server="${line#*= }" + server="${server%%#*}" url="$(getfetchurl "$server")" [[ $url = fail ]] && err "url \`$URL' is malformed." time=$(gettime "$url") -- 1.7.1

1 0

[pacman-dev] NEWS for 3.4.0 - very, very draft
by Allan McRae 15 May '10

15 May '10

A very draft NEWS item based on "git shortlog --no-merges master --not v3.3.0". May be a bit makepkg-centric, but numbers of patches for makepkg is quite high this time and many pacman patches are the "not-newsworthy" type... Anyway, cut/add entries and I can flash it out some more. pacman: -D --database option show required by in -Sii output Architecture --arch option / check package arch / $arch --print/--print-format only extract new DB entiries -Su foo util: deltacleanup rankmirror -> bash repo-add - can create "empty" repo when removing last package makepkg: new packaging variable - changelog Allow overriding pkgver, pkgrel, arch in split packages Can specify subsets of packages to build from a split package warn about references to build root in package deprecate repackaging without a package function can only use package() function strip options are configurable auto abort on any packaging error SRCPKGDEST --skipinteg syntax checking for backup and optdepends entries contrib: pactree - reverse tree

5 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-179-g25cd6c2
by dan＠archlinux.org 15 May '10

15 May '10

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 25cd6c2e8da4d0659d259a38f00d512f97dbc962 (commit) from f03f09011f878ad0b3aea05602a1cb0a11d839e1 (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 25cd6c2e8da4d0659d259a38f00d512f97dbc962 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri May 14 21:58:31 2010 +0200 Fix a serious bug in the download code After commit df99495b82 pacman downloaded files from the first repo only, and reported corrupted packages for all files from other repos. The download_size was set to 0 for _all_ transaction packages after downloading some files from the first repo. This code-block was moved to its correct place. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-178-gf03f090
by dan＠archlinux.org 14 May '10

14 May '10

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 f03f09011f878ad0b3aea05602a1cb0a11d839e1 (commit) via 10b0acfc20589abd92b5d7517529c92e48cfcc7c (commit) via 07b2ba251f7956b887f00dadc0e2cff91777326b (commit) via df833f6c64033bc4e00e47213a536219bc1611b4 (commit) from 7f02f7cb9fba13a8e9762d30d7e0648b257ec091 (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 f03f09011f878ad0b3aea05602a1cb0a11d839e1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 13 18:11:50 2010 -0500 doc: fix up description of where example PKGBUILD is located As Allan pointed out, this actually ships with pacman (at least with Arch) and not necessarily with ABS or any other package. Also fix the language dealing with the prototype install files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 10b0acfc20589abd92b5d7517529c92e48cfcc7c Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 13 17:46:30 2010 -0500 PKGBUILD.vim: only allow hex characters in checksums Of course, we still have only md5 and sha1 hardcoded here but I resisted the urge to copy paste for the rest of our supported checksums in hope that someone knows how to do it a better way. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07b2ba251f7956b887f00dadc0e2cff91777326b Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 13 17:26:54 2010 -0500 Add 'pkgbase' highlighting to vim syntax file Simple change and probably a bit too copy/paste, but works for now. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit df833f6c64033bc4e00e47213a536219bc1611b4 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Thu May 13 14:36:59 2010 +0200 PKGBUILD.vim : update valid licenses Updated list with : echo $(pacman -Ql licenses | grep "/usr/share/licenses/common/.*/$" | cut -d'/' -f6 ) Maybe PKGBUILD.vim could do this at runtime ? Dan: you forgot the symlinks; readded FDL, GPL, LGPL. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 2 +- contrib/PKGBUILD.vim | 21 +++++++++++++++------ doc/Makefile.am | 3 +++ doc/PKGBUILD.5.txt | 15 ++++++--------- 4 files changed, 25 insertions(+), 16 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] PKGBUILD man page
by Allan McRae 13 May '10

13 May '10

More as a reminder to me that I need to fix this: --begin quote-- Note If you are using Arch Linux and have a local copy of the Arch Build System (ABS) tree on your computer, or are using another distribution that provides a similar tree of build files, you can copy the provided PKGBUILD.proto file to a new package build directory and make customizations to suit your needs. An up to date prototype file can also be found in the source distribution of this package. --end quote-- The protoype is provided by the pacman package and not ABS.

3 3

[pacman-dev] [PATCH] rankmirrors: Add a --repo option to target a specific repo
by Daenyth Blank 13 May '10

13 May '10

--- scripts/rankmirrors.sh.in | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index d5cbadd..54b04e0 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -35,6 +35,7 @@ usage() { echo " -t, --times only output mirrors and their response times" echo " -u, --url test a specific url" echo " -v, --verbose be verbose in ouptut" + echo " -r, --repo specify a specific repo name instead of guessing" exit 0 } @@ -69,13 +70,18 @@ ARCH="$(uname -m)" getfetchurl() { local strippedurl="${1%/}" - local replacedurl="${strippedurl//'$repo'/core}" - replacedurl="${replacedurl//'$arch'/$ARCH}" + local replacedurl="${replacedurl//'$arch'/$ARCH}" + if [[ $TARGETREPO ]]; then + replacedurl="${strippedurl//'$repo'/core}" + local tmp="${replacedurl%/*}" + tmp="${tmp%/*}" - local tmp="${replacedurl%/*}" - tmp="${tmp%/*}" + local reponame="${tmp##*/}" + else + replacedurl="${strippedurl//'$repo'/$TARGETREPO}" + local reponame="$TARGETREPO" + fi - local reponame="${tmp##*/}" if [[ -z $reponame || $reponame = $replacedurl ]]; then echo "fail" else @@ -119,6 +125,7 @@ while [[ $1 ]]; do times) TIMESONLY=1 ; shift ;; verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; + repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; *) err "\`$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -136,6 +143,7 @@ while [[ $1 ]]; do t) TIMESONLY=1 ;; v) VERBOSE=1 ;; u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; + r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; *) err "\`-$1' is an invald argument." ;; esac @@ -182,6 +190,7 @@ for line in "${linearray[@]}"; do # Getting values and times and such server="${line#*= }" + server="${server%%#*}" url="$(getfetchurl "$server")" [[ $url = fail ]] && err "url \`$URL' is malformed." time=$(gettime "$url") -- 1.7.0

3 9

[pacman-dev] [PATCH 1/2] Add 'pkgbase' highlighting to vim syntax file
by Dan McGee 13 May '10

13 May '10

Simple change and probably a bit too copy/paste, but works for now. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- PKGBUILD-split.proto | 2 +- contrib/PKGBUILD.vim | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 0cbd563..484cb1a 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -5,7 +5,7 @@ # Maintainer: Your Name <youremail(a)domain.com> pkgname=('pkg1' 'pkg2') -pkgbase="" +pkgbase=BASE pkgver=VERSION pkgrel=1 pkgdesc="" diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index a1112e5..90b628e 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -25,6 +25,13 @@ syn match pbValidPkgname /$[[:alnum:]]\|+\|-\|_${,32}/ contained contains=pbIl syn match pbIllegalPkgname /[[:upper:]]\|[^[:alnum:]-+_=]\|=.*=\|=['"]\?.\{33,\}['"]\?/ contained syn match pbPkgnameGroup /^pkgname=.*/ contains=pbIllegalPkgname,pb_k_pkgname,shDoubleQuote,shSingleQuote +" pkgbase +" FIXME if '=' is in pkgbase/pkgname/pkgver, it highlights whole string, not just '=' +syn keyword pb_k_pkgbase pkgbase contained +syn match pbValidPkgbase /$[[:alnum:]]\|+\|-\|_${,32}/ contained contains=pbIllegalPkgbase +syn match pbIllegalPkgbase /[[:upper:]]\|[^[:alnum:]-+_=]\|=.*=\|=['"]\?.\{33,\}['"]\?/ contained +syn match pbPkgbaseGroup /^pkgbase=.*/ contains=pbIllegalPkgbase,pb_k_pkgbase,shDoubleQuote,shSingleQuote + " pkgver syn keyword pb_k_pkgver pkgver contained syn match pbValidPkgver /$[[:alnum:]]\|\.\|+\|_$/ contained contains=pbIllegalPkgver @@ -133,7 +140,6 @@ syn match pbDerefEmulation /\$[{]\?[[:alnum:]_]*[}]\?/ contained hi def link pbDerefEmulation PreProc " md5sums - syn keyword pb_k_md5sums md5sums contained syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums syn match pbValidMd5sums /[[:alnum:]]\{32\}/ contained @@ -187,6 +193,9 @@ hi def link pbTodo Todo hi def link pbIllegalPkgname Error hi def link pb_k_pkgname pbKeywords +hi def link pbIllegalPkgbase Error +hi def link pb_k_pkgbase pbKeywords + hi def link pbIllegalPkgver Error hi def link pb_k_pkgver pbKeywords -- 1.7.1

1 1

[pacman-dev] [PATCH] PKGBUILD.vim : update valid licenses
by Xavier Chantry 13 May '10

13 May '10

Updated list with : echo $(pacman -Ql licenses | grep "/usr/share/licenses/common/.*/$" | cut -d'/' -f6 ) Maybe PKGBUILD.vim could do this at runtime ? Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- contrib/PKGBUILD.vim | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index af0f981..55a5161 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -54,7 +54,7 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl " license syn keyword pb_k_license license contained -syn keyword pbLicense APACHE CDDL EPL FDL GPL LGPL MPL PHP RUBY ZLIB ISC MIT BSD contained +syn keyword pbLicense APACHE CCPL CDDL CPL EPL FDL1.2 FDL1.3 GPL2 GPL3 LGPL2.1 LGPL3 LPPL MPL PHP PSF PerlArtistic RALINK RUBY ZPL contained syn match pbLicenseCustom /custom$:[[:alnum:]]*$*/ contained syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense -- 1.7.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-174-g7f02f7c
by dan＠archlinux.org 11 May '10

11 May '10

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 7f02f7cb9fba13a8e9762d30d7e0648b257ec091 (commit) via 364ebf4e16658f36d4dbff997916c8ccec4d2b79 (commit) via 2ce444ee1099d837d4a1a2978edfdfc9d5fe9d96 (commit) via 79987c92cb07c67914adf1febcc5ebdecf2a09b7 (commit) via 64c3255b0e03190a35a1cef4bbc8b75b6be72684 (commit) via 590606a5d7c699e4d4705501377ca83fb696b61c (commit) via ccbef232c97fda061eee54a96bcd60b13a77f5d1 (commit) via df99495b826eab9f25ceeb8f2643565af8818c20 (commit) from d485c0370f554758a28eff2cc32b2cc9c72a4604 (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 7f02f7cb9fba13a8e9762d30d7e0648b257ec091 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 7 13:02:37 2010 +1000 Allow -Qo to perform a functional 'which' When pacman queries the ownership of an object that is not a path, it will check in the users PATH for a match. Implements FS#8798. Dan: did some small refactoring and error message changes when PATH is searched and nothing is found. Original-patch-by: Shankar <jatheendra(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 364ebf4e16658f36d4dbff997916c8ccec4d2b79 Author: David Campbell <davekong(a)archlinux.us> Date: Sat Apr 3 17:20:00 2010 -0400 Switch Contributor line with Maintainer line. When someone is creating a new PKGBUILD he will most likely be the maintainer not a contributor. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2ce444ee1099d837d4a1a2978edfdfc9d5fe9d96 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 11 21:50:45 2009 +1000 makepkg: rework --skipinteg The current --skipinteg is a bit weird. It does not skip integrity checks, but instead does them and prints a warning. Change this behaviour to actually skipping the checks. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 79987c92cb07c67914adf1febcc5ebdecf2a09b7 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Oct 14 20:07:28 2009 +0200 makepkg -g: use checksums defined in the pkgbuild Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Allan: amend documentation] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 64c3255b0e03190a35a1cef4bbc8b75b6be72684 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 26 14:59:42 2010 +1000 makepkg: handle multiple install and changelog files The presence of all install and changelog files (multiple files may be used with package splitting) is checked for in check_sanity(). All install and changelog files are copied to the source location when using --source. The check for install and changelog file presence is removed in create_srcpackage() as this is redundant to the checks performed in check_sanity(). Moved install and changelog handling in create_srcpackage() to after source array files, as this is more logical and readily allows for the following. A check is made when creating a source package that a symlink to an install file has not already been added. This can occur if the install file is used multiple times or if it is listed in the source array. Fixes FS#18831, FS#18394 and partially fixes FS#16004 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 590606a5d7c699e4d4705501377ca83fb696b61c Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Thu Mar 4 21:57:46 2010 -0500 makepkg: fall back to su if sudo is not available Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ccbef232c97fda061eee54a96bcd60b13a77f5d1 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Oct 23 15:30:47 2009 +1000 makepkg: improve removal of installed dependencies Compare a list of packages on the system before and after dependency resolution in order to get a complete list of packages to remove. This allows makepkg to remove packages installed due to provides. Bail in cases where packages that were on the system originally have been removed as there is a risk of breaking the system when removing the new packages. Fixes FS#15144. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit df99495b826eab9f25ceeb8f2643565af8818c20 Author: Jonathan Conder <j(a)skurvy.no-ip.org> Date: Thu May 6 10:07:37 2010 +1200 Compute package download size outside _alpm_sync_prepare And add a new info level for this piece of data. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 2 +- PKGBUILD.proto | 2 +- doc/makepkg.8.txt | 18 +++--- lib/libalpm/db.h | 3 +- lib/libalpm/sync.c | 15 ++++- scripts/makepkg.sh.in | 161 ++++++++++++++++++++++++++++++++---------------- src/pacman/query.c | 64 ++++++++++++++++++-- 7 files changed, 193 insertions(+), 72 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Allow -Qo to perform a functional 'which'
by Allan McRae 10 May '10

10 May '10

When pacman queries the ownership of an object that is not a path, it will check in the users PATH for a match. Implements FS#8798. Original-patch-by: Shankar <jatheendra(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This should address all comments I had when this was submitted a few months back. src/pacman/query.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 52 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 6b6a25d..038072f 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -56,10 +56,44 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, size_t size, struct stat * bufptr) +{ + char *envpath, *envpathsplit, *path, fullname[PATH_MAX+1]; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + if ((envpath = envpathsplit = strdup(envpath)) == NULL) { + return(-1); + } + + while ((path = strsep(&envpathsplit, ":")) != NULL) { + len = strlen(path); + + /* strip the trailing slash if one exists */ + while(path[len - 1] == '/') { + path[--len] = '\0'; + } + + snprintf(fullname, sizeof(fullname), "%s/%s", path, filename); + + if(stat(fullname, bufptr) == 0) { + strncpy(filename, fullname, size); + free(envpath); + return(0); + } + } + free(envpath); + return(-1); +} + static int query_fileowner(alpm_list_t *targets) { int ret = 0; alpm_list_t *t; + size_t len=PATH_MAX+1; /* This code is here for safety only */ if(targets == NULL) { @@ -67,19 +101,31 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(len, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename, alpm_list_getdata(t), len); char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(lstat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename, '/') == NULL) { + if(search_path(filename, len, &buf) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } if(S_ISDIR(buf.st_mode)) { @@ -140,6 +186,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.7.0.1

4 6

Re: [pacman-dev] [PATCH] [bash_completion] Undeclared local vars/filenames with spaces/other
by Xavier Chantry 09 May '10

09 May '10

On Sat, May 8, 2010 at 10:31 AM, Xavier Chantry <shiningxc(a)gmail.com> wrote: > > > Attached list of changes between maint and master, + the new patch > rebased on top of master. > > Of course if you want to keep working on it, you're very welcome to do so :) > What mostly annoyed me with pacman bash completion is the lag/delay on completing packages in pacman -S. That clearly feels better after your patch, but I've noticed a funny problem and different behavior. I am sitting in my pacman git tree, and wanted to reinstall pacman : $ pacman -S pac<tab> after your patch : $ sudo pacman -S pac pacbuild pacman-contrib pacman-mirrorlist paco pacpan pacupdate before : $ sudo pacman -S pac pacbuild pacman/ pacman-contrib pacman-mirrorlist paco pacpan pacupdate So actually I couldnt complete pacman with your patch, it proposed me pacman- directly. The old behavior didnt propose me pacman either, but since it hesitated between pacman/ and pacman- , the completion stopped on pacman which is the good package name :) And this weird behavior is because I had a pacman dir in my PWD : $ ls -ld pacman/ drwxr-xr-x 2 xavier users 4096 Sep 23 2009 pacman/

2 1

[pacman-dev] Provides/replaces fields and backup files
by Nezmer 09 May '10

09 May '10

Hi, Suppose package B replaces package A. Both packages share the same content with minor differences. They both have many backup files with the same initial content. When package B replaces package A. Modified backup files will move to <backupfile.pacsave>. What If pacman could check for initial content of the backup files for both packages and If the content is the same, treat those backup files as If the process is a package upgrade not a package replacement. This is a real-life example. Packages A and B contain files like "/etc/passwd" and "/etc/group". So not moving the files to ".pacsave" adds more than a convenience for the lazy. My C skills are next-to-zero so unfortunately I can't help coding this. Do you consider this a valid minor bug? Should I report this to flyspray?

3 2

[pacman-dev] [PATCH] [bash_completion] Undeclared local vars/filenames with spaces/other
by Andres Perera 08 May '10

08 May '10

Fix: 3 Undeclared local vars with common enough names to warrant breakage Performance issues with _pacman trying to replicate /usr/bin/pacman with find and other slow tools. Performance issues with expanding an array (with sometimes hundreds of items) over three times. Expanding said array to remove already completed entries had the side effect of braking filenames with spaces and or \n. The full description of fixes are already posted at: http://bugs.archlinux.org/task/16630#comment55779 along with time diffs. Signed-off-by: Andres P <andres87p(a)gmail.com> --- contrib/bash_completion | 535 ++++++++++++++++++----------------------------- 1 files changed, 202 insertions(+), 333 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 62e5bc9..65051f5 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -1,365 +1,234 @@ -# vim: set ft=sh ts=2 sw=2 et: -# file: /etc/bash_completion.d/pacman - -# Bash completion for pacman -# Original: Manolis Tzanidakis <mtzanidakis(a)freemail.gr> +# pacman/makepkg completion by Andres Perera <andres87p gmail> # -# Distributed under the terms of the GNU General Public License, v2 or later. +# Distributed under the terms of the GNU General Public License v3 or +# later. # - -## initial functions - -rem_selected () -{ - # (Adapted from bash_completion by Ian Macdonald <ian(a)caliban.org>) - # This removes any options from the list of completions that have - # already been specified on the command line. - COMPREPLY=($(/bin/echo "${COMP_WORDS[@]}" | \ - (while read -d ' ' i; do - [ "${i}" == "" ] && continue - # flatten array with spaces on either side, - # otherwise we cannot grep on word boundaries of - # first and last word - COMPREPLY=" ${COMPREPLY[@]} " - # remove word from list of completions - COMPREPLY=(${COMPREPLY/ ${i%% *} / }) +# Local variables: common core cur glob list long m o prev query r +# remove s short sync upgrade w +# +# vim: ft=sh sts=2 sw=2 et: + +# Removes packages/files already present in the line +_arch_rem_selected() { + local w r + + for (( w=0; w<${#COMP_WORDS[@]}-1; w++)); do + # Don't touch operands + [[ ${COMP_WORDS[w]} == -* ]] && continue + for r in "${!COMPREPLY[@]}"; do + # Only deal with full matches + if [[ ${COMP_WORDS[w]} == ${COMPREPLY[r]} ]]; then + unset 'COMPREPLY[r]'; break + fi done - /bin/echo ${COMPREPLY[@]}))) - return 0 -} - -_available_repos () -{ - COMPREPLY=( $( compgen -W "$(/bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) ) -} - -_installed_pkgs () -{ - local installed_pkgs - installed_pkgs=$( /bin/ls /var/lib/pacman/local/ ) - COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + done } -_available_pkgs () -{ - #find balks easilly on a find /foo/*/* type dir, especially one like - # /var/lib/pacman/*/* - # This little change-up removes the find *and* only uses enabled repos - local available_pkgs - local enabled_repos - enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_pkgs=$( for r in $enabled_repos; do /bin/echo /var/lib/pacman/sync/$r/*; done ) - COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) ) -} +# makepkg purge functions +_makepkg_deselect() { + local o -_installed_groups () -{ - local installed_groups - installed_groups=$( /bin/find /var/lib/pacman/local -name desc -exec /bin/sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | /bin/sort -u ) - COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + if [[ $1 == l ]]; then + for o in "${!long[@]}"; do + if [[ ${COMP_WORDS[w]} == ${long[o]} ]]; then + unset 'long[o]'; break + fi + done + else + for o in "${!short[@]}"; do + if [[ ${COMP_WORDS[w]} == -*([^- ])${short[o]}* ]]; then + unset 'short[o]' + fi + done + fi } -_available_groups () -{ - #find balks easilly on a find /foo/*/* type dir, especially one like - # /var/lib/pacman/*/* - # This little change-up removes the find *and* only uses enabled repos - local available_groups - local enabled_repos - enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_groups=$( for r in $enabled_repos; do /bin/sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | /bin/sort -u; done ) - COMPREPLY=( $( compgen -W "$( for i in $available_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) +_makepkg_count_words() { + local w + + for (( w=0; w<${#COMP_WORDS[@]}; w++)); do + [[ ${COMP_WORDS[w]} == @(-*([^- ])[hC]*|--@(help|cleancache)) ]] && return 0 + _makepkg_deselect "$1" + done } -## makepkg completion - -_makepkg () -{ - local cur prev +# makepkg main +_makepkg() { COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} - case "$prev" in - -p) - _filedir - return 0 - ;; - --help|--cleancache) - COMPREPLY='' - return 0 - ;; - esac - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '\ - -A --ignorearch \ - -b --builddeps \ - -c --clean \ - -C --cleancache \ - -d --nodeps \ - -e --noextract \ - -f --force \ - -g --geninteg \ - -h --help \ - -i --install \ - -L --log \ - -m --nocolor \ - -o --nobuild \ - -p \ - -r --rmdeps \ - -s --syncdeps \ - --asroot \ - --source \ - --noconfirm \ - --noprogressbar' -- $cur ) ) + local prev cur short long parse glob + prev=${COMP_WORDS[COMP_CWORD-1]} + cur=`_get_cword` + + short=( A C L R c d e f g h i m o p r s ) + + long=( --allsource --asroot --clean --cleancache --config --force + --geninteg --help --holdver --ignorearch --install --log + --nobuild --nocolor --noconfirm --nodeps --noextract + --noprogressbar --repackage --rmdeps --skipinteg --source + --syncdeps ) + + if (( COMP_CWORD == 1 )) && [[ $cur != -[^-]* ]]; then + # First word check + COMPREPLY=($(compgen -W "$(echo "${short[@]/#/-}" "${long[@]}")" -- "$cur")) + elif [[ $prev == @(--config|-*([^- ])p*) ]]; then + # Complete filenames for selected options + _arch_rem_selected + return 0 + else + # Generate the list depending on current word + case $cur in + -+($(IFS='|'; echo "${short[*]}"))) + _makepkg_count_words s + COMPREPLY=($(compgen -W "$(echo "${short[@]/#/$cur}")" -- "$cur")) + ;; + -*) + # If $cur isn't a combination option, fall back to displaying + # long options only. These are the prime target for completion + _makepkg_count_words l + COMPREPLY=($(compgen -W "$(echo "${long[@]}")" -- "$cur")) + ;; + esac fi - - rem_selected } -complete -o default -F _makepkg makepkg -## pacman completion - -_instring () -{ - str="${1}" - shift 1 - for c in "${@}"; do - if [ $(/bin/expr index "${str}" "${c}") -gt 0 ]; then - return 0 - fi - done - return 1 +# pacman packages +_pacman_pkg() { + COMPREPLY=($(compgen -W "$(if [[ $2 ]]; then + command pacman -"$1" |\ + command sed 's, .*,,' |\ + command sort -u + else + command pacman -"$1" + fi)" -- "$cur" )) } -_pacman () -{ - local a arg toparse op mod cur +# pacman main +_pacman() { COMPREPLY=() - # This argument parsing is done so we can check for flag existance later - # right now it's a tad crappy, but does the job - for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do - a=${COMP_WORDS[i]} - arg="${a:0:2}" - toparse="${a:2}" + local prev cur query remove sync upgrade core common list w m o s=() + prev=${COMP_WORDS[COMP_CWORD-1]} + cur=`_get_cword` - case "${arg}" in - -@(U|R|S|Q|h|V)) - op="${arg/-}" - mod="${mod}${a:2}" - ;; - --) - arg="${a:2}" - case "${arg}" in - remove) op="R" ;; - upgrade) op="U" ;; - query) op="Q" ;; - sync) op="S" ;; - help) op="h" ;; - version) op="V" ;; - verbose) mod="${mod}v" ;; - root) mod="${mod}r" ;; - dbpath) mod="${mod}b" ;; - nodeps) mod="${mod}d" ;; - force) mod="${mod}f" ;; - groups) mod="${mod}g" ;; - info) mod="${mod}i" ;; - list) mod="${mod}l" ;; - print-uris) mod="${mod}p" ;; - search) mod="${mod}s" ;; - sysupgrade) mod="${mod}u" ;; - upgrades) mod="${mod}u" ;; - downloadonly) mod="${mod}w" ;; - refresh) mod="${mod}y" ;; - changelog) mod="${mod}c" ;; - deps) mod="${mod}d" ;; - explicit) mod="${mod}e" ;; - unrequired) mod="${mod}t" ;; - foreign) mod="${mod}m" ;; - owns) mod="${mod}o" ;; - file) mod="${mod}p" ;; - search) mod="${mod}s" ;; - upgrades) mod="${mod}u" ;; - cascade) mod="${mod}c" ;; - check) mod="${mod}k" ;; - dbonly) mod="${mod}k" ;; - nosave) mod="${mod}n" ;; - recursive) mod="${mod}s" ;; - unneeded) mod="${mod}u" ;; - esac ;; - *) toparse="${a}" ;; - esac + # These are split in a subshell with IFS=' '. No point in listing + # them by \n since compgen -W can't handle spaces or new lines in + # operands + query=( '--changelog --check --deps --explicit --file --foreign --groups --info + --list --owns --quiet --search --unrequired --upgrades' 'c e g i k l m o p q s t u' ) - arglen=$(( ${#toparse}-1 )) - for c in $(/bin/seq 0 "${arglen}"); do - arg=${toparse:$c:1} - [ "${arg}" != "-" ] && mod="${mod}${arg}" - done - done + remove=( '--cascade --dbonly --nodeps --nosave --recursive --unneeded' 'c k n s u' ) - cur=${COMP_WORDS[COMP_CWORD]} + sync=( '--asdeps --asexplicit --clean --downloadonly --force --groups --ignore --ignoregroup + --info --list --needed --nodeps --print-uris --quiet --refresh --search --sysupgrade' + 'c f g i l p q s u w y' ) - if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '\ - -h --help \ - -Q --query \ - -R --remove \ - -S --sync \ - -U --upgrade \ - -V --version \ - ' -- $cur ) ) - rem_selected - return 0 - fi + upgrade=( '--asdeps --asexplicit --force --nodeps' f ) - if [[ "$cur" == -* ]]; then - case "${op}" in - U) - COMPREPLY=( $( compgen -W '\ - --asdeps \ - --asexplicit \ - -d --nodeps \ - -f --force \ - -h --help \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - R) - COMPREPLY=( $( compgen -W '\ - -c --cascade \ - -d --nodeps \ - -h --help \ - -k --dbonly \ - -n --nosave \ - -s --recursive \ - -u --unneeded \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - S) - COMPREPLY=( $( compgen -W '\ - --asdeps \ - --asexplicit \ - -c --clean \ - -d --nodeps \ - -f --force \ - -g --groups \ - -h --help \ - -i --info \ - -l --list \ - -p --print-uris \ - -s --search \ - -u --sysupgrade \ - -w --downloadonly \ - -y --refresh \ - --needed \ - --ignore \ - --ignoregroup \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - Q) - COMPREPLY=( $( compgen -W '\ - -c --changelog \ - -d --deps \ - -e --explicit \ - -g --groups \ - -h --help \ - -i --info \ - -k --check \ - -l --list \ - -m --foreign \ - -o --owns \ - -p --file \ - -s --search \ - -t --unrequired \ - -u --upgrades \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - esac - rem_selected + common=( '--cachedir --config --dbpath --debug --help --logfile --noconfirm + --noprogressbar --noscriptlet --root --verbose' 'b d h r v' ) + + core=( --query --remove --sync --upgrade --version -Q -R -S -U -V ) + + if (( COMP_CWORD == 1 )) && [[ $cur != -[^-]* ]]; then + COMPREPLY=($(compgen -W "$(echo "${core[@]}") '--help' '-h'" -- "$cur")) + return 0 + elif [[ $prev == @(-*([^- ])[br]*|--@(config|logfile|root|dbpath|cachedir)) ]]; then + _arch_rem_selected + return 0 else - case "${op}" in - U) - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) + # Main option check + for m in 'Q query' 'R remove' 'S sync' 'U upgrade' 'null'; do + if [[ $m == null ]]; then + # Go back to core if null + COMPREPLY=($(compgen -W "$(echo "${core[@]}")" -- "$cur")) return 0 - ;; - h|V) - COMPREPLY='' - return 0 - ;; - Q) - if _instring $mod g; then - _installed_groups - elif _instring $mod o; then - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -- "$cur" ) ) - elif _instring $mod p; then - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) - elif _instring $mod u; then - COMPREPLY='' + fi + # Break on match + [[ $COMP_LINE == @(* -*([^- ])${m% *}*|* --${m#* } *) ]] && break + done + fi + + # See if $cur is an operand before calling _pacman_pkg + case $cur in + + # Check if it's a combination option first + -"${m% *}"*) + # Generate the list from the option arrays. eval is being using on + # possible matches between query, remove, sync, upgrade and common + # arrays; completely sanitized input + eval "list=($(command sed 's,.*,\${&[1]},' <<<"${m#* }"; IFS=' '; echo ${common[1]}))" + # Parse previous arguments + for (( w=0; w<${#COMP_WORDS[@]}; w++)); do + if [[ ${COMP_WORDS[w]} == -*([^-])[hV]* ]]; then return 0 - else - _installed_pkgs fi - return 0 + for o in "${!list[@]}"; do + if [[ ${COMP_WORDS[w]} == -*([^-])*${list[o]}* ]]; then + unset 'list[o]' + fi + done + done + # Allow special double letters + case ${m% *} in + Q) [[ $cur == *([^i])i*([^i]) ]] && s+=(i) ;; + R) [[ $cur == *([^s])s*([^s]) ]] && s+=(s) ;; + S) [[ $cur == *([^c])c*([^c]) ]] && s+=(c) + [[ $cur == *([^u])u*([^u]) ]] && s+=(u) + [[ $cur == *([^y])y*([^y]) ]] && s+=(y) ;; + esac + list=("${list[@]/#/$cur}" "${s[@]/#/$cur}") + ;; + + # Use long array instead + -*) + eval "list=($(command sed 's,.*,\${&[0]},' <<<"${m#* }"; IFS=' '; echo ${common[0]}))" + for (( w=0; w<${#COMP_WORDS[@]}-1; w++)); do + if [[ ${COMP_WORDS[w]} == --@(help|version) ]]; then + return 0 + fi + for o in "${!list[@]}"; do + if [[ ${COMP_WORDS[w]} == ${list[o]} ]]; then + unset 'list[o]'; break + fi + done + done + ;; + + # The word isn't an operand; use pacman or _filedir + *) + case ${m% *} in + # The weak extglobs are due to a previous match already + # confirming validity + Q) + case $COMP_LINE in + @(* -*([^- ])g*|* --groups *)) _pacman_pkg Qgq sort ;; + @(* -*([^- ])o*|* --owns *)) ;; + @(* -*([^- ])p*|* --file *)) _filedir 'pkg.tar.gz' ;; + @(* -*([^- ])u*|* --upgrades *)) _pacman_pkg Quq ;; + *) _pacman_pkg Qq ;; + esac ;; - R) - _installed_pkgs - return 0 + R) + _pacman_pkg Qq ;; - S) - if _instring $mod l; then - _available_repos - else - _available_pkgs - fi - return 0 + S) + case $COMP_LINE in + @(* -*([^- ])l*|* --list *)) _pacman_pkg Sl sort ;; + @(* -*([^- ])g*|* --groups *)) _pacman_pkg Sg ;; + *) _pacman_pkg Slq ;; + esac ;; - esac - fi - - rem_selected + U) + _filedir 'pkg.tar.gz' + ;; + esac + _arch_rem_selected + return 0 + ;; + esac + COMPREPLY=($(compgen -W "$(echo "${list[@]}")" -- "$cur")) } -complete -o filenames -F _pacman pacman + +complete -F _makepkg -o default -o filenames -o plusdirs makepkg +complete -F _pacman -o default -o filenames -o plusdirs pacman -- 1.6.6

4 6

[pacman-dev] Release plans
by Andres P 08 May '10

08 May '10

On 05/05/10 at 18:31:22 CEST, Dan McGee <dpmcgee at gmail.com> wrote: >>> 8*?) Tidy up bash_completion stuff? (FS#16630) > The poster disappeared and he tried to sneak a license change in > there, so that just hit a bit of a roadblock. I'd like to improve this > so I might just sit down and hack at it myself. "Tried to sneak a license change"? >From your own ml: > On Tue, Jan 19, 2010 at 11:48 PM, Andres Perera <andres...(a)gmail.com> wrote: >> On Wed, Jan 20, 2010 at 1:07 AM, Dan McGee <dpmc...(a)gmail.com> wrote: >>> Is this strictly necessary? You are changing one piece of code in the >>> entire codebase to require v3 or later and as weird as it sounds, I am >>> not going to let that fly. I won't be merging this unless it is v2 or >>> you give some darn good reasons why we should move to v3. >> >> Not really necessary. You can change it to v2, or I can do that if it >> requires a commit from me. > > Nah that's good enough for me. I'll try to give this whole thing a > workout in the next day or two and see if I can come up with anything > else that we might want to tweak, however. > > -Dan http://www.mail-archive.com/pacman-dev@archlinux.org/msg04127.html Maybe I was a little harsh? Anyway, I don't care if you put a random bash script I wrote ages ago under GPL, Public Domain, BSD... lol, Andres P

2 1

Re: [pacman-dev] [arch-general] Package signing
by Linas 08 May '10

08 May '10

I wrote about this topic ~1 month ago. You don't need PKCis or distribute the keyrings themselves. GPG supports transitive trust. The pacman keyring would be installed by default trusting on whatever keys a pacman root signature has signed (there could also be a different master key for community developers). The basic idea here is that you are not trusting the repository, but the individuals themselves. The master key -which can be kept offline and is only used when a developer joins/part- provides a basic default (people we generally trust) but a power user could reconfigure it to not accept packages signed by Pierre, because he distrusts him :), or he can add additional trusted people (a much more likely scenario) by just adding that person key to its keyring. A developer asks you to try a beta package -> You need to do nothing since you already have its key. Fetching from personal repo from a developer -> You need to do nothing since you already have its key. That really smart guy from the forum whose advice you follow blindly. -> Add its key. Packages built by you -> Add your own key. Sysadmin -> Add its key to the computers he administers. Paranoic sysadmin -> Add its key and remove the developers one. Then resign all packages after verifying that they work. I think this is more or less what Florian Pritz proposes, althouugh I think he was thinking in terms of the user gpg, while I would go using a different, pacman gpg. Denis A. Altoé Falqueto wrote: > The central point is the management of the keyring. > > We could have a single key that all developers share, but this is > troublesome as it would require some trusted channel to exchange the > password (the first time and in the event of it changing). This > approach is what others big distributions do, but the have a different > structure than ours. > With this structure the developers never share the keys. You could even remove the master key and consider someone a developer when n developers signed him. But I find the master key method clearer. > We could have a keyring with all the trusted keys of the developers, > but this could bring some problems as the keyring should be very well > synchronized with the official one. Including a rule to upgrade the > keyring package before others, as pacman. This requires intervention > on user`s systems, so I think that it should be avoided, if possible. > There are two cases where the keyring could change due to distro changes. a) Add a new developer. b) Remove a developer. In case (a), pacman would find an unknown signature, an download [on user approval] the public key from the key servers. Case (b) is trickier, since no matter how it is done, I think there will always be a race condition on a roque developer. Luckily, the shouts of such case would make it difficult to have people holding outdated keys. I would probably make the key updating part of pacman -y to ensure that users are not using a revoked key. > My idea tries to give the best of both worlds. The management of > trusted devs would be made by a few admins and users would just be > exposed to an official Arch key that would change just a few times, if > it is not compromised. > Your approach is more insecure, since you are removing the developer key (end-to-end signing) and putting instead a generic one. With the other schema, in case a developer key was compromised, you would only need to untrust that key, not the whole master key which signs everything. Plus, your key is used continously, so it is more exposed (the signing server is compromised, it signs a fake request...). IMHO trusting the individuals also facilitates forking. A derivative distribution could share arch packages by trusting the same devvelopers. With a master key owning everything, the child distro would need to have a second key resigning everything. __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

8 31

[pacman-dev] [PATCH 2/2] Switch Contributor line with Maintainer line.
by David Campbell 06 May '10

06 May '10

When someone is creating a new PKGBUILD he will most likely be the maintainer not a contributor. --- PKGBUILD-split.proto | 2 +- PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 53a3e8f..f549cfd 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -3,7 +3,7 @@ # see 'man PKGBUILD'. NOTE: Please fill out the license field for your package! # If it is unknown, then please put 'unknown'. -# Contributor: Your Name <youremail(a)domain.com> +# Maintainer: Your Name <youremail(a)domain.com> pkgname=('pkg1' 'pkg2') pkgbase="" pkgver=VERSION diff --git a/PKGBUILD.proto b/PKGBUILD.proto index 93da0fc..59b9acb 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -3,7 +3,7 @@ # NOTE: Please fill out the license field for your package! If it is unknown, # then please put 'unknown'. -# Contributor: Your Name <youremail(a)domain.com> +# Maintainer: Your Name <youremail(a)domain.com> pkgname=NAME pkgver=VERSION pkgrel=1 -- 1.7.0.3

2 1

[pacman-dev] [PATCH] compute package download size outside _alpm_sync_prepare
by Jonathan Conder 06 May '10

06 May '10

Thanks to Dan for pointing out a mistake I made. --- lib/libalpm/db.h | 3 ++- lib/libalpm/sync.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 9b78ad4..1851b5c 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -34,7 +34,8 @@ typedef enum _pmdbinfrq_t { INFRQ_FILES = (1 << 3), INFRQ_SCRIPTLET = (1 << 4), INFRQ_DELTAS = (1 << 5), - /* ALL should be sum of all above */ + INFRQ_DSIZE = (1 << 6), + /* ALL should be info stored in the package or database */ INFRQ_ALL = 0x3F } pmdbinfrq_t; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 4996920..13d39aa 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -356,6 +356,7 @@ static int compute_download_size(pmpkg_t *newpkg) off_t size = 0; if(newpkg->origin == PKG_FROM_FILE) { + newpkg->infolevel |= INFRQ_DSIZE; newpkg->download_size = 0; return(0); } @@ -392,6 +393,7 @@ static int compute_download_size(pmpkg_t *newpkg) _alpm_log(PM_LOG_DEBUG, "setting download size %jd for pkg %s\n", (intmax_t)size, alpm_pkg_get_name(newpkg)); + newpkg->infolevel |= INFRQ_DSIZE; newpkg->download_size = size; return(0); } @@ -649,6 +651,9 @@ cleanup: */ off_t SYMEXPORT alpm_pkg_download_size(pmpkg_t *newpkg) { + if(!(newpkg->infolevel & INFRQ_DSIZE)) { + compute_download_size(newpkg); + } return(newpkg->download_size); } @@ -850,7 +855,14 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(files) { EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL); - if(_alpm_download_files(files, current->servers, cachedir)) { + errors = _alpm_download_files(files, current->servers, cachedir); + + for(j = trans->add; j; j = j->next) { + j->infolevel &= ~INFRQ_DSIZE; + j->download_size = 0; + } + + if (errors) { _alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"), current->treename); if(pm_errno == 0) { -- 1.7.1

3 4

[pacman-dev] [PATCH] compute package download size outside _alpm_sync_prepare
by Jonathan Conder 05 May '10

05 May '10

Hi Here is a patch to resolve FS#18769. I created a new INFRQ/infolevel to describe package download size, so that it could be lazily calculated like most of the other package info. This differs slightly from most of the other infolevels, which correspond to information actually read by _alpm_db_read and alpm_pkg_load. However, I felt it better to do it this way than setting the download size to -1 for invalid, as this would make it the only field in pmpkg_t that needs to be initialized to something other than 0. It is also possible that the download size will be reported incorrectly if a package download size is read, and then that same package is downloaded with alpm_fetch_pkgurl. However, this is better than the present situation where download sizes aren't reported at all, and furthermore this is unlikely since alpm_fetch_pkgurl would probably not be used to download a package that is in the repositories. Thanks for your time, Jonathan

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-166-gd485c03
by dan＠archlinux.org 05 May '10

05 May '10

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 d485c0370f554758a28eff2cc32b2cc9c72a4604 (commit) via 9528c36452a6ca8b3718ef5895f31f46c16b17fa (commit) via f9fa822ccb0a077cf4cfa2cbbdac773187b88e20 (commit) via ac9dde072c56b9dbc3fe515dc3702c2c992f492f (commit) via 6b6eb6345bb3d9f59d967144968328c9a4b7873c (commit) via eb6af031ec83c4c0c1d7e12d1cc8f585197c025f (commit) via 4f80993933a3feee68758c27c58e9cf5d84bf20e (commit) via 2a6f3f06528149200e4fc8996c0c1e6d2bfa5480 (commit) via 8a6bbed98e11be3f619ef31e9e753d31081d11ee (commit) from 90aca75cb92c12419f2998cf54caa8ef5fe59f99 (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 d485c0370f554758a28eff2cc32b2cc9c72a4604 Author: Dan McGee <dan(a)archlinux.org> Date: Wed May 5 11:18:27 2010 -0500 Improve documentation of -k/--dbonly We had the long option wrong in some places and its behavior wasn't documented at all with regards to -U/--upgrade. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9528c36452a6ca8b3718ef5895f31f46c16b17fa Author: Dan McGee <dan(a)archlinux.org> Date: Wed May 5 10:59:20 2010 -0500 Add two new pactests for --dbonly It caught me by surprise that: 1. These weren't being tested at all 2. The --dbonly combined with -U not only "works" but is also completely undocumented. It also has some weird behavior on install vs. upgrade that may need addressing. Add some tests which will hopefully provoke some discussion. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f9fa822ccb0a077cf4cfa2cbbdac773187b88e20 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Mar 16 19:40:29 2010 +0100 Remove unused 'z' option from getopt_long's optstring In addition, I permuted shortopts to make it more readable. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ac9dde072c56b9dbc3fe515dc3702c2c992f492f Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed May 20 21:46:23 2009 +0200 Introduce -D, --database The request of FS#12950 is implemented. On the backend side, I introduced a new function, alpm_db_set_pkgreason(), to modify the install reason of a package in the local database. On the front-end side, I introduced a new main operation, -D/--database, which has two options, --asdeps and --asexplicit. I documented this in pacman manual. I've created two pactests to test -D: database001.py and database002.py. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6b6eb6345bb3d9f59d967144968328c9a4b7873c Author: Dan McGee <dan(a)archlinux.org> Date: Tue May 4 23:43:43 2010 -0500 Fix up the cross-compilation patch library lookup Don't explicitly add things to the list that might not need to be there, and get the fallback list of libraries correct. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eb6af031ec83c4c0c1d7e12d1cc8f585197c025f Author: Dan McGee <dan(a)archlinux.org> Date: Tue May 4 23:42:01 2010 -0500 Build vercmp without needing link to libalpm Include the object file directly from the libalpm version comparison code as it is the only thing we need. This drops the dependency of vercmp on libalpm and all of the stuff we know it drags in. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4f80993933a3feee68758c27c58e9cf5d84bf20e Author: Dan McGee <dan(a)archlinux.org> Date: Tue May 4 23:38:52 2010 -0500 Remove call to function logger It isn't really necessary here and it helps us get rid of some link pollution so we can have a slim vercmp binary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2a6f3f06528149200e4fc8996c0c1e6d2bfa5480 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 5 14:56:32 2010 -0500 Move vercmp code into a separate file This will facilitate using this object file on its own in the vercmp tool which will be done in a future commit. The net impact on the generated binaries should not be noticeable after this commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8a6bbed98e11be3f619ef31e9e753d31081d11ee Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 27 13:08:09 2010 -0500 Update PKGBUILD.proto to include a package() function Relevant after we deprecated `makepkg -R` without a package() function being present in the PKGBUILD. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD.proto | 3 + configure.ac | 4 +- doc/pacman.8.txt | 21 ++++- lib/libalpm/Makefile.am | 3 +- lib/libalpm/alpm.h | 16 ++-- lib/libalpm/db.c | 38 ++++++++ lib/libalpm/package.c | 171 ------------------------------------ lib/libalpm/version.c | 195 ++++++++++++++++++++++++++++++++++++++++++ pactest/tests/database001.py | 11 +++ pactest/tests/database002.py | 11 +++ pactest/tests/database010.py | 17 ++++ pactest/tests/database011.py | 17 ++++ pactest/tests/database012.py | 31 +++++++ src/pacman/Makefile.am | 1 + src/pacman/conf.h | 3 +- src/pacman/database.c | 90 +++++++++++++++++++ src/pacman/pacman.c | 24 ++++-- src/pacman/pacman.h | 2 + src/pacman/util.c | 2 + src/util/Makefile.am | 2 +- src/util/vercmp.c | 6 +- 21 files changed, 475 insertions(+), 193 deletions(-) create mode 100644 lib/libalpm/version.c create mode 100644 pactest/tests/database001.py create mode 100644 pactest/tests/database002.py create mode 100644 pactest/tests/database010.py create mode 100644 pactest/tests/database011.py create mode 100644 pactest/tests/database012.py create mode 100644 src/pacman/database.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Add two new pactests for --dbonly
by Dan McGee 05 May '10

05 May '10

It caught me by surprise that: 1. These weren't being tested at all 2. The --dbonly combined with -U not only "works" but is also completely undocumented. It also has some weird behavior on install vs. upgrade that may need addressing. Add some tests which will hopefully provoke some discussion. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- pactest/tests/database010.py | 17 +++++++++++++++++ pactest/tests/database011.py | 17 +++++++++++++++++ pactest/tests/database012.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/database010.py create mode 100644 pactest/tests/database011.py create mode 100644 pactest/tests/database012.py diff --git a/pactest/tests/database010.py b/pactest/tests/database010.py new file mode 100644 index 0000000..662dc1b --- /dev/null +++ b/pactest/tests/database010.py @@ -0,0 +1,17 @@ +# TODO: these are labeled as database packages because they sure seem to me to +# be database-type operations. In their current implementation however they are +# calling -U and -R rather than -D. Obviously the tests will need to be updated +# if this changes. +self.description = "Remove a package with --dbonly, no files touched" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", p) + +self.args = "-R --dbonly %s" % p.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +for f in p.files: + self.addrule("FILE_EXIST=%s" % f) diff --git a/pactest/tests/database011.py b/pactest/tests/database011.py new file mode 100644 index 0000000..7d475d9 --- /dev/null +++ b/pactest/tests/database011.py @@ -0,0 +1,17 @@ +# TODO: these are labeled as database packages because they sure seem to me to +# be database-type operations. In their current implementation however they are +# calling -U and -R rather than -D. Obviously the tests will need to be updated +# if this changes. +self.description = "Install a package with --dbonly, no files touched" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-U --dbonly %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +for f in p.files: + self.addrule("!FILE_EXIST=%s" % f) diff --git a/pactest/tests/database012.py b/pactest/tests/database012.py new file mode 100644 index 0000000..a1f8698 --- /dev/null +++ b/pactest/tests/database012.py @@ -0,0 +1,31 @@ +# TODO: these are labeled as database packages because they sure seem to me to +# be database-type operations. In their current implementation however they are +# calling -U and -R rather than -D. Obviously the tests will need to be updated +# if this changes. +self.description = "Upgrade a package with --dbonly, no files touched" + +lp = pmpkg("dummy") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "2.0-1") +p.files = ["bin/dummy", + "bin/dummy2", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-U --dbonly %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("PKG_VERSION=dummy|2.0-1") +for f in lp.files: + self.addrule("!FILE_EXIST=%s" % f) +# TODO: I honestly think the above should NOT delete the original files, it +# should upgrade the DB entry without touching anything on the file system. +# E.g. this test should be the same as: +# pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz +#for f in lp.files: +# self.addrule("FILE_EXIST=%s" % f) +self.addrule("!FILE_EXIST=bin/dummy2") -- 1.7.1

1 1

[pacman-dev] [PATCH 1/4] Move vercmp code into a separate file
by Dan McGee 05 May '10

05 May '10

This will facilitate using this object file on its own in the vercmp tool which will be done in a future commit. The net impact on the generated binaries should not be noticeable after this commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/Makefile.am | 3 +- lib/libalpm/package.c | 171 ---------------------------------------- lib/libalpm/version.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 172 deletions(-) create mode 100644 lib/libalpm/version.c diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 871855e..3473a73 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -43,7 +43,8 @@ libalpm_la_SOURCES = \ remove.h remove.c \ sync.h sync.c \ trans.h trans.c \ - util.h util.c + util.h util.c \ + version.c libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_LIBADD = $(LTLIBINTL) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ed6d71d..becbc60 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -604,177 +604,6 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) return(reqs); } -/** Compare two version strings and determine which one is 'newer'. - * Returns a value comparable to the way strcmp works. Returns 1 - * if a is newer than b, 0 if a and b are the same version, or -1 - * if b is newer than a. - * - * This function has been adopted from the rpmvercmp function located - * at lib/rpmvercmp.c, and was most recently updated against rpm - * version 4.4.2.3. Small modifications have been made to make it more - * consistent with the libalpm coding style. - * - * Keep in mind that the pkgrel is only compared if it is available - * on both versions handed to this function. For example, comparing - * 1.5-1 and 1.5 will yield 0; comparing 1.5-1 and 1.5-2 will yield - * -1 as expected. This is mainly for supporting versioned dependencies - * that do not include the pkgrel. - */ -int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) -{ - char oldch1, oldch2; - char *str1, *str2; - char *ptr1, *ptr2; - char *one, *two; - int rc; - int isnum; - int ret = 0; - - ALPM_LOG_FUNC; - - /* libalpm added code. ensure our strings are not null */ - if(!a) { - if(!b) return(0); - return(-1); - } - if(!b) return(1); - - /* easy comparison to see if versions are identical */ - if(strcmp(a, b) == 0) return(0); - - str1 = strdup(a); - str2 = strdup(b); - - one = str1; - two = str2; - - /* loop through each version segment of str1 and str2 and compare them */ - while(*one && *two) { - while(*one && !isalnum((int)*one)) one++; - while(*two && !isalnum((int)*two)) two++; - - /* If we ran to the end of either, we are finished with the loop */ - if(!(*one && *two)) break; - - ptr1 = one; - ptr2 = two; - - /* grab first completely alpha or completely numeric segment */ - /* leave one and two pointing to the start of the alpha or numeric */ - /* segment and walk ptr1 and ptr2 to end of segment */ - if(isdigit((int)*ptr1)) { - while(*ptr1 && isdigit((int)*ptr1)) ptr1++; - while(*ptr2 && isdigit((int)*ptr2)) ptr2++; - isnum = 1; - } else { - while(*ptr1 && isalpha((int)*ptr1)) ptr1++; - while(*ptr2 && isalpha((int)*ptr2)) ptr2++; - isnum = 0; - } - - /* save character at the end of the alpha or numeric segment */ - /* so that they can be restored after the comparison */ - oldch1 = *ptr1; - *ptr1 = '\0'; - oldch2 = *ptr2; - *ptr2 = '\0'; - - /* this cannot happen, as we previously tested to make sure that */ - /* the first string has a non-null segment */ - if (one == ptr1) { - ret = -1; /* arbitrary */ - goto cleanup; - } - - /* take care of the case where the two version segments are */ - /* different types: one numeric, the other alpha (i.e. empty) */ - /* numeric segments are always newer than alpha segments */ - /* XXX See patch #60884 (and details) from bugzilla #50977. */ - if (two == ptr2) { - ret = isnum ? 1 : -1; - goto cleanup; - } - - if (isnum) { - /* this used to be done by converting the digit segments */ - /* to ints using atoi() - it's changed because long */ - /* digit segments can overflow an int - this should fix that. */ - - /* throw away any leading zeros - it's a number, right? */ - while (*one == '0') one++; - while (*two == '0') two++; - - /* whichever number has more digits wins */ - if (strlen(one) > strlen(two)) { - ret = 1; - goto cleanup; - } - if (strlen(two) > strlen(one)) { - ret = -1; - goto cleanup; - } - } - - /* strcmp will return which one is greater - even if the two */ - /* segments are alpha or if they are numeric. don't return */ - /* if they are equal because there might be more segments to */ - /* compare */ - rc = strcmp(one, two); - if (rc) { - ret = rc < 1 ? -1 : 1; - goto cleanup; - } - - /* restore character that was replaced by null above */ - *ptr1 = oldch1; - one = ptr1; - *ptr2 = oldch2; - two = ptr2; - - /* libalpm added code. check if version strings have hit the pkgrel - * portion. depending on which strings have hit, take correct action. - * this is all based on the premise that we only have one dash in - * the version string, and it separates pkgver from pkgrel. */ - if(*ptr1 == '-' && *ptr2 == '-') { - /* no-op, continue comparing since we are equivalent throughout */ - } else if(*ptr1 == '-') { - /* ptr1 has hit the pkgrel and ptr2 has not. continue version - * comparison after stripping the pkgrel from ptr1. */ - *ptr1 = '\0'; - } else if(*ptr2 == '-') { - /* ptr2 has hit the pkgrel and ptr1 has not. continue version - * comparison after stripping the pkgrel from ptr2. */ - *ptr2 = '\0'; - } - } - - /* this catches the case where all numeric and alpha segments have */ - /* compared identically but the segment separating characters were */ - /* different */ - if ((!*one) && (!*two)) { - ret = 0; - goto cleanup; - } - - /* the final showdown. we never want a remaining alpha string to - * beat an empty string. the logic is a bit weird, but: - * - if one is empty and two is not an alpha, two is newer. - * - if one is an alpha, two is newer. - * - otherwise one is newer. - * */ - if ( ( !*one && !isalpha((int)*two) ) - || isalpha((int)*one) ) { - ret = -1; - } else { - ret = 1; - } - -cleanup: - free(str1); - free(str2); - return(ret); -} - /** @} */ pmpkg_t *_alpm_pkg_new(void) diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c new file mode 100644 index 0000000..1c838f4 --- /dev/null +++ b/lib/libalpm/version.c @@ -0,0 +1,198 @@ +/* + * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "config.h" + +#include <string.h> +#include <ctype.h> + +/* libalpm */ +#include "log.h" +#include "util.h" + +/** Compare two version strings and determine which one is 'newer'. + * Returns a value comparable to the way strcmp works. Returns 1 + * if a is newer than b, 0 if a and b are the same version, or -1 + * if b is newer than a. + * + * This function has been adopted from the rpmvercmp function located + * at lib/rpmvercmp.c, and was most recently updated against rpm + * version 4.4.2.3. Small modifications have been made to make it more + * consistent with the libalpm coding style. + * + * Keep in mind that the pkgrel is only compared if it is available + * on both versions handed to this function. For example, comparing + * 1.5-1 and 1.5 will yield 0; comparing 1.5-1 and 1.5-2 will yield + * -1 as expected. This is mainly for supporting versioned dependencies + * that do not include the pkgrel. + */ +int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) +{ + char oldch1, oldch2; + char *str1, *str2; + char *ptr1, *ptr2; + char *one, *two; + int rc; + int isnum; + int ret = 0; + + ALPM_LOG_FUNC; + + /* libalpm added code. ensure our strings are not null */ + if(!a) { + if(!b) return(0); + return(-1); + } + if(!b) return(1); + + /* easy comparison to see if versions are identical */ + if(strcmp(a, b) == 0) return(0); + + str1 = strdup(a); + str2 = strdup(b); + + one = str1; + two = str2; + + /* loop through each version segment of str1 and str2 and compare them */ + while(*one && *two) { + while(*one && !isalnum((int)*one)) one++; + while(*two && !isalnum((int)*two)) two++; + + /* If we ran to the end of either, we are finished with the loop */ + if(!(*one && *two)) break; + + ptr1 = one; + ptr2 = two; + + /* grab first completely alpha or completely numeric segment */ + /* leave one and two pointing to the start of the alpha or numeric */ + /* segment and walk ptr1 and ptr2 to end of segment */ + if(isdigit((int)*ptr1)) { + while(*ptr1 && isdigit((int)*ptr1)) ptr1++; + while(*ptr2 && isdigit((int)*ptr2)) ptr2++; + isnum = 1; + } else { + while(*ptr1 && isalpha((int)*ptr1)) ptr1++; + while(*ptr2 && isalpha((int)*ptr2)) ptr2++; + isnum = 0; + } + + /* save character at the end of the alpha or numeric segment */ + /* so that they can be restored after the comparison */ + oldch1 = *ptr1; + *ptr1 = '\0'; + oldch2 = *ptr2; + *ptr2 = '\0'; + + /* this cannot happen, as we previously tested to make sure that */ + /* the first string has a non-null segment */ + if (one == ptr1) { + ret = -1; /* arbitrary */ + goto cleanup; + } + + /* take care of the case where the two version segments are */ + /* different types: one numeric, the other alpha (i.e. empty) */ + /* numeric segments are always newer than alpha segments */ + /* XXX See patch #60884 (and details) from bugzilla #50977. */ + if (two == ptr2) { + ret = isnum ? 1 : -1; + goto cleanup; + } + + if (isnum) { + /* this used to be done by converting the digit segments */ + /* to ints using atoi() - it's changed because long */ + /* digit segments can overflow an int - this should fix that. */ + + /* throw away any leading zeros - it's a number, right? */ + while (*one == '0') one++; + while (*two == '0') two++; + + /* whichever number has more digits wins */ + if (strlen(one) > strlen(two)) { + ret = 1; + goto cleanup; + } + if (strlen(two) > strlen(one)) { + ret = -1; + goto cleanup; + } + } + + /* strcmp will return which one is greater - even if the two */ + /* segments are alpha or if they are numeric. don't return */ + /* if they are equal because there might be more segments to */ + /* compare */ + rc = strcmp(one, two); + if (rc) { + ret = rc < 1 ? -1 : 1; + goto cleanup; + } + + /* restore character that was replaced by null above */ + *ptr1 = oldch1; + one = ptr1; + *ptr2 = oldch2; + two = ptr2; + + /* libalpm added code. check if version strings have hit the pkgrel + * portion. depending on which strings have hit, take correct action. + * this is all based on the premise that we only have one dash in + * the version string, and it separates pkgver from pkgrel. */ + if(*ptr1 == '-' && *ptr2 == '-') { + /* no-op, continue comparing since we are equivalent throughout */ + } else if(*ptr1 == '-') { + /* ptr1 has hit the pkgrel and ptr2 has not. continue version + * comparison after stripping the pkgrel from ptr1. */ + *ptr1 = '\0'; + } else if(*ptr2 == '-') { + /* ptr2 has hit the pkgrel and ptr1 has not. continue version + * comparison after stripping the pkgrel from ptr2. */ + *ptr2 = '\0'; + } + } + + /* this catches the case where all numeric and alpha segments have */ + /* compared identically but the segment separating characters were */ + /* different */ + if ((!*one) && (!*two)) { + ret = 0; + goto cleanup; + } + + /* the final showdown. we never want a remaining alpha string to + * beat an empty string. the logic is a bit weird, but: + * - if one is empty and two is not an alpha, two is newer. + * - if one is an alpha, two is newer. + * - otherwise one is newer. + * */ + if ( ( !*one && !isalpha((int)*two) ) + || isalpha((int)*one) ) { + ret = -1; + } else { + ret = 1; + } + +cleanup: + free(str1); + free(str2); + return(ret); +} + +/* vim: set ts=2 sw=2 noet: */ -- 1.7.1

3 6

[pacman-dev] An interesting error
by Roman Kyrylych 02 May '10

02 May '10

I've just got this when updating my linode server: $ sudo pacman -Syyu :: Synchronizing package databases... error: failed retrieving file 'testing.db.tar.gz' from ftp.archlinux.org : No address record testing 13.4K 733.6K/s 00:00:00 [#####################] 100% error: failed retrieving file 'core.db.tar.gz' from ftp.archlinux.org : No address record core 36.1K 1303.4K/s 00:00:00 [#####################] 100% error: failed retrieving file 'extra.db.tar.gz' from ftp.archlinux.org : No address record extra 449.8K 4.7M/s 00:00:00 [#####################] 100% error: failed retrieving file 'community-testing.db.tar.gz' from ftp.archlinux.org : No address record community-testing 1.2K 20.1M/s 00:00:00 [#####################] 100% error: failed retrieving file 'community.db.tar.gz' from ftp.archlinux.org : No address record community 373.4K 4.6M/s 00:00:00 [#####################] 100% :: Starting full system upgrade... resolving dependencies... looking for inter-conflicts... Targets (4): kernel26-firmware-2.6.33.3-2 kernel26-2.6.33.3-2 psmisc-22.11-1 tzdata-2010i-1 Total Download Size: 32.46 MB Total Installed Size: 114.00 MB Proceed with installation? [Y/n] n [roman@codeplace ~]$ sudo pacman -Su :: Starting full system upgrade... resolving dependencies... looking for inter-conflicts... Targets (4): kernel26-firmware-2.6.33.3-2 kernel26-2.6.33.3-2 psmisc-22.11-1 tzdata-2010i-1 Total Download Size: 32.46 MB Total Installed Size: 114.00 MB Proceed with installation? [Y/n] :: Retrieving packages from testing... error: failed retrieving file 'kernel26-firmware-2.6.33.3-2-x86_64.pkg.tar.gz' from ftp.archlinux.org : File unavailable (e.g., file not found, no access) kernel26-firmware-2... 1048.8K 664.4K/s 00:00:02 [#####################] 100% error: failed retrieving file 'kernel26-2.6.33.3-2-x86_64.pkg.tar.gz' from ftp.archlinux.org : File unavailable (e.g., file not found, no access) kernel26-2.6.33.3-2... 31.2M 5.1M/s 00:00:06 [#####################] 100% psmisc-22.11-1-x86_... 76.9K 153.5K/s 00:00:01 [#####################] 100% tzdata-2010i-1-x86_... 178.7K 90.6K/s 00:00:02 [#####################] 100% Can anyone explain what exactly happens here? -- Roman Kyrylych (Роман Кирилич)

1 1