- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add valigpgpkeys to PKGBUILD prototypes.
by Allan McRae 01 Jul '14

01 Jul '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- proto/PKGBUILD-split.proto | 1 + proto/PKGBUILD.proto | 1 + 2 files changed, 2 insertions(+) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index dd73f93..6dae704 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -29,6 +29,7 @@ source=("$pkgbase-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() md5sums=() +validpgpkeys=() prepare() { cd "$pkgname-$pkgver" diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 12816e0..a2c600d 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -28,6 +28,7 @@ source=("$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() md5sums=() +validpgpkeys=() prepare() { cd "$pkgname-$pkgver" -- 2.0.1

2 1

[pacman-dev] [PATCH v2] makepkg: skip dependency checking with --verifysource
by Allan McRae 29 Jun '14

29 Jun '14

Dependencies are now handled with --nobuild unless specificially skipped. Using --verifysource will skip dependency checks unless --syncdeps is specified. Fixes FS#35057 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This time with documentation updates. doc/makepkg.8.txt | 4 +++- scripts/makepkg.sh.in | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 0277f54..16bdc8a 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -63,7 +63,9 @@ Options *\--verifysource*:: For each source file in the source array of PKGBUILD, download the file if required and perform the integrity checks. No extraction or build is - performed. Useful for performing subsequent offline builds. + performed. Dependencies specified in the PKGBUILD will not be handled + unless `--syndeps` is used. Useful for performing subsequent offline + builds. *-f, \--force*:: makepkg will not build a package if a built package already exists in diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 94dd98a..917bc2c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2448,7 +2448,7 @@ check_vcs_software() { local uninstalled uninstalled="$(set +E; check_deps $client)" || exit 1 # if not installed, check presence in depends or makedepends - if [[ -n "$uninstalled" ]] && (( ! NODEPS )); then + if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then if ! in_array "$client" "${depends[@]} ${makedepends}"; then error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ "$client" "${proto%%+*}" @@ -3125,7 +3125,7 @@ if (( SOURCEONLY )); then exit 0 fi -if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then +if (( NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then # no warning message needed for nobuild if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" -- 2.0.1

1 1

[pacman-dev] [PATCH] doc: makepkg: Add note about dependencies and split packages
by Olivier Brunel 29 Jun '14

29 Jun '14

Specifically, the fact that `makepkg -s` will only use global values, so any override in "depends" or "optdepends" inside a split package's packaging function will not be used, and therefore should probably be included in "makedepends" (Else build could fail e.g. in a clean chroot) Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- So I'm assuming this isn't really a bug, but a known limitation of makepkg. Once I figured out what was happening and why, I looked into it and couldn't find any documentation about said limitation (unless I missed something obvious?), but looking at some official PKGBUILDs it seems to be known, although sometimes it's a bit "tricky" to figure out. E.g. if you look at php, you won't find pcre nor libxml2 in makedepends, even though they're required for building. One could assume makepkg will install them due to their presence in depends inside package_XXX() functions, while they actually get installed because apache (which depends on pcre) and libxslt (which depends on libxml2) are in makedepends. Others, e.g. unixodbc or sqlite, are listed both in makedepends and as depends in some package_XXX() functions. Looking into this, I also found this old blog post[1] of Allan's, introducing split packages, where he says: "As a general rule, almost every package in the split packages depends array should probably be present in the global makedepends array." No mention of "why"/makepkg's limitation, though. I'm assuming it was/is rather obvious to you guys, but wasn't to me, and I couldn't find a similar recommendation in the doc, hence the patch. [1] http://allanmcrae.com/2009/07/new-pkgbuild-syntax-options-with-pacman-33/ doc/PKGBUILD.5.txt | 8 ++++++++ doc/makepkg.8.txt | 2 ++ 2 files changed, 10 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 17e8af2..1fc19f5 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -372,6 +372,14 @@ each split package's packaging function: `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and `changelog`. +Note that when `makepkg` installs dependencies (via its `--syncdeps` option) +only global values are used, i.e. any override done in a split package's +packaging function will not be used. + +Therefore, any dependency featured as `depends` or `optdepends` in such a +function should probably be listed under the global `makedepends` as well, to +ensure it will be installed in such cases. + An optional global directive is available when building a split package: *pkgbase*:: diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 0277f54..01039a9 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -132,6 +132,8 @@ Options Install missing dependencies using pacman. When build-time or run-time dependencies are not found, pacman will try to resolve them. If successful, the missing packages will be downloaded and installed. + Note that only global values from the `PKGBUILD` are used, see + linkman:PKGBUILD[5] for more. *-S, \--source*:: Do not actually build the package, but build a source-only tarball that -- 2.0.1

1 0

