Date: Sunday, October 11, 2020 @ 18:28:28
Author: arojas
Revision: 723535
archrelease: copy trunk to community-testing-x86_64
Added:
kea/repos/community-testing-x86_64/PKGBUILD
(from rev 723534, kea/trunk/PKGBUILD)
kea/repos/community-testing-x86_64/fix-scripts-include-path.patch
(from rev 723534, kea/trunk/fix-scripts-include-path.patch)
kea/repos/community-testing-x86_64/kea-ctrl-agent.service
(from rev 723534, kea/trunk/kea-ctrl-agent.service)
kea/repos/community-testing-x86_64/kea-dhcp-ddns.service
(from rev 723534, kea/trunk/kea-dhcp-ddns.service)
kea/repos/community-testing-x86_64/kea-dhcp4.service
(from rev 723534, kea/trunk/kea-dhcp4.service)
kea/repos/community-testing-x86_64/kea-dhcp6.service
(from rev 723534, kea/trunk/kea-dhcp6.service)
kea/repos/community-testing-x86_64/kea.install
(from rev 723534, kea/trunk/kea.install)
kea/repos/community-testing-x86_64/tmpfiles-kea.conf
(from rev 723534, kea/trunk/tmpfiles-kea.conf)
Deleted:
kea/repos/community-testing-x86_64/PKGBUILD
kea/repos/community-testing-x86_64/fix-scripts-include-path.patch
kea/repos/community-testing-x86_64/kea-ctrl-agent.service
kea/repos/community-testing-x86_64/kea-dhcp-ddns.service
kea/repos/community-testing-x86_64/kea-dhcp4.service
kea/repos/community-testing-x86_64/kea-dhcp6.service
kea/repos/community-testing-x86_64/kea.install
kea/repos/community-testing-x86_64/tmpfiles-kea.conf
--------------------------------+
PKGBUILD | 194 +++----
fix-scripts-include-path.patch | 1068 +++++++++++++++++++--------------------
kea-ctrl-agent.service | 28 -
kea-dhcp-ddns.service | 26
kea-dhcp4.service | 28 -
kea-dhcp6.service | 28 -
kea.install | 34 -
tmpfiles-kea.conf | 4
8 files changed, 705 insertions(+), 705 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-11 18:28:06 UTC (rev 723534)
+++ PKGBUILD 2020-10-11 18:28:28 UTC (rev 723535)
@@ -1,97 +0,0 @@
-# Maintainer: Konstantin Gizdov <arch at kge dot pw>
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: nfnty
-pkgname='kea'
-pkgver=1.8.0
-_upstreamver=1.8.0
-pkgrel=1
-pkgdesc='High-performance, extensible DHCP server engine from ISC, supporting
both DHCPv4 and DHCPv6'
-arch=('x86_64')
-url='https://kea.isc.org'
-license=('MPL2')
-depends=('botan' 'boost-libs' 'log4cplus' 'mariadb-libs' 'openssl'
'postgresql-libs')
-makedepends=('boost'
- 'postgresql' # Needed for some headers
- 'python') # kea-shell
-optdepends=('mariadb: lease information database'
- 'postgresql: lease information database'
- 'python: to use kea-shell'
- 'kea-devel-docs: developer documentation')
-# Checks are disabled for now
-#checkdepends=('gtest' 'postgresql' 'mariadb' 'python' 'procps-ng') #
procps-ng needed for 'pgrep'
-backup=(
- # New config files as of Kea 1.3
- 'etc/kea/kea-dhcp4.conf'
- 'etc/kea/kea-dhcp6.conf'
- 'etc/kea/kea-dhcp-ddns.conf'
- 'etc/kea/kea-ctrl-agent.conf'
- 'etc/kea/kea-netconf.conf'
- 'etc/kea/keactrl.conf'
-)
-install=kea.install
-
-source=(https://ftp.isc.org/isc/kea/${_upstreamver}/kea-${_upstreamver}.tar.gz{,.asc}
- fix-scripts-include-path.patch
- tmpfiles-kea.conf
- kea-dhcp4.service
- kea-dhcp6.service
- kea-dhcp-ddns.service
- kea-ctrl-agent.service
- kea.install)
-sha512sums=('a8896ebdb6948851cddca015d696db4ec205af1472ccc25e7fd6d2f9070599cb7f80998f1dc94e763723723e8e0edd8a53274b96630d27db8c40995489d3a883'
- 'SKIP'
-
'aec7df9fccd55b82b7f63b8738c335d8ebb57f8b7a1f2838398191b2aa7a4278c8460a7f196506260e29a70e80f5184432f051fc64454bb91c785924c4b2497f'
-
'b83479f0b90caf4022b1c858f99d8310848a90b0cc45aaa222cb2bf08b2a97312816b8f64c8c0232b612795bc7a0bbe5b05dbc508b2f1214c1ea88dc84200a2d'
-
'1b62dace9f9a955b21c5dd5b5466fb3a4f1d8057ad2a30ea89e222a769dc721ad2fe4913c41ec407e018b1b38ddde757e9b7b8fc12d4763ddde077a0abb0c971'
-
'8f0e8d059338c415ae322e971e243b259d9b2ef7d37b6be57b409bf5f0f3392e519c9bb94c5b548021d000b944a5da82096608cd9ff3ee58061059ad519b0068'
-
'9ab05b580f3b206d127514e158a445146a765ba4bf760daa93bcf29ec9d816dbdd08a497b5a4bba67645f4cc79b210fed8d1defa9daefc48175a654738927d31'
-
'db329fd83e458e4a77f6df8569074088bed152ffc1a188059d868d7178a6d3530efe368ce870a2e0be894f87fa0e5ba43562bdc3ad6372ddfcfedae37c90f491'
-
'758371f20a977f8e42e9d43d2d065c6aa294866070e54868dc329c0875b2eeafa05dcdf93590d5b429e262e2350a42c7616a3bc2e6f3994f53886870f4910251')
-validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57' # Internet Systems
Consortium, Inc. (Signing key, 2017-2018) <codes...@isc.org>
- 'AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') # Internet Systems
Consortium, Inc. (Signing key, 2019-2020) <codes...@isc.org>
-prepare() {
- cd "${srcdir}/${pkgname}-${_upstreamver}"
- # The include path is set incorrectly (it uses undefined $prefix instead of
/usr).
- # Also, it fallbacks to the absolute path inside the chrooted build dir,
- # which will certainly not exist on the target system...
- patch -p1 < "${srcdir}"/fix-scripts-include-path.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${_upstreamver}"
- autoreconf --install
- ./configure \
- --prefix='/usr' \
- --sbindir='/usr/bin' \
- --libexecdir='/usr/bin' \
- --sysconfdir='/etc' \
- --localstatedir='/var' \
- --with-openssl \
- --with-dhcp-mysql \
- --with-dhcp-pgsql \
- --enable-perfdhcp \
- --enable-generate-messages \
- --enable-generate-parser \
- --enable-shell
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${_upstreamver}"
- # Disable for now, some tests fail (for instance dhcp-ddns.sigterm_test)
- #make check
-}
-
-package() {
- cd "${srcdir}/kea-${_upstreamver}"
- make DESTDIR="${pkgdir}" install
- # Handle /var/run -> /run symlink
- rmdir "${pkgdir}"/var/run/kea
- rmdir "${pkgdir}"/var/run
- install -Dm644 "${srcdir}"/tmpfiles-kea.conf
"${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
- # Systemd service files
- install -Dm644 "${srcdir}"/kea-dhcp4.service
"${pkgdir}"/usr/lib/systemd/system/kea-dhcp4.service
- install -Dm644 "${srcdir}"/kea-dhcp6.service
"${pkgdir}"/usr/lib/systemd/system/kea-dhcp6.service
- install -Dm644 "${srcdir}"/kea-dhcp-ddns.service
"${pkgdir}"/usr/lib/systemd/system/kea-dhcp-ddns.service
- install -Dm644 "${srcdir}"/kea-ctrl-agent.service
"${pkgdir}"/usr/lib/systemd/system/kea-ctrl-agent.service
-}
Copied: kea/repos/community-testing-x86_64/PKGBUILD (from rev 723534,
kea/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-11 18:28:28 UTC (rev 723535)
@@ -0,0 +1,97 @@
+# Maintainer: Konstantin Gizdov <arch at kge dot pw>
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: nfnty
+pkgname='kea'
+pkgver=1.8.0
+_upstreamver=1.8.0
+pkgrel=3
+pkgdesc='High-performance, extensible DHCP server engine from ISC, supporting
both DHCPv4 and DHCPv6'
+arch=('x86_64')
+url='https://kea.isc.org'
+license=('MPL2')
+depends=('botan' 'boost-libs' 'log4cplus' 'mariadb-libs' 'openssl'
'postgresql-libs')
+makedepends=('boost'
+ 'postgresql' # Needed for some headers
+ 'python') # kea-shell
+optdepends=('mariadb: lease information database'
+ 'postgresql: lease information database'
+ 'python: to use kea-shell'
+ 'kea-devel-docs: developer documentation')
+# Checks are disabled for now
+#checkdepends=('gtest' 'postgresql' 'mariadb' 'python' 'procps-ng') #
procps-ng needed for 'pgrep'
+backup=(
+ # New config files as of Kea 1.3
+ 'etc/kea/kea-dhcp4.conf'
+ 'etc/kea/kea-dhcp6.conf'
+ 'etc/kea/kea-dhcp-ddns.conf'
+ 'etc/kea/kea-ctrl-agent.conf'
+ 'etc/kea/kea-netconf.conf'
+ 'etc/kea/keactrl.conf'
+)
+install=kea.install
+
+source=(https://ftp.isc.org/isc/kea/${_upstreamver}/kea-${_upstreamver}.tar.gz{,.asc}
+ fix-scripts-include-path.patch
+ tmpfiles-kea.conf
+ kea-dhcp4.service
+ kea-dhcp6.service
+ kea-dhcp-ddns.service
+ kea-ctrl-agent.service
+ kea.install)
+sha512sums=('a8896ebdb6948851cddca015d696db4ec205af1472ccc25e7fd6d2f9070599cb7f80998f1dc94e763723723e8e0edd8a53274b96630d27db8c40995489d3a883'
+ 'SKIP'
+
'aec7df9fccd55b82b7f63b8738c335d8ebb57f8b7a1f2838398191b2aa7a4278c8460a7f196506260e29a70e80f5184432f051fc64454bb91c785924c4b2497f'
+
'b83479f0b90caf4022b1c858f99d8310848a90b0cc45aaa222cb2bf08b2a97312816b8f64c8c0232b612795bc7a0bbe5b05dbc508b2f1214c1ea88dc84200a2d'
+
'1b62dace9f9a955b21c5dd5b5466fb3a4f1d8057ad2a30ea89e222a769dc721ad2fe4913c41ec407e018b1b38ddde757e9b7b8fc12d4763ddde077a0abb0c971'
+
'8f0e8d059338c415ae322e971e243b259d9b2ef7d37b6be57b409bf5f0f3392e519c9bb94c5b548021d000b944a5da82096608cd9ff3ee58061059ad519b0068'
+
'9ab05b580f3b206d127514e158a445146a765ba4bf760daa93bcf29ec9d816dbdd08a497b5a4bba67645f4cc79b210fed8d1defa9daefc48175a654738927d31'
+
'db329fd83e458e4a77f6df8569074088bed152ffc1a188059d868d7178a6d3530efe368ce870a2e0be894f87fa0e5ba43562bdc3ad6372ddfcfedae37c90f491'
+
'758371f20a977f8e42e9d43d2d065c6aa294866070e54868dc329c0875b2eeafa05dcdf93590d5b429e262e2350a42c7616a3bc2e6f3994f53886870f4910251')
+validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57' # Internet Systems
Consortium, Inc. (Signing key, 2017-2018) <codes...@isc.org>
+ 'AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') # Internet Systems
Consortium, Inc. (Signing key, 2019-2020) <codes...@isc.org>
+prepare() {
+ cd "${srcdir}/${pkgname}-${_upstreamver}"
+ # The include path is set incorrectly (it uses undefined $prefix instead of
/usr).
+ # Also, it fallbacks to the absolute path inside the chrooted build dir,
+ # which will certainly not exist on the target system...
+ patch -p1 < "${srcdir}"/fix-scripts-include-path.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${_upstreamver}"
+ autoreconf --install
+ ./configure \
+ --prefix='/usr' \
+ --sbindir='/usr/bin' \
+ --libexecdir='/usr/bin' \
+ --sysconfdir='/etc' \
+ --localstatedir='/var' \
+ --with-openssl \
+ --with-dhcp-mysql \
+ --with-dhcp-pgsql \
+ --enable-perfdhcp \
+ --enable-generate-messages \
+ --enable-generate-parser \
+ --enable-shell
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${_upstreamver}"
+ # Disable for now, some tests fail (for instance dhcp-ddns.sigterm_test)
+ #make check
+}
+
+package() {
+ cd "${srcdir}/kea-${_upstreamver}"
+ make DESTDIR="${pkgdir}" install
+ # Handle /var/run -> /run symlink
+ rmdir "${pkgdir}"/var/run/kea
+ rmdir "${pkgdir}"/var/run
+ install -Dm644 "${srcdir}"/tmpfiles-kea.conf
"${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+ # Systemd service files
+ install -Dm644 "${srcdir}"/kea-dhcp4.service
"${pkgdir}"/usr/lib/systemd/system/kea-dhcp4.service
+ install -Dm644 "${srcdir}"/kea-dhcp6.service
"${pkgdir}"/usr/lib/systemd/system/kea-dhcp6.service
+ install -Dm644 "${srcdir}"/kea-dhcp-ddns.service
"${pkgdir}"/usr/lib/systemd/system/kea-dhcp-ddns.service
+ install -Dm644 "${srcdir}"/kea-ctrl-agent.service
"${pkgdir}"/usr/lib/systemd/system/kea-ctrl-agent.service
+}
Deleted: fix-scripts-include-path.patch
===================================================================
--- fix-scripts-include-path.patch 2020-10-11 18:28:06 UTC (rev 723534)
+++ fix-scripts-include-path.patch 2020-10-11 18:28:28 UTC (rev 723535)
@@ -1,534 +0,0 @@
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
2020-10-02 11:02:02.400414722 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
2020-10-02 11:02:31.870972519 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
2020-10-02 11:02:47.074593828 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
2020-10-02 11:02:53.631384734 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
2020-10-02 11:02:59.278158416 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
2020-10-02 11:03:06.771633795 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
2020-10-02 11:03:11.888397474 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
2020-10-02 11:03:17.211831753 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
2020-10-02 11:03:22.781937394 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
2020-10-02 11:03:27.845366775 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
2020-10-02 11:03:41.438958033 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
2020-10-02 11:03:50.945805145 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.2_to_9.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.2_to_9.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.2_to_9.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.2_to_9.0.sh.in
2020-10-02 11:04:02.296020643 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
2020-10-02 11:04:08.132798154 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
2020-10-02 11:04:13.879573974 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
2020-10-02 11:04:25.629797209 +0300
-@@ -1,13 +1,7 @@
- #!/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=`mysql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/wipe_data.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/wipe_data.sh.in
---- kea-1.8.0-old/src/share/database/scripts/mysql/wipe_data.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/mysql/wipe_data.sh.in
2020-10-02 11:05:55.311503213 +0300
-@@ -12,14 +12,8 @@
- # including leases, reservations, etc... Use at your own peril.
- # Reference tables will be left in-tact.
-
--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
-
- # First argument is must be the expected schema version <major>.<minor>
- exp_version="$1"
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
2020-10-02 11:04:39.893401621 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
2020-10-02 11:00:03.148163954 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
2020-10-02 11:04:45.243503326 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
2020-10-02 11:00:03.148163954 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
2020-10-02 11:04:50.880277161 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
2020-10-02 11:04:55.337028573 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
2020-10-02 11:05:00.917134693 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
2020-10-02 11:00:03.151497350 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
2020-10-02 11:05:09.357295228 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
2020-10-02 11:00:03.148163954 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
2020-10-02 11:05:14.294055811 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh.in
2020-10-02 11:00:03.148163954 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh.in
2020-10-02 11:05:19.260816976 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
2020-10-02 11:00:03.148163954 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
2020-10-02 11:05:23.947572823 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
2020-10-02 11:00:03.148163954 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
2020-10-02 11:05:29.001002326 +0300
-@@ -1,13 +1,7 @@
- #!/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=`pgsql_version "$@"`
-
-diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/wipe_data.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/wipe_data.sh.in
---- kea-1.8.0-old/src/share/database/scripts/pgsql/wipe_data.sh.in
2020-10-02 11:00:03.148163954 +0300
-+++ kea-1.8.0-new/src/share/database/scripts/pgsql/wipe_data.sh.in
2020-10-02 11:05:37.991173444 +0300
-@@ -12,14 +12,8 @@
- # including leases, reservations, etc... Use at your own peril.
- # Reference tables will be left in-tact.
-
--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
-
- # First argument is must be the expected schema version <major>.<minor>
- exp_version="$1"
Copied: kea/repos/community-testing-x86_64/fix-scripts-include-path.patch (from
rev 723534, kea/trunk/fix-scripts-include-path.patch)
===================================================================
--- fix-scripts-include-path.patch (rev 0)
+++ fix-scripts-include-path.patch 2020-10-11 18:28:28 UTC (rev 723535)
@@ -0,0 +1,534 @@
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
2020-10-02 11:02:02.400414722 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
2020-10-02 11:02:31.870972519 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
2020-10-02 11:02:47.074593828 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
2020-10-02 11:02:53.631384734 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
2020-10-02 11:02:59.278158416 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
2020-10-02 11:03:06.771633795 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
2020-10-02 11:03:11.888397474 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
2020-10-02 11:03:17.211831753 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
2020-10-02 11:03:22.781937394 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
2020-10-02 11:03:27.845366775 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh.in
2020-10-02 11:03:41.438958033 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
2020-10-02 11:03:50.945805145 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.2_to_9.0.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.2_to_9.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_8.2_to_9.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_8.2_to_9.0.sh.in
2020-10-02 11:04:02.296020643 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
2020-10-02 11:04:08.132798154 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
2020-10-02 11:04:13.879573974 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
2020-10-02 11:04:25.629797209 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`mysql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/mysql/wipe_data.sh.in
kea-1.8.0-new/src/share/database/scripts/mysql/wipe_data.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/mysql/wipe_data.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/mysql/wipe_data.sh.in
2020-10-02 11:05:55.311503213 +0300
+@@ -12,14 +12,8 @@
+ # including leases, reservations, etc... Use at your own peril.
+ # Reference tables will be left in-tact.
+
+-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
+
+ # First argument is must be the expected schema version <major>.<minor>
+ exp_version="$1"
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
2020-10-02 11:04:39.893401621 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
2020-10-02 11:00:03.148163954 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
2020-10-02 11:04:45.243503326 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
2020-10-02 11:00:03.148163954 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
2020-10-02 11:04:50.880277161 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in
2020-10-02 11:04:55.337028573 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in
2020-10-02 11:05:00.917134693 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
2020-10-02 11:00:03.151497350 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
2020-10-02 11:05:09.357295228 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
2020-10-02 11:00:03.148163954 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
2020-10-02 11:05:14.294055811 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh.in
2020-10-02 11:00:03.148163954 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh.in
2020-10-02 11:05:19.260816976 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
2020-10-02 11:00:03.148163954 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
2020-10-02 11:05:23.947572823 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
2020-10-02 11:00:03.148163954 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
2020-10-02 11:05:29.001002326 +0300
+@@ -1,13 +1,7 @@
+ #!/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=`pgsql_version "$@"`
+
+diff -aur --color
kea-1.8.0-old/src/share/database/scripts/pgsql/wipe_data.sh.in
kea-1.8.0-new/src/share/database/scripts/pgsql/wipe_data.sh.in
+--- kea-1.8.0-old/src/share/database/scripts/pgsql/wipe_data.sh.in
2020-10-02 11:00:03.148163954 +0300
++++ kea-1.8.0-new/src/share/database/scripts/pgsql/wipe_data.sh.in
2020-10-02 11:05:37.991173444 +0300
+@@ -12,14 +12,8 @@
+ # including leases, reservations, etc... Use at your own peril.
+ # Reference tables will be left in-tact.
+
+-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
+
+ # First argument is must be the expected schema version <major>.<minor>
+ exp_version="$1"
Deleted: kea-ctrl-agent.service
===================================================================
--- kea-ctrl-agent.service 2020-10-11 18:28:06 UTC (rev 723534)
+++ kea-ctrl-agent.service 2020-10-11 18:28:28 UTC (rev 723535)
@@ -1,14 +0,0 @@
-[Unit]
-Description=ISC Kea control agent daemon
-Documentation=man:kea-ctrl-agent(8)
-Wants=network-online.target
-After=network-online.target
-After=time-sync.target
-
-[Service]
-Environment="KEA_PIDFILE_DIR=/run"
-Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
-ExecStart=/usr/bin/kea-ctrl-agent -c /etc/kea/kea-ctrl-agent.conf
-
-[Install]
-WantedBy=multi-user.target
Copied: kea/repos/community-testing-x86_64/kea-ctrl-agent.service (from rev
723534, kea/trunk/kea-ctrl-agent.service)
===================================================================
--- kea-ctrl-agent.service (rev 0)
+++ kea-ctrl-agent.service 2020-10-11 18:28:28 UTC (rev 723535)
@@ -0,0 +1,14 @@
+[Unit]
+Description=ISC Kea control agent daemon
+Documentation=man:kea-ctrl-agent(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+Environment="KEA_PIDFILE_DIR=/run"
+Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
+ExecStart=/usr/bin/kea-ctrl-agent -c /etc/kea/kea-ctrl-agent.conf
+
+[Install]
+WantedBy=multi-user.target
Deleted: kea-dhcp-ddns.service
===================================================================
--- kea-dhcp-ddns.service 2020-10-11 18:28:06 UTC (rev 723534)
+++ kea-dhcp-ddns.service 2020-10-11 18:28:28 UTC (rev 723535)
@@ -1,13 +0,0 @@
-[Unit]
-Description=ISC Kea dynamic DNS daemon
-Documentation=man:kea-dhcp-ddns(8)
-Wants=network-online.target
-After=network-online.target
-After=time-sync.target
-
-[Service]
-Environment="KEA_PIDFILE_DIR=/run"
-ExecStart=/usr/bin/kea-dhcp-ddns -c /etc/kea/kea-dhcp-ddns.conf
-
-[Install]
-WantedBy=multi-user.target
Copied: kea/repos/community-testing-x86_64/kea-dhcp-ddns.service (from rev
723534, kea/trunk/kea-dhcp-ddns.service)
===================================================================
--- kea-dhcp-ddns.service (rev 0)
+++ kea-dhcp-ddns.service 2020-10-11 18:28:28 UTC (rev 723535)
@@ -0,0 +1,13 @@
+[Unit]
+Description=ISC Kea dynamic DNS daemon
+Documentation=man:kea-dhcp-ddns(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+Environment="KEA_PIDFILE_DIR=/run"
+ExecStart=/usr/bin/kea-dhcp-ddns -c /etc/kea/kea-dhcp-ddns.conf
+
+[Install]
+WantedBy=multi-user.target
Deleted: kea-dhcp4.service
===================================================================
--- kea-dhcp4.service 2020-10-11 18:28:06 UTC (rev 723534)
+++ kea-dhcp4.service 2020-10-11 18:28:28 UTC (rev 723535)
@@ -1,14 +0,0 @@
-[Unit]
-Description=ISC Kea IPv4 DHCP daemon
-Documentation=man:kea-dhcp4(8)
-Wants=network-online.target
-After=network-online.target
-After=time-sync.target
-
-[Service]
-Environment="KEA_PIDFILE_DIR=/run"
-Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
-ExecStart=/usr/bin/kea-dhcp4 -c /etc/kea/kea-dhcp4.conf
-
-[Install]
-WantedBy=multi-user.target
Copied: kea/repos/community-testing-x86_64/kea-dhcp4.service (from rev 723534,
kea/trunk/kea-dhcp4.service)
===================================================================
--- kea-dhcp4.service (rev 0)
+++ kea-dhcp4.service 2020-10-11 18:28:28 UTC (rev 723535)
@@ -0,0 +1,14 @@
+[Unit]
+Description=ISC Kea IPv4 DHCP daemon
+Documentation=man:kea-dhcp4(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+Environment="KEA_PIDFILE_DIR=/run"
+Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
+ExecStart=/usr/bin/kea-dhcp4 -c /etc/kea/kea-dhcp4.conf
+
+[Install]
+WantedBy=multi-user.target
Deleted: kea-dhcp6.service
===================================================================
--- kea-dhcp6.service 2020-10-11 18:28:06 UTC (rev 723534)
+++ kea-dhcp6.service 2020-10-11 18:28:28 UTC (rev 723535)
@@ -1,14 +0,0 @@
-[Unit]
-Description=ISC Kea IPv6 DHCP daemon
-Documentation=man:kea-dhcp6(8)
-Wants=network-online.target
-After=network-online.target
-After=time-sync.target
-
-[Service]
-Environment="KEA_PIDFILE_DIR=/run"
-Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
-ExecStart=/usr/bin/kea-dhcp6 -c /etc/kea/kea-dhcp6.conf
-
-[Install]
-WantedBy=multi-user.target
Copied: kea/repos/community-testing-x86_64/kea-dhcp6.service (from rev 723534,
kea/trunk/kea-dhcp6.service)
===================================================================
--- kea-dhcp6.service (rev 0)
+++ kea-dhcp6.service 2020-10-11 18:28:28 UTC (rev 723535)
@@ -0,0 +1,14 @@
+[Unit]
+Description=ISC Kea IPv6 DHCP daemon
+Documentation=man:kea-dhcp6(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+Environment="KEA_PIDFILE_DIR=/run"
+Environment="KEA_LOCKFILE_DIR=/run/lock/kea"
+ExecStart=/usr/bin/kea-dhcp6 -c /etc/kea/kea-dhcp6.conf
+
+[Install]
+WantedBy=multi-user.target
Deleted: kea.install
===================================================================
--- kea.install 2020-10-11 18:28:06 UTC (rev 723534)
+++ kea.install 2020-10-11 18:28:28 UTC (rev 723535)
@@ -1,17 +0,0 @@
-post_install () {
- echo '## WARNING!##'
- echo 'Upgrading from Kea version <1.6 to version >= 1.6 requires special
attention'
- echo 'Please refer to the following web page for details:'
- echo '[Upgrading to Kea
1.6](https://kb.isc.org/docs/en/upgrading-to-kea-16)'
- echo 'Notable changes include:'
- echo ' - Files in /var/kea have moved to (/var)/run/kea'
- echo ' - State Info: now in /usr/lib/kea'
- echo ' - Hooks: /usr/lib/hooks has moved to /usr/lib/kea/hooks'
- echo ' - Admin commands lease-{init,version,upgrade} have been renamed'
- echo ' to db-{init,version,upgrade}'
- echo ' - Logger configuration changed scope thus a manual configuration'
- echo ' file intervention is needed)'
-}
-post_upgrade () {
- post_install $*
-}
Copied: kea/repos/community-testing-x86_64/kea.install (from rev 723534,
kea/trunk/kea.install)
===================================================================
--- kea.install (rev 0)
+++ kea.install 2020-10-11 18:28:28 UTC (rev 723535)
@@ -0,0 +1,17 @@
+post_install () {
+ echo '## WARNING!##'
+ echo 'Upgrading from Kea version <1.6 to version >= 1.6 requires special
attention'
+ echo 'Please refer to the following web page for details:'
+ echo '[Upgrading to Kea
1.6](https://kb.isc.org/docs/en/upgrading-to-kea-16)'
+ echo 'Notable changes include:'
+ echo ' - Files in /var/kea have moved to (/var)/run/kea'
+ echo ' - State Info: now in /usr/lib/kea'
+ echo ' - Hooks: /usr/lib/hooks has moved to /usr/lib/kea/hooks'
+ echo ' - Admin commands lease-{init,version,upgrade} have been renamed'
+ echo ' to db-{init,version,upgrade}'
+ echo ' - Logger configuration changed scope thus a manual configuration'
+ echo ' file intervention is needed)'
+}
+post_upgrade () {
+ post_install $*
+}
Deleted: tmpfiles-kea.conf
===================================================================
--- tmpfiles-kea.conf 2020-10-11 18:28:06 UTC (rev 723534)
+++ tmpfiles-kea.conf 2020-10-11 18:28:28 UTC (rev 723535)
@@ -1,2 +0,0 @@
-d /run/kea 0755 root root -
-d /run/lock/kea 0755 root root -
Copied: kea/repos/community-testing-x86_64/tmpfiles-kea.conf (from rev 723534,
kea/trunk/tmpfiles-kea.conf)
===================================================================
--- tmpfiles-kea.conf (rev 0)
+++ tmpfiles-kea.conf 2020-10-11 18:28:28 UTC (rev 723535)
@@ -0,0 +1,2 @@
+d /run/kea 0755 root root -
+d /run/lock/kea 0755 root root -
