Date: Saturday, April 7, 2018 @ 11:24:02
  Author: zorun
Revision: 314833

archrelease: copy trunk to community-staging-x86_64

Added:
  kea/repos/community-staging-x86_64/
  kea/repos/community-staging-x86_64/PKGBUILD
    (from rev 314832, kea/trunk/PKGBUILD)
  kea/repos/community-staging-x86_64/asiolink-fix-build-with-boost-1.66.patch
    (from rev 314832, kea/trunk/asiolink-fix-build-with-boost-1.66.patch)
  kea/repos/community-staging-x86_64/fix-scripts-include-path.patch
    (from rev 314832, kea/trunk/fix-scripts-include-path.patch)
  kea/repos/community-staging-x86_64/kea-dhcp4.service
    (from rev 314832, kea/trunk/kea-dhcp4.service)
  kea/repos/community-staging-x86_64/kea-dhcp6.service
    (from rev 314832, kea/trunk/kea-dhcp6.service)
  kea/repos/community-staging-x86_64/tmpfiles-kea.conf
    (from rev 314832, kea/trunk/tmpfiles-kea.conf)

------------------------------------------+
 PKGBUILD                                 |   79 ++++++++++++++
 asiolink-fix-build-with-boost-1.66.patch |   99 +++++++++++++++++
 fix-scripts-include-path.patch           |  162 +++++++++++++++++++++++++++++
 kea-dhcp4.service                        |   12 ++
 kea-dhcp6.service                        |   12 ++
 tmpfiles-kea.conf                        |    1 
 6 files changed, 365 insertions(+)

Copied: kea/repos/community-staging-x86_64/PKGBUILD (from rev 314832, 
kea/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD                           (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-04-07 11:24:02 UTC (rev 314833)
@@ -0,0 +1,79 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: nfnty
+pkgname='kea'
+pkgver=1.3.0
+pkgrel=6
+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'
+            
'873612cdab1c5d72105ccf379885975405e10b4e4b3b93b258293fbd304ea9f6a47e5af5357b130e603d713691d4980d8868a5ed23376e50aba6eb81b348b8cb'
+            
'48cd98cfc2a82b4d5f6350e70ba7048976a633ceae3c8f405824d2131700d78a9eeb885a41634a393e3cdaacc9836dda45343b7ae81c44427b46e758d6520f6c')
+validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems 
Consortium, Inc. (Signing key, 2017-2018) <codes...@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-staging-x86_64/asiolink-fix-build-with-boost-1.66.patch 
(from rev 314832, kea/trunk/asiolink-fix-build-with-boost-1.66.patch)
===================================================================
--- community-staging-x86_64/asiolink-fix-build-with-boost-1.66.patch           
                (rev 0)
+++ community-staging-x86_64/asiolink-fix-build-with-boost-1.66.patch   
2018-04-07 11:24:02 UTC (rev 314833)
@@ -0,0 +1,99 @@
+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
+

Copied: kea/repos/community-staging-x86_64/fix-scripts-include-path.patch (from 
rev 314832, 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-04-07 
11:24:02 UTC (rev 314833)
@@ -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 "$@"`
+ 

Copied: kea/repos/community-staging-x86_64/kea-dhcp4.service (from rev 314832, 
kea/trunk/kea-dhcp4.service)
===================================================================
--- community-staging-x86_64/kea-dhcp4.service                          (rev 0)
+++ community-staging-x86_64/kea-dhcp4.service  2018-04-07 11:24:02 UTC (rev 
314833)
@@ -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 314832, 
kea/trunk/kea-dhcp6.service)
===================================================================
--- community-staging-x86_64/kea-dhcp6.service                          (rev 0)
+++ community-staging-x86_64/kea-dhcp6.service  2018-04-07 11:24:02 UTC (rev 
314833)
@@ -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 314832, 
kea/trunk/tmpfiles-kea.conf)
===================================================================
--- community-staging-x86_64/tmpfiles-kea.conf                          (rev 0)
+++ community-staging-x86_64/tmpfiles-kea.conf  2018-04-07 11:24:02 UTC (rev 
314833)
@@ -0,0 +1 @@
+d /run/kea 0755 root root -

Reply via email to