From 118c2b5ca1a5b524471d7a9dd89fdce394d1e5a6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 10 Oct 2022 23:02:51 +0200 Subject: [PATCH] kea: update to 2.2.0. Update to latest stable release; fixes GCC 12 build. Disable SQL tests. --- common/shlibs | 41 ++++++++++++++-------------- srcpkgs/kea/patches/sphinx-4.0.patch | 13 --------- srcpkgs/kea/patches/sphinx-5.0.patch | 11 -------- srcpkgs/kea/patches/std.patch | 12 -------- srcpkgs/kea/template | 15 +++++----- 5 files changed, 29 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/kea/patches/sphinx-4.0.patch delete mode 100644 srcpkgs/kea/patches/sphinx-5.0.patch delete mode 100644 srcpkgs/kea/patches/std.patch diff --git a/common/shlibs b/common/shlibs index 9f95ac87a7ea..b1ae1988a5d8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2903,26 +2903,27 @@ libkj-http-0.10.2.so capnproto-0.10.2_1 libkj-async-0.10.2.so capnproto-0.10.2_1 libkj-test-0.10.2.so capnproto-0.10.2_1 libkj-0.10.2.so capnproto-0.10.2_1 -libkea-asiodns.so.12 libkea-1.9.5_2 -libkea-asiolink.so.23 libkea-1.9.5_2 -libkea-cc.so.22 libkea-1.9.5_2 -libkea-cfgclient.so.22 libkea-1.9.5_2 -libkea-cryptolink.so.16 libkea-1.9.5_2 -libkea-database.so.21 libkea-1.9.5_2 -libkea-dhcp++.so.33 libkea-1.9.5_2 -libkea-dhcp_ddns.so.15 libkea-1.9.5_2 -libkea-dhcpsrv.so.43 libkea-1.9.5_2 -libkea-dns++.so.16 libkea-1.9.5_2 -libkea-eval.so.25 libkea-1.9.5_2 -libkea-exceptions.so.0 libkea-1.9.5_2 -libkea-hooks.so.31 libkea-1.9.5_2 -libkea-http.so.23 libkea-1.9.5_2 -libkea-log.so.18 libkea-1.9.5_2 -libkea-pgsql.so.18 libkea-1.9.5_2 -libkea-process.so.26 libkea-1.9.5_2 -libkea-stats.so.18 libkea-1.9.5_2 -libkea-util-io.so.0 libkea-1.9.5_2 -libkea-util.so.32 libkea-1.9.5_2 +libkea-asiodns.so.24 libkea-2.2.0_1 +libkea-asiolink.so.40 libkea-2.2.0_1 +libkea-cc.so.39 libkea-2.2.0_1 +libkea-cfgclient.so.36 libkea-2.2.0_1 +libkea-cryptolink.so.28 libkea-2.2.0_1 +libkea-d2srv.so.16 libkea-2.2.0_1 +libkea-database.so.35 libkea-2.2.0_1 +libkea-dhcp++.so.54 libkea-2.2.0_1 +libkea-dhcp_ddns.so.29 libkea-2.2.0_1 +libkea-dhcpsrv.so.69 libkea-2.2.0_1 +libkea-dns++.so.30 libkea-2.2.0_1 +libkea-eval.so.39 libkea-2.2.0_1 +libkea-exceptions.so.13 libkea-2.2.0_1 +libkea-hooks.so.57 libkea-2.2.0_1 +libkea-http.so.42 libkea-2.2.0_1 +libkea-log.so.35 libkea-2.2.0_1 +libkea-pgsql.so.36 libkea-2.2.0_1 +libkea-process.so.40 libkea-2.2.0_1 +libkea-stats.so.18 libkea-2.2.0_1 +libkea-util-io.so.0 libkea-2.2.0_1 +libkea-util.so.52 libkea-2.2.0_1 libytnef.so.0 ytnef-1.8_1 libpisock.so.9 pilot-link-0.12.5_1 libpisync.so.1 pilot-link-0.12.5_1 diff --git a/srcpkgs/kea/patches/sphinx-4.0.patch b/srcpkgs/kea/patches/sphinx-4.0.patch deleted file mode 100644 index ffe68522a57a..000000000000 --- a/srcpkgs/kea/patches/sphinx-4.0.patch +++ /dev/null @@ -1,13 +0,0 @@ - add_stylesheet was renamed to add_css_file from Sphinx 1.8 -Index: kea-1.9.5/doc/sphinx/conf.py -=================================================================== ---- kea-1.9.5.orig/doc/sphinx/conf.py -+++ kea-1.9.5/doc/sphinx/conf.py -@@ -228,6 +228,6 @@ def run_generate_docs(_): - - # custom setup hook - def setup(app): -- app.add_stylesheet('kea.css') -+ app.add_css_file('kea.css') - - app.connect('builder-inited', run_generate_docs) diff --git a/srcpkgs/kea/patches/sphinx-5.0.patch b/srcpkgs/kea/patches/sphinx-5.0.patch deleted file mode 100644 index d973fbfbe2a0..000000000000 --- a/srcpkgs/kea/patches/sphinx-5.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/doc/sphinx/conf.py -+++ b/doc/sphinx/conf.py -@@ -67,7 +67,7 @@ messages_doc = 'kea-messages' - # - # This is also used if you do content translation via gettext catalogs. - # Usually you set "language" from the command line for these cases. --language = None -+language = 'en' - - # List of patterns, relative to source directory, that match files and - # directories to ignore when looking for source files. diff --git a/srcpkgs/kea/patches/std.patch b/srcpkgs/kea/patches/std.patch deleted file mode 100644 index a8ccafef6bb9..000000000000 --- a/srcpkgs/kea/patches/std.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/lib/dhcpsrv/timer_mgr.cc -+++ b/src/lib/dhcpsrv/timer_mgr.cc -@@ -14,7 +14,9 @@ - - #include - -+#include - #include -+#include - #include - - using namespace isc; diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index a55b58691de9..10ae9bb0efd4 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,7 +1,7 @@ # Template file for 'kea' pkgname=kea -version=1.9.5 -revision=3 +version=2.2.0 +revision=1 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr $(vopt_if mysql --with-mysql) @@ -13,14 +13,14 @@ makedepends="boost-devel log4cplus-devel python3-devel $(vopt_if mysql libmariadbclient-devel) $(vopt_if pgsql postgresql-libs-devel)" depends="libkea>=0" -checkdepends="procps-ng" #needs pgrep +checkdepends="procps-ng" # needs pgrep conf_files="/etc/kea/*.conf" short_desc="Next generation DHCPv4/v6 server" maintainer="Orphaned " license="MPL-2.0, Apache-2.0" homepage="https://kea.isc.org" distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz" -checksum=324a06f488645bee587e49a45d491b525f53417c56b219f1cb37461fdefd9d91 +checksum=da7d90ca62a772602dac6e77e507319038422895ad68eeb142f1487d67d531d2 build_options="botan mysql pgsql" desc_option_botan="With Botan SSL support" @@ -28,11 +28,12 @@ desc_option_mysql="With MySQL lease information database" desc_option_pgsql="With PostgreSQL lease information database" build_options_default="pgsql" -# Reduce log spamming for deprecated auto_ptr -CXXFLAGS="-Wno-deprecated-declarations -O2" - make_dirs="/var/kea 755 root root" +post_extract() { + vsed -i -e '/SHTESTS.*sql_tests/d' src/bin/admin/tests/Makefile.am +} + pre_configure() { autoreconf -fi }