[PATCH] main/argon2: fix wrong version in libargon2.pc

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[PATCH] main/argon2: fix wrong version in libargon2.pc

alpine-mips-patches <info@mobile-stream.com>

Details

Message ID: <20191113213314.1D16D6C86A@mx12.valuehost.ru>
DKIM signature: missing

Download raw message

5 years ago

Patch: +2 -2

Otherwise build fails with the following message:

>>> argon2-dev*: Running split function dev...
>>> argon2-dev*: Preparing subpackage argon2-dev...
>>> argon2-dev*: Stripping binaries
>>> ERROR: argon2-dev*: usr/lib/pkgconfig/libargon2.pc: pkgconf version ZERO is invalid
>>> ERROR: argon2*: prepare_subpackages failed
>>> ERROR: argon2: rootpkg failed
---
 main/argon2/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/argon2/APKBUILD b/main/argon2/APKBUILD
index 7ce733ad9e..c2f73b908c 100644
--- a/main/argon2/APKBUILD
+++ b/main/argon2/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=argon2
 _pkgname=phc-winner-argon2
 pkgver=20190702
-pkgrel=0
+pkgrel=1
 pkgdesc="The password hash Argon2, winner of PHC"
 url="https://github.com/P-H-C/phc-winner-argon2"
 arch="all"
@@ -16,7 +16,7 @@ builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
 	cd "$builddir"
-	make OPTTARGET=none
+	make OPTTARGET=none ARGON2_VERSION="$pkgver"
 }
 
 check() {
-- 
2.23.0

Kevin Daudt <kdaudt@alpinelinux.org>

Details

Message ID: <20191116195833.GB456781@alpha>
In-Reply-To: <20191113213314.1D16D6C86A@mx12.valuehost.ru> (view parent)
DKIM signature: missing

Download raw message

5 years ago

On Wed, Nov 13, 2019 at 08:14:14PM +0000, alpine-mips-patches wrote:
> Otherwise build fails with the following message:
> 
> >>> argon2-dev*: Running split function dev...
> >>> argon2-dev*: Preparing subpackage argon2-dev...
> >>> argon2-dev*: Stripping binaries
> >>> ERROR: argon2-dev*: usr/lib/pkgconfig/libargon2.pc: pkgconf version ZERO is invalid
> >>> ERROR: argon2*: prepare_subpackages failed
> >>> ERROR: argon2: rootpkg failed
> ---
>  main/argon2/APKBUILD | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/main/argon2/APKBUILD b/main/argon2/APKBUILD
> index 7ce733ad9e..c2f73b908c 100644
> --- a/main/argon2/APKBUILD
> +++ b/main/argon2/APKBUILD
> @@ -4,7 +4,7 @@
>  pkgname=argon2
>  _pkgname=phc-winner-argon2
>  pkgver=20190702
> -pkgrel=0
> +pkgrel=1
>  pkgdesc="The password hash Argon2, winner of PHC"
>  url="https://github.com/P-H-C/phc-winner-argon2"
>  arch="all"
> @@ -16,7 +16,7 @@ builddir="$srcdir/$_pkgname-$pkgver"
>  
>  build() {
>  	cd "$builddir"
> -	make OPTTARGET=none
> +	make OPTTARGET=none ARGON2_VERSION="$pkgver"
>  }
>  
>  check() {
> -- 
> 2.23.0
> 

Sorry, we missed this patch and it already has been fixed.

~alpine/aports

[PATCH] main/argon2: fix wrong version in libargon2.pc