[pacman-dev] -Rs with dependency cycle
by Nagy Gabor 29 Jun '14

29 Jun '14

Hi! I'm using "Pacman v4.1.2 - libalpm v8.0.2". I have a clean 64 bit system. Installed skype (with -S) and then I removed it with -Rs. I noticed that 13 lib32 packages were not removed with -Rs. (64 packages were installed with -S, and 51 were removed with -Rs) This is not the expected behaviour. It seems that this is caused by the dependency cycle (detected by pacman -S): "lib32-harfbuzz will be installed before its lib32-freetype2 dependency" I think this is a bug.

2 2

[pacman-dev] [PATCH 1/4] Revert refactoring in fa0c1e14
by Allan McRae 29 Jun '14

29 Jun '14

This will cause the code to break as soon as we handle another signal such as SIGWINCH... Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Well... that didn't last long. src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e8c5f9e..baa0485 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -301,7 +301,7 @@ static void handler(int signum) "Please submit a full bug report with --debug if appropriate.\n"; xwrite(err, msg, strlen(msg)); exit(signum); - } else if(signum != SIGTERM) { + } else if(signum == SIGINT || signum == SIGHUP) { if(signum == SIGINT) { msg = "\nInterrupt signal received\n"; } else { -- 2.0.1

3 3

[pacman-dev] [PATCH] pacdiff: allow DIFFPROG to contain commandline options
by Allan McRae 29 Jun '14

29 Jun '14

Also use 'vim -d' as default diff viewer. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- In FS#40758, someone pointed out that vimdiff was not installed in their vim package and suggested using 'vim -d' as the default DIFFPROG. I was tempted to say use the DIFFPROG environmental variable to deal with that, but you are unable to pass command line options using that. The drawback is DIFFPROG can not genuinely contain spaces in the command. Is anyone actually concerned about that? contrib/pacdiff.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index c8fbe74..ecb6ae2 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -23,7 +23,7 @@ shopt -s extglob declare -r myname='pacdiff' declare -r myver='@PACKAGE_VERSION@' -diffprog=${DIFFPROG:-vimdiff} +diffprog=${DIFFPROG:-'vim -d'} diffsearchpath=${DIFFSEARCHPATH:-/etc} USE_COLOR='y' declare -a oldsaves @@ -49,7 +49,7 @@ General Options: --nocolor remove colors from output Environment Variables: - DIFFPROG override the merge program: (default: vimdiff) + DIFFPROG override the merge program: (default: 'vim -d') DIFFSEARCHPATH override the search path. (only when using find) (default: /etc) @@ -118,7 +118,7 @@ done m4_include(../scripts/library/term_colors.sh) -if ! type -p $diffprog >/dev/null; then +if ! type -p ${diffprog%% *} >/dev/null; then error "Cannot find the $diffprog binary required for viewing differences." exit 1 fi -- 2.0.1

1 0

[pacman-dev] [PATCH] makepkg: handle "epoch=" in PKGBUILD with pkgver function
by Allan McRae 29 Jun '14

29 Jun '14

After resourcing the PKGBUILD in update_pkgver(), set the epoch to 0 if it is empty. Also adjust the get_full_version function to be more robust if epoch somehow still is empty. Fixes FS#41022. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e20b707..779ebcb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -824,6 +824,7 @@ update_pkgver() { fi @SEDINPLACE@ "s:^pkgrel=[^ ]*:pkgrel=1:" "$BUILDFILE" source_safe "$BUILDFILE" + epoch=${epoch:-0} local fullver=$(get_full_version) msg "$(gettext "Updated version: %s")" "$pkgbase $fullver" else @@ -846,10 +847,10 @@ missing_source_file() { ## get_full_version() { if [[ -z $1 ]]; then - if [[ $epoch ]] && (( ! $epoch )); then - printf "%s\n" "$pkgver-$pkgrel" - else + if [[ -n $epoch ]] && (( $epoch )); then printf "%s\n" "$epoch:$pkgver-$pkgrel" + else + printf "%s\n" "$pkgver-$pkgrel" fi else for i in pkgver pkgrel epoch; do @@ -857,10 +858,10 @@ get_full_version() { eval $(declare -f package_$1 | sed -n "s/$^[[:space:]]*$i=$/${i}_override=/p") [[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\" done - if (( ! $epoch_override )); then - printf "%s\n" "$pkgver_override-$pkgrel_override" - else + if [[ -n $epoch_override ]] && (( $epoch_override )); then printf "%s\n" "$epoch_override:$pkgver_override-$pkgrel_override" + else + printf "%s\n" "$pkgver_override-$pkgrel_override" fi fi } -- 2.0.1

1 0

[pacman-dev] [PATCH 1/5] add test for file type check with -Qk
by Andrew Gregory 29 Jun '14

