diff options
Diffstat (limited to 'main/dhcp/APKBUILD')
| -rw-r--r-- | main/dhcp/APKBUILD | 146 |
1 files changed, 74 insertions, 72 deletions
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD index 34fab799e17..5ce964d49e1 100644 --- a/main/dhcp/APKBUILD +++ b/main/dhcp/APKBUILD @@ -1,21 +1,29 @@ -# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: pkgname=dhcp -pkgver=4.4.2_p1 -_realver=${pkgver/_p/-P} -pkgrel=0 +pkgver=4.4.3_p1 +_projver=${pkgver/_p/-P} +pkgrel=4 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" url="https://www.isc.org/" arch="all" license="MPL-2.0" -_depends_server_ldap="!$pkgname-server-vanilla $pkgname" -_depends_server_vanilla="!$pkgname-server-ldap $pkgname" -depends_static="$pkgname-dev" +depends_static="$pkgname-dev=$pkgver-r$pkgrel" # busybox utils are not sufficient -_depends_dhclient="coreutils iproute2 run-parts" -_depends_dhcrelay="" # do not inherit depends from $pkgname +_depends_dhclient=" + coreutils + iproute2 + run-parts + " +makedepends=" + krb5-dev + linux-headers + openldap-dev + perl + $_depends_dhclient + " pkgusers="dhcp" pkggroups="dhcp" -makedepends="krb5-dev linux-headers openldap-dev perl" install="$pkgname.pre-install" subpackages=" $pkgname-dbg @@ -23,29 +31,28 @@ subpackages=" $pkgname-openrc $pkgname-libs-static $pkgname-dev - dhclient + $pkgname-server-vanilla:_server_vanilla + $pkgname-server-ldap:_server_ldap dhcrelay dhcrelay-openrc - $pkgname-server-vanilla:server_vanilla - $pkgname-server-ldap:server_ldap + dhclient + keama " -source=" - https://downloads.isc.org/isc/dhcp/$_realver/dhcp-$_realver.tar.gz - 01-dhclient-script-fix-bare-ip.patch - 02-dhclient-script-remove-bashisms.patch +source="https://downloads.isc.org/isc/dhcp/$_projver/dhcp-$_projver.tar.gz + fix-unwind-import.patch dhcp-3.0-fix-perms.patch - segfault-fix.patch - remove-duplicate-definitions.patch dhclient-script-alpine dhcrelay.initd dhcrelay.confd dhcpd.confd dhcpd.initd " -builddir="$srcdir/$pkgname-$_realver" -makedepends="$makedepends $_depends_dhclient $_depends_server_ldap $_depends_server_vanilla" +builddir="$srcdir/$pkgname-$_projver" # secfixes: +# 4.4.3_p1-r0: +# - CVE-2022-2928 +# - CVE-2022-2929 # 4.4.2_p1-r0: # - CVE-2021-25217 # 4.4.1-r0: @@ -80,7 +87,6 @@ _configure() { --enable-paranoia \ --enable-log-pid \ "$@" - } prepare() { @@ -89,17 +95,20 @@ prepare() { # it early then the build system will just use what we've already # unpacked and patched. tar -C "$builddir"/bind/ -xzf "$builddir"/bind/bind.tar.gz + default_prepare + update_config_guess update_config_sub + cp config.guess config.sub bind/bind-*/ + + cp -ar "$builddir" "$builddir-ldap" } build() { - cp config.guess config.sub bind/bind-*/ - cp -a "$builddir" "$builddir-ldap" - _configure make -j1 -C bind && make + make -C keama cd "$builddir-ldap" _configure \ @@ -118,11 +127,10 @@ check() { package() { make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C keama install - #install -m751 -D "$builddir"/client/scripts/linux "$pkgdir"/sbin/dhclient-script install -m751 -D "$srcdir"/dhclient-script-alpine "$pkgdir"/sbin/dhclient-script - install -d "$pkgdir"/var/lib/dhcp - install -d "$pkgdir"/run/dhcp + install -d -o dhcp -g dhcp "$pkgdir"/var/lib/dhcp } openrc() { @@ -135,59 +143,56 @@ openrc() { default_openrc } -server_ldap() { - pkgdesc="ISC dhcpd server with LDAP support" - depends="$_depends_server_ldap" - provides="dhcp-server" - provider_priority=100 - - install -d "$subpkgdir" - make DESTDIR="$subpkgdir" -C "$builddir-ldap/server" install-sbinPROGRAMS +static() { + depends="$depends_static" + default_static || mkdir -p "$subpkgdir" } -server_vanilla() { - pkgdesc="ISC dhcpd server" - depends="$_depends_server_vanilla" +_server_vanilla() { + pkgdesc="ISC DHCP server" + depends="$pkgname=$pkgver-r$pkgrel" install_if="$pkgname=$pkgver-r$pkgrel" - provides="dhcp-server" - provider_priority=200 + provides="dhcp-server=$pkgver-r$pkgrel" + provider_priority=100 # highest - install -d "$subpkgdir"/usr/sbin - mv "$pkgdir/usr/sbin/dhcpd" "$subpkgdir/usr/sbin/" - rmdir "$pkgdir/usr/sbin" || : + amove usr/sbin/dhcpd } -dhclient() { - pkgdesc="ISC dhcp client" - depends="$_depends_dhclient" +_server_ldap() { + pkgdesc="ISC DHCP server with LDAP support" + depends="$pkgname=$pkgver-r$pkgrel" + provides="dhcp-server=$pkgver-r$pkgrel" + provider_priority=10 # lowest - install -d -o dhcp -g dhcp "$subpkgdir"/var/lib/dhcp - install -d -o dhcp -g dhcp "$subpkgdir"/run/dhcp - install -d "$subpkgdir"/usr/sbin - install -d "$subpkgdir"/sbin - install -d "$subpkgdir"/etc/dhcp - mv "$pkgdir"/usr/sbin/dhclient "$subpkgdir"/usr/sbin/ - mv "$pkgdir"/sbin/dhclient-script "$subpkgdir"/sbin/ - ln -s ../sbin/dhclient-script "$subpkgdir"/etc/dhclient-script - mv "$pkgdir"/etc/dhcp/dhclient.conf* "$subpkgdir"/etc/dhcp/ + install -d "$subpkgdir" + make DESTDIR="$subpkgdir" -C "$builddir-ldap/server" install-sbinPROGRAMS } dhcrelay() { - pkgdesc="ISC dhcp relay server" - depends="$_depends_dhcrelay" - replaces="dhcp" + pkgdesc="ISC DHCP relay agent" + depends="" install="$subpkgname.pre-install" - install -d "$subpkgdir"/run/dhcp \ - "$subpkgdir"/usr/sbin - mv "$pkgdir"/usr/sbin/dhcrelay "$subpkgdir"/usr/sbin/ + amove usr/sbin/dhcrelay } -static() { - depends="$depends_static" - default_static || mkdir -p "$subpkgdir" +dhclient() { + pkgdesc="ISC DHCP client" + depends="$_depends_dhclient" + + amove etc/dhcp/dhclient.conf* + amove usr/sbin/dhclient + amove sbin/dhclient-script + ln -s ../sbin/dhclient-script "$subpkgdir"/etc/dhclient-script + + install -d -o dhcp -g dhcp "$subpkgdir"/var/lib/dhcp } +keama() { + pkgdesc="KEA Migration Assistant to translate ISC DHCP configurations to Kea" + + amove usr/sbin/keama +} # gpg_signature_extensions="sha512.asc" # gpgfingerprints=" @@ -196,15 +201,12 @@ static() { # " sha512sums=" -924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040 dhcp-4.4.2-P1.tar.gz -17e2b9588ee5d1bd9acb9c2e30f7a28308d29c9e797c2be14c1feff52e6e231ce8a94535f18badff1342aff4ae4003aab986e0f0473f0cd280292fdab044b148 01-dhclient-script-fix-bare-ip.patch -a70e4a7e80ee65c8ced6b61db80f7ccd0f35015b5cccf2e7c51705ae129230aa49ba9926bb88f7418018e7a112c2a40451f24b88e04464b590ff20091e8d8709 02-dhclient-script-remove-bashisms.patch +d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154 dhcp-4.4.3-P1.tar.gz +23ab581d85ba97a37fd6a0a612e0aa977b24bbaf83d58a93d1a87f9f24ea9a098aa549e77a6e1d78f721681c152464b15fd1d402d0673edf4dac6aa196df1fe9 fix-unwind-import.patch d5697a56fbbff25199962608986e7ffb533ed4afd3e344e3c79d2010dda73cc0b088f06c454e9f0c69eb054e09a374455fa71d3f73306e0c98fa76df4dd321b7 dhcp-3.0-fix-perms.patch -ff07f613da93de6d6a81cf5147ecc937e1405913f1649bf9c58d45214417e6b94b3fd897796d1dd3422ed27a43d935a84d7c72df98d59f30abd88b12f4f6edad segfault-fix.patch -fcc9f3c5a361e8a5fa690986c415a23e86c347f697aec3087c5783670d4abefcb0f073a37cfac8fe07206ac3e349df9cb7283b84356cdc4f4777b426ab0305ef remove-duplicate-definitions.patch d1dce58875793316761f168e29feddc1d3454d1d917d063d43ae102b7b6aab256c3cb420478335c57ebcdb2b7c804afa4d8a1f9ab06a29a4dd23bc5d87db8df2 dhclient-script-alpine -ce62693cb483616844bb6774f9046af6a1a210e35cfaa59ab3bd12f68d50176714a324e92538b35139110b78191866f65b30d6979d8a45f7b68e572e7a1e8427 dhcrelay.initd -fd15dbaa4c61c3c26f407bf13dde859470a1adba134da064b653ccc152ce42635ee8de2fe113ae21ba8470e97e3caad8c1a47b69eb25e5e92b40e26790b96f6d dhcrelay.confd +e672ec030137e870afb817ec0fe4e01a7553f331181e481cba1f032f1e18798dd153bf30105ca8361284e6e11f80435ef7c960b0a11c32c5766c30a0c960550c dhcrelay.initd +970ee381dd6a7e0e30d71e28597d17074421ac167b233f597a129ed9b977cba1026375a020dff2613c3f4d458b71ed9fe4447abfcf5edf27b395e6f2b00f0982 dhcrelay.confd 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d dhcpd.confd 1f78c4f64a891012b4de029c50934b284ad80313959e06b0f29416f33a9e4f0deca8b61e9224a683a92faf8a08e8b7c075bc6e833ab73b6305c0d6d9712d0baf dhcpd.initd " |