cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to dhcpcd-9.3.0

Browse Source
This commit is contained in:
sthen 2020-10-05 19:23:10 +00:00
parent 93af99c29c
commit 9d992ca270
5 changed files with 4 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/dhcpcd/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.81 2020/10/02 19:29:32 kn Exp $
# $OpenBSD: Makefile,v 1.82 2020/10/05 19:23:10 sthen Exp $
COMMENT= DHCPv4/IPv4LL/IPv6RS/DHCPv6 quad stack client
DISTNAME= dhcpcd-9.2.0
DISTNAME= dhcpcd-9.3.0
EPOCH= 0
CATEGORIES= net

4
net/dhcpcd/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dhcpcd-9.2.0.tar.xz) = /LLRlnLURbv9OGeP3uT1Vu+Wej6mvYEJLRBUXfLLlmY=
SIZE (dhcpcd-9.2.0.tar.xz) = 250584
SHA256 (dhcpcd-9.3.0.tar.xz) = n07By0mmNR9HhmfosQ/kLj4oraQPNLwdvyXqp/WBHno=
SIZE (dhcpcd-9.3.0.tar.xz) = 252256

43
net/dhcpcd/patches/patch-src_if-bsd_c
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-src_if-bsd_c,v 1.13 2020/10/02 19:29:32 kn Exp $
22.09.2020 e675d4dde0 "BSD: Detect initial link state in ifa_data"
fixes dhcpcd on pppoe(4), remove with next release.
Index: src/if-bsd.c
--- src/if-bsd.c.orig
+++ src/if-bsd.c
@@ -363,11 +363,32 @@ if_carrier(struct interface *ifp)
return LINK_UNKNOWN;
strlcpy(ifmr.ifm_name, ifp->name, sizeof(ifmr.ifm_name));
- if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFMEDIA, &ifmr) == -1 ||
- !(ifmr.ifm_status & IFM_AVALID))
+ if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFMEDIA, &ifmr) == -1)
return LINK_UNKNOWN;
+ if (!(ifmr.ifm_status & IFM_AVALID))
+ return LINK_UNKNOWN;
+
return (ifmr.ifm_status & IFM_ACTIVE) ? LINK_UP : LINK_DOWN;
+}
+
+int
+if_carrier_ifadata(struct interface *ifp, void *ifadata)
+{
+ int carrier = if_carrier(ifp);
+ struct if_data *ifdata;
+
+ if (carrier != LINK_UNKNOWN || ifadata == NULL)
+ return carrier;
+
+ ifdata = ifadata;
+ switch (ifdata->ifi_link_state) {
+ case LINK_STATE_DOWN:
+ return LINK_DOWN;
+ case LINK_STATE_UP:
+ return LINK_UP;
+ }
+ return LINK_UNKNOWN;
}
static void

17
net/dhcpcd/patches/patch-src_if_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_if_c,v 1.1 2020/10/02 19:29:32 kn Exp $
22.09.2020 e675d4dde0 "BSD: Detect initial link state in ifa_data"
fixes dhcpcd on pppoe(4), remove with next release.
Index: src/if.c
--- src/if.c.orig
+++ src/if.c
@@ -682,7 +682,7 @@ if_discover(struct dhcpcd_ctx *ctx, struct ifaddrs **i
ifp->active = active;
if (ifp->active)
- ifp->carrier = if_carrier(ifp);
+ ifp->carrier = if_carrier_ifadata(ifp, ifa->ifa_data);
else
ifp->carrier = LINK_UNKNOWN;
TAILQ_INSERT_TAIL(ifs, ifp, next);

16
net/dhcpcd/patches/patch-src_if_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_if_h,v 1.3 2020/10/02 19:29:32 kn Exp $
22.09.2020 e675d4dde0 "BSD: Detect initial link state in ifa_data"
fixes dhcpcd on pppoe(4), remove with next release.
Index: src/if.h
--- src/if.h.orig
+++ src/if.h
@@ -160,6 +160,7 @@ int if_domtu(const struct interface *, short int);
#define if_getmtu(ifp) if_domtu((ifp), 0)
#define if_setmtu(ifp, mtu) if_domtu((ifp), (mtu))
int if_carrier(struct interface *);
+int if_carrier_ifadata(struct interface *, void *);
int if_pollinit(struct interface *ifp);
#ifdef ALIAS_ADDR