29 Jun '14

If a directory has been replaced by a symlink, -Qk currently stats the symlink target rather than the symlink itself and doesn't check that the actual file type matches the package file list. This will make it difficult to discover errors once 4.2 is released and replacing directories with symlinks is no longer supported. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/tests/TESTS | 1 + test/pacman/tests/querycheck_fast_file_type.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/pacman/tests/querycheck_fast_file_type.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index dc47294..1b5a81f 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -90,6 +90,7 @@ TESTS += test/pacman/tests/query011.py TESTS += test/pacman/tests/query012.py TESTS += test/pacman/tests/querycheck001.py TESTS += test/pacman/tests/querycheck002.py +TESTS += test/pacman/tests/querycheck_fast_file_type.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py diff --git a/test/pacman/tests/querycheck_fast_file_type.py b/test/pacman/tests/querycheck_fast_file_type.py new file mode 100644 index 0000000..a19fcee --- /dev/null +++ b/test/pacman/tests/querycheck_fast_file_type.py @@ -0,0 +1,14 @@ +self.description = "check file type without mtree" + +self.filesystem = [ "bar/", "foo -> bar/" ] + +pkg = pmpkg("dummy") +pkg.files = [ "foo/" ] +self.addpkg2db("local",pkg) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_OUTPUT=warning.*(File type mismatch)") + +self.expectfailure = True -- 2.0.0

2 7

[pacman-dev] [PATCH 1/2] read cachedir from config file
by Dave Reisner 29 Jun '14

29 Jun '14

--- contrib/paccache.sh.in | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 039ac8a..57c0458 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -25,7 +25,7 @@ declare -r myver='@PACKAGE_VERSION@' declare -a candidates=() cmdopts=() whitelist=() blacklist=() declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 -declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch= +declare cachedir= delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -37,6 +37,19 @@ die() { exit 1 } +get_cachedir_from_config() { + local key value + + while IFS=$'= \t' read -r key value _; do + if [[ $key = CacheDir ]]; then + echo "$value" + return 0 + fi + done <"$1" + + return 1 +} + # reads a list of files on stdin and prints out deletion candidates pkgfilter() { # there's whitelist and blacklist parameters passed to this @@ -165,8 +178,7 @@ Usage: ${myname} <operation> [options] [targets...] Options: -a, --arch <arch> scan for "arch" (default: all architectures). - -c, --cachedir <dir> scan "dir" for packages. - (default: @localstatedir@/cache/pacman/pkg). + -c, --cachedir <dir> scan "dir" for packages. (default: $cachedir). -f, --force apply force to mv(1) and rm(1) operations. -h, --help display this help message and exit. -i, --ignore <pkgs> ignore "pkgs", comma-separated. Alternatively, specify @@ -191,6 +203,8 @@ OPT_SHORT=':a:c:dfhi:k:m:rsuVvz' OPT_LONG=('arch:' 'cachedir:' 'dryrun' 'force' 'help' 'ignore:' 'keep:' 'move' 'nocolor' 'remove' 'uninstalled' 'version' 'verbose' 'null') +cachedir=$(get_cachedir_from_config "@sysconfdir@/pacman.conf") + if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 fi -- 2.0.0

3 4

[pacman-dev] Fwd: [PATCH 1/1] libalpm: check for valid public key algorithm
by Allan McRae 29 Jun '14

29 Jun '14

Forwarding to list. -------- Original Message -------- Subject: [PATCH 1/1] libalpm: check for valid public key algorithm Date: Tue, 24 Jun 2014 09:38:19 +0200 From: Christian Hesse <mail(a)eworm.de> To: Allan McRae <allan(a)archlinux.org> CC: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/signing.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index c6b748e..e46fa2e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -327,6 +327,10 @@ static int key_search(alpm_handle_t *handle, const char *fpr, pgpkey->length = key->subkeys->length; pgpkey->revoked = key->subkeys->revoked; + /* Initialize with '?', this is overwritten unless public key + * algorithm is unknown. */ + pgpkey->pubkey_algo = '?'; + switch(key->subkeys->pubkey_algo) { case GPGME_PK_RSA: case GPGME_PK_RSA_E: @@ -352,6 +356,14 @@ static int key_search(alpm_handle_t *handle, const char *fpr, ret = 1; + /* We do not want to add a default switch case above to receive + * compiler error on new public key algorithm in gpgme. So check + * here if we have a valid pubkey_algo. */ + if (pgpkey->pubkey_algo == '?') { + _alpm_log(handle, ALPM_LOG_DEBUG, + "unknown public key algorithm: %d\n", key->subkeys->pubkey_algo); + } + gpg_error: if(ret != 1) { _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(gpg_err)); -- 2.0.0

1 0