Fri Mar 31 21:02:09 2017 UTC ()
Adjust build glue for dhcpcd-7


(roy)
diff -r1.1 -r1.2 src/external/bsd/dhcpcd/Makefile
diff -r0 -r1.1 src/external/bsd/dhcpcd/Makefile.inc
diff -r0 -r1.1 src/external/bsd/dhcpcd/include/config.h
diff -r0 -r1.1 src/external/bsd/dhcpcd/libexec/Makefile
diff -r0 -r1.1 src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
diff -r0 -r1.1 src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile
diff -r1.34 -r1.35 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
cvs diff -r1.1 -r1.2 src/external/bsd/dhcpcd/Makefile (expand / switch to unified diff)

--- src/external/bsd/dhcpcd/Makefile 2008/07/27 19:31:03 1.1
+++ src/external/bsd/dhcpcd/Makefile 2017/03/31 21:02:08 1.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1# $NetBSD: Makefile,v 1.1 2008/07/27 19:31:03 joerg Exp $ 1# $NetBSD: Makefile,v 1.2 2017/03/31 21:02:08 roy Exp $
2 2
3SUBDIR= sbin 3SUBDIR= sbin libexec
4 4
5.include <bsd.subdir.mk> 5.include <bsd.subdir.mk>
File Added: src/external/bsd/dhcpcd/Makefile.inc
# $NetBSD: Makefile.inc,v 1.1 2017/03/31 21:02:08 roy Exp $

SRCDIR=		${NETBSDSRCDIR}/external/bsd/dhcpcd
DIST=		${SRCDIR}/dist

SED_SYS=	-e 's:@SYSCONFDIR@:/etc:g' \
		-e 's:@DBDIR@:/var/db:g' \
		-e 's:@LIBDIR@:/lib:g' \
		-e 's:@RUNDIR@:/var/run:g' \
		-e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \
		-e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \
		-e 's:@SERVICEEXISTS@::g' \
		-e 's:@SERVICECMD@::g' \
		-e 's:@SERVICESTATUS@::g' \
		-e 's:@STATUSARG@::g'
File Added: src/external/bsd/dhcpcd/include/config.h
/* netbsd */
#define SYSCONFDIR	"/etc"
#define SBINDIR		"/sbin"
#define LIBDIR		"/lib"
#define LIBEXECDIR	"/libexec"
#define DBDIR		"/var/db/dhcpcd"
#define RUNDIR		"/var/run"
#define HAVE_IFAM_PID
#define HAVE_IFAM_ADDRFLAGS
#define HAVE_IFADDRS_ADDRFLAGS
#define HAVE_UTIL_H
#define HAVE_SYS_QUEUE_H
#define HAVE_SPAWN_H
#define HAVE_REALLOCARRAY
#define HAVE_KQUEUE
#define HAVE_KQUEUE1
#define HAVE_SYS_BITOPS_H
#define HAVE_MD5_H
#define SHA2_H		<sha2.h>
File Added: src/external/bsd/dhcpcd/libexec/Makefile
#	$NetBSD: Makefile,v 1.1 2017/03/31 21:02:09 roy Exp $

SUBDIR=		dhcpcd-hooks
SUBDIR=		dhcpcd-run-hooks

.include <bsd.subdir.mk>
File Added: src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
# $NetBSD: Makefile,v 1.1 2017/03/31 21:02:09 roy Exp $
#

.include <bsd.own.mk>

.include "../../Makefile.inc"
HOOKSRC=		${DIST}/hooks
.PATH:			${HOOKSRC}

HOOKS=			01-test 02-dump 20-resolv.conf 30-hostname
HOOKS+=			50-ntp.conf

FILES=			${HOOKS:C,^,${HOOKSRC}/,}
FILESDIR=		/libexec/dhcpcd-hooks

EGHOOKS=		10-wpa_supplicant 15-timezone 29-lookup-hostname
EGHOOKS+=		50-ypbind

.if ${MKSHARE} != "no"
EGFILES=		${EGHOOKS:C,^,${HOOKSRC}/,}
FILES+=			${EGFILES}
.for f in ${EGFILES}
FILESDIR_${f}=		/usr/share/examples/dhcpcd/hooks
.endfor
.endif

.include <bsd.prog.mk>
File Added: src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile
# $NetBSD: Makefile,v 1.1 2017/03/31 21:02:09 roy Exp $
#

.include <bsd.own.mk>

