[arch-commits] Commit in kea/repos (6 files)
Baptiste Jonglez
zorun at archlinux.org
Mon Oct 22 12:12:38 UTC 2018
Date: Monday, October 22, 2018 @ 12:12:37
Author: zorun
Revision: 398392
archrelease: copy trunk to community-staging-x86_64
Added:
kea/repos/community-staging-x86_64/
kea/repos/community-staging-x86_64/PKGBUILD
(from rev 398391, kea/trunk/PKGBUILD)
kea/repos/community-staging-x86_64/fix-scripts-include-path.patch
(from rev 398391, kea/trunk/fix-scripts-include-path.patch)
kea/repos/community-staging-x86_64/kea-dhcp4.service
(from rev 398391, kea/trunk/kea-dhcp4.service)
kea/repos/community-staging-x86_64/kea-dhcp6.service
(from rev 398391, kea/trunk/kea-dhcp6.service)
kea/repos/community-staging-x86_64/tmpfiles-kea.conf
(from rev 398391, kea/trunk/tmpfiles-kea.conf)
--------------------------------+
PKGBUILD | 79 +++++++++++
fix-scripts-include-path.patch | 266 +++++++++++++++++++++++++++++++++++++++
kea-dhcp4.service | 12 +
kea-dhcp6.service | 12 +
tmpfiles-kea.conf | 1
5 files changed, 370 insertions(+)
Copied: kea/repos/community-staging-x86_64/PKGBUILD (from rev 398391, kea/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2018-10-22 12:12:37 UTC (rev 398392)
@@ -0,0 +1,79 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: nfnty
+pkgname='kea'
+pkgver=1.4.0.P1
+_upstreamver=1.4.0-P1
+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>=2.7.0' '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-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/${_upstreamver}/kea-${_upstreamver}.tar.gz{,.asc}
+ fix-scripts-include-path.patch
+ tmpfiles-kea.conf
+ kea-dhcp4.service
+ kea-dhcp6.service
+ kea-boost-1.68.patch::"https://github.com/isc-projects/kea/commit/4a88f764.patch")
+sha512sums=('beb3baae09510de970fb5c1a301c57d64fc56d825d964f413357ba448b993d0a4f714d4efa4da166d3c06623a9ae78b70c25b61793e696551cb97b7e08d5e634'
+ 'SKIP'
+ '337c1e8689ce569bb8b085261e946743bc88d62ffdd264f4e8f271a6ca92c5bcda2329376aec4ffacd96187c7dba30450b8d5a9e2929f0a559ef8ecba7c0bafc'
+ '13a473bea4f8a1ba40f5667b880010590c5fddecaa76c360113e977c9ab3898558141cda17000def7b1c592b7dc6f8d5a508752351c601f6484abd775b60d214'
+ '873612cdab1c5d72105ccf379885975405e10b4e4b3b93b258293fbd304ea9f6a47e5af5357b130e603d713691d4980d8868a5ed23376e50aba6eb81b348b8cb'
+ '48cd98cfc2a82b4d5f6350e70ba7048976a633ceae3c8f405824d2131700d78a9eeb885a41634a393e3cdaacc9836dda45343b7ae81c44427b46e758d6520f6c'
+ 'c1d2d2c4ee980d0485d50c285a441e343e2bf64278aaa98de72b20e45fd956b4fb8fb01a7ad35a5d255ac9a942cb4aafbaac753afd452fd0ed646f681250fbf6')
+validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign at 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
+
+ patch -p1 -i ../kea-boost-1.68.patch # Fix build with boost 1.68
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${_upstreamver}"
+ 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}-${_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
+}
Copied: kea/repos/community-staging-x86_64/fix-scripts-include-path.patch (from rev 398391, kea/trunk/fix-scripts-include-path.patch)
===================================================================
--- community-staging-x86_64/fix-scripts-include-path.patch (rev 0)
+++ community-staging-x86_64/fix-scripts-include-path.patch 2018-10-22 12:12:37 UTC (rev 398392)
@@ -0,0 +1,266 @@
+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
+
+-# 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/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
+
+-# 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/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
+
+-# 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/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
+
+-# 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/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
+
+-# 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/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
+
+-# 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/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
+
+-# 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/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 --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
+
+-# 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.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
+
+-# 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.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 "$@"`
+
Copied: kea/repos/community-staging-x86_64/kea-dhcp4.service (from rev 398391, kea/trunk/kea-dhcp4.service)
===================================================================
--- community-staging-x86_64/kea-dhcp4.service (rev 0)
+++ community-staging-x86_64/kea-dhcp4.service 2018-10-22 12:12:37 UTC (rev 398392)
@@ -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-dhcp4.conf
+
+[Install]
+WantedBy=multi-user.target
Copied: kea/repos/community-staging-x86_64/kea-dhcp6.service (from rev 398391, kea/trunk/kea-dhcp6.service)
===================================================================
--- community-staging-x86_64/kea-dhcp6.service (rev 0)
+++ community-staging-x86_64/kea-dhcp6.service 2018-10-22 12:12:37 UTC (rev 398392)
@@ -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-dhcp6.conf
+
+[Install]
+WantedBy=multi-user.target
Copied: kea/repos/community-staging-x86_64/tmpfiles-kea.conf (from rev 398391, kea/trunk/tmpfiles-kea.conf)
===================================================================
--- community-staging-x86_64/tmpfiles-kea.conf (rev 0)
+++ community-staging-x86_64/tmpfiles-kea.conf 2018-10-22 12:12:37 UTC (rev 398392)
@@ -0,0 +1 @@
+d /run/kea 0755 root root -
More information about the arch-commits
mailing list