[arch-commits] Commit in kea/repos/community-x86_64 (14 files)

Baptiste Jonglez zorun at archlinux.org
Fri Dec 6 22:15:43 UTC 2019


    Date: Friday, December 6, 2019 @ 22:15:42
  Author: zorun
Revision: 536122

archrelease: copy trunk to community-x86_64

Added:
  kea/repos/community-x86_64/PKGBUILD
    (from rev 536121, kea/trunk/PKGBUILD)
  kea/repos/community-x86_64/fix-scripts-include-path.patch
    (from rev 536121, kea/trunk/fix-scripts-include-path.patch)
  kea/repos/community-x86_64/kea-ctrl-agent.service
    (from rev 536121, kea/trunk/kea-ctrl-agent.service)
  kea/repos/community-x86_64/kea-dhcp-ddns.service
    (from rev 536121, kea/trunk/kea-dhcp-ddns.service)
  kea/repos/community-x86_64/kea-dhcp4.service
    (from rev 536121, kea/trunk/kea-dhcp4.service)
  kea/repos/community-x86_64/kea-dhcp6.service
    (from rev 536121, kea/trunk/kea-dhcp6.service)
  kea/repos/community-x86_64/tmpfiles-kea.conf
    (from rev 536121, kea/trunk/tmpfiles-kea.conf)
Deleted:
  kea/repos/community-x86_64/PKGBUILD
  kea/repos/community-x86_64/fix-scripts-include-path.patch
  kea/repos/community-x86_64/kea-ctrl-agent.service
  kea/repos/community-x86_64/kea-dhcp-ddns.service
  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                       |  160 +++++------
 fix-scripts-include-path.patch |  532 +++++++++++++++++++--------------------
 kea-ctrl-agent.service         |   28 +-
 kea-dhcp-ddns.service          |   26 -
 kea-dhcp4.service              |   28 +-
 kea-dhcp6.service              |   28 +-
 tmpfiles-kea.conf              |    2 
 7 files changed, 403 insertions(+), 401 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-06 22:15:12 UTC (rev 536121)
