Date: Thursday, January 26, 2023 @ 19:41:29
Author: kgizdov
Revision: 1388362
upgpkg: kea 2.2.0-5: FS#77174
Modified:
kea/trunk/PKGBUILD
Deleted:
kea/trunk/kea.install
-------------+
PKGBUILD | 72 ++++++++++++++++++++++++----------------------------------
kea.install | 17 -------------
2 files changed, 30 insertions(+), 59 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-26 18:12:27 UTC (rev 1388361)
+++ PKGBUILD 2023-01-26 19:41:29 UTC (rev 1388362)
@@ -1,16 +1,17 @@
# Maintainer: Konstantin Gizdov <arch at kge dot pw>
# Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org>
# Contributor: nfnty
+
pkgbase='kea'
pkgname=("${pkgbase}" "${pkgbase}-docs")
pkgver=2.2.0
_upstreamver="${pkgver}"
-pkgrel=4
+pkgrel=5
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=('boost-libs' 'log4cplus' 'mariadb-libs' 'openssl' 'postgresql-libs')
+depends=('log4cplus' 'mariadb-libs' 'openssl' 'postgresql-libs')
makedepends=(
'boost'
'mariadb'
@@ -19,6 +20,7 @@
'python-sphinx'
'python-sphinx_rtd_theme'
'doxygen'
+ 'graphviz'
# texlive-most group
'texlive-bibtexextra'
'texlive-core'
@@ -40,17 +42,7 @@
'kea-docs: user and developer documentation')
# Checks are disabled for now
# We can ignore mysql/pgsql, but admin tests use custom scripts that break
everything
-checkdepends=('benchmark' 'gtest' 'procps-ng') # procps-ng needed for 'pgrep'
-backup=(
- # New config files as of Kea 1.3
- 'etc/kea/kea-dhcp4.conf'
- 'etc/kea/kea-dhcp6.conf'
- 'etc/kea/kea-dhcp-ddns.conf'
- 'etc/kea/keactrl.conf'
- 'etc/kea/kea-ctrl-agent.conf'
- 'etc/kea/kea-netconf.conf'
-)
-install=kea.install
+checkdepends=('gtest' 'procps-ng') # procps-ng needed for 'pgrep'
source=(
"https://ftp.isc.org/isc/${pkgbase}/${_upstreamver}/${pkgbase}-${_upstreamver}.tar.gz"{,.asc}
'tmpfiles-kea.conf'
@@ -58,16 +50,14 @@
'kea-dhcp6.service'
'kea-dhcp-ddns.service'
'kea-ctrl-agent.service'
- 'kea.install'
)
-sha512sums=('82cd44efea8c968ef097de242e1ca59e0183c80df25050017fd45538d35da64a9a0d2f4a5249ad3bd3d30b1f8895c360d301518bc22e60dfddd966fe020dc773'
- 'SKIP'
-
'b83479f0b90caf4022b1c858f99d8310848a90b0cc45aaa222cb2bf08b2a97312816b8f64c8c0232b612795bc7a0bbe5b05dbc508b2f1214c1ea88dc84200a2d'
-
'1b62dace9f9a955b21c5dd5b5466fb3a4f1d8057ad2a30ea89e222a769dc721ad2fe4913c41ec407e018b1b38ddde757e9b7b8fc12d4763ddde077a0abb0c971'
-
'8f0e8d059338c415ae322e971e243b259d9b2ef7d37b6be57b409bf5f0f3392e519c9bb94c5b548021d000b944a5da82096608cd9ff3ee58061059ad519b0068'
-
'1da9f02d5f6b3e2f9f2f896b1085c141b8739bd6614706fe0544a31b278f4d3c6616cb1ab3915c650262ea3592df86e95b53ce944ade2c80bb72fcae796f8fd4'
-
'db329fd83e458e4a77f6df8569074088bed152ffc1a188059d868d7178a6d3530efe368ce870a2e0be894f87fa0e5ba43562bdc3ad6372ddfcfedae37c90f491'
-
'758371f20a977f8e42e9d43d2d065c6aa294866070e54868dc329c0875b2eeafa05dcdf93590d5b429e262e2350a42c7616a3bc2e6f3994f53886870f4910251')
+b2sums=('10b4bca1a135c6d146490f8c4c7bd4d56c1c03e2b4cc88a6888fcad5d1a5c2ee2d2c0215cb345b53a2a4262dbd02516d75d5778835d45384a7d69a062b8696b9'
+ 'SKIP'
+
'7ac151ae19093350e75112ab1fba38561f6f986a8ac333ada91b86819abd65559e31cec86ef19fce68e0e56cbae7ed28858654507c4d975985db4d34ee0184fb'
+
'b25f29b3cd8657508d766eb4c92c8c2b9ebebd60c3639930cb0439f69d205352b6ef066409d704228721ae252b0d954e5f6a3a26bb46c33bbc9ede4170c22e94'
+
'60167919868547b03bfd37ffdd88a636019f1b6340aadd5c44fa99e77f66f47595fe89830bb53de11b91702d1dff986988d4c7df29a16e9456b1976760496259'
+
'01035d110b87bed6664e49f11d3d483a4e6a7b9290b05c85a43e485b309c8f15dc00b09959804f5dc3d7590abea36334300010e557988de587a2bf9043966d67'
+
'f7be743d8b90ffc82551c3afc28477c8bef10596c77368ccb63e61de7355518e5e668429ab277e3f1a994cdc8b3ef542867ddb91bc7f23860dfe2d72f67b99ba')
validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57' # Internet Systems
Consortium, Inc. (Signing key, 2017-2018) <[email protected]>
'AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38' # Internet Systems
Consortium, Inc. (Signing key, 2019-2020) <[email protected]>
'7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') # Internet Systems
Consortium, Inc. (Signing key, 2021-2022) <[email protected]>
@@ -74,11 +64,6 @@
build() {
cd "${srcdir}/${pkgbase}-${_upstreamver}"
- # make sure Google Benchmark can be linked to
- sed -e 's/dir\/lib\/libbenchmark.a/dir\/lib\/libbenchmark.so/g' \
- -e
's/BENCHMARK_LDADD="$dir\/lib\/libbenchmark.so/BENCHMARK_LDADD="-lbenchmark/' \
- -i configure.ac
- autoreconf --install
./configure \
--prefix='/usr' \
--sbindir='/usr/bin' \
@@ -85,15 +70,15 @@
--libexecdir='/usr/bin' \
--sysconfdir='/etc' \
--localstatedir='/var' \
- --enable-benchmark \
+ --runstatedir='/run' \
--enable-perfdhcp \
--enable-generate-messages \
--enable-generate-parser \
--enable-generate-docs \
--enable-shell \
+ --disable-static \
+ --with-gtest \
--with-openssl \
- --with-gtest \
- --with-benchmark \
--with-mysql \
--with-pgsql \
--with-gssapi \
@@ -100,13 +85,10 @@
--with-log4cplus
# do not treat sphinx warnings as errors
sed -e 's/sphinxopts = -v -E -a -W/sphinxopts = -v -E -a/g' \
- -i doc/Makefile.in \
- -i doc/Makefile \
- -i doc/sphinx/Makefile.in \
-i doc/sphinx/Makefile
+ # prevent libtool overlinking
+ sed -i -e 's/ -shared / '"${LDFLAGS}"' -shared /g' libtool
make
- make -C doc
- make -C doc/sphinx
make -C doc/devel devel
}
@@ -119,11 +101,18 @@
}
package_kea() {
+ backup=(
+ # New config files as of Kea 1.3
+ 'etc/kea/kea-dhcp4.conf'
+ 'etc/kea/kea-dhcp6.conf'
+ 'etc/kea/kea-dhcp-ddns.conf'
+ 'etc/kea/keactrl.conf'
+ 'etc/kea/kea-ctrl-agent.conf'
+ )
cd "${srcdir}/kea-${_upstreamver}"
make DESTDIR="${pkgdir}" install
- # Handle /var/run -> /run symlink
- rmdir "${pkgdir}"/var/run/kea
- rmdir "${pkgdir}"/var/run
+ # Do not package /run
+ rm -rf "${pkgdir}"/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
@@ -131,7 +120,7 @@
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
# split docs in a separate package
- rm -rf "${pkgdir}"/usr/share/doc
+ rm -rf "${pkgdir}"/usr/share/{doc,man}
}
package_kea-docs() {
@@ -139,11 +128,10 @@
optdepends=()
provides=('kea-devel-docs')
replaces=('kea-devel-docs')
+
cd "${srcdir}/${pkgbase}-${_upstreamver}"
install -d "${pkgdir}/usr/share/doc/${pkgbase}/"
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/{etc,var,usr/{bin,lib,include,share/kea}}
make DESTDIR="${pkgdir}" -C doc install
- make DESTDIR="${pkgdir}" -C doc/devel install
cp -r doc/devel/html "${pkgdir}/usr/share/doc/${pkgbase}/devel"
+ rm "${pkgdir}"/usr/share/doc/kea/devel/doxygen{,-error}.log
}
Deleted: kea.install
===================================================================
--- kea.install 2023-01-26 18:12:27 UTC (rev 1388361)
+++ kea.install 2023-01-26 19:41:29 UTC (rev 1388362)
@@ -1,17 +0,0 @@
-post_install () {
- echo '## WARNING!##'
- echo 'Upgrading from Kea version <1.6 to version >= 1.6 requires special
attention'
- echo 'Please refer to the following web page for details:'
- echo '[Upgrading to Kea
1.6](https://kb.isc.org/docs/en/upgrading-to-kea-16)'
- echo 'Notable changes include:'
- echo ' - Files in /var/kea have moved to (/var)/run/kea'
- echo ' - State Info: now in /usr/lib/kea'
- echo ' - Hooks: /usr/lib/hooks has moved to /usr/lib/kea/hooks'
- echo ' - Admin commands lease-{init,version,upgrade} have been renamed'
- echo ' to db-{init,version,upgrade}'
- echo ' - Logger configuration changed scope thus a manual configuration'
- echo ' file intervention is needed)'
-}
-post_upgrade () {
- post_install $*
-}
