May 2010 - Pacman-dev - lists.archlinux.org

[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 14 May '10

14 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 14 May '10

14 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 14 May '10

14 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 11 May '10

11 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