commit d7979be1d4ef69028d7ee804798e093b470fd382 Author: Tim Biermann <tbier@posteo.de> Date: Tue Jul 2 08:38:02 2019 +0200 argon2: bump to 20190702 diff --git a/argon2/.footprint b/argon2/.footprint index cfeac8a3..ed6237bd 100644 --- a/argon2/.footprint +++ b/argon2/.footprint @@ -4,8 +4,8 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/argon2.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libargon2.a +-rw-r--r-- root/root usr/lib/libargon2.a lrwxrwxrwx root/root usr/lib/libargon2.so -> libargon2.so.1 --rwxr-xr-x root/root usr/lib/libargon2.so.1 +-rw-r--r-- root/root usr/lib/libargon2.so.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libargon2.pc diff --git a/argon2/.signature b/argon2/.signature index 390a1b70..be8bfcc3 100644 --- a/argon2/.signature +++ b/argon2/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+r/ZtBL6Rl8hb4BofGExhllSK4uo6BW+ZXDnrARl/8EZuRpVItcGivXxYbaVXw8l3aRZ1NuYhXdUQcfX0khrwQ= -SHA256 (Pkgfile) = 875b9639097d0b3656817fcf5b264a5d68b71a0b34e40714a12bad0d5aca5a0f -SHA256 (.footprint) = ecfd3f39e069d04ac53985d4c8389fa2e3a9081c44f914083cbd39682a45d722 -SHA256 (phc-winner-argon2-20171227.tar.gz) = eaea0172c1f4ee4550d1b6c9ce01aab8d1ab66b4207776aa67991eb5872fdcd8 -SHA256 (libargon2.pc) = 4189ce6c183319ceaf2c4ec96facd424deeaa9e2819efb7511893bcf3ef5c836 +RWSagIOpLGJF33kzJlf3sVpJNOiLn6Yq3ztqSEQMkHIwfAddxEU9dFUQbcGZm1JQTOu4mjp0aDmWzEbp2TGBqGfUdtxbNomL+Qw= +SHA256 (Pkgfile) = 7b1e2bd18f8429220a2c39619e84519a49ebfc99dc3f1432313fac2ace61ad94 +SHA256 (.footprint) = fa0e9945f509a47a211faa09e583f59ff1704a95950522357e9428791d75b100 +SHA256 (phc-winner-argon2-20190702.tar.gz) = daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c diff --git a/argon2/Pkgfile b/argon2/Pkgfile index 03368f08..388f0e59 100644 --- a/argon2/Pkgfile +++ b/argon2/Pkgfile @@ -4,13 +4,15 @@ # Depends on: name=argon2 -version=20171227 +version=20190702 release=1 -source=(https://github.com/P-H-C/phc-winner-argon2/archive/20171227/phc-winner-argon... libargon2.pc) +source=(https://github.com/P-H-C/phc-winner-argon2/archive/$version/phc-winner-argon...) build() { - cd phc-winner-$name-$version - make - make DESTDIR=$PKG install - install -D -m0644 libargon2.pc $PKG/usr/lib/pkgconfig/libargon2.pc + cd phc-winner-$name-$version + # install to /usr/lib directly instead of /usr/lib/x86_64-linux-gnu + sed -e 's/LIBRARY_REL ?= lib\/x86_64-linux-gnu/LIBRARY_REL ?= lib/g' -i Makefile + make + make DESTDIR=$PKG install + sed -e 's/NULL/$version/g' -i $PKG/usr/lib/pkgconfig/libargon2.pc } diff --git a/argon2/libargon2.pc b/argon2/libargon2.pc deleted file mode 100644 index c41e1c0c..00000000 --- a/argon2/libargon2.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: libargon2 -Description: Development libraries for libargon2 -Version: @UPSTREAM_VER@ -Libs: -L${libdir} -largon2 -lrt -ldl -Cflags: -URL: https://github.com/P-H-C/phc-winner-argon2