testing/kea: upgrade to 1.7.2

2 files changed, 18 insertions, 279 deletions

diff --git a/testing/kea/APKBUILD b/testing/kea/APKBUILD
index 7b878046b5..2725c92a1c 100644
--- a/testing/kea/APKBUILD
+++ b/testing/kea/APKBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Steve Holweg <skytep@gmail.com>
 # Contributor: Baptiste Jonglez <baptiste--aur@jonglez.org>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=kea
-pkgver=1.5.0
-pkgrel=3
-pkgdesc="High-performance, extensible DHCP server engine from ISC, supporting both DHCPv4 and DHCPv6"
+pkgver=1.7.2
+pkgrel=0
+pkgdesc="DHCPv4, DHCPv6 and DDNS server from ISC"
 url="http://kea.isc.org"
 arch="all !armhf !armv7"
 license="MPL2"
@@ -21,11 +22,21 @@ subpackages="
 	$pkgname-utils
 	"
 source="https://ftp.isc.org/isc/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-	fix-scripts-include-path.patch
 	kea.initd.in
 	"
 validpgpkeys="BE0E9748B718253A28BB89FFF1B11BF05CF02E57" # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign@isc.org>
 
+prepare() {
+	default_prepare
+
+	# Remove the builddir path from the scripts to satisfy abuild checks.
+	# NOTE: There's a new script each release, so using patch file would be
+	# very inconvenient.
+	find src/share/database/scripts/ \
+		-name '*.sh.in' \
+		-exec sed -i 's|^\s*. @abs_top_builddir@/src/bin/admin/admin-utils.sh.*|echo "admin-utils.sh not found!"; exit 1|' {} \;
+}
+
 build() {
 	# Complete build for dev and doc
 
@@ -61,6 +72,8 @@ admin() {
 }
 
 ctrlagent() {
+	pkgdesc="$pkgdesc (Control Agent with RESTful API)"
+
 	amove usr/sbin/kea-ctrl-agent
 	amove ./etc/kea/kea-ctrl-agent.conf
 
@@ -104,9 +117,7 @@ keactrl() {
 utils() {
 	pkgdesc="$pkgdesc (Optional Utils)"
 
-	amove ./usr/sbin/perfdhcp
 	amove ./usr/sbin/kea-lfc
-	amove ./usr/bin/kea-msg-compiler
 }
 
 _install_initd() {
@@ -116,6 +127,5 @@ _install_initd() {
 	sed -i "s|@@NAME@@|$name|g" "$subpkgdir"/etc/init.d/$name
 }
 
-sha512sums="6d6b7407831311ebe37abce382ce77c664015ddbe3e73ec78153a00b301f98af5be52e26ad4febf5ca1e478d2c1844db4c988b241d2700d758e90b077f176ad8  kea-1.5.0.tar.gz
-293d523b59de8531ae0ecc1be863d9c47b940eb32017f769b212150250c86672bc0473b096eaa07ad6b682259b754a2f387a6ff2abec14a2fb8968f34585b0d5  fix-scripts-include-path.patch
+sha512sums="f84bed2e1dacd172c7aed8e4d6c11ec5e79f37ad2c7991963fc9c4a1761668f9f0e105ba5c4deed06264ab2ec13b1b5787350d823de12fd3782223192e3653f2  kea-1.7.2.tar.gz
 94378a20f92ce03863dfc7be207faa06ab2bd207224e7beb00b89a0e81209a7bf0de102699a2bece78a415750c6efd3589aa045160ad561752ee8a390ab379f9  kea.initd.in"
diff --git a/testing/kea/fix-scripts-include-path.patch b/testing/kea/fix-scripts-include-path.patch
deleted file mode 100644
index b2ba1b9398..0000000000
--- a/testing/kea/fix-scripts-include-path.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -ru /src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in /src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
---- /src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:03:52.823615380 +0200
-+++ /src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:05:19.092517025 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`mysql_version "$@"`
- 
-diff -ru /src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in /src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
---- /src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:03:52.823615380 +0200
-+++ /src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:05:27.885738379 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`mysql_version "$@"`
- 
-diff -ru /src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in /src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
---- /src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in	2017-08-01 13:03:52.823615380 +0200
-+++ /src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in	2017-08-01 13:11:20.277913463 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`mysql_version "$@"`
- 
-diff -ru /src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in /src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
---- /src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in	2017-08-01 13:03:52.823615380 +0200
-+++ /src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in	2017-08-01 13:11:31.137774925 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`mysql_version "$@"`
- 
-diff -ru /src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in /src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
---- /src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in	2017-08-01 13:03:52.823615380 +0200
-+++ /src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in	2017-08-01 13:11:37.317696084 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`mysql_version "$@"`
- 
-diff -ru /src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in /src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
---- /src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in	2017-08-01 13:03:52.823615380 +0200
-+++ /src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in	2017-08-01 13:11:43.007623495 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`mysql_version "$@"`
-
-diff -ru /src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in /src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
---- /src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in	2017-08-01 13:03:52.823615380 +0200
-+++ /src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in	2017-08-01 13:11:43.007623495 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`mysql_version "$@"`
-
-diff -ru /src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in /src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
---- /src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in	2017-08-01 13:03:52.823615380 +0200
-+++ /src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in	2017-08-01 13:11:43.007623495 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`mysql_version "$@"`
- 
-diff -ru /src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in /src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
---- /src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:03:52.826948671 +0200
-+++ /src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:04:53.279512387 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`pgsql_version "$@"`
- 
-diff -ru /src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in /src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
---- /src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:03:52.826948671 +0200
-+++ /src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:11:52.627500763 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`pgsql_version "$@"`
- 
-diff -ru /src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in /src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
---- /src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in	2017-08-01 13:03:52.826948671 +0200
-+++ /src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in	2017-08-01 13:11:59.840742064 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`pgsql_version "$@"`
- 
-diff -ru /src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in /src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
---- /src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in	2017-08-01 13:03:52.826948671 +0200
-+++ /src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in	2017-08-01 13:11:52.627500763 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`pgsql_version "$@"`
- 
-diff -ru /src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in /src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
---- /src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in	2017-08-01 13:03:52.826948671 +0200
-+++ /src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in	2017-08-01 13:11:52.627500763 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`pgsql_version "$@"`
- 
-diff -ru /src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in /src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
---- /src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in	2017-08-01 13:03:52.826948671 +0200
-+++ /src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in	2017-08-01 13:11:52.627500763 +0200
-@@ -1,12 +1,7 @@
- #!/bin/sh
- 
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
- 
- VERSION=`pgsql_version "$@"`
-
-diff -ru /src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in /src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in
---- /src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:03:52.826948671 +0200
-+++ /src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:11:52.627500763 +0200
-@@ -1,13 +1,9 @@
- #!/bin/sh
-
- prefix=@prefix@
--# Include utilities. Use installed version if available and
--# use build version if it isn't.
--if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
--    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
--else
--    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
--fi
-+
-+# Include utilities.
-+. /usr/share/kea/scripts/admin-utils.sh
-
- version=$(cql_version "$@")