From e63a0a9ee639bef024655040f71df0e5469d8136 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 15 Feb 2022 15:52:48 +0100 Subject: [PATCH] libscrypt: update to 1.22. --- srcpkgs/libscrypt/patches/makefile.patch | 20 -------------------- srcpkgs/libscrypt/template | 8 ++++---- 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/libscrypt/patches/makefile.patch diff --git a/srcpkgs/libscrypt/patches/makefile.patch b/srcpkgs/libscrypt/patches/makefile.patch deleted file mode 100644 index 550f37e287..0000000000 --- a/srcpkgs/libscrypt/patches/makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -6,7 +6,7 @@ - - CC?=gcc - CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version -+MYLDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version - CFLAGS_EXTRA?=-Wl,-rpath=. - - all: reference -@@ -14,7 +14,7 @@ - OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o - - libscrypt.so.0: $(OBJS) -- $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc -+ $(CC) $(MYLDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc $(LDFLAGS) - ar rcs libscrypt.a $(OBJS) - - reference: libscrypt.so.0 main.o crypto_scrypt-hexconvert.o diff --git a/srcpkgs/libscrypt/template b/srcpkgs/libscrypt/template index f3777bab08..954415bae7 100644 --- a/srcpkgs/libscrypt/template +++ b/srcpkgs/libscrypt/template @@ -1,14 +1,14 @@ # Template file for 'libscrypt' pkgname=libscrypt -version=1.21 -revision=2 +version=1.22 +revision=1 build_style=gnu-makefile short_desc="Library that implements scrypt() functionality" maintainer="Leah Neukirchen " license="2-clause-BSD" -homepage="https://github.com/technion/" +homepage="https://github.com/technion/libscrypt" distfiles="https://github.com/technion/${pkgname}/archive/v${version}.tar.gz" -checksum=68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 +checksum=a2d30ea16e6d288772791de68be56153965fe4fd4bcd787777618b8048708936 post_install() { vlicense LICENSE