diff --git a/temp/dhcpcd/APKBUILD b/temp/dhcpcd/APKBUILD deleted file mode 100644 index 27361cfde..000000000 --- a/temp/dhcpcd/APKBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# Forked from Alpine to disable IFA_F_NOPREFIXROUTE (for old kernels) - -pkgname=dhcpcd -pkgver=9999 -_pkgver=8.1.6 -pkgrel=2 -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" -subpackages="$pkgname-doc $pkgname-openrc" -source="https://roy.marples.name/downloads/dhcpcd/dhcpcd-$_pkgver.tar.xz - busybox-logger.patch - fix-chrony-conf-location.patch - old-kernel.patch - dhcpcd.initd - musl.patch - " -builddir="$srcdir/dhcpcd-$_pkgver" - -build() { - CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname \ - --dbdir=/var/lib/$pkgname \ - --rundir=/run \ - --enable-ipv6 \ - --without-dev \ - --without-udev - make -} - -check() { - make test -} - -package() { - make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir"/dhcpcd.initd \ - "$pkgdir"/etc/init.d/dhcpcd -} - -sha512sums="f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df dhcpcd-8.1.6.tar.xz -692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0 busybox-logger.patch -1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch -d4610be2b694ae3c7ba2defc4273635b87579c51ae5a74cc4c3ecce66dfc7cb32c4713655ac0324781445c5271fcfdc14b20584b332a2c1e2dbbeaf7ff17b44b dhcpcd.initd -082aa80798476917e2a86003cb95136212cbb9b8da986e7d8186d7f3d857e81a4cb03af56296484e035e5006d36c695ef57f571ea9c1fd18b4200a9cf745a6b4 musl.patch -a4837a22ebf1f99ac3dc137c6edabd6d0c146ea3ca3b755e957cff6421c51eaef3feea443c0900518689c21b56f10af8230ae8fe257054207df0debaf4e55d29 old-kernel.patch" diff --git a/temp/dhcpcd/busybox-logger.patch b/temp/dhcpcd/busybox-logger.patch deleted file mode 100644 index f1b913931..000000000 --- a/temp/dhcpcd/busybox-logger.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hooks/dhcpcd-run-hooks.in -+++ b/hooks/dhcpcd-run-hooks.in -@@ -179,7 +179,7 @@ - *) echo "$interface: $*";; - esac - if type 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/temp/dhcpcd/dhcpcd.initd b/temp/dhcpcd/dhcpcd.initd deleted file mode 100644 index 58c405c65..000000000 --- a/temp/dhcpcd/dhcpcd.initd +++ /dev/null @@ -1,18 +0,0 @@ -#!/sbin/openrc-run - -supervisor=supervise-daemon - -name="DHCP Client Daemon" -description="DHCP Client Daemon" - -command=/sbin/dhcpcd -command_args_foreground="-B" -command_args="-q ${command_args:-}" - -depend() { - provide net - need localmount - use logger network - after bootmisc modules - before dns -} diff --git a/temp/dhcpcd/dhcpcd.post-upgrade b/temp/dhcpcd/dhcpcd.post-upgrade deleted file mode 100644 index f1e7dc924..000000000 --- a/temp/dhcpcd/dhcpcd.post-upgrade +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -ver_new="$1" -ver_old="$2" - -# Move dhcpcd.duid and dhcpcd.secret to new location when upgrading -# to dhcpcd 7.x. -# See https://roy.marples.name/blog/dhcpcd-7-finally-enters-beta. -if [ "$(apk version -t "$ver_old" '7.0.0-r0')" = '<' ]; then - dbdir='/var/lib/dhcpcd' - duid_old='/etc/dhcpcd.duid' - secret_old='/etc/dhcpcd.secret' - - if [ -f $duid_old ] && [ ! -f $dbdir/duid ]; then - echo "* Moving $duid_old to $dbdir/duid" >&2 - mv $duid_old $dbdir/duid - fi - if [ -f $secret_old ] && [ ! -f $dbdir/secret ]; then - echo "* Moving $secret_old to $dbdir/secret" >&2 - mv $secret_old $dbdir/secret - fi -fi - -exit 0 diff --git a/temp/dhcpcd/fix-chrony-conf-location.patch b/temp/dhcpcd/fix-chrony-conf-location.patch deleted file mode 100644 index b75df9f37..000000000 --- a/temp/dhcpcd/fix-chrony-conf-location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hooks/50-ntp.conf -+++ b/hooks/50-ntp.conf -@@ -17,7 +17,7 @@ - # above examples. - - : ${ntp_confs:=ntp.conf ntpd.conf chrony.conf} --: ${ntp_conf_dirs=/etc /usr/pkg/etc /usr/local/etc} -+: ${ntp_conf_dirs=/etc /etc/chrony /usr/pkg/etc /usr/local/etc} - ntp_conf_dir="$state_dir/ntp.conf" - - # If NTP_CONF is not set, work out a good default diff --git a/temp/dhcpcd/musl.patch b/temp/dhcpcd/musl.patch deleted file mode 100644 index 9de5163db..000000000 --- a/temp/dhcpcd/musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -Include linux/if_tun.h after netinet/if_tun.h to avoid redefinition of struct ethhdr - -diff --git a/src/if-linux.c b/src/if-linux.c -index fd47278..cca4e36 100644 ---- a/src/if-linux.c -+++ b/src/if-linux.c -@@ -37,7 +37,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -51,6 +50,8 @@ - #include - #include - -+#include -+ - #include - #include - #include - diff --git a/temp/dhcpcd/old-kernel.patch b/temp/dhcpcd/old-kernel.patch deleted file mode 100644 index fdc30939c..000000000 --- a/temp/dhcpcd/old-kernel.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/if-linux.c -+++ b/src/if-linux.c -@@ -97,6 +97,8 @@ int if_getssid_wext(const char *ifname, uint8_t *ssid); - #define BPF_ETHCOOK -ETH_HLEN - #define BPF_WHOLEPACKET 0x0fffffff /* work around buggy LPF filters */ - -+#undef IFA_F_NOPREFIXROUTE -+ - struct priv { - int route_fd; - uint32_t route_pid;