gentoo auto-resync : 02:11:2024 - 03:04:23

6 files changed, 125 insertions, 52 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index cde5ca7c3c91..a2c035d87c4b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/onak/Manifest b/app-crypt/onak/Manifest
index 872c38259a8b..a48a4eba6e84 100644
--- a/app-crypt/onak/Manifest
+++ b/app-crypt/onak/Manifest
@@ -1,5 +1,7 @@
 AUX onak-0.5.0-musl-strtouq-fix.patch 353 BLAKE2B b5930a61c157073072e8dac9bf38c195cbfa4a0da8d7c424d8cf6e7845b63003b87be65cb0ed509f40dcb275034b05f0581507c2d0f2569ebe6fb67dd4c2913b SHA512 8b9dd23c05f14453d1d3cd5349fe1af7c0fd4713c882835600b2825854c02c2944e9a3f932888e7c26e439d98c5aac57527198db3e634908d9d31e1c3f6fb3ec
+AUX onak-0.6.3-cmake.patch 1849 BLAKE2B b4c05a73554c7c831ba55adb32b8e5f5c97932b042b6afdc0b884aef952f7ff84e288c31c17e5b1cd5782d4be22f67fe4e2f4a5a15a8af926bde7fbfd5e12756 SHA512 e97e58eca3411a7b06d28d4e6ce726921f28eb7a4091d70b97435519416c126fdf502fe21abee6dd32ff9a3e81b1ee675059073d41241366e53d2f57a988c67e
 DIST onak-0.5.0.tar.xz 240764 BLAKE2B a42d9a97137ae7fb403d8a20f2a9a5b5060d216fca97447630c8e8659440d5baa0c6e0fbe983feec8b4061263decc1183868055fe53c0797d49dd1f2e4c141f8 SHA512 db38793acc82089089ac0b9fb6db9989b6bb8e94c35c14112d028d12f7bb7553b7409121378346625528c4916506d007bf40963f4a346483f51a23b670680a7d
+DIST onak-0.6.3.tar.xz 717040 BLAKE2B bae6c5b6022b42f59d6cf978d5e79df7b8bb71692bc11cfd162563f8afacb07c81505e070a7f6154b409db78449cd3b2182a1232e6ff3dacb4588cd977482f44 SHA512 3952b2ca8dfc32236dc6fc92a35d0d8223ae03be343fef4fcda49875d9d2b6ceb042c1c2cd63c035c467ee2773a103a36c7407c201f23de176e2121559ea1bff
 EBUILD onak-0.5.0-r1.ebuild 1072 BLAKE2B 9b46f3f2266676601f8be4ed9484912f89fa6abf77088761d02d7237977fe70f6ef4254524ba204a72bef9acc513dbcc843f1cf1debcc925849bf7b27ea7db18 SHA512 3816329df3635c81f7aa03ddb655dee7f552f03085936c88a228ed92510af2f5c0aa11cd78217dc5279a0145d094d760e61c0330e1282b9e5dd17ab19f943f76
