commit: 787cc9c45a357ecaebb1cc7ef5b8c6c423644d48
parent 2e289933d54b223c20f6bf0171661d50bf91870e
Author: Eduardo Sánchez Muñoz <eduardosm-dev@e64.io>
Date: Tue, 11 Apr 2023 23:37:59 +0200
Update dhcpcd to version 9.5.0
Also fixes broken download link
Diffstat:
8 files changed, 138 insertions(+), 138 deletions(-)
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
@@ -36,7 +36,7 @@ acd3ba50a33ea0172c3ca59e341a48e4233be48ded26fa031fd2e9417a2dfb31 coreutils-5.0_
e41aba2caa7514704731d3b7a49f63ff8ffb2d22a64f14afdbaadbd0b24073f0 coreutils-8.32_0.tar.bz2
8df7fe3124243028cc9fd9a00fe8ab55c2143a9b7551426447867d2e1de436b6 curl-7.88.1_0.tar.bz2
d7d0a5fc9117f9b3ebd287851a48716c96a3c11991365edb8890f0e203d3b810 curl-7.88.1_1.tar.bz2
-ddb6a5292b15cc8925fe3f42ff44e3f2b5bda20a08159c4b3f4ea81730e40178 dhcpcd-9.4.1_0.tar.bz2
+5022827ba9d4cc7de3b0d0bafdce1c8abd01e437e940193c672d6a309c889806 dhcpcd-9.5.0_0.tar.bz2
c4008ae6b168aee4120b0f3624a1875f9e413d8f0c637708b8b04a1fb5be173c diffutils-2.7_0.tar.bz2
bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1 dist-3.5-236_0.tar.bz2
c0514138e251062c9ac2ff1e432e01a541777bfd61480c77479ea55f5b75cdd1 e2fsprogs-1.45.7_0.tar.bz2
diff --git a/sysa/dhcpcd-9.4.1/patches/remove-ctassert.patch b/sysa/dhcpcd-9.4.1/patches/remove-ctassert.patch
@@ -1,134 +0,0 @@
-# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
-#
-# SPDX-License-Identifier: BSD-2-Clause
-
-__CTASSERT macro does not work properly on our older GCC.
-
-diff --color -ru src/arp.c src/arp.c
---- src/arp.c 2022-05-22 13:55:30.103757852 +1000
-+++ src/arp.c 2022-05-22 13:55:43.692407546 +1000
-@@ -63,9 +63,6 @@
- /* ARP debugging can be quite noisy. Enable this for more noise! */
- //#define ARP_DEBUG
-
--/* Assert the correct structure size for on wire */
--__CTASSERT(sizeof(struct arphdr) == 8);
--
- static ssize_t
- arp_request(const struct arp_state *astate,
- const struct in_addr *sip)
-diff --color -ru src/auth.c src/auth.c
---- src/auth.c 2022-05-22 13:52:30.219151581 +1000
-+++ src/auth.c 2022-05-22 13:53:24.729760674 +1000
-@@ -343,9 +343,6 @@
-
- /* RFC3318, section 5.2 - zero giaddr and hops */
- if (mp == 4) {
-- /* Assert the bootp structure is correct size. */
-- __CTASSERT(sizeof(struct bootp) == 300);
--
- *(mm + offsetof(struct bootp, hops)) = '\0';
- memset(mm + offsetof(struct bootp, giaddr), 0, 4);
- }
-diff --color -ru src/dhcp6.c src/dhcp6.c
---- src/dhcp6.c 2022-05-22 13:52:30.219151581 +1000
-+++ src/dhcp6.c 2022-05-22 13:53:33.455178213 +1000
-@@ -84,33 +84,28 @@
- uint8_t xid[3];
- /* followed by options */
- };
--__CTASSERT(sizeof(struct dhcp6_message) == 4);
-
- struct dhcp6_option {
- uint16_t code;
- uint16_t len;
- /* followed by data */
- };
--__CTASSERT(sizeof(struct dhcp6_option) == 4);
-
- struct dhcp6_ia_na {
- uint8_t iaid[4];
- uint32_t t1;
- uint32_t t2;
- };
--__CTASSERT(sizeof(struct dhcp6_ia_na) == 12);
-
- struct dhcp6_ia_ta {
- uint8_t iaid[4];
- };
--__CTASSERT(sizeof(struct dhcp6_ia_ta) == 4);
-
- struct dhcp6_ia_addr {
- struct in6_addr addr;
- uint32_t pltime;
- uint32_t vltime;
- };
--__CTASSERT(sizeof(struct dhcp6_ia_addr) == 16 + 8);
-
- /* XXX FIXME: This is the only packed structure and it does not align.
- * Maybe manually decode it? */
-@@ -120,7 +115,6 @@
- uint8_t prefix_len;
- struct in6_addr prefix;
- } __packed;
--__CTASSERT(sizeof(struct dhcp6_pd_addr) == 8 + 1 + 16);
-
- struct dhcp6_op {
- uint16_t type;
-diff --color -ru src/dhcp.c src/dhcp.c
---- src/dhcp.c 2022-05-22 13:52:30.219151581 +1000
-+++ src/dhcp.c 2022-05-22 13:53:08.074963614 +1000
-@@ -98,11 +98,6 @@
- #define IP_RECVPKTINFO IP_PKTINFO
- #endif
-
--/* Assert the correct structure size for on wire */
--__CTASSERT(sizeof(struct ip) == 20);
--__CTASSERT(sizeof(struct udphdr) == 8);
--__CTASSERT(sizeof(struct bootp) == 300);
--
- struct dhcp_op {
- uint8_t value;
- const char *name;
-diff --color -ru src/if-bsd.c src/if-bsd.c
---- src/if-bsd.c 2022-05-22 13:52:30.219151581 +1000
-+++ src/if-bsd.c 2022-05-22 13:53:31.686093557 +1000
-@@ -1589,7 +1589,6 @@
- #endif
- }
-
--__CTASSERT(offsetof(struct rt_msghdr, rtm_msglen) == 0);
- int
- if_handlelink(struct dhcpcd_ctx *ctx)
- {
-diff --color -ru src/ipv6nd.c src/ipv6nd.c
---- src/ipv6nd.c 2022-05-22 13:52:30.219151581 +1000
-+++ src/ipv6nd.c 2022-05-22 13:53:30.092017279 +1000
-@@ -80,7 +80,6 @@
- uint32_t nd_opt_rdnss_lifetime;
- /* followed by list of IP prefixes */
- };
--__CTASSERT(sizeof(struct nd_opt_rdnss) == 8);
- #endif
-
- #ifndef ND_OPT_DNSSL
-@@ -92,7 +91,6 @@
- uint32_t nd_opt_dnssl_lifetime;
- /* followed by list of DNS servers */
- };
--__CTASSERT(sizeof(struct nd_opt_rdnss) == 8);
- #endif
-
- /* Impossible options, so we can easily add extras */
-diff --color -ru src/privsep-root.c src/privsep-root.c
---- src/privsep-root.c 2022-05-22 13:52:30.220151629 +1000
-+++ src/privsep-root.c 2022-05-22 13:53:28.152924488 +1000
-@@ -56,8 +56,6 @@
- #include "sa.h"
- #include "script.h"
-
--__CTASSERT(sizeof(ioctl_request_t) <= sizeof(unsigned long));
--
- struct psr_error
- {
- ssize_t psr_result;
diff --git a/sysa/dhcpcd-9.4.1/sources b/sysa/dhcpcd-9.4.1/sources
@@ -1 +0,0 @@
-https://roy.marples.name/git/dhcpcd/snapshot/dhcpcd-9.4.1.tar.gz adc30f140fbd0dc7f61ff9cf99da7eedfd484a26a8dafdcc9a0cd859e2199b5a
diff --git a/sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh b/sysa/dhcpcd-9.5.0/dhcpcd-9.5.0.sh
diff --git a/sysa/dhcpcd-9.5.0/patches/remove-ctassert.patch b/sysa/dhcpcd-9.5.0/patches/remove-ctassert.patch
@@ -0,0 +1,134 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: BSD-2-Clause
+
+__CTASSERT macro does not work properly on our older GCC.
+
+diff -ru src/arp.c src/arp.c
+--- src/arp.c
++++ src/arp.c
+@@ -63,9 +63,6 @@
+ /* ARP debugging can be quite noisy. Enable this for more noise! */
+ //#define ARP_DEBUG
+
+-/* Assert the correct structure size for on wire */
+-__CTASSERT(sizeof(struct arphdr) == 8);
+-
+ static ssize_t
+ arp_request(const struct arp_state *astate,
+ const struct in_addr *sip)
+diff -ru src/auth.c src/auth.c
+--- src/auth.c
++++ src/auth.c
+@@ -343,9 +343,6 @@
+
+ /* RFC3318, section 5.2 - zero giaddr and hops */
+ if (mp == 4) {
+- /* Assert the bootp structure is correct size. */
+- __CTASSERT(sizeof(struct bootp) == 300);
+-
+ *(mm + offsetof(struct bootp, hops)) = '\0';
+ memset(mm + offsetof(struct bootp, giaddr), 0, 4);
+ }
+diff -ru src/dhcp6.c src/dhcp6.c
+--- src/dhcp6.c
++++ src/dhcp6.c
+@@ -84,33 +84,28 @@
+ uint8_t xid[3];
+ /* followed by options */
+ };
+-__CTASSERT(sizeof(struct dhcp6_message) == 4);
+
+ struct dhcp6_option {
+ uint16_t code;
+ uint16_t len;
+ /* followed by data */
+ };
+-__CTASSERT(sizeof(struct dhcp6_option) == 4);
+
+ struct dhcp6_ia_na {
+ uint8_t iaid[4];
+ uint32_t t1;
+ uint32_t t2;
+ };
+-__CTASSERT(sizeof(struct dhcp6_ia_na) == 12);
+
+ struct dhcp6_ia_ta {
+ uint8_t iaid[4];
+ };
+-__CTASSERT(sizeof(struct dhcp6_ia_ta) == 4);
+
+ struct dhcp6_ia_addr {
+ struct in6_addr addr;
+ uint32_t pltime;
+ uint32_t vltime;
+ };
+-__CTASSERT(sizeof(struct dhcp6_ia_addr) == 16 + 8);
+
+ /* XXX FIXME: This is the only packed structure and it does not align.
+ * Maybe manually decode it? */
+@@ -120,7 +115,6 @@
+ uint8_t prefix_len;
+ struct in6_addr prefix;
+ } __packed;
+-__CTASSERT(sizeof(struct dhcp6_pd_addr) == 8 + 1 + 16);
+
+ struct dhcp6_op {
+ uint16_t type;
+diff -ru src/dhcp.c src/dhcp.c
+--- src/dhcp.c
++++ src/dhcp.c
+@@ -98,11 +98,6 @@
+ #define IP_RECVPKTINFO IP_PKTINFO
+ #endif
+
+-/* Assert the correct structure size for on wire */
+-__CTASSERT(sizeof(struct ip) == 20);
+-__CTASSERT(sizeof(struct udphdr) == 8);
+-__CTASSERT(sizeof(struct bootp) == 300);
+-
+ struct dhcp_op {
+ uint8_t value;
+ const char *name;
+diff -ru src/if-bsd.c src/if-bsd.c
+--- src/if-bsd.c
++++ src/if-bsd.c
+@@ -1600,7 +1600,6 @@
+ #endif
+ }
+
+-__CTASSERT(offsetof(struct rt_msghdr, rtm_msglen) == 0);
+ int
+ if_handlelink(struct dhcpcd_ctx *ctx)
+ {
+diff -ru src/ipv6nd.c src/ipv6nd.c
+--- src/ipv6nd.c
++++ src/ipv6nd.c
+@@ -80,7 +80,6 @@
+ uint32_t nd_opt_rdnss_lifetime;
+ /* followed by list of IP prefixes */
+ };
+-__CTASSERT(sizeof(struct nd_opt_rdnss) == 8);
+ #endif
+
+ #ifndef ND_OPT_DNSSL
+@@ -92,7 +91,6 @@
+ uint32_t nd_opt_dnssl_lifetime;
+ /* followed by list of DNS servers */
+ };
+-__CTASSERT(sizeof(struct nd_opt_dnssl) == 8);
+ #endif
+
+ /* Impossible options, so we can easily add extras */
+diff -ru src/privsep-root.c src/privsep-root.c
+--- src/privsep-root.c
++++ src/privsep-root.c
+@@ -56,8 +56,6 @@
+ #include "sa.h"
+ #include "script.h"
+
+-__CTASSERT(sizeof(ioctl_request_t) <= sizeof(unsigned long));
+-
+ struct psr_error
+ {
+ ssize_t psr_result;
diff --git a/sysa/dhcpcd-9.5.0/sources b/sysa/dhcpcd-9.5.0/sources
@@ -0,0 +1 @@
+https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/dhcpcd-9.5.0.tar.gz bb8ebda4b250ca8c2faa910205f5ffac66ae83a786b59f5cedbfe7624ad04bc2
diff --git a/sysa/run2.sh b/sysa/run2.sh
@@ -63,7 +63,7 @@ build util-linux-2.19.1
build e2fsprogs-1.45.7
-build dhcpcd-9.4.1 '' '' dhcpcd-dhcpcd-9.4.1-1663155
+build dhcpcd-9.5.0 '' '' dhcpcd-dhcpcd-9.5.0
build kbd-1.15
diff --git a/sysc/init b/sysc/init
@@ -43,7 +43,7 @@ install_tar binutils-2.30 0
install_tar bzip2-1.0.8 0
install_tar bison-3.4.1 2
install_tar coreutils-6.10 0
-install_tar dhcpcd-9.4.1 0
+install_tar dhcpcd-9.5.0 0
install_tar diffutils-2.7 0
install_tar findutils-4.2.33 0
install_tar flex-2.6.4 0