.include "../../Makefile.inc"
HOOKSRC=	${DIST}/hooks
.PATH:		${HOOKSRC}

SCRIPTS=	dhcpcd-run-hooks
SCRIPTSDIR=	/libexec

MAN=		dhcpcd-run-hooks.8

CLEANFILES=	dhcpcd-run-hooks dhcpcd-run-hooks.8

.for f in ${SCRIPTS} ${MAN}
${f}:	../../Makefile.inc ${f}.in
	${TOOL_SED} ${SED_SYS} ${HOOKSRC}/${f}.in > $@
.endfor

.include <bsd.prog.mk>
cvs diff -r1.34 -r1.35 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile (expand / switch to unified diff)

--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile 2016/12/02 02:41:54 1.34
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile 2017/03/31 21:02:09 1.35
@@ -1,112 +1,81 @@ @@ -1,112 +1,81 @@
1# $NetBSD: Makefile,v 1.34 2016/12/02 02:41:54 riastradh Exp $ 1# $NetBSD: Makefile,v 1.35 2017/03/31 21:02:09 roy Exp $
2# 2#
3 3
4WARNS?= 6 4WARNS?= 6
5USE_FORT?= yes # network client (local server) 5USE_FORT?= yes # network client (local server)
6 6
7.include <bsd.init.mk> 7.include <bsd.init.mk>
 8.include "../../Makefile.inc"