-EBUILD onak-0.5.0.ebuild 1012 BLAKE2B 3dacd0c3dd3afc4b74018f8056f5acc74bd8cbacbdb9c82f553264f12894d2815b953828284adf878b2a31d0d6c8cf15f3189767de5505fcf11ccbc982a93ed7 SHA512 b10740cf0ca4c1790acf7d7584c9e64e7865ef4159a2d56a034da96f0adc48c246efe50bdb986c32d317471a1f680e5f77b12c3bb0e3b301ac14fa4d1b92f423
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD onak-0.6.3.ebuild 1513 BLAKE2B f8a0441ba6311fc1e69bcd15c912b9a699a4c4ee01175118a88bbd1273c55c17c7a94052b4dd264f1eb30e5a0891920923bb84e4043beea3fe28f0a8c1afaca4 SHA512 bd430b1fa6fd4185757aac77bec8f81e5caead1ac182c4ceeeb1cab52eaeee1d3d13189c7ccaf0309217d94275dd67264bc862f4d99640240b3c15462dc36113
+MISC metadata.xml 380 BLAKE2B a9dc78b8406eee4e7a6b1ce374a80251c5934f7b9a35775cdcd3ca2caafc6343d4c987f216297b51ca12275772a181b9518890b3a21fa82120fd6fed21209c73 SHA512 a8d98d4dffe5ef8e4074a948ae7a7d52fc7e77e8712446c90481ad54f481dfd4e2689857bf324bf95e859b55e6c25f1197dd8db6b1f874b27606809e7cdbd53a
diff --git a/app-crypt/onak/files/onak-0.6.3-cmake.patch b/app-crypt/onak/files/onak-0.6.3-cmake.patch
new file mode 100644
index 000000000000..f1b62577c87d
--- /dev/null
+++ b/app-crypt/onak/files/onak-0.6.3-cmake.patch
@@ -0,0 +1,51 @@
+From 226cb71737b24ab602e26b72b183888cd1385e86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
+Date: Fri, 1 Nov 2024 15:02:07 +0100
+Subject: [PATCH 1/2] Workaround automagic properties of CMakeList.txt
+
+The GENTOO_BACKENDS variable is controlled from the ebuild, therefore it
+can be synchronised with users USE preference, unlike the BACKENDS which
+is filled automagically based on detected libraries.
+
+Additionally, BACKEND_${DBTYPE}_LIBS variable needs to be propagated to
+the parent scope, otherwise non-dynamic db backend cannot link properly.
+---
+ CMakeLists.txt       | 2 +-
+ keydb/CMakeLists.txt | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed47ba3..d46dcdf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,7 +123,7 @@ add_subdirectory(keydb)
+ if (DBTYPE STREQUAL "dynamic")
+ 	LIST(APPEND LIBONAK_LIBRARIES "dl")
+ else()
+-	list (FIND BACKENDS ${DBTYPE} _index)
++	list (FIND GENTOO_BACKENDS ${DBTYPE} _index)
+ 	if (${_index} LESS 0)
+ 		message(FATAL_ERROR "${DBTYPE} is not a supported DB backend.")
+ 	endif()
+diff --git a/keydb/CMakeLists.txt b/keydb/CMakeLists.txt
+index 7567b6c..724f208 100644
+--- a/keydb/CMakeLists.txt
++++ b/keydb/CMakeLists.txt
+@@ -50,7 +50,7 @@ if (KEYD STREQUAL "ON")
+ endif()
+ 
+ if (DBTYPE STREQUAL "dynamic")
+-	foreach(BACKEND IN LISTS BACKENDS)
++	foreach(BACKEND IN LISTS GENTOO_BACKENDS)
+ 		add_library(keydb_${BACKEND} SHARED keydb_${BACKEND}.c)
+ 		target_include_directories(keydb_${BACKEND} SYSTEM PUBLIC
+ 			${BACKEND_${BACKEND}_INC})
+@@ -59,4 +59,6 @@ if (DBTYPE STREQUAL "dynamic")
+ 		install(TARGETS keydb_${BACKEND} LIBRARY DESTINATION
+ 			${CMAKE_INSTALL_LIBDIR}/onak/backends/)
+ 	endforeach(BACKEND)
++else()
++	set(BACKEND_${DBTYPE}_LIBS ${BACKEND_${DBTYPE}_LIBS} PARENT_SCOPE)
+ endif()
+-- 
+2.45.2
diff --git a/app-crypt/onak/metadata.xml b/app-crypt/onak/metadata.xml
index 115e9d64a669..68c2a2f0f43b 100644
--- a/app-crypt/onak/metadata.xml
+++ b/app-crypt/onak/metadata.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<use>
+		<flag name="dynamic">Support for dynamic loading of backends</flag>
+		<flag name="hkp">Proxying backend support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">u1f35c/onak</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/onak/onak-0.5.0.ebuild b/app-crypt/onak/onak-0.5.0.ebuild
deleted file mode 100644
index 258e3d778a1e..000000000000
--- a/app-crypt/onak/onak-0.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="onak is an OpenPGP keyserver"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb postgres"
-
-DEPEND="berkdb? ( >=sys-libs/db-4 )
-	postgres? ( dev-db/postgresql[server] )"
-
-DOCS=(
-	apache2 README LICENSE onak.sql
-)
-
-# it tries to use all backends?
-RESTRICT="test"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local backend="fs"
-	use berkdb && backend="db4"
-	use postgres && backend="pg"
-	if use berkdb && use postgres; then
-		ewarn "berkdb and postgres requested, postgres was preferred"
-	fi
-	econf --localstatedir=/var --enable-backend="${backend}"
-}
-
-src_install() {
-	default
-	insinto /etc
-	doins onak.ini
-	keepdir /var/lib/onak
-	dodir /usr/lib/cgi-bin/pks
-	insinto /usr/lib/cgi-bin/pks
-	doins add gpgwww lookup
-}
diff --git a/app-crypt/onak/onak-0.6.3.ebuild b/app-crypt/onak/onak-0.6.3.ebuild
new file mode 100644
index 000000000000..d1f63a70acd1
--- /dev/null
+++ b/app-crypt/onak/onak-0.6.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="onak is an OpenPGP keyserver"
+HOMEPAGE="
+	https://www.earth.li/projectpurple/progs/onak.html
+	https://github.com/u1f35c/onak
+"
+SRC_URI="https://www.earth.li/projectpurple/files/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb +dynamic hkp postgres test"
+REQUIRED_USE="test? ( dynamic )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:=
+	dev-libs/gmp:=
+	berkdb? ( sys-libs/db:= )
+	hkp? ( net-misc/curl )
+	postgres? ( dev-db/postgresql:= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	README.md onak.sql
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.0-musl-strtouq-fix.patch"
+	"${FILESDIR}/${P}-cmake.patch"
+)
+
+src_configure() {
+	# variable is initialized with default values based on list from
+	# keydb/CMakeLists.txt. The fs backend is the last one in the list for
+	# USE=-dynamic backend options, see DBTYPE option, which mimics bahavior of
+	# older ebuild version.
+	local backends=( file keyring stacked keyd fs )
+	use berkdb && backends+=( db4 )
+	use hkp && backends+=( hkp )
+	use postgres && backends+=( pg )
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DGENTOO_BACKENDS=$(IFS=';'; echo "${backends[*]}")
+		-DDBTYPE=$(usex dynamic dynamic "${backends[-1]}")
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	keepdir /var/lib/onak
+	insinto /usr/lib/cgi-bin/pks
+	doins "${BUILD_DIR}"/cgi/{add,gpgwww,hashquery,lookup}
+}