summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2023-04-19 18:48:29 +0000
committerpsykose <alice@ayaya.dev>2023-04-19 20:48:29 +0200
commitf3a3371b7a11d6335e14b215b2828af2adc465fc (patch)
treee3ff6a233694db69d54f1e81d335edea7db56910
parentc878341873168fef6b5c91c8f5c924a1af67c7c3 (diff)
downloadaports-f3a3371b7a11d6335e14b215b2828af2adc465fc.zip
main/dhcpcd: upgrade to 10.0.0
-rw-r--r--main/dhcpcd/APKBUILD16
-rw-r--r--main/dhcpcd/busybox-logger.patch6
2 files changed, 12 insertions, 10 deletions
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index f6adc669638..1ae6085b581 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
-pkgver=9.4.1
-pkgrel=5
+pkgver=10.0.0
+pkgrel=0
pkgdesc="RFC2131 compliant DHCP client"
url="https://roy.marples.name/projects/dhcpcd"
arch="all"
@@ -11,13 +11,14 @@ license="BSD-2-Clause"
makedepends="linux-headers bsd-compat-headers dbus-dev"
install="$pkgname.post-upgrade $pkgname.pre-install"
subpackages="$pkgname-doc $pkgname-openrc"
-source="https://roy.marples.name/downloads/dhcpcd/dhcpcd-$pkgver.tar.xz
+source="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/dhcpcd-$pkgver.tar.gz
busybox-logger.patch
fix-chrony-conf-location.patch
dhcpcd.initd
"
+builddir="$srcdir/dhcpcd-dhcpcd-10.0.0"
+
build() {
- CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,8 +30,7 @@ build() {
--rundir=/run/dhcpcd \
--enable-ipv6 \
--without-dev \
- --without-udev \
- --disable-privsep
+ --without-udev
make
}
@@ -45,8 +45,8 @@ package() {
}
sha512sums="
-530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 dhcpcd-9.4.1.tar.xz
-692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch
+3b7096a2b3fac070443b6b08dffd38a5fd388a0f2c2581598452fa20445574d7ab3d1239601d3c9ed03fcfff6c8b740c88c337be94a5397a6b292ab9a474be7f dhcpcd-10.0.0.tar.gz
+b6bdaac9fc0d5d2d7e8c5e30d1a45db1cff2284d01f92f8821b2f03aaff4e0dbd8cbfbced96d8d9d934dc11f22b792a8345d634d8e4e3b84f43016b7e866e302 busybox-logger.patch
1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch
7fb44b82a6fa25ee6249fc4835853a4c1fc7d327653efabd9fde303b1f306b3aa6956b2621b55a24fc007ec7ad878ce50e7418ebff0b17fece76e2fdd9e5190d dhcpcd.initd
"
diff --git a/main/dhcpcd/busybox-logger.patch b/main/dhcpcd/busybox-logger.patch
index f1b913931b0..220b914bcb9 100644
--- a/main/dhcpcd/busybox-logger.patch
+++ b/main/dhcpcd/busybox-logger.patch
@@ -1,9 +1,11 @@
+diff --git a/hooks/dhcpcd-run-hooks.in b/hooks/dhcpcd-run-hooks.in
+index 91df64b..c6fb8c6 100644
--- a/hooks/dhcpcd-run-hooks.in
+++ b/hooks/dhcpcd-run-hooks.in
-@@ -179,7 +179,7 @@
+@@ -179,7 +179,7 @@ syslog()
*) echo "$interface: $*";;
esac
- if type logger >/dev/null 2>&1; then
+ if command -v logger >/dev/null 2>&1; then
- logger -i -p daemon."$lvl" -t dhcpcd-run-hooks "$interface: $*"
+ logger -p daemon."$lvl" -t dhcpcd-run-hooks "$interface: $*"
fi