diff options
Diffstat (limited to 'main/dhcpcd')
| -rw-r--r-- | main/dhcpcd/APKBUILD | 21 | ||||
| -rw-r--r-- | main/dhcpcd/busybox-logger.patch | 6 | ||||
| -rw-r--r-- | main/dhcpcd/dhcpcd.initd | 10 | ||||
| -rw-r--r-- | main/dhcpcd/dhcpcd.pre-install | 9 |
4 files changed, 32 insertions, 14 deletions
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index 269a068ca94..38d7d6ef8b5 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD @@ -2,22 +2,22 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd -pkgver=9.4.1 +pkgver=10.0.6 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" arch="all" license="BSD-2-Clause" -makedepends="linux-headers bsd-compat-headers dbus-dev" -install="$pkgname.post-upgrade" +makedepends="linux-headers bsd-compat-headers" +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/releases/download/v$pkgver/dhcpcd-$pkgver.tar.xz busybox-logger.patch fix-chrony-conf-location.patch dhcpcd.initd " + build() { - CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,8 +26,11 @@ build() { --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname \ --dbdir=/var/lib/$pkgname \ - --rundir=/run \ + --rundir=/run/dhcpcd \ + --runstatedir=/run/dhcpcd \ --enable-ipv6 \ + --enable-privsep \ + --enable-seccomp \ --without-dev \ --without-udev make @@ -44,8 +47,8 @@ package() { } sha512sums=" -530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 dhcpcd-9.4.1.tar.xz -692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch +403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004 dhcpcd-10.0.6.tar.xz +b6bdaac9fc0d5d2d7e8c5e30d1a45db1cff2284d01f92f8821b2f03aaff4e0dbd8cbfbced96d8d9d934dc11f22b792a8345d634d8e4e3b84f43016b7e866e302 busybox-logger.patch 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch -dc3b30295dbe5310526443736e60ccc53621d465d512639e8ea20efe598037ff33730e46964e4e7bc32d4ce88aaecf3b9bb9a4ceab892d8bff3423e0374ccae1 dhcpcd.initd +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 diff --git a/main/dhcpcd/dhcpcd.initd b/main/dhcpcd/dhcpcd.initd index aab118242e1..bcefb601d6c 100644 --- a/main/dhcpcd/dhcpcd.initd +++ b/main/dhcpcd/dhcpcd.initd @@ -3,9 +3,9 @@ description="DHCP Client Daemon" command="/sbin/dhcpcd" -command_args="-q ${command_args:-}" -command_args_foreground="-B" -pidfile="/run/dhcpcd.pid" +command_args="-q -B ${command_args:-}" +command_background="true" +pidfile="/run/dhcpcd/pid" depend() { provide net @@ -14,3 +14,7 @@ depend() { after bootmisc modules before dns } + +start_pre() { + checkpath -d /run/dhcpcd +} diff --git a/main/dhcpcd/dhcpcd.pre-install b/main/dhcpcd/dhcpcd.pre-install new file mode 100644 index 00000000000..e69b5e9bd92 --- /dev/null +++ b/main/dhcpcd/dhcpcd.pre-install @@ -0,0 +1,9 @@ +#!/bin/sh + +user=dhcpcd +group=dhcpcd + +addgroup -S $group 2>/dev/null +adduser -S -D -h /var/lib/$user -s /sbin/nologin -G $group -g $user $user 2>/dev/null + +exit 0 |