- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 4/4] Add --noprepare option to makepkg
by Eric Bélanger 30 Apr '13

30 Apr '13

This new option disables the prepare function. Useful in combination with -o to get an unpatched copy of the sources for testing purpose. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- contrib/bash_completion.in | 2 +- contrib/zsh_completion.in | 1 + doc/makepkg.8.txt | 3 +++ scripts/makepkg.sh.in | 9 +++++++-- test/scripts/parseopts_test.sh | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 28981ae..519aa6d 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -77,7 +77,7 @@ _makepkg() { if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch install key log needed nobuild nocheck nocolor noconfirm nodeps noextract - noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg + noprepare noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg skippgpcheck source syncdeps verifysource version' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f9d1106..c1fe041 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -583,6 +583,7 @@ _makepkg_longopts=( '--holdver[Prevent automatic version bumping for development PKGBUILDs]' '--key[Specify key to use for gpg signing instead of the default]: :_keys' '--nocheck[Do not run the check() function in the PKGBUILD]' + '--noprepare[Do not run the prepare() function in the PKGBUILD]' '--nosign[Do not create a signature for the package]' '--pkg[Only build listed packages from a split package]' '--sign[Sign the resulting package with gpg]' diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 53a7867..3f2e24d 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -165,6 +165,9 @@ Options *\--nocheck*:: Do not run the check() function in the PKGBUILD or handle the checkdepends. +*\--noprepare*:: + Do not run the prepare() function in the PKGBUILD. + *\--sign*:: Sign the resulting package with gpg, overriding the setting in linkman:makepkg.conf[5]. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 710b76b..13f3610 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2484,6 +2484,7 @@ usage() { printf -- "$(gettext " --holdver Do not update VCS sources")\n" printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" + printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" @@ -2526,7 +2527,7 @@ ARGLIST=("$@") OPT_SHORT="AcdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' - 'nocheck' 'nodeps' 'noextract' 'nosign' 'pkg:' 'repackage' 'rmdeps' + 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') @@ -2565,6 +2566,7 @@ while true; do -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; --nocheck) RUN_CHECK='n' ;; + --noprepare) RUN_PREPARE='n' ;; --nosign) SIGNPKG='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; @@ -2798,7 +2800,10 @@ fi # test for available PKGBUILD functions if declare -f prepare >/dev/null; then - PREPAREFUNC=1 + # "Hide" prepare() function if not going to be run + if [[ $RUN_PREPARE != "n" ]]; then + PREPAREFUNC=1 + fi fi if declare -f build >/dev/null; then BUILDFUNC=1 diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 1693b9f..0d894c9 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -18,7 +18,7 @@ fi OPT_SHORT="AcdefFghiLmop:rRsV" OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean:' 'cleanall' 'nodeps' 'noextract' 'force' 'forcever:' 'geninteg' 'help' 'holdver' - 'install' 'key:' 'log' 'nocolor' 'nobuild' 'nocheck' 'nosign' 'pkg:' 'rmdeps' + 'install' 'key:' 'log' 'nocolor' 'nobuild' 'nocheck' 'noprepare' 'nosign' 'pkg:' 'rmdeps' 'repackage' 'skipinteg' 'sign' 'source' 'syncdeps' 'version' 'config:' 'noconfirm' 'noprogressbar') -- 1.8.2.2

2 1

[pacman-dev] [PATCH 2/2] Add -V/--version option to makepkg's usage function and man page
by Eric Bélanger 30 Apr '13

30 Apr '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- doc/makepkg.8.txt | 3 +++ scripts/makepkg.sh.in | 1 + 2 files changed, 4 insertions(+) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ecee63a..bb7a9a3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -144,6 +144,9 @@ Options remote builder, or a tarball upload. Because integrity checks are verified, all source files of the package need to be present or downloadable. +*-V, \--version*:: + Display version information. + *\--allsource*:: Do not actually build the package, but build a source-only tarball that includes all sources, including those that are normally download via diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..710b76b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2475,6 +2475,7 @@ usage() { printf -- "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")\n" printf -- "$(gettext " -s, --syncdeps Install missing dependencies with %s")\n" "pacman" printf -- "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")\n" + printf -- "$(gettext " -V, --version Show version information and exit")\n" printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n" printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n" printf -- "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" -- 1.8.2.2

2 1

[pacman-dev] [PATCH] makepkg: avoid redirecting stdout
by Dave Reisner 28 Apr '13

28 Apr '13

If stdout is already redirected, redirecting stderr to stdout can lead to undesirable results. Fixes FS#34974. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is somewhat of an RFC. Allan and I were unable to discern why this was originally done from git history. 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 da620a4..838d435 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1451,7 +1451,7 @@ run_function() { wait $teepid rm "$logpipe" else - $pkgfunc 2>&1 + "$pkgfunc" fi # reset our shell options eval "$shellopts" -- 1.8.2.1

2 1

[pacman-dev] [PATCH] Use libalpm version in pkg-config file
by Allan McRae 26 Apr '13

26 Apr '13

We currently use the pacman version number in the libalpm.pc file. It makes more sense to use the libalpm version. Fixes FS#34967. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/libalpm.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/libalpm.pc.in b/lib/libalpm/libalpm.pc.in index fe4e258..fdfc8be 100644 --- a/lib/libalpm/libalpm.pc.in +++ b/lib/libalpm/libalpm.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libalpm Description: Arch Linux package management library URL: http://www.archlinux.org/pacman/ -Version: @VERSION@ +Version: @LIB_VERSION@ Cflags: -I${includedir} Libs: -L${libdir} -lalpm Libs.private: @LIBS@ @LIBARCHIVE_LIBS@ @LIBSSL_LIBS@ @LIBCURL_LIBS@ @GPGME_LIBS@ -- 1.8.2.1

1 0

[pacman-dev] [PATCH] doc: Document pkgver() function
by William Giokas 25 Apr '13

25 Apr '13

Originally from Jason St. John's patch, This is a much simplified version explaining some basic functions the four vcs's makepkg supports can use to get package version information. Signed-off-by: William Giokas <1007380(a)gmail.com> --- I know that Allan didn't like this patch last time it was sent in, and neither did I, but I think that this should be documented. I took out the two terrible package versions for the git section, and cut it down to just the commands used to actually print out the pkgver, not the whole pkgver() { cd ... foo bar baz } which makes a lot more sense and keeps things to a minimum. doc/PKGBUILD.5.txt | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index ea280a0..bb185ea 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -450,6 +450,41 @@ The source URL is divided into three components: *svn*;; revision +*pkgver() Function*:: + This function allows 'makepkg' to automatically update the package version of + a package using a script. This is meant to be used with VCS packages. + *Git*:: + *Using git tags*;; + Example output: 1.5.1.g123defa + + git describe --long | sed 's/-/./' + + *Using the total number of commits (used when there are no tags)*;; + Example output: 0.r6283.g123defa + + echo "0.r$(git rev-list --count HEAD).$(git log -1 --format="%h")" + + *Subversion*:: + Example output: 8546 + + svnversion | tr -d [A-z] + + *Mercurial*:: + Example output: 2813.75881cc5391e + + hg identify -ni | awk 'BEGIN{OFS=".";} {print $2 $1}' + + *Bazaar*:: + Example output: 830 + + bzr revno + + *Fallback*:: + If no acceptable version information can be extracted from the + repository, use the current date. + Example output: 20130408 + + date +%Y%m%d Example ------- -- 1.8.2.1.573.g118f60e

5 6

[pacman-dev] Segfault at end of transaction?
by Allan McRae 25 Apr '13

25 Apr '13

I'm guess no-one here has seen this (or why have you not reported it yet!!!), but a couple of people on the Chakra forums are reporting a segfault at the end of the transaction - after releasing the databases. See http://chakra-project.org/bbs/viewtopic.php?id=10224 Waiting for more backtrace information. Allan

4 5

[pacman-dev] [PATCH] Add prepare function to PKGBUILD proto files
by Eric Bélanger 24 Apr '13

24 Apr '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- proto/PKGBUILD-split.proto | 7 ++++++- proto/PKGBUILD.proto | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 42c469c..f2a2d11 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -24,10 +24,15 @@ backup=() options=() install= changelog= -source=($pkgbase-$pkgver.tar.gz) +source=($pkgbase-$pkgver.tar.gz $pkgname-$pkgver.patch) noextract=() md5sums=() #generate with 'makepkg -g' +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" +} + build() { cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 8e9ae04..e78b110 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -24,10 +24,15 @@ backup=() options=() install= changelog= -source=($pkgname-$pkgver.tar.gz) +source=($pkgname-$pkgver.tar.gz $pkgname-$pkgver.patch) noextract=() md5sums=() #generate with 'makepkg -g' +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" +} + build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr -- 1.8.2.1

3 2

[pacman-dev] Mark outdated packages automatically (aka Livecheck)
by Anatol Pomozov 18 Apr '13

18 Apr '13

Hi, I believe in automatization. Any routine work that can be done automatically should be done this way. One such thing that can be improved in Arch project is discovering out-of-date packages. Currently it is done by users who go to https://www.archlinux.org/packages/ find the package and then click "Flag Package Out-of-Date" link. Why to bother users? Why not to let some bot to visit websites and check for new versions? There are examples of package managers that have such functionality - macports http://guide.macports.org/chunked/reference.livecheck.html Their Portfiles can have information about how to find released files (using regexp). Then periodically (e.g. daily) a bot visits webpages, parses html and checks if new files are present. Is it possible to have such functionality in pacman? It would save users time and make package update time lower.

4 8

[pacman-dev] [PATCH v2] Remove ALPM_QUESTION_LOCAL_NEWER
by Connor Behan 18 Apr '13

18 Apr '13

Remove a question that hasn't been used since the 3.0 days. To prevent us from having an ugly enum of questions that is missing a bitmask, this changes the API of the hidden --ask option. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- lib/libalpm/alpm.h | 7 +++---- src/pacman/callback.c | 9 --------- test/pacman/tests/ignore005.py | 2 +- test/pacman/tests/sync140.py | 2 +- test/pacman/tests/sync141.py | 2 +- test/pacman/tests/unresolvable001.py | 2 +- test/pacman/tests/upgrade090.py | 2 +- 7 files changed, 8 insertions(+), 18 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ccbdd1c..2277a69 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -405,10 +405,9 @@ typedef enum _alpm_question_t { ALPM_QUESTION_REPLACE_PKG = (1 << 1), ALPM_QUESTION_CONFLICT_PKG = (1 << 2), ALPM_QUESTION_CORRUPTED_PKG = (1 << 3), - ALPM_QUESTION_LOCAL_NEWER = (1 << 4), - ALPM_QUESTION_REMOVE_PKGS = (1 << 5), - ALPM_QUESTION_SELECT_PROVIDER = (1 << 6), - ALPM_QUESTION_IMPORT_KEY = (1 << 7) + ALPM_QUESTION_REMOVE_PKGS = (1 << 4), + ALPM_QUESTION_SELECT_PROVIDER = (1 << 5), + ALPM_QUESTION_IMPORT_KEY = (1 << 6) } alpm_question_t; /** Question callback */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..01cb2e4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -377,15 +377,6 @@ void cb_question(alpm_question_t event, void *data1, void *data2, *response = select_question(count); } break; - case ALPM_QUESTION_LOCAL_NEWER: - if(!config->op_s_downloadonly) { - *response = yesno(_("%s-%s: local version is newer. Upgrade anyway?"), - alpm_pkg_get_name(data1), - alpm_pkg_get_version(data1)); - } else { - *response = 1; - } - break; case ALPM_QUESTION_CORRUPTED_PKG: *response = yesno(_("File %s is corrupted (%s).\n" "Do you want to delete it?"), diff --git a/test/pacman/tests/ignore005.py b/test/pacman/tests/ignore005.py index 274e44c..51bcba3 100644 --- a/test/pacman/tests/ignore005.py +++ b/test/pacman/tests/ignore005.py @@ -36,7 +36,7 @@ self.option["IgnorePkg"] = ["packageA3"] -self.args = "-S packageA1 packageA2 --ask=32" +self.args = "-S packageA1 packageA2 --ask=16" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=packageA1|1.0-1") diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/sync140.py index ce21cc3..fbe750f 100644 --- a/test/pacman/tests/sync140.py +++ b/test/pacman/tests/sync140.py @@ -18,7 +18,7 @@ for p in sp1, sp2, sp3: self.addpkg2db("sync", p) -self.args = "-Su --ignore %s --ask=32" % sp1.name +self.args = "-Su --ignore %s --ask=16" % sp1.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=glibc|1.0-1") diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/sync141.py index f2f0136..02f7be8 100644 --- a/test/pacman/tests/sync141.py +++ b/test/pacman/tests/sync141.py @@ -18,7 +18,7 @@ for p in sp1, sp2, sp3: self.addpkg2db("sync", p) -self.args = "-Su --ignore %s --ask=32" % sp1.name +self.args = "-Su --ignore %s --ask=16" % sp1.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=c_glibc|1.0-1") diff --git a/test/pacman/tests/unresolvable001.py b/test/pacman/tests/unresolvable001.py index 9d54c3e..4e5da6f 100644 --- a/test/pacman/tests/unresolvable001.py +++ b/test/pacman/tests/unresolvable001.py @@ -11,7 +11,7 @@ packageA2up.depends = ["dep"]; self.addpkg2db("sync", packageA2up) -self.args = "-S package dep --ask=32" +self.args = "-S package dep --ask=16" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=package") diff --git a/test/pacman/tests/upgrade090.py b/test/pacman/tests/upgrade090.py index 26e531c..cdd4cac 100644 --- a/test/pacman/tests/upgrade090.py +++ b/test/pacman/tests/upgrade090.py @@ -16,7 +16,7 @@ sp.files = ["bin/dep"] self.addpkg2db("sync", sp) -self.args = "-U %s --ask=32" % " ".join([p.filename() for p in p1, p2, p3]) +self.args = "-U %s --ask=16" % " ".join([p.filename() for p in p1, p2, p3]) self.addrule("PACMAN_RETCODE=0") for p in p1, p2, sp: -- 1.8.2.1

1 0

[pacman-dev] pacman-4.2 plans?
by Allan McRae 18 Apr '13

18 Apr '13

The 4.2 roadmap is empty! https://wiki.archlinux.org/index.php?title=DeveloperWiki:Pacman_Roadmap I thought it would be good to discuss what people are planning. So far things I know are being or will be worked on: - Remove of support for PKGBUILDs with only a build() function - Removal of directory symlink support Other things that have starts of patchsets available: - Parallel operations (I think I will take this...) - Optdepends handling Things the world would love to see but need substantial planning: - Hooks Any other ideas that people are working on or plan to? Allan

9 20