+++ PKGBUILD	2019-12-06 22:15:42 UTC (rev 536122)
@@ -1,79 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: nfnty
-pkgname='kea'
-pkgver=1.5.0
-_upstreamver=1.5.0
-pkgrel=10
-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' '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-dhcp-ddns.service
-        kea-ctrl-agent.service)
-sha512sums=('6d6b7407831311ebe37abce382ce77c664015ddbe3e73ec78153a00b301f98af5be52e26ad4febf5ca1e478d2c1844db4c988b241d2700d758e90b077f176ad8'
-            'SKIP'
-            '337c1e8689ce569bb8b085261e946743bc88d62ffdd264f4e8f271a6ca92c5bcda2329376aec4ffacd96187c7dba30450b8d5a9e2929f0a559ef8ecba7c0bafc'
-            '702a5dc19d1ed8fbe21aa9a4c09297eff9c9a3f6f1b178af8101a655b18b70c9e1dafd0cccc32063e31b2592d276e80c9bd4d2d51d8e1f74f67931fd290be6c0'
-            '1b62dace9f9a955b21c5dd5b5466fb3a4f1d8057ad2a30ea89e222a769dc721ad2fe4913c41ec407e018b1b38ddde757e9b7b8fc12d4763ddde077a0abb0c971'
-            '8f0e8d059338c415ae322e971e243b259d9b2ef7d37b6be57b409bf5f0f3392e519c9bb94c5b548021d000b944a5da82096608cd9ff3ee58061059ad519b0068'
-            '9ab05b580f3b206d127514e158a445146a765ba4bf760daa93bcf29ec9d816dbdd08a497b5a4bba67645f4cc79b210fed8d1defa9daefc48175a654738927d31'
-            'db329fd83e458e4a77f6df8569074088bed152ffc1a188059d868d7178a6d3530efe368ce870a2e0be894f87fa0e5ba43562bdc3ad6372ddfcfedae37c90f491')
-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
-}
-
-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-x86_64/PKGBUILD (from rev 536121, kea/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-06 22:15:42 UTC (rev 536122)
@@ -0,0 +1,81 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: nfnty
+pkgname='kea'
+pkgver=1.5.0
+_upstreamver=1.5.0
+pkgrel=11
+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' '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-dhcp-ddns.service
+        kea-ctrl-agent.service)
+sha512sums=('6d6b7407831311ebe37abce382ce77c664015ddbe3e73ec78153a00b301f98af5be52e26ad4febf5ca1e478d2c1844db4c988b241d2700d758e90b077f176ad8'
+            'SKIP'
+            '337c1e8689ce569bb8b085261e946743bc88d62ffdd264f4e8f271a6ca92c5bcda2329376aec4ffacd96187c7dba30450b8d5a9e2929f0a559ef8ecba7c0bafc'
+            '702a5dc19d1ed8fbe21aa9a4c09297eff9c9a3f6f1b178af8101a655b18b70c9e1dafd0cccc32063e31b2592d276e80c9bd4d2d51d8e1f74f67931fd290be6c0'
+            '1b62dace9f9a955b21c5dd5b5466fb3a4f1d8057ad2a30ea89e222a769dc721ad2fe4913c41ec407e018b1b38ddde757e9b7b8fc12d4763ddde077a0abb0c971'
+            '8f0e8d059338c415ae322e971e243b259d9b2ef7d37b6be57b409bf5f0f3392e519c9bb94c5b548021d000b944a5da82096608cd9ff3ee58061059ad519b0068'
+            '9ab05b580f3b206d127514e158a445146a765ba4bf760daa93bcf29ec9d816dbdd08a497b5a4bba67645f4cc79b210fed8d1defa9daefc48175a654738927d31'
+            'db329fd83e458e4a77f6df8569074088bed152ffc1a188059d868d7178a6d3530efe368ce870a2e0be894f87fa0e5ba43562bdc3ad6372ddfcfedae37c90f491')
+validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57'  # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign at isc.org>
+              'AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') # Internet Systems Consortium, Inc. (Signing key, 2019-2020) <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
+}
+
+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
+  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	2019-12-06 22:15:12 UTC (rev 536121)
+++ fix-scripts-include-path.patch	2019-12-06 22:15:42 UTC (rev 536122)
@@ -1,266 +0,0 @@
-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-x86_64/fix-scripts-include-path.patch (from rev 536121, kea/trunk/fix-scripts-include-path.patch)
===================================================================
--- fix-scripts-include-path.patch	                        (rev 0)
+++ fix-scripts-include-path.patch	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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 "$@"`
+ 

Deleted: kea-ctrl-agent.service
===================================================================
--- kea-ctrl-agent.service	2019-12-06 22:15:12 UTC (rev 536121)
+++ kea-ctrl-agent.service	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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-x86_64/kea-ctrl-agent.service (from rev 536121, kea/trunk/kea-ctrl-agent.service)
===================================================================
--- kea-ctrl-agent.service	                        (rev 0)
+++ kea-ctrl-agent.service	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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	2019-12-06 22:15:12 UTC (rev 536121)
+++ kea-dhcp-ddns.service	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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-x86_64/kea-dhcp-ddns.service (from rev 536121, kea/trunk/kea-dhcp-ddns.service)
===================================================================
--- kea-dhcp-ddns.service	                        (rev 0)
+++ kea-dhcp-ddns.service	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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	2019-12-06 22:15:12 UTC (rev 536121)
+++ kea-dhcp4.service	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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-x86_64/kea-dhcp4.service (from rev 536121, kea/trunk/kea-dhcp4.service)
===================================================================
--- kea-dhcp4.service	                        (rev 0)
+++ kea-dhcp4.service	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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	2019-12-06 22:15:12 UTC (rev 536121)
+++ kea-dhcp6.service	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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-x86_64/kea-dhcp6.service (from rev 536121, kea/trunk/kea-dhcp6.service)
===================================================================
--- kea-dhcp6.service	                        (rev 0)
+++ kea-dhcp6.service	2019-12-06 22:15:42 UTC (rev 536122)
@@ -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: tmpfiles-kea.conf
===================================================================
--- tmpfiles-kea.conf	2019-12-06 22:15:12 UTC (rev 536121)
+++ tmpfiles-kea.conf	2019-12-06 22:15:42 UTC (rev 536122)
@@ -1 +0,0 @@
-d /run/lock/kea 0755 root root -

Copied: kea/repos/community-x86_64/tmpfiles-kea.conf (from rev 536121, kea/trunk/tmpfiles-kea.conf)
===================================================================
--- tmpfiles-kea.conf	                        (rev 0)
+++ tmpfiles-kea.conf	2019-12-06 22:15:42 UTC (rev 536122)
@@ -0,0 +1 @@
+d /run/lock/kea 0755 root root -



More information about the arch-commits mailing list