main/libkcapi: upgrade to 1.5.0

main/libkcapi/APKBUILD

@@ -1,9 +1,9 @@
 # Maintainer:
 pkgname=libkcapi
-pkgver=1.4.0
-pkgrel=4
+pkgver=1.5.0
+pkgrel=0
 pkgdesc="Linux Kernel Crypto API User Space Interface Library"
-url="https://www.chronox.de/libkcapi.html"
+url="https://www.chronox.de/libkcapi/index.html"
 arch="all"
 license="BSD-3-Clause OR GPL-2.0-only"
 makedepends="
@@ -14,10 +14,8 @@ makedepends="
 	"
 checkdepends="bash openssl"
 subpackages="$pkgname-dev $pkgname-tools $pkgname-doc"
-# upstream returns 404
-#source="https://www.chronox.de/libkcapi/libkcapi-$pkgver.tar.xz
-source="https://dev.alpinelinux.org/archive/libkcapi/libkcapi-$pkgver.tar.xz
-	no-werror.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/smuellerDD/libkcapi/archive/refs/tags/v$pkgver.tar.gz
+	busybox-ln.patch
 	"
 # requires AF_ALG support and enablement of ktls on running kernel
 options="!check"
@@ -40,7 +38,8 @@ build() {
 		--enable-kcapi-encapp \
 		--enable-kcapi-dgstapp \
 		--enable-kcapi-test \
-		--disable-static
+		--disable-static \
+		--disable-werror
 	make
 }
 
@@ -64,25 +63,16 @@ package() {
 
 	rm "$pkgdir"/usr/lib/.[!.]*
 	rm "$pkgdir"/usr/bin/.[!.]*
-	rm "$pkgdir"/usr/bin/fips*
-	rm -r "$pkgdir"/usr/libexec/
-
-	cd "$pkgdir"/usr/bin
-
-	# rename generic utils to not conflict with generic names. the options
-	# aren't guaranteed to be compatible
-	for tool in sha* md5* sm3*; do
-		mv $tool kcapi-$tool
-	done
 }
 
 tools() {
 	pkgdesc="$pkgdesc (commandline utilities)"
 
 	amove usr/bin
+	amove usr/libexec
 }
 
 sha512sums="
-fa3df1fe22eba32585de5df044f907d3ad189c33f5704fe29b0fdeda92e772ef077055b80e17bc1646a8cdedaf4f195aadf0b133f493597f0f7657b04ea93a99  libkcapi-1.4.0.tar.xz
-a5b38f49a7bb07eb57523566e065bad702999d8be21fa6cd8a01af1b60e9bd8fbb6fd9cf71f70dca7d616aa381475273d995841b8580f91418fb0094263e6402  no-werror.patch
+510d0606cdc9479a77ed07bd3ac59b07c3996402a85cee012e6836d0a31cb06f5b7f715cdb76f3745784aab3154595caec4537b4c774236a139ebfe6e1a8be9b  libkcapi-1.5.0.tar.gz
+b8a7daa4cf076f5e6ae72eeb34139d04a80350e69935053b5e1ca22d57849f2b2488ab1161c17d396646d7c6775c1512301f5ce164a68ca0992f22f4e585a27b  busybox-ln.patch
 "

main/libkcapi/busybox-ln.patch

@@ -0,0 +1,12 @@
+Patch-source: https://github.com/smuellerDD/libkcapi/commit/805d2dd0bec9ddb9d714afd4e181cee88c13adb0
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -168,7 +168,7 @@ CHECK_DIR_BIN = $(if $(CHECK_DIR),$(CHECK_DIR)/hmaccalc,$(bindir))
+ 
+ install-exec-hook:
+ 	$(MKDIR_P) -p $(DESTDIR)/$(pkglibexecdir)
+-	$(foreach link, $(hasher_links), $(LN) -srf $(DESTDIR)/$(bindir)/kcapi-hasher $(DESTDIR)/$(pkglibexecdir)/$(link);)
++	$(foreach link, $(hasher_links), $(LN) -sf $(DESTDIR)/$(bindir)/kcapi-hasher $(DESTDIR)/$(pkglibexecdir)/$(link);)
+ if HAVE_OPENSSL
+ 	$(MKDIR_P) $(DESTDIR)$(CHECK_DIR_BIN)
+ 	cd $(DESTDIR)$(bindir) && $(CHECKSUM_CMD) kcapi-hasher > $(DESTDIR)$(CHECK_DIR_BIN)/$(CHECK_PREFIX)kcapi-hasher.$(CHECK_SUFFIX)

main/libkcapi/no-werror.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index fa7ba4d..5d9e45b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
- AUTOMAKE_OPTIONS = subdir-objects
- lib_LTLIBRARIES = libkcapi.la
- 
--COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -Werror -std=gnu99 -Wconversion
-+COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -std=gnu99 -Wconversion
- COMMON_LDFLAGS =  -Wl,-z,relro,-z,now
- 
- libtool: $(LIBTOOL_DEPS)