- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: fix order of --help output
by Allan McRae 09 Sep '12

09 Sep '12

Small alphabeticalization issue in options passable to pacman. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aed6b8b..6de7b4f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2261,8 +2261,8 @@ usage() { echo printf -- "$(gettext "These options can be passed to %s:")\n" "pacman" echo - printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" + printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" -- 1.7.12

1 0

[pacman-dev] [PATCH] Allow querying directory ownership
by Andrew Gregory 08 Sep '12

08 Sep '12

The restriction of not checking the ownership of a directory is unnecessary given that all the package filelists contain this information. Remove this restriction, with the expectation that you might get multiple packages returned for a given directory. Additionally attempt to minimise the number of files getting through to the slow realpath call. Original-work-by: Dan McGee <dan(a)archlinux.org> Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Applies on top of my other -Qo patches queued in Allan's working-split/query-owner branch. src/pacman/query.c | 61 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 92219e8..06505eb 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -97,6 +97,7 @@ static int query_fileowner(alpm_list_t *targets) size_t rootlen; alpm_list_t *t; alpm_db_t *db_local; + alpm_list_t *packages; /* This code is here for safety only */ if(targets == NULL) { @@ -129,13 +130,14 @@ static int query_fileowner(alpm_list_t *targets) } db_local = alpm_get_localdb(config->handle); + packages = alpm_db_get_pkgcache(db_local); for(t = targets; t; t = alpm_list_next(t)) { char *filename = NULL, *dname = NULL, *rpath = NULL; const char *bname; struct stat buf; alpm_list_t *i; - size_t len; + size_t len, is_dir, bname_len, pbname_len; int found = 0; if((filename = strdup(t->data)) == NULL) { @@ -163,15 +165,20 @@ static int query_fileowner(alpm_list_t *targets) } } - if(S_ISDIR(buf.st_mode)) { - pm_printf(ALPM_LOG_ERROR, - _("cannot determine ownership of directory '%s'\n"), filename); - goto targcleanup; + if((is_dir = S_ISDIR(buf.st_mode))) { + /* the entire filename is safe to resolve if we know it points to a dir, + * and it's necessary in case it ends in . or .. */ + dname = realpath(filename, NULL); + bname = mbasename(dname); + rpath = mdirname(dname); + } else { + bname = mbasename(filename); + dname = mdirname(filename); + rpath = realpath(dname, NULL); } - bname = mbasename(filename); - dname = mdirname(filename); - rpath = realpath(dname, NULL); + bname_len = strlen(bname); + pbname_len = bname_len + (is_dir ? 1 : 0); if(!dname || !rpath) { pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), @@ -179,7 +186,7 @@ static int query_fileowner(alpm_list_t *targets) goto targcleanup; } - for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { + for(i = packages; i && (!found || is_dir); i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); size_t j; @@ -188,22 +195,48 @@ static int query_fileowner(alpm_list_t *targets) const alpm_file_t *file = filelist->files + j; char *ppath, *pdname; const char *pkgfile = file->name; + size_t pkgfile_len = strlen(pkgfile); + + /* make sure pkgfile and target are of the same type */ + if(!is_dir != !(pkgfile[pkgfile_len - 1] == '/')) { + continue; + } + + /* make sure pkgfile is long enough */ + if(pkgfile_len < pbname_len) { + continue; + } - /* avoid the costly realpath usage if the basenames don't match */ - if(strcmp(mbasename(pkgfile), bname) != 0) { + /* make sure pbname_len takes us to the start of a path component */ + if(pbname_len != pkgfile_len && pkgfile[pkgfile_len - pbname_len - 1] != '/') { + continue; + } + + /* compare basename with bname */ + if(strncmp(pkgfile + pkgfile_len - pbname_len, bname, bname_len) != 0) { continue; } /* concatenate our file and the root path */ - if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { + if(rootlen + 1 + pkgfile_len > PATH_MAX) { path[rootlen] = '\0'; /* reset path for error message */ pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), path, pkgfile); continue; } strcpy(path + rootlen, pkgfile); - pdname = mdirname(path); - ppath = realpath(pdname, NULL); + /* check that the file exists on disk and is the correct type */ + if(lstat(path, &buf) == -1 || !is_dir != !S_ISDIR(buf.st_mode)) { + continue; + } + + if(is_dir) { + pdname = realpath(path, NULL); + ppath = mdirname(pdname); + } else { + pdname = mdirname(path); + ppath = realpath(pdname, NULL); + } free(pdname); if(!ppath) { -- 1.7.12

3 5

[pacman-dev] [PATCH] pacman.8: remove redundant section
by Allan McRae 05 Sep '12

05 Sep '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.8.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 0ad8188..24c2243 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -401,9 +401,6 @@ system upgrade and install/upgrade the foo package in the same operation. will force a refresh of all package lists even if they appear to be up to date. -*\--needed*:: - Do not reinstall the targets that are already up to date. - Handling Config Files[[HCF]] ---------------------------- -- 1.7.12

1 0

[pacman-dev] [PATCH 0/4] Miscellaneous query_fileowner cleanup
by Andrew Gregory 29 Aug '12

29 Aug '12

These patches apply on top of my previous query.c patches sitting in Allan's working-split/query-owner branch. Also available under the dirowner_split branch of my repo at https://bitbucket.org/andrewgregory/pacman

2 10

[pacman-dev] [RFC] Generation of a .SRCINFO file for source packages
by canyonknight＠gmail.com 29 Aug '12

29 Aug '12

Hello all, I had the idea of adding a .SRCINFO file to source packages generated by makepkg. I did some research to see if this had been previously proposed and where the discussion went. I've collected my thoughts on such an addition for your consideration. Previous proposal: The idea of generating a .SRCINFO file was previously proposed on the mailing list [1]. No format was ever agreed upon and discussion died off when no fixes were sent based off of developer suggestions. I've included my own proposed format to fuel discussion and maybe reach an ideal format. Proposed format with example (using "boost" PKGBUILD [2]): - Every variable (pkgver, depends, etc) is preceded by ($pkgname). - Every "global" (defined outside a package_* function) variable is explicitly listed for each $pkgname. - Every array (arch, depends, etc) has one line for each array element # Generated by makepkg 4.0.3 # Mon Aug 27 01:23:45 UTC 2012 (boost) pkgbase = boost (boost) pkgname = boost (boost) pkgver = 1.50.0 (boost) pkgrel = 2 (boost) epoch = 0 (boost) pkgdesc = Free peer-reviewed portable C++ source libraries - Development (boost) arch = i686 (boost) arch = x86_64 (boost) url = http://www.boost.org/ (boost) depends = boost-libs=1.50.0 (boost) optdepends = python: for python bindings (boost) optdepends = python2: for python2 bindings (boost) optdepends = boost-build: to use boost jam for building your project. (boost) makedepends = icu (boost) makedepends = python (boost) makedepends = python2 (boost) makedepends = bzip2 (boost) makedepends = zlib (boost) makedepends = openmpi (boost) source = http://downloads.sourceforge.net/boost/boost_1_50_0.tar.gz (boost) license = custom (boost-libs) pkgbase = boost (boost-libs) pkgname = boost-libs (boost-libs) pkgver = 1.50.0 (boost-libs) pkgrel = 2 (boost-libs) epoch = 0 (boost-libs) pkgdesc = Free peer-reviewed portable C++ source libraries - Runtime (boost-libs) arch = i686 (boost-libs) arch = x86_64 (boost-libs) url = http://www.boost.org/ (boost-libs) depends = gcc-libs (boost-libs) depends = bzip2 (boost-libs) depends = zlib (boost-libs) depends = icu (boost-libs) optdepends = openmpi: for mpi support (boost-libs) makedepends = icu (boost-libs) makedepends = python (boost-libs) makedepends = python2 (boost-libs) makedepends = bzip2 (boost-libs) makedepends = zlib (boost-libs) makedepends = openmpi (boost-libs) source = http://downloads.sourceforge.net/boost/boost_1_50_0.tar.gz (boost-libs) license = custom Advantages of proposed format: - Don't need a bash parser to determine PKGBUILD variables in a source package. This would make things a lot easier for projects (including AUR) that depend on information from PKGBUILD variables. - Previously proposed implementation could run into issues for a package named "global", this proposal avoids need for "global" label. Disadvantages of proposed format: - Adds additional dot file to every generated source package. - Compared to the previously proposed implementation, this implementation results in more lines (and a bit of redundancy) in each .SRCINFO file due to the avoidance of any "global" variables. Thanks for the consideration. I am more than happy to answer any questions relating to anything above. Regards, Jason [1] http://mailman.archlinux.org/pipermail/pacman-dev/2010-August/011461.html [2] https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h…

3 5

[pacman-dev] [PATCH] makepkg: allow fragment to contain a "#" character
by Allan McRae 28 Aug '12

28 Aug '12

The frament element of a vcs url may contain the "#" charcter in the (e.g) branch or tag name. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7e5aa95..aed6b8b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -380,7 +380,7 @@ download_file() { download_git() { local netfile=$1 - local fragment=${netfile##*#} + local fragment=${netfile#*#} if [[ $fragment = "$netfile" ]]; then unset fragment fi @@ -460,7 +460,7 @@ download_git() { download_hg() { local netfile=$1 - local fragment=${netfile##*#} + local fragment=${netfile#*#} if [[ $fragment = "$netfile" ]]; then unset fragment fi @@ -520,7 +520,7 @@ download_hg() { download_svn() { local netfile=$1 - local fragment=${netfile##*#} + local fragment=${netfile#*#} if [[ $fragment = "$netfile" ]]; then unset fragment fi -- 1.7.12

1 1

[pacman-dev] [PATCH 0/3] makepkg: Alternate implementation of VCS URLs in sources array.
by Luke Shumaker 28 Aug '12

28 Aug '12

A while ago I started working on a derivative of makepkg to support having 'git://...' type urls in the sources=() array. When preparing to file this patch, I did a `git rebase`, and noticed that Allan McRae began working on a similar feature. Our implementations are in many ways similar. Hopefully mine will be useful. My implementation makes minimal changes to makepkg itself (only adding blob expansion to DLAGENTS, allowing for things like "git+*::""). Instead I added a `vcsget` tool which generates a tarball from the VCS repo, in a very similar manner to the way Allan's implementation does so within makepkg. It looks as if Allan's download_*() functions are more verbose than mine about what failed when there is an error. His svn and hg handlers are likely more robust--though my git is pretty solid. I also have a half-written handler for for bzr. An advantage of my design is that it does allow for integrity checks of VCS packages, rather than inserting 'SKIP' into the md5sums array. This is very important to the derivative distribution Parabola. (However, the 'SKIP' option is still valuable for URLs that track a branch) Happy hacking, ~ Luke Shumaker Luke Shumaker (3): Add a `vcsget` tool to download source from VCS repositories. makepkg: do glob expansion in DLAGENTS maps makepkg.conf: add vcsget DLAGENTS etc/makepkg.conf.in | 8 +- scripts/.gitignore | 1 + scripts/Makefile.am | 4 +- scripts/makepkg.sh.in | 13 ++- scripts/vcsget.sh.in | 294 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 316 insertions(+), 4 deletions(-) create mode 100644 scripts/vcsget.sh.in -- 1.7.12

4 12

[pacman-dev] [PATCH 3/3] makepkg.conf: add vcsget DLAGENTS
by Luke Shumaker 25 Aug '12

25 Aug '12

Signed-off-by: Luke Shumaker <LukeShu(a)sbcglobal.net> --- etc/makepkg.conf.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index dcec6f5..7d19dfb 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -12,7 +12,13 @@ DLAGENTS=('ftp::/usr/bin/curl -qfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o 'http::/usr/bin/curl -qb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' 'https::/usr/bin/curl -qb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' 'rsync::/usr/bin/rsync --no-motd -z %u %o' - 'scp::/usr/bin/scp -C %u %o') + 'scp::/usr/bin/scp -C %u %o' + 'cvs::/usr/bin/vcsget %u %o' + 'git::/usr/bin/vcsget %u %o' + 'git+*::/usr/bin/vcsget %u %o' + 'svn+*::/usr/bin/vcsget %u %o' + 'bzr::/usr/bin/vcsget %u %o' + 'hg+*::/usr/bin/vcsget %u %o') # Other common tools: # /usr/bin/snarf -- 1.7.12

1 0

[pacman-dev] [PATCH 2/3] makepkg: do glob expansion in DLAGENTS maps
by Luke Shumaker 25 Aug '12

25 Aug '12

This allows vcs-* schemes to be used for vcsget. Signed-off-by: Luke Shumaker <LukeShu(a)sbcglobal.net> --- scripts/makepkg.sh.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b30e9d0..f2a5008 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -394,16 +394,25 @@ source_has_signatures() { return 1 } +string_matches_glob() { + local string=$1 + local glob=$2 + case "$string" in + $glob) return 0;; + esac + return 1 +} + get_downloadclient() { # $1 = URL with valid protocol prefix local url=$1 local proto="${url%%://*}" - # loop through DOWNLOAD_AGENTS variable looking for protocol + # loop through DLAGENTS (download agents) variable looking for protocol local i for i in "${DLAGENTS[@]}"; do local handler="${i%%::*}" - if [[ $proto = "$handler" ]]; then + if string_matches_glob "$proto" "$handler"; then local agent="${i##*::}" break fi -- 1.7.12

1 0

[pacman-dev] [PATCH] makepkg: do not embed timestamps in compressed manpages
by Allan McRae 23 Aug '12

23 Aug '12

This will make the checksum of man pages match across architectures despite different build times. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8ba4ff7..cad1f5e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1390,7 +1390,7 @@ tidy_install() { done if [[ -z ${files[$inode]} ]]; then files[$inode]=$file - gzip -9 -f "$file" + gzip -9 -n -f "$file" else rm -f "$file" ln "${files[$inode]}.gz" "${file}.gz" -- 1.7.12

1 0