diff options
Diffstat (limited to 'source/n')
4 files changed, 2 insertions, 122 deletions
diff --git a/source/n/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo deleted file mode 100644 index fa1cbf654..000000000 --- a/source/n/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo +++ /dev/null @@ -1 +0,0 @@ -SHA256 (dhcpcd-9.4.0.tar.xz) = 41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513 diff --git a/source/n/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo new file mode 100644 index 000000000..40b2f7bff --- /dev/null +++ b/source/n/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo @@ -0,0 +1 @@ +SHA256 (dhcpcd-9.4.1.tar.xz) = 819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild index 5bab0cb38..82a9b44fb 100755 --- a/source/n/dhcpcd/dhcpcd.SlackBuild +++ b/source/n/dhcpcd/dhcpcd.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dhcpcd VERSION=${VERSION:-$(echo dhcpcd-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # By default, Slackware builds dhcpcd with privilege separation, which improves # security by ensuring that any security vulnerabilies such as buffer overflows @@ -85,7 +85,6 @@ find . \ patch -p1 --verbose < $CWD/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch || exit 1 patch -p1 --verbose < $CWD/patches/use-hostname_short-in-dhcpcd.conf.patch || exit 1 patch -p1 --verbose < $CWD/patches/dhcpcd.conf-request_ntp_server_by_default.patch || exit 1 -patch -p1 --verbose < $CWD/patches/dhcpcd.2fae4a113c3e736d585dd300ca6c8fddae300503.patch || exit 1 # At this point, it should be safe to assume that /var will be mounted by the # time dhcpcd is called, as all non-root local filesystems are mounted from diff --git a/source/n/dhcpcd/patches/dhcpcd.2fae4a113c3e736d585dd300ca6c8fddae300503.patch b/source/n/dhcpcd/patches/dhcpcd.2fae4a113c3e736d585dd300ca6c8fddae300503.patch deleted file mode 100644 index 8f6a0075a..000000000 --- a/source/n/dhcpcd/patches/dhcpcd.2fae4a113c3e736d585dd300ca6c8fddae300503.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 2fae4a113c3e736d585dd300ca6c8fddae300503 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Tue, 31 Aug 2021 10:57:44 +0100 -Subject: [PATCH] DHCP6: Only send FQDN for SOLICIT, REQUEST, RENEW, or REBIND messages. - -As per RFC 4704 section 5. -Fixes #44. ---- - src/dhcp6.c | 79 +++++++++++++++++++++++++++++++++------------------------- - 1 files changed, 45 insertions(+), 34 deletions(-) - -diff --git a/src/dhcp6.c b/src/dhcp6.c -index f355418..9c818b3 100644 ---- a/src/dhcp6.c -+++ b/src/dhcp6.c -@@ -637,7 +637,7 @@ dhcp6_makemessage(struct interface *ifp) - uint8_t type; - uint16_t si_len, uni_len, n_options; - uint8_t *o_lenp; -- struct if_options *ifo; -+ struct if_options *ifo = ifp->options; - const struct dhcp_opt *opt, *opt2; - const struct ipv6_addr *ap; - char hbuf[HOSTNAME_MAX_LEN + 1]; -@@ -658,8 +658,50 @@ dhcp6_makemessage(struct interface *ifp) - state->send = NULL; - } - -- ifo = ifp->options; -- fqdn = ifo->fqdn; -+ switch(state->state) { -+ case DH6S_INIT: /* FALLTHROUGH */ -+ case DH6S_DISCOVER: -+ type = DHCP6_SOLICIT; -+ break; -+ case DH6S_REQUEST: -+ type = DHCP6_REQUEST; -+ break; -+ case DH6S_CONFIRM: -+ type = DHCP6_CONFIRM; -+ break; -+ case DH6S_REBIND: -+ type = DHCP6_REBIND; -+ break; -+ case DH6S_RENEW: -+ type = DHCP6_RENEW; -+ break; -+ case DH6S_INFORM: -+ type = DHCP6_INFORMATION_REQ; -+ break; -+ case DH6S_RELEASE: -+ type = DHCP6_RELEASE; -+ break; -+ case DH6S_DECLINE: -+ type = DHCP6_DECLINE; -+ break; -+ default: -+ errno = EINVAL; -+ return -1; -+ } -+ -+ /* RFC 4704 Section 5 says we can only send FQDN for these -+ * message types. */ -+ switch(type) { -+ case DHCP6_SOLICIT: -+ case DHCP6_REQUEST: -+ case DHCP6_RENEW: -+ case DHCP6_REBIND: -+ fqdn = ifo->fqdn; -+ break; -+ default: -+ fqdn = FQDN_DISABLE; -+ break; -+ } - - if (fqdn == FQDN_DISABLE && ifo->options & DHCPCD_HOSTNAME) { - /* We're sending the DHCPv4 hostname option, so send FQDN as -@@ -823,37 +865,6 @@ dhcp6_makemessage(struct interface *ifp) - } - - switch(state->state) { -- case DH6S_INIT: /* FALLTHROUGH */ -- case DH6S_DISCOVER: -- type = DHCP6_SOLICIT; -- break; -- case DH6S_REQUEST: -- type = DHCP6_REQUEST; -- break; -- case DH6S_CONFIRM: -- type = DHCP6_CONFIRM; -- break; -- case DH6S_REBIND: -- type = DHCP6_REBIND; -- break; -- case DH6S_RENEW: -- type = DHCP6_RENEW; -- break; -- case DH6S_INFORM: -- type = DHCP6_INFORMATION_REQ; -- break; -- case DH6S_RELEASE: -- type = DHCP6_RELEASE; -- break; -- case DH6S_DECLINE: -- type = DHCP6_DECLINE; -- break; -- default: -- errno = EINVAL; -- return -1; -- } -- -- switch(state->state) { - case DH6S_REQUEST: /* FALLTHROUGH */ - case DH6S_RENEW: /* FALLTHROUGH */ - case DH6S_RELEASE: --- -1.7.1 - - |