8 9
9PROG= dhcpcd 10PROG= dhcpcd
10SRCS= common.c control.c dhcpcd.c duid.c eloop.c 11SRCS= common.c control.c dhcpcd.c duid.c eloop.c
11SRCS+= if.c if-options.c script.c 12SRCS+= if.c if-options.c route.c sa.c script.c
12SRCS+= dhcp-common.c dhcpcd-embedded.c 13SRCS+= dhcp-common.c dhcpcd-embedded.c
13SRCS+= if-bsd.c 14SRCS+= if-bsd.c
14 15
15CPPFLAGS+= -DHAVE_CONFIG_H -D_OPENBSD_SOURCE 16CPPFLAGS+= -DHAVE_CONFIG_H -D_OPENBSD_SOURCE
16 17
17USE_INET?= yes 18USE_INET?= yes
18 19
19.if defined(SMALLPROG) 20.if defined(SMALLPROG)
20CPPFLAGS+= -DSMALL 21CPPFLAGS+= -DSMALL
21DHCPCD_DEFS= dhcpcd-definitions-small.conf 22DHCPCD_DEFS= dhcpcd-definitions-small.conf
22.else 23.else
23DHCPCD_DEFS= dhcpcd-definitions.conf 24DHCPCD_DEFS= dhcpcd-definitions.conf
24CPPFLAGS+= -DAUTH 25CPPFLAGS+= -DAUTH
25SRCS+= auth.c hmac_md5.c 26SRCS+= auth.c hmac_md5.c
26.endif 27.endif
27 28
28.if (${USE_INET} != "no") 29.if (${USE_INET} != "no")
29CPPFLAGS+= -DINET 30CPPFLAGS+= -DARP -DINET
30SRCS+= arp.c dhcp.c ipv4.c 31SRCS+= arp.c bpf.c dhcp.c ipv4.c
31.if !defined(SMALLPROG) 32.if !defined(SMALLPROG)
32CPPFLAGS+= -DIPV4LL 33CPPFLAGS+= -DIPV4LL
33SRCS+= ipv4ll.c 34SRCS+= ipv4ll.c
34.endif 35.endif
35.endif 36.endif
36 37
37.if (${USE_INET6} != "no") 38.if (${USE_INET6} != "no")
38CPPFLAGS+= -DINET6 39CPPFLAGS+= -DINET6
39SRCS+= ipv6.c ipv6nd.c 40SRCS+= ipv6.c ipv6nd.c
40# -DSMALL already strips out prefix delegation 41# -DSMALL already strips out prefix delegation
41# A network could be IPv6 only and require DHCPv6 42# A network could be IPv6 only and require DHCPv6
42CPPFLAGS+= -DDHCP6 43CPPFLAGS+= -DDHCP6
43SRCS+= dhcp6.c 44SRCS+= dhcp6.c
44.endif 45.endif
45 46
46DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist 47CPPFLAGS+= -I${SRCDIR}/include -I${DIST}/src -I${.OBJDIR}
47CPPFLAGS+= -I${DIST} -I${.OBJDIR} 
48 48
49DPADD+= ${LIBUTIL} 49DPADD+= ${LIBUTIL}
50LDADD+= -lutil 50LDADD+= -lutil
51 51
52.PATH: ${DIST} ${DIST}/crypt ${LIBC_NET} 52.PATH: ${DIST}/src ${DIST}/src/crypt ${LIBC_NET}
53 
54SCRIPTS= dhcpcd-run-hooks 
55SCRIPTSDIR_dhcpcd-run-hooks= /libexec 
56 53
57CONFIGFILES= dhcpcd.conf 54CONFIGFILES= dhcpcd.conf
58FILESDIR_dhcpcd.conf= /etc 55FILESDIR_dhcpcd.conf= /etc
59FILESMODE_dhcpcd.conf= 644 # -rw-r--r-- 56FILESMODE_dhcpcd.conf= 644 # -rw-r--r--
60 57
61HOOKS= 01-test 02-dump 20-resolv.conf 30-hostname 58MAN= dhcpcd.conf.5 dhcpcd.8
62HOOKS+= 50-ntp.conf 59CLEANFILES= dhcpcd.conf.5 dhcpcd.8
63 
64FILES= ${HOOKS:C,^,${DIST}/dhcpcd-hooks/,} 
65FILESDIR= /libexec/dhcpcd-hooks 
66 
67EGHOOKS= 10-wpa_supplicant 15-timezone 29-lookup-hostname 
68EGHOOKS+= 50-ypbind 
69 
70.if ${MKSHARE} != "no" 
71EGFILES= ${EGHOOKS:C,^,${DIST}/dhcpcd-hooks/,} 
72FILES+= ${EGFILES} 
73.for f in ${EGFILES} 
74FILESDIR_${f}= /usr/share/examples/dhcpcd/hooks 
75.endfor 
76.endif 
77 
78MAN= dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8 
79 
80CLEANFILES= dhcpcd.conf.5 dhcpcd.8 \ 
81 dhcpcd-run-hooks dhcpcd-run-hooks.8 
82 60
83dhcpcd-embedded.h: genembedh ${DHCPCD_DEFS} dhcpcd-embedded.h.in 61dhcpcd-embedded.h: genembedh ${DHCPCD_DEFS} dhcpcd-embedded.h.in
84 ${HOST_SH} ${.ALLSRC} $^ > $@ 62 ${HOST_SH} ${.ALLSRC} $^ > $@
85 63
86dhcpcd-embedded.c: genembedc ${DHCPCD_DEFS} dhcpcd-embedded.c.in 64dhcpcd-embedded.c: genembedc ${DHCPCD_DEFS} dhcpcd-embedded.c.in
87 ${HOST_SH} ${.ALLSRC} $^ > $@ 65 ${HOST_SH} ${.ALLSRC} $^ > $@
88 66
89if-options.c: dhcpcd-embedded.h 67if-options.c: dhcpcd-embedded.h
90 68
91CLEANFILES+= dhcpcd-embedded.c dhcpcd-embedded.h 69CLEANFILES+= dhcpcd-embedded.c dhcpcd-embedded.h
92 70
93.for f in dhcpcd-run-hooks dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8 71.for f in dhcpcd.conf.5 dhcpcd.8
94${f}: ${f}.in 72${f}: ${f}.in
95 ${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \ 73 ${TOOL_SED} ${SED_SYS} ${DIST}/src/${f}.in > $@
96 -e 's:@LIBDIR@:/lib:g' \ 
97 -e 's:@RUNDIR@:/var/run:g' \ 
98 -e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \ 
99 -e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \ 
100 -e 's:@SERVICEEXISTS@::g' \ 
101 -e 's:@SERVICECMD@::g' \ 
102 -e 's:@SERVICESTATUS@::g' \ 
103 -e 's:@STATUSARG@::g' \ 
104 ${DIST}/${f}.in > $@ 
105.endfor 74.endfor
106 75
107# XXXGCC5 76# XXXGCC5
108.if defined(HAVE_GCC) && ${HAVE_GCC} == 53 && ${ACTIVE_CC} == "gcc" 77.if defined(HAVE_GCC) && ${HAVE_GCC} == 53 && ${ACTIVE_CC} == "gcc"
109COPTS.if-bsd.c+= -Wno-error=sign-conversion 78COPTS.if-bsd.c+= -Wno-error=sign-conversion
110.endif 79.endif
111 80
112.include <bsd.prog.mk> 81.include <bsd.prog.mk>