Date: Monday, May 21, 2018 @ 09:45:19 Author: zorun Revision: 325988 upgpkg: kea 1.4.0beta-1
Modified: kea/trunk/PKGBUILD kea/trunk/fix-scripts-include-path.patch Deleted: kea/trunk/3c22fedef78c5391561dd66c0a0de6d593351f6c.patch kea/trunk/asiolink-fix-build-with-boost-1.66.patch ------------------------------------------------+ 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch | 65 --------- PKGBUILD | 33 +--- asiolink-fix-build-with-boost-1.66.patch | 99 -------------- fix-scripts-include-path.patch | 158 +++++++++++++++++++---- 4 files changed, 144 insertions(+), 211 deletions(-) Deleted: 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch =================================================================== --- 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch 2018-05-21 09:44:21 UTC (rev 325987) +++ 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch 2018-05-21 09:45:19 UTC (rev 325988) @@ -1,65 +0,0 @@ -From d6c31960033ff0f4aa05b4c2698cf456145ce6ff Mon Sep 17 00:00:00 2001 -From: Francis Dupont <fdup...@isc.org> -Date: Sun, 8 Oct 2017 01:09:11 +0200 -Subject: [PATCH] [5380] Addressed another log4cplus 2.0.0 API change - ---- - src/lib/log/logger_level_impl.cc | 10 ++++++++-- - src/lib/log/logger_level_impl.h | 6 +++++- - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/lib/log/logger_level_impl.cc b/src/lib/log/logger_level_impl.cc -index 79ca4856f2..fdcc5d367f 100644 ---- a/src/lib/log/logger_level_impl.cc -+++ b/src/lib/log/logger_level_impl.cc -@@ -177,20 +177,26 @@ LoggerLevelImpl::logLevelFromString(const log4cplus::tstring& level) { - - // Convert logging level to string. If the level is a valid debug level, - // return the string DEBUG, else return the empty string. -+#if LOG4CPLUS_VERSION < LOG4CPLUS_MAKE_VERSION(2, 0, 0) - LoggerLevelImpl::LogLevelString -+#else -+const LoggerLevelImpl::LogLevelString& -+#endif - LoggerLevelImpl::logLevelToString(log4cplus::LogLevel level) { - Level bindlevel = convertToBindLevel(level); - Severity& severity = bindlevel.severity; - int& dbglevel = bindlevel.dbglevel; -+ static LoggerLevelImpl::LogLevelString debug_ = tstring("DEBUG"); -+ static LoggerLevelImpl::LogLevelString empty_ = tstring(); - - if ((severity == DEBUG) && - ((dbglevel >= MIN_DEBUG_LEVEL) && (dbglevel <= MAX_DEBUG_LEVEL))) { -- return (tstring("DEBUG")); -+ return (debug_); - } - - // Unknown, so return empty string for log4cplus to try other conversion - // functions. -- return (tstring()); -+ return (empty_); - } - - // Initialization. Register the conversion functions with the LogLevelManager. -diff --git a/src/lib/log/logger_level_impl.h b/src/lib/log/logger_level_impl.h -index 96696c2b1f..77da5f7408 100644 ---- a/src/lib/log/logger_level_impl.h -+++ b/src/lib/log/logger_level_impl.h -@@ -1,4 +1,4 @@ --// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC") -+// Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC") - // - // This Source Code Form is subject to the terms of the Mozilla Public - // License, v. 2.0. If a copy of the MPL was not distributed with this -@@ -107,7 +107,11 @@ typedef log4cplus::tstring LogLevelString; - /// \param level Extended logging level - /// - /// \return Equivalent string. -+#if LOG4CPLUS_VERSION < LOG4CPLUS_MAKE_VERSION(2, 0, 0) - static LogLevelString logLevelToString(log4cplus::LogLevel level); -+#else -+ static const LogLevelString& logLevelToString(log4cplus::LogLevel level); -+#endif - - /// \brief Initialize extended logging levels - /// Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-21 09:44:21 UTC (rev 325987) +++ PKGBUILD 2018-05-21 09:45:19 UTC (rev 325988) @@ -1,8 +1,9 @@ # Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org> # Contributor: nfnty pkgname='kea' -pkgver=1.3.0 -pkgrel=9 +pkgver=1.4.0beta +_upstreamver=1.4.0-beta +pkgrel=1 pkgdesc='High-performance, extensible DHCP server engine from ISC, supporting both DHCPv4 and DHCPv6' arch=('x86_64') url='http://kea.isc.org' @@ -17,39 +18,31 @@ 'kea-devel-docs: developer documentation') # Checks are disabled for now #checkdepends=('gtest' 'postgresql' 'mariadb' 'python' 'procps-ng') # procps-ng needed for 'pgrep' -backup=('etc/kea/kea.conf' 'etc/kea/kea-ca.conf' # Config files up to Kea 1.2 - 'etc/kea/kea-dhcp4.conf' 'etc/kea/kea-dhcp6.conf' 'etc/kea/kea-dhcp-ddns.conf' 'etc/kea/kea-ctrl-agent.conf' 'etc/kea/keactrl.conf') # New config files as of Kea 1.3 +backup=('etc/kea/kea-dhcp4.conf' 'etc/kea/kea-dhcp6.conf' 'etc/kea/kea-dhcp-ddns.conf' 'etc/kea/kea-ctrl-agent.conf' 'etc/kea/keactrl.conf') # New config files as of Kea 1.3 -source=(https://ftp.isc.org/isc/kea/${pkgver}/kea-${pkgver}.tar.gz{,.asc} +source=(https://ftp.isc.org/isc/kea/${_upstreamver}/kea-${_upstreamver}.tar.gz{,.asc} fix-scripts-include-path.patch - asiolink-fix-build-with-boost-1.66.patch tmpfiles-kea.conf kea-dhcp4.service - kea-dhcp6.service - 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch) -sha512sums=('4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b' + kea-dhcp6.service) +sha512sums=('3ff76b270d6064746e94843e8538e1766014dce60ee86a016c962c4565466245f9b34095ae22476996a12ac1be00fe7816c019663123fe0a3cb0b90428e5dfa0' 'SKIP' - '81874fd3a12f55ea23593b7248c7653450c3a6e5ba8e79c7c5fb40ab685b0dc5d4e29e50f10000bd9018200731dba35f15e5d86c8005c94d14865d73e19983e5' - '2ac01524f70c95986cb64f8d0fc29612aec38c8ab95892469329ced071cf3660b4e9997b6e22a62765c244a9c68b41c4729aec8cfe03099e009ce858faa5c661' + '337c1e8689ce569bb8b085261e946743bc88d62ffdd264f4e8f271a6ca92c5bcda2329376aec4ffacd96187c7dba30450b8d5a9e2929f0a559ef8ecba7c0bafc' '13a473bea4f8a1ba40f5667b880010590c5fddecaa76c360113e977c9ab3898558141cda17000def7b1c592b7dc6f8d5a508752351c601f6484abd775b60d214' '873612cdab1c5d72105ccf379885975405e10b4e4b3b93b258293fbd304ea9f6a47e5af5357b130e603d713691d4980d8868a5ed23376e50aba6eb81b348b8cb' - '48cd98cfc2a82b4d5f6350e70ba7048976a633ceae3c8f405824d2131700d78a9eeb885a41634a393e3cdaacc9836dda45343b7ae81c44427b46e758d6520f6c' - '5c1d0d76e2c1a9e1e96935703b9e92143ecdae56afde66fcdd3a76c473a7af5336107a344ccbd5834b02b86c7797f157b89b9f5d28fb5a7bdc1c155c3c830854') + '48cd98cfc2a82b4d5f6350e70ba7048976a633ceae3c8f405824d2131700d78a9eeb885a41634a393e3cdaacc9836dda45343b7ae81c44427b46e758d6520f6c') validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codes...@isc.org> prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + 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 - - patch -p1 < "${srcdir}"/asiolink-fix-build-with-boost-1.66.patch - patch -p1 < "${srcdir}"/3c22fedef78c5391561dd66c0a0de6d593351f6c.patch } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${_upstreamver}" autoreconf --install ./configure \ --prefix='/usr' \ @@ -64,13 +57,13 @@ } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${_upstreamver}" # Disable for now, some tests fail (for instance dhcp-ddns.sigterm_test) #make check } package() { - cd "${srcdir}/kea-${pkgver}" + cd "${srcdir}/kea-${_upstreamver}" make DESTDIR="${pkgdir}" install # Handle /var/run -> /run symlink rmdir "${pkgdir}"/var/run/kea Deleted: asiolink-fix-build-with-boost-1.66.patch =================================================================== --- asiolink-fix-build-with-boost-1.66.patch 2018-05-21 09:44:21 UTC (rev 325987) +++ asiolink-fix-build-with-boost-1.66.patch 2018-05-21 09:45:19 UTC (rev 325988) @@ -1,99 +0,0 @@ -From 758f62a57395ce851f87a56af93409a36c69e5a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrow...@archlinux.org> -Date: Sat, 30 Dec 2017 14:40:24 +0100 -Subject: [PATCH] asiolink: fix build with boost 1.66 - -- use native_handle() for getting native socket type -- use io_context instead of io_service ---- - src/lib/asiolink/io_acceptor.h | 4 ++++ - src/lib/asiolink/io_service.h | 5 +++++ - src/lib/asiolink/tcp_socket.h | 4 ++++ - src/lib/asiolink/udp_socket.h | 4 ++++ - src/lib/asiolink/unix_domain_socket.cc | 4 ++++ - 5 files changed, 21 insertions(+) - -diff --git a/src/lib/asiolink/io_acceptor.h b/src/lib/asiolink/io_acceptor.h -index c493d34..913a328 100644 ---- a/src/lib/asiolink/io_acceptor.h -+++ b/src/lib/asiolink/io_acceptor.h -@@ -47,7 +47,11 @@ public: - - /// @brief Returns file descriptor of the underlying socket. - virtual int getNative() const { -+#if BOOST_VERSION < 106600 - return (acceptor_->native()); -+#else -+ return (acceptor_->native_handle()); -+#endif - } - - /// @brief Opens acceptor socket given the endpoint. -diff --git a/src/lib/asiolink/io_service.h b/src/lib/asiolink/io_service.h -index e9e402d..e0832b2 100644 ---- a/src/lib/asiolink/io_service.h -+++ b/src/lib/asiolink/io_service.h -@@ -11,7 +11,12 @@ - - namespace boost { - namespace asio { -+#if BOOST_VERSION < 106600 - class io_service; -+#else -+ class io_context; -+ typedef io_context io_service; -+#endif - } - } - -diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h -index adf74d1..83b8264 100644 ---- a/src/lib/asiolink/tcp_socket.h -+++ b/src/lib/asiolink/tcp_socket.h -@@ -75,7 +75,11 @@ public: - - /// \brief Return file descriptor of underlying socket - virtual int getNative() const { -+#if BOOST_VERSION < 106600 - return (socket_.native()); -+#else -+ return (socket_.native_handle()); -+#endif - } - - /// \brief Return protocol of socket -diff --git a/src/lib/asiolink/udp_socket.h b/src/lib/asiolink/udp_socket.h -index 07ba447..5b040cf 100644 ---- a/src/lib/asiolink/udp_socket.h -+++ b/src/lib/asiolink/udp_socket.h -@@ -61,7 +61,11 @@ public: - - /// \brief Return file descriptor of underlying socket - virtual int getNative() const { -+#if BOOST_VERSION < 106600 - return (socket_.native()); -+#else -+ return (socket_.native_handle()); -+#endif - } - - /// \brief Return protocol of socket -diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc -index f17ec2e..d1ad9ec 100644 ---- a/src/lib/asiolink/unix_domain_socket.cc -+++ b/src/lib/asiolink/unix_domain_socket.cc -@@ -287,7 +287,11 @@ UnixDomainSocket::UnixDomainSocket(IOService& io_service) - - int - UnixDomainSocket::getNative() const { -+#if BOOST_VERSION < 106600 - return (impl_->socket_.native()); -+#else -+ return (impl_->socket_.native_handle()); -+#endif - } - - int --- -2.15.1 - Modified: fix-scripts-include-path.patch =================================================================== --- fix-scripts-include-path.patch 2018-05-21 09:44:21 UTC (rev 325987) +++ fix-scripts-include-path.patch 2018-05-21 09:45:19 UTC (rev 325988) @@ -1,6 +1,7 @@ -diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in ---- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in 2017-08-01 13:03:52.823615380 +0200 -+++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in 2017-08-01 13:05:19.092517025 +0200 +diff --git a/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in b/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in +index 6914f6de1..d13bd1f95 100644 +--- a/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in ++++ b/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -16,9 +17,10 @@ VERSION=`mysql_version "$@"` -diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in ---- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in 2017-08-01 13:03:52.823615380 +0200 -+++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in 2017-08-01 13:05:27.885738379 +0200 +diff --git a/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in b/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in +index 0c28330ff..4383a5abf 100644 +--- a/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in ++++ b/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -34,9 +36,10 @@ VERSION=`mysql_version "$@"` -diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in ---- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in 2017-08-01 13:03:52.823615380 +0200 -+++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in 2017-08-01 13:11:20.277913463 +0200 +diff --git a/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in b/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in +index 400bbaa07..9570d184b 100644 +--- a/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in ++++ b/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -52,9 +55,10 @@ VERSION=`mysql_version "$@"` -diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in ---- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in 2017-08-01 13:03:52.823615380 +0200 -+++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in 2017-08-01 13:11:31.137774925 +0200 +diff --git a/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in b/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in +index 88d2677f6..5b552b10a 100644 +--- a/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in ++++ b/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -70,9 +74,10 @@ VERSION=`mysql_version "$@"` -diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in ---- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in 2017-08-01 13:03:52.823615380 +0200 -+++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in 2017-08-01 13:11:37.317696084 +0200 +diff --git a/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in b/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in +index f63179bb3..daea9d134 100644 +--- a/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in ++++ b/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -88,9 +93,10 @@ VERSION=`mysql_version "$@"` -diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in ---- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in 2017-08-01 13:03:52.823615380 +0200 -+++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in 2017-08-01 13:11:43.007623495 +0200 +diff --git a/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in b/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in +index 14d0ef013..3f7798ec9 100644 +--- a/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in ++++ b/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -106,9 +112,10 @@ VERSION=`mysql_version "$@"` -diff -ru kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in ---- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in 2017-08-01 13:03:52.826948671 +0200 -+++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in 2017-08-01 13:04:53.279512387 +0200 +diff --git a/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in b/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in +index b692f6912..dee79e7e5 100644 +--- a/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in ++++ b/src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -122,11 +129,50 @@ +# Include utilities. +. /usr/share/kea/scripts/admin-utils.sh + VERSION=`mysql_version "$@"` + +diff --git a/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in b/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in +index 3bf129cce..66dfaaf7f 100644 +--- a/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in ++++ b/src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in +@@ -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 --git a/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in b/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in +index 22d6af4d8..cd0b048bb 100644 +--- a/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in ++++ b/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in +@@ -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 kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in ---- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in 2017-08-01 13:03:52.826948671 +0200 -+++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in 2017-08-01 13:11:52.627500763 +0200 +diff --git a/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in b/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in +index ac283c3c0..29c78ddbc 100644 +--- a/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in ++++ b/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -142,9 +188,10 @@ VERSION=`pgsql_version "$@"` -diff -ru kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in ---- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in 2017-08-01 13:03:52.826948671 +0200 -+++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in 2017-08-01 13:11:59.840742064 +0200 +diff --git a/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in b/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in +index 531f250b8..e687b4bfc 100644 +--- a/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in ++++ b/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in @@ -1,12 +1,7 @@ #!/bin/sh @@ -160,3 +207,60 @@ VERSION=`pgsql_version "$@"` +diff --git a/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in b/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in +index 3581ead64..60d1d3e49 100644 +--- a/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in ++++ b/src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh.in +@@ -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 --git a/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in b/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in +index 76f4683ea..f7d292439 100644 +--- a/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in ++++ b/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in +@@ -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 --git a/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in b/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in +index b9513629c..d65cafc22 100644 +--- a/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in ++++ b/src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in +@@ -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 "$@"` +