[arch-commits] Commit in kea/repos/community-x86_64 (14 files)
Alexander Rødseth
arodseth at archlinux.org
Thu Jan 11 23:32:19 UTC 2018
Date: Thursday, January 11, 2018 @ 23:32:18
Author: arodseth
Revision: 281502
archrelease: copy trunk to community-x86_64
Added:
kea/repos/community-x86_64/PKGBUILD
(from rev 281501, kea/trunk/PKGBUILD)
kea/repos/community-x86_64/add-missing-header.patch
(from rev 281501, kea/trunk/add-missing-header.patch)
kea/repos/community-x86_64/asiolink-fix-build-with-boost-1.66.patch
(from rev 281501, kea/trunk/asiolink-fix-build-with-boost-1.66.patch)
kea/repos/community-x86_64/fix-scripts-include-path.patch
(from rev 281501, kea/trunk/fix-scripts-include-path.patch)
kea/repos/community-x86_64/kea-dhcp4.service
(from rev 281501, kea/trunk/kea-dhcp4.service)
kea/repos/community-x86_64/kea-dhcp6.service
(from rev 281501, kea/trunk/kea-dhcp6.service)
kea/repos/community-x86_64/tmpfiles-kea.conf
(from rev 281501, kea/trunk/tmpfiles-kea.conf)
Deleted:
kea/repos/community-x86_64/PKGBUILD
kea/repos/community-x86_64/add-missing-header.patch
kea/repos/community-x86_64/asiolink-fix-build-with-boost-1.66.patch
kea/repos/community-x86_64/fix-scripts-include-path.patch
kea/repos/community-x86_64/kea-dhcp4.service
kea/repos/community-x86_64/kea-dhcp6.service
kea/repos/community-x86_64/tmpfiles-kea.conf
------------------------------------------+
PKGBUILD | 158 +++++++-------
add-missing-header.patch | 36 +--
asiolink-fix-build-with-boost-1.66.patch | 198 ++++++++---------
fix-scripts-include-path.patch | 324 ++++++++++++++---------------
kea-dhcp4.service | 24 +-
kea-dhcp6.service | 24 +-
tmpfiles-kea.conf | 2
7 files changed, 383 insertions(+), 383 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-11 23:32:04 UTC (rev 281501)
+++ PKGBUILD 2018-01-11 23:32:18 UTC (rev 281502)
@@ -1,79 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: nfnty
-pkgname='kea'
-pkgver=1.3.0
-pkgrel=3
-pkgdesc='High-performance, extensible DHCP server engine from ISC, supporting both DHCPv4 and DHCPv6'
-arch=('x86_64')
-url='http://kea.isc.org'
-license=('MPL2')
-depends=('botan' 'boost-libs' 'log4cplus' 'libmariadbclient' '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=('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
-
-source=(https://ftp.isc.org/isc/kea/${pkgver}/kea-${pkgver}.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)
-sha512sums=('4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b'
- 'SKIP'
- '81874fd3a12f55ea23593b7248c7653450c3a6e5ba8e79c7c5fb40ab685b0dc5d4e29e50f10000bd9018200731dba35f15e5d86c8005c94d14865d73e19983e5'
- '2ac01524f70c95986cb64f8d0fc29612aec38c8ab95892469329ced071cf3660b4e9997b6e22a62765c244a9c68b41c4729aec8cfe03099e009ce858faa5c661'
- '13a473bea4f8a1ba40f5667b880010590c5fddecaa76c360113e977c9ab3898558141cda17000def7b1c592b7dc6f8d5a508752351c601f6484abd775b60d214'
- '24fdd95fc25bcd6aaf21cec598f3d09715418705aadbb2403792b62f4d8789b1897aa65f5e68184612d0a2c1c6be4123491db2fc3b1d602f6e7c5cd6c2d278eb'
- 'f4d54483034ac5d2815a5a06cec84a20aa2849484630d7eeed4d9f2bd7cb96814f80d1f06da2f10b43eabdba0f79f4fb7befe06171001b7d1617844fe8813dae')
-validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign at isc.org>
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # 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
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- autoreconf --install
- ./configure \
- --prefix='/usr' \
- --sbindir='/usr/bin' \
- --libexecdir='/usr/bin' \
- --sysconfdir='/etc' \
- --localstatedir='/var' \
- --with-dhcp-mysql \
- --with-dhcp-pgsql \
- --enable-shell
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # Disable for now, some tests fail (for instance dhcp-ddns.sigterm_test)
- #make check
-}
-
-package() {
- cd "${srcdir}/kea-${pkgver}"
- 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
-}
Copied: kea/repos/community-x86_64/PKGBUILD (from rev 281501, kea/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-11 23:32:18 UTC (rev 281502)
@@ -0,0 +1,79 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: nfnty
+pkgname='kea'
+pkgver=1.3.0
+pkgrel=4
+pkgdesc='High-performance, extensible DHCP server engine from ISC, supporting both DHCPv4 and DHCPv6'
+arch=('x86_64')
+url='http://kea.isc.org'
+license=('MPL2')
+depends=('botan' 'boost-libs' 'log4cplus' 'libmariadbclient' '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=('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
+
+source=(https://ftp.isc.org/isc/kea/${pkgver}/kea-${pkgver}.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)
+sha512sums=('4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b'
+ 'SKIP'
+ '81874fd3a12f55ea23593b7248c7653450c3a6e5ba8e79c7c5fb40ab685b0dc5d4e29e50f10000bd9018200731dba35f15e5d86c8005c94d14865d73e19983e5'
+ '2ac01524f70c95986cb64f8d0fc29612aec38c8ab95892469329ced071cf3660b4e9997b6e22a62765c244a9c68b41c4729aec8cfe03099e009ce858faa5c661'
+ '13a473bea4f8a1ba40f5667b880010590c5fddecaa76c360113e977c9ab3898558141cda17000def7b1c592b7dc6f8d5a508752351c601f6484abd775b60d214'
+ '24fdd95fc25bcd6aaf21cec598f3d09715418705aadbb2403792b62f4d8789b1897aa65f5e68184612d0a2c1c6be4123491db2fc3b1d602f6e7c5cd6c2d278eb'
+ 'f4d54483034ac5d2815a5a06cec84a20aa2849484630d7eeed4d9f2bd7cb96814f80d1f06da2f10b43eabdba0f79f4fb7befe06171001b7d1617844fe8813dae')
+validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign at isc.org>
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # 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
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ autoreconf --install
+ ./configure \
+ --prefix='/usr' \
+ --sbindir='/usr/bin' \
+ --libexecdir='/usr/bin' \
+ --sysconfdir='/etc' \
+ --localstatedir='/var' \
+ --with-dhcp-mysql \
+ --with-dhcp-pgsql \
+ --enable-shell
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # Disable for now, some tests fail (for instance dhcp-ddns.sigterm_test)
+ #make check
+}
+
+package() {
+ cd "${srcdir}/kea-${pkgver}"
+ 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
+}
Deleted: add-missing-header.patch
===================================================================
--- add-missing-header.patch 2018-01-11 23:32:04 UTC (rev 281501)
+++ add-missing-header.patch 2018-01-11 23:32:18 UTC (rev 281502)
@@ -1,18 +0,0 @@
-commit b63da2b6ab2a623539eb1bc8ed3850cb88ef6f26
-Author: Walt Steverson <waltsteverson at users.noreply.github.com>
-Date: Fri Jun 9 11:12:42 2017 -0500
-
- Add missing header file option6_pdexclude.h
-
-diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
-index 461429ba8..12c3ebf84 100644
---- a/src/lib/dhcp/Makefile.am
-+++ b/src/lib/dhcp/Makefile.am
-@@ -99,6 +99,7 @@ libkea_dhcp___include_HEADERS = \
- option6_ia.h \
- option6_iaaddr.h \
- option6_iaprefix.h \
-+ option6_pdexclude.h \
- option6_status_code.h \
- option.h \
- option_custom.h \
Copied: kea/repos/community-x86_64/add-missing-header.patch (from rev 281501, kea/trunk/add-missing-header.patch)
===================================================================
--- add-missing-header.patch (rev 0)
+++ add-missing-header.patch 2018-01-11 23:32:18 UTC (rev 281502)
@@ -0,0 +1,18 @@
+commit b63da2b6ab2a623539eb1bc8ed3850cb88ef6f26
+Author: Walt Steverson <waltsteverson at users.noreply.github.com>
+Date: Fri Jun 9 11:12:42 2017 -0500
+
+ Add missing header file option6_pdexclude.h
+
+diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
+index 461429ba8..12c3ebf84 100644
+--- a/src/lib/dhcp/Makefile.am
++++ b/src/lib/dhcp/Makefile.am
+@@ -99,6 +99,7 @@ libkea_dhcp___include_HEADERS = \
+ option6_ia.h \
+ option6_iaaddr.h \
+ option6_iaprefix.h \
++ option6_pdexclude.h \
+ option6_status_code.h \
+ option.h \
+ option_custom.h \
Deleted: asiolink-fix-build-with-boost-1.66.patch
===================================================================
--- asiolink-fix-build-with-boost-1.66.patch 2018-01-11 23:32:04 UTC (rev 281501)
+++ asiolink-fix-build-with-boost-1.66.patch 2018-01-11 23:32:18 UTC (rev 281502)
@@ -1,99 +0,0 @@
-From 758f62a57395ce851f87a56af93409a36c69e5a7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski at 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
-
Copied: kea/repos/community-x86_64/asiolink-fix-build-with-boost-1.66.patch (from rev 281501, kea/trunk/asiolink-fix-build-with-boost-1.66.patch)
===================================================================
--- asiolink-fix-build-with-boost-1.66.patch (rev 0)
+++ asiolink-fix-build-with-boost-1.66.patch 2018-01-11 23:32:18 UTC (rev 281502)
@@ -0,0 +1,99 @@
+From 758f62a57395ce851f87a56af93409a36c69e5a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski at 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
+
Deleted: fix-scripts-include-path.patch
===================================================================
--- fix-scripts-include-path.patch 2018-01-11 23:32:04 UTC (rev 281501)
+++ fix-scripts-include-path.patch 2018-01-11 23:32:18 UTC (rev 281502)
@@ -1,162 +0,0 @@
-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
-@@ -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 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
-@@ -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 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
-@@ -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 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
-@@ -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 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
-@@ -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 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
-@@ -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 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
-@@ -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
-@@ -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_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
-@@ -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 "$@"`
-
Copied: kea/repos/community-x86_64/fix-scripts-include-path.patch (from rev 281501, kea/trunk/fix-scripts-include-path.patch)
===================================================================
--- fix-scripts-include-path.patch (rev 0)
+++ fix-scripts-include-path.patch 2018-01-11 23:32:18 UTC (rev 281502)
@@ -0,0 +1,162 @@
+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
+@@ -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 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
+@@ -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 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
+@@ -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 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
+@@ -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 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
+@@ -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 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
+@@ -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 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
+@@ -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
+@@ -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_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
+@@ -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 "$@"`
+
Deleted: kea-dhcp4.service
===================================================================
--- kea-dhcp4.service 2018-01-11 23:32:04 UTC (rev 281501)
+++ kea-dhcp4.service 2018-01-11 23:32:18 UTC (rev 281502)
@@ -1,12 +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]
-ExecStart=/usr/bin/kea-dhcp4 -c /etc/kea/kea.conf
-
-[Install]
-WantedBy=multi-user.target
Copied: kea/repos/community-x86_64/kea-dhcp4.service (from rev 281501, kea/trunk/kea-dhcp4.service)
===================================================================
--- kea-dhcp4.service (rev 0)
+++ kea-dhcp4.service 2018-01-11 23:32:18 UTC (rev 281502)
@@ -0,0 +1,12 @@
+[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]
+ExecStart=/usr/bin/kea-dhcp4 -c /etc/kea/kea.conf
+
+[Install]
+WantedBy=multi-user.target
Deleted: kea-dhcp6.service
===================================================================
--- kea-dhcp6.service 2018-01-11 23:32:04 UTC (rev 281501)
+++ kea-dhcp6.service 2018-01-11 23:32:18 UTC (rev 281502)
@@ -1,12 +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]
-ExecStart=/usr/bin/kea-dhcp6 -c /etc/kea/kea.conf
-
-[Install]
-WantedBy=multi-user.target
Copied: kea/repos/community-x86_64/kea-dhcp6.service (from rev 281501, kea/trunk/kea-dhcp6.service)
===================================================================
--- kea-dhcp6.service (rev 0)
+++ kea-dhcp6.service 2018-01-11 23:32:18 UTC (rev 281502)
@@ -0,0 +1,12 @@
+[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]
+ExecStart=/usr/bin/kea-dhcp6 -c /etc/kea/kea.conf
+
+[Install]
+WantedBy=multi-user.target
Deleted: tmpfiles-kea.conf
===================================================================
--- tmpfiles-kea.conf 2018-01-11 23:32:04 UTC (rev 281501)
+++ tmpfiles-kea.conf 2018-01-11 23:32:18 UTC (rev 281502)
@@ -1 +0,0 @@
-d /run/kea 0755 root root -
Copied: kea/repos/community-x86_64/tmpfiles-kea.conf (from rev 281501, kea/trunk/tmpfiles-kea.conf)
===================================================================
--- tmpfiles-kea.conf (rev 0)
+++ tmpfiles-kea.conf 2018-01-11 23:32:18 UTC (rev 281502)
@@ -0,0 +1 @@
+d /run/kea 0755 root root -
More information about the arch-commits
mailing list