August 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] removed duplicate macros SYMEXPORT and SYMHIDDEN from alpm_list.c, using them from util.h
by Paul Barbu Gheorghe 29 May '13

29 May '13

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/alpm_list.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 39eded1..b9e7cba 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -21,13 +21,11 @@ #include <stdlib.h> #include <string.h> +#include "util.h" + /* libalpm */ #include "alpm_list.h" -/* check exported library symbols with: nm -C -D <lib> */ -#define SYMEXPORT __attribute__((visibility("default"))) -#define SYMHIDDEN __attribute__((visibility("internal"))) - /** * @addtogroup alpm_list List Functions * @brief Functions to manipulate alpm_list_t lists. -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

6 9

[pacman-dev] [PATCH 1/2] makepkg: Bazaar VCS support.
by Gary van der Merwe 13 Sep '12

13 Sep '12

This patch adds Bazaar VCS support to makepkg. Fragments can be any bzr revision spec. eg: http://example.com/project/#revno:62 or just http://example.com/project/#62 For more info, see `bzr help revisionspec`. Writing a pkgver func is easy with `bzr version-info`, eg: pkgver() { cd $srcdir/$pkgname bzr version-info --custom --template="{revno}\n" } --- doc/PKGBUILD.5.txt | 5 ++++- scripts/makepkg.sh.in | 60 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 47f9e88..c0f96c2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -405,7 +405,7 @@ Using VCS Sources[[VCS]] ------------------------ Building a developmental version of a package using sources from a version control system (VCS) is enabled by specifying the source in the form -`source=('folder::url#fragment')`. Currently makepkg supports the `git`, `hg` and +`source=('folder::url#fragment')`. Currently makepkg supports the `git`, `hg`, `bzr` and `svn` protocols. The source URL is divided into three components: @@ -433,6 +433,9 @@ The source URL is divided into three components: *hg*;; branch, revision, tag + *bzr*;; + revisionspec (see `bzr help revisionspec` for details) + *svn*;; revision diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dd4066b..3460824 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -200,7 +200,7 @@ get_filepath() { local proto="$(get_protocol "$1")" case $proto in - git*|hg*|svn*) + git*|hg*|svn*|bzr*) if [[ -d "$startdir/$file" ]]; then file="$startdir/$file" elif [[ -d "$SRCDEST/$file" ]]; then @@ -236,7 +236,7 @@ get_filename() { local proto=$(get_protocol "$netfile") case $proto in - git*|hg*|svn*) + git*|hg*|svn*|bzr*) filename=${netfile##*/} filename=${filename%%#*} # fall-through @@ -572,6 +572,57 @@ download_svn() { popd &>/dev/null } +download_bzr() { + local netfile=$1 + + local url=$(get_url "$netfile") + url=${url##*bzr+} + url=${url%%#*} + + local fragment=${netfile##*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + local revisionspec="-r-1" + local displaylocation="$url" + else + local revisionspec="-r$fragment" + local displaylocation="$url -r $fragment" + fi + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + if [[ ! -d "$dir" ]]; then + msg2 "$(gettext "Branching %s ...")" "${displaylocation}" + if ! bzr branch "$url" "$dir" $revisionspec --no-tree; then + error "$(gettext "Failure while branching %s")" "${displaylocation}" + plain "$(gettext "Aborting...")" + exit 1 + fi + elif (( ! HOLDVER )); then + msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" + cd_safe "$dir" + if ! bzr pull "$url" $revisionspec --overwrite; then + # only warn on failure to allow offline builds + warning "$(gettext "Failure while pulling %s")" "${displaylocation}" + fi + fi + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + if ! bzr checkout "$dir" --lightweight; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr" + plain "$(gettext "Aborting...")" + exit 1 + fi + + cd_safe "${dir##*/}" + + popd &>/dev/null +} + download_sources() { msg "$(gettext "Retrieving Sources...")" @@ -602,6 +653,9 @@ download_sources() { svn*) (( GET_VCS )) && download_svn "$netfile" ;; + bzr*) + (( GET_VCS )) && download_bzr "$netfile" + ;; *) error "$(gettext "Unknown download protocol: %s")" "$proto" plain "$(gettext "Aborting...")" @@ -974,7 +1028,7 @@ generate_checksums() { proto="$(get_protocol "$netfile")" case $proto in - git*|hg*|svn*) + git*|hg*|svn*|bzr*) sum="SKIP" ;; *) -- 1.7.11.4

2 10

[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

[pacman-dev] [PATCH] makepkg: check if hg and svn directories are non-empty before updating
by Allan McRae 22 Aug '12

22 Aug '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 21c660c..8ba4ff7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -475,7 +475,7 @@ download_hg() { url=${url##*hg+} url=${url%%#*} - if [[ ! -d "$dir" ]]; then + if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "hg" if ! hg clone -U "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "hg" @@ -537,7 +537,7 @@ download_svn() { fi url=${url%%#*} - if [[ ! -d "$dir" ]]; then + if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn" if ! svn checkout --config-dir "$dir" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" -- 1.7.12

1 0