diff options
Diffstat (limited to 'net-misc/dhcpcd')
| -rw-r--r-- | net-misc/dhcpcd/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/dhcpcd/dhcpcd-10.2.0.ebuild | 1 | ||||
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-10.2.0-no-ipv6-build.patch | 110 |
3 files changed, 113 insertions, 1 deletions
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index b6e32d13b4ca..cc1683d5700b 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,11 +1,12 @@ AUX dhcpcd-10.0.6-fix-lib-check.patch 340 BLAKE2B 6e9f881e64676477b100bb65d4962ac4de360a21e938e79c294cd8f8cb837bbe30cdcfa8ca84b3d9558fcf3d5109ba04704c2e4bb269ba2526deed51fec0bf11 SHA512 66ac97580ae066afb4e46b15161a8331140c010764f7932218ce03112bed4bf52e316f58fbb7919c38052ce6ef2a4c36768103aa01f146161cf94169cb8ccacd AUX dhcpcd-10.1.0-seccomp-glibc-2.41.patch 870 BLAKE2B 1ea71a1a5b9d3483139617bea790ad70a989e28256afd2c2a73b0048bbfdefd1f164b548b59caf47269fba5ef6deb379c9ee6d790149a02559b6ea2334992e3b SHA512 acfce6d1966347b1b7797c96d499fe28e3a7e97c1961ab10f3fc7023826af18bcfcef7731e42444b78c5404870b75b9790eac529f346a1a68ae03f3366e91171 +AUX dhcpcd-10.2.0-no-ipv6-build.patch 2878 BLAKE2B 2977a52230d9d88b5661614ff0831dc77357472ee17d39de133bd864d5e13545e9e1f9a753865139bd961548f3d27053589d6234df7dcf0f2af1716355036c50 SHA512 827bfb891f58134b508c7ec97eaa1e300c3c6b0f37e108199db0d3d5c07ae6d75e36ad7c1ffebad6182df326ecf3302b68bcb708674c7d96a45dec6c0de40a88 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041 DIST dhcpcd-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04 DIST dhcpcd-10.2.0.tar.xz 274896 BLAKE2B 0b209f253e6462cc176ffef749228fc3b82474ee4baa2c468277b58abea9541282a2a96633e88641c46e3e9a612049f574009dd42f00f86334e655b10c234e81 SHA512 d2414ae8ff292e04a9d7060d523b5975e996fb921c481d198c5b6804fd73c6fc6edd806faf24788eacd8a2125e80528db8844865178b65a3acf29d3d264a3bff EBUILD dhcpcd-10.1.0-r1.ebuild 4976 BLAKE2B 1f6d2267d9f45879b23321b23e61bf94d45ebee8636d2f3e7d2c0952205f00f136b234f59858f7d342b53977b7702a452f0bb64e46ab97978123c714e07b6abf SHA512 f986c753abd83ebacb0083d85dc747d5266807b73db634498279ac88e0316b807bee99a9ecaf1bfef5217d207160a6a4c6e710cb2cb6c93db915e1b1f658e0d6 EBUILD dhcpcd-10.1.0.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c -EBUILD dhcpcd-10.2.0.ebuild 4935 BLAKE2B 2a5789402ae1b1f4b6a049ca45f98ebddb10a45c4d8753d60346e6ee69287b2d99bc566fa1573d6d97c281b9e1912f85d84e395a7f5d011198e20af417313951 SHA512 902a31842e545c59ff3955706306066cd34b0d8b46a8e588370c4943df64415845a080672458c4233c9188474342c6965a8b1c3da64c9954c2f608687a743cef +EBUILD dhcpcd-10.2.0.ebuild 4975 BLAKE2B 80cd65893ab4a5c5b3cd6e9913278d2ecfcb013c40898e3a2f26fcf7ad2f8ac11825ccd26ba633ac420df20d46f6869c3e52c77c7afe286bb7e027262b0f5960 SHA512 5e3d62016332ee3c7c40c1ae2f2e1f23fc416d22a309f6f2f7122fc990a79dbb67f1bce03328abc1a6645a2e8f5cf2468eeac1225ee99539d1612d0f80de8d71 EBUILD dhcpcd-9999.ebuild 4935 BLAKE2B c5c7a630572305a52a7edb2f9c329c3314393a94896f7b538c6e613d05eeb35eff0059186ad402c05a29130af09f231f3d8d712df413c6d6088ceb9376b52780 SHA512 d0edccb3d0047d4adf3f694f0c7625914de2e552e7aa8ef189ced54399469622cdb3a340549eb4017b391eb765d93095fd21312d78e7b7ab537c290ec07fa251 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45 diff --git a/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild index fcfca62700dc..c3595a4f780e 100644 --- a/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild @@ -54,6 +54,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch + "${FILESDIR}"/${P}-no-ipv6-build.patch ) src_configure() { diff --git a/net-misc/dhcpcd/files/dhcpcd-10.2.0-no-ipv6-build.patch b/net-misc/dhcpcd/files/dhcpcd-10.2.0-no-ipv6-build.patch new file mode 100644 index 000000000000..c9f426d913c0 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.2.0-no-ipv6-build.patch @@ -0,0 +1,110 @@ +https://bugs.gentoo.org/949688 +https://github.com/NetworkConfiguration/dhcpcd/commit/7f70a6a4e6e19703e705881da958e8a1d42d27ec + +From 7f70a6a4e6e19703e705881da958e8a1d42d27ec Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Thu, 13 Feb 2025 00:32:43 +0000 +Subject: [PATCH] Address some build options + +Fixes #458. +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -3068,7 +3068,7 @@ dhcp_handledhcp(struct interface *ifp, struct bootp *bootp, size_t bootp_len, + struct dhcp_state *state = D_STATE(ifp); + struct if_options *ifo = ifp->options; + struct dhcp_lease *lease = &state->lease; +- uint8_t type, tmp; ++ uint8_t type; + struct in_addr addr; + unsigned int i; + char *msg; +@@ -3079,6 +3079,9 @@ dhcp_handledhcp(struct interface *ifp, struct bootp *bootp, size_t bootp_len, + const uint8_t *auth; + size_t auth_len; + #endif ++#ifdef IPV4LL ++ uint8_t tmp; ++#endif + #ifdef IN_IFF_DUPLICATED + struct ipv4_addr *ia; + #endif +--- a/src/if-options.c ++++ b/src/if-options.c +@@ -655,8 +655,6 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo, + uint8_t *request, *require, *no, *reject; + struct dhcp_opt **dop, *ndop; + size_t *dop_len, dl, odl; +- struct vivco *vivco; +- const struct vivco *vivco_endp = ifo->vivco + ifo->vivco_len; + struct group *grp; + #ifdef AUTH + struct token *token; +@@ -665,16 +663,22 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo, + struct group grpbuf; + #endif + #ifdef DHCP6 +- size_t sl; + struct if_ia *ia; + uint8_t iaid[4]; ++#endif ++#if defined(DHCP6) || ((defined(INET) || defined(INET6)) && !defined(SMALL)) ++ size_t sl; ++#endif + #ifndef SMALL +- struct in6_addr in6addr; ++#ifdef DHCP6 + struct if_sla *sla, *slap; ++#endif ++ struct vivco *vivco; ++ const struct vivco *vivco_endp = ifo->vivco + ifo->vivco_len; ++ struct in6_addr in6addr; + struct vsio **vsiop = NULL, *vsio; + size_t *vsio_lenp = NULL, opt_max, opt_header; + struct vsio_so *vsio_so; +-#endif + #endif + + dop = NULL; +@@ -2951,11 +2955,11 @@ free_options(struct dhcpcd_ctx *ctx, struct if_options *ifo) + struct rt *rt; + #endif + struct dhcp_opt *opt; +- struct vivco *vo; + #ifdef AUTH + struct token *token; + #endif + #ifndef SMALL ++ struct vivco *vo; + struct vsio *vsio; + struct vsio_so *vsio_so; + #endif +--- a/src/ipv6.c ++++ b/src/ipv6.c +@@ -626,7 +626,7 @@ ipv6_deletedaddr(struct ipv6_addr *ia) + #endif + + #if !defined(DHCP6) || (!defined(PRIVSEP) && defined(SMALL)) +- UNUSED(ia) ++ UNUSED(ia); + #endif + } + +--- a/src/privsep-inet.c ++++ b/src/privsep-inet.c +@@ -215,6 +215,7 @@ ps_inet_startcb(struct ps_process *psp) + return ret; + } + ++#if defined(INET) || defined(DHCP6) + static bool + ps_inet_validudp(struct msghdr *msg, uint16_t sport, uint16_t dport) + { +@@ -233,6 +234,7 @@ ps_inet_validudp(struct msghdr *msg, uint16_t sport, uint16_t dport) + } + return true; + } ++#endif + + #ifdef INET6 + static bool + |