X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mx1.riseup.net (mx1.riseup.net [198.252.153.129]) by lists.alpinelinux.org (Postfix) with ESMTP id BF0465C4569 for ; Wed, 22 Mar 2017 14:58:57 +0000 (GMT) Received: from piha.riseup.net (unknown [10.0.1.163]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 61B881A22C9 for ; Wed, 22 Mar 2017 14:58:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1490194737; bh=krnuMS04VPodtC1l0I2s+3Zjp1dKHXVhLJKQoMWwOFA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rjed463sXzlMPysya/vLBTY9+SiUj4ECRxRMwbWpW1GF29l3Wns3XDRYboGLWElZu 7+BlE9fw9gTzHDqkBtez46gBWdaNeRciLzI5mXeyX8cHSqv3trz+85Ne+snipTs9Iv /VnOaFUjx0n2oc1GQzpBD7yao7/4qq4Kra7+Spgw= Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: pickfire) with ESMTPSA id 6C1521C2322 Date: Wed, 22 Mar 2017 22:58:42 +0800 From: Pickfire To: pickfire@riseup.net Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] testing/pass: upgrade to 1.7 Message-ID: <20170322145842.d2bayWHQ-%pickfire@riseup.net> References: <20170320133443.15083-1-pickfire@riseup.net> In-Reply-To: <20170320133443.15083-1-pickfire@riseup.net> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Ivan Tham wrote: > --- > testing/pass/APKBUILD | 29 ++++++++++++----------------- > 1 file changed, 12 insertions(+), 17 deletions(-) > > diff --git a/testing/pass/APKBUILD b/testing/pass/APKBUILD > index 56f7dd26..ca4740ee 100644 > --- a/testing/pass/APKBUILD > +++ b/testing/pass/APKBUILD > @@ -2,8 +2,8 @@ > # Contributor: Johannes Matheis > # Maintainer: Johannes Matheis > pkgname=pass > -pkgver=1.6.5 > -pkgrel=3 > +pkgver=1.7 > +pkgrel=0 > pkgdesc="Stores, retrieves, generates, and synchronizes passwords securely" > url="http://zx2c4.com/projects/password-store/" > arch="noarch" > @@ -18,10 +18,10 @@ subpackages="$pkgname-doc > $pkgname-fish-completion:fishcomp > $pkgname-zsh-completion:zshcomp" > source="http://git.zx2c4.com/password-store/snapshot/password-store-${pkgver}.tar.xz" > +builddir="$srcdir/password-store-$pkgver" > > -_builddir="$srcdir/password-store-$pkgver" > package() { > - cd "$_builddir" > + cd "$builddir" > make DESTDIR="$pkgdir" \ > FORCE_BASHCOMP=1 \ > FORCE_ZSHCOMP=1 \ > @@ -31,7 +31,7 @@ package() { > contrib() { > pkgdesc="contrib files for pass" > mkdir -p "$subpkgdir"/usr/share > - cp -a "$_builddir"/contrib "$subpkgdir"/usr/share/$pkgname > + cp -a "$builddir"/contrib "$subpkgdir"/usr/share/$pkgname > } > > bashcomp() { > @@ -40,9 +40,8 @@ bashcomp() { > install_if="$pkgname=$pkgver-r$pkgrel bash-completion" > arch="noarch" > > - mkdir -p "$subpkgdir"/usr/share/bash-completion/completions > - mv "$pkgdir"/usr/share/bash-completion/completions/* \ > - "$subpkgdir"/usr/share/bash-completion/completions/ || return 1 > + install -Dm644 "$pkgdir"/usr/share/bash-completion/completions/pass \ > + "$subpkgdir"/usr/share/bash-completion/completions/pass || return 1 > } > > fishcomp() { > @@ -51,9 +50,8 @@ fishcomp() { > install_if="$pkgname=$pkgver-r$pkgrel fish" > arch="noarch" > > - mkdir -p "$subpkgdir"/usr/share/fish/completions/ > - mv "$pkgdir"/usr/share/fish/vendor_completions.d/* \ > - "$subpkgdir"/usr/share/fish/completions/ || return 1 > + install -Dm644 "$pkgdir"/usr/share/fish/vendor_completions.d/pass.fish \ > + "$subpkgdir"/usr/share/fish/completions/pass.fish || return 1 > } > > zshcomp() { > @@ -62,11 +60,8 @@ zshcomp() { > install_if="$pkgname=$pkgver-r$pkgrel zsh" > arch="noarch" > > - mkdir -p "$subpkgdir/usr/share/zsh/site-functions" > - mv "$pkgdir"/usr/share/zsh/site-functions/* \ > - "$subpkgdir"/usr/share/zsh/site-functions || return 1 > + install -Dm644 "$pkgdir"/usr/share/zsh/site-functions/_pass \ > + "$subpkgdir"/usr/share/zsh/site-functions/_pass || return 1 > } > > -md5sums="2c4468360c678184051e76f03c2f6b04 password-store-1.6.5.tar.xz" > -sha256sums="337a39767e6a8e69b2bcc549f27ff3915efacea57e5334c6068fcb72331d7315 password-store-1.6.5.tar.xz" > -sha512sums="e28503b63c6d18a2f45f4a732fdec0380c2ac15e1778136ec5e7ac568662b09183d3ad4fd36ca7e87cfe74540f916cb6365695bdf665a39da4cbe86c4bde7a78 password-store-1.6.5.tar.xz" > +sha512sums="f31fd067f9c6134eac7bb5039df6de3d6fe25c9fcd16d27a0cba159bd7fa9361193081a1fff2000cba1943edbb324e645c6399d4f4aa9f441dd9c67696462a50 password-store-1.7.tar.xz" Looks like yours failed instead: >>> pass-bash-completion*: Running split function bashcomp... install: cannot stat '/home/ivan/act/pkg/aports/testing/pass/pkg/pass/usr/share/bash-completion/completions/pass': No such file or directory >>> ERROR: pass-bash-completion*: bashcomp failed >>> ERROR: pass*: prepare_subpackages failed >>> ERROR: pass: all failed Mine works: 'src/completion/pass.bash-completion' -> '/home/ivan/act/pkg/aports/testing/pass/pkg/pass/usr/share/bash-completion/completions/pass' install: creating directory '/home/ivan/act/pkg/aports/testing/pass/pkg/pass/usr/share/zsh' install: creating directory '/home/ivan/act/pkg/aports/testing/pass/pkg/pass/usr/share/zsh/site-functions' >>> pass-bash-completion*: Tracing dependencies... >>> pass-bash-completion*: Package size: 4.0 KB >>> pass-bash-completion*: Compressing data... >>> pass-bash-completion*: Create checksum... >>> pass-bash-completion*: Create pass-bash-completion-1.7-r0.apk Please close the old patch http://patchwork.alpinelinux.org/patch/3167/ http://patchwork.alpinelinux.org/patch/3168/ --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---