Update ISC DHCP related pacakges to 4.2.0. Changes since 4.2.0 (new features) - If a client renews before 'dhcp-cache-threshold' percent of its lease has elapsed (default 25%), the server will reuse the allocated lease (provide a lease within the currently allocated lease-time) rather than extend or renew the lease. This absolves the server of needing to perform an fsync() operation on the lease database before reply, which improves performance. [ISC-Bugs #22228] Updated this patch to support asynchronous DDNS. If the server is attempting to do DDNS on a lease it should be udpated and written to disk even if that wouldn't be necessary due to the thresholding. [ISC-Bugs #26311] - The 'no available billing' log line now also logs the name of the last matching billing class tried before failing to provide a billing. [ISC-Bugs #21759] - A problem with missing get_hw_addr function when --enable-use-sockets was used is now solved on GNU/Linux, BSD and GNU/Hurd systems. Note that use-sockets feature was not tested on those systems. Client and server code no longer use MAX_PATH constant that is not defined on GNU/Hurd systems. [ISC-Bugs #25979] - Add a perl script in the contrib directory, dhcp-lease-list.pl, which can parse v4 lease files and output the lease information in a more human friendly manner. This was written by Christian Hammers with some updates by vom and ISC. This is contributed code and is not supported by ISC; however it may be useful to some users. [ISC-Bugs #20680] - Add support in v6 for on-commit, on-expire and on-release. [ISC-Bugs #27912] - Add support for using classes with v6. [ISC-Bugs #26510] - Update the DDNS code to current standards and allow for sharing of DDNS entries between v4 and v6 clients. The new code is used if the ddns-update-style is set to "standard", the older code is still available if ddns-update-style is set to "interim". The oldest DDNS code "ad-hoc" has been removed. Thanks to Thomas Pegeot who submitted a patch for this issue. This patch is based on that work with some modifications. [ISC-Bugs #21139] - Add a configuration option to the server to suppress using fsync(). Enabling this option will mean that fsync() is never called. This may provide better performance but there is also a risk that a lease will not be properly written to the disk after it has been issued to a client and before the server stops. Using this option is not recommended. [ISC-Bugs #34810] - Add some logging statements to indicate when the server is ready to serve. One statement is emitted after the server has finished reading its files and is about to enter the dispatch loop. This is "Server starting service.". The second is emitted when a server determines that both it and its failover peer are in the normal state. This is "failover peer <name>: Both servers normal." [ISC-Bugs #33208] - Add support for accessing options from v6 relays. The v6relay statement allows the administrator to choose which relay to use when searching for an option, see the dhcp-options man page for a description. The host-identifier option has also been updated to support the use of relay options, see the dhcpd.conf man page for a description. [ISC-Bugs #19598] - When doing DDNS if there isn't an appropriate zone statement attempt to find a reasonable nameserver via a DNS resolver. This restores some functionality that was lost in the transition to asynchronous DDNS. Due to the lack of security and increase in fragility of the system when using this feature we strongly recommend the use of appropriate zone statements rather than using this functionality. [ISC-Bugs #30461] - Add support for specifying the address from which to send DDNS updates on the DHCP server. There are two new options "ddns-local-address4" and "ddns-local-address6" that each take one instance of their respective address types. [ISC-Bugs #34779] - Add ignore-client-uids option in the server. This option causes the server to not record a client's uid in its lease. This violates the specification but may also be useful when a client can dual boot using different client ids but the same mac address. Thank you to Brian De Wolf at Cal Poly Pomona for the patch. [ISC-Bugs #32427] [ISC-Bugs #35066] - Extend the DHCPINFORM processing to honor the subnet selection option and take host declarations into account. Thanks to Christof Chen for testing and submitting the patch. [ISC-Bugs #35015] - Extend the hardware expression to look into the lease structure for a hardware address if there is no packet. This allows the server to find the hardware address during on-expiry processing. [ISC-Bugs #24584] - Add definitions for some options that have been specified by the IETF. [ISC-Bugs #29268] [ISC-Bugs #35198] Changes since 4.3.0b1 - Tidy up receive packet processing. Thanks to Brad Plank of GTA for reporting the issue and suggesting a possible patch. [ISC-Bugs #34447] Changes since 4.3.0a1 - Modify the message displayed when a process hits a fatal error. The new message is much shorter and simply points to the README and our website for directions on bug submissions. [ISC-Bugs #24789] - Handle an absent resolv.conf file better. [ISC-Bugs #35194]diff -r1.8 -r1.9 pkgsrc/net/isc-dhclient4/Makefile
(taca)
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.8 2013/04/10 11:31:26 fhajny Exp $ | 1 | # $NetBSD: Makefile,v 1.9 2014/02/09 04:34:31 taca Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | PKGNAME= isc-dhclient-${DHVER} | 4 | PKGNAME= isc-dhclient-${DHVER} | |
5 | PKGREVISION= 1 | |||
6 | COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client | 5 | COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client | |
7 | BUILD_SUBDIR= bind includes tests common omapip client | 6 | BUILD_SUBDIR= bind includes tests common omapip client | |
8 | SUBDIR= client | 7 | SUBDIR= client | |
9 | 8 | |||
10 | CONF_FILES+= ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf | 9 | CONF_FILES+= ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf | |
11 | 10 | |||
12 | RCD_SCRIPTS= isc_dhclient | 11 | RCD_SCRIPTS= isc_dhclient | |
13 | FILES_SUBST+= DHCP_HOME=${DHCP_HOME} | 12 | FILES_SUBST+= DHCP_HOME=${DHCP_HOME} | |
14 | 13 | |||
15 | .include "${.CURDIR}/../isc-dhcp4/options.mk" | 14 | .include "${.CURDIR}/../isc-dhcp4/options.mk" | |
16 | 15 | |||
17 | INSTALLATION_DIRS+= ${EGDIR} | 16 | INSTALLATION_DIRS+= ${EGDIR} | |
18 | 17 |
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.12 2013/05/10 00:58:06 riastradh Exp $ | 1 | # $NetBSD: Makefile,v 1.13 2014/02/09 04:34:31 taca Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | PKGNAME= isc-dhcp-${DHVER} | 4 | PKGNAME= isc-dhcp-${DHVER} | |
5 | PKGREVISION= 2 | |||
6 | COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base | 5 | COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base | |
7 | BUILD_SUBDIR= bind includes tests common # dst | 6 | BUILD_SUBDIR= bind includes tests common # dst | |
8 | SUBDIR= includes common # dst | 7 | SUBDIR= includes common # dst | |
9 | 8 | |||
10 | .include "options.mk" | 9 | .include "options.mk" | |
11 | 10 | |||
12 | INSTALLATION_DIRS+= share/doc/${PKGBASE} | 11 | INSTALLATION_DIRS+= share/doc/${PKGBASE} | |
13 | 12 | |||
14 | post-install: | 13 | post-install: | |
15 | ${INSTALL_DATA} ${WRKSRC}/README \ | 14 | ${INSTALL_DATA} ${WRKSRC}/README \ | |
16 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} | 15 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} | |
17 | ${INSTALL_DATA} ${WRKSRC}/RELNOTES \ | 16 | ${INSTALL_DATA} ${WRKSRC}/RELNOTES \ | |
18 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} | 17 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} |
@@ -1,33 +1,33 @@ | @@ -1,33 +1,33 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.21 2013/05/10 00:58:06 riastradh Exp $ | 1 | # $NetBSD: Makefile.common,v 1.22 2014/02/09 04:34:31 taca Exp $ | |
2 | # | 2 | # | |
3 | # used by net/isc-dhcp4/Makefile | 3 | # used by net/isc-dhcp4/Makefile | |
4 | # used by net/isc-dhcpd4/Makefile | 4 | # used by net/isc-dhcpd4/Makefile | |
5 | # used by net/isc-dhclient4/Makefile | 5 | # used by net/isc-dhclient4/Makefile | |
6 | # used by net/isc-dhcrelay4/Makefile | 6 | # used by net/isc-dhcrelay4/Makefile | |
7 | 7 | |||
8 | DISTNAME= dhcp-${VERSION} | 8 | DISTNAME= dhcp-${VERSION} | |
9 | DHVER= ${DISTNAME:S/dhcp-//:S/-P/p/} | 9 | DHVER= ${DISTNAME:S/dhcp-//:S/-P/p/} | |
10 | CATEGORIES= net | 10 | CATEGORIES= net | |
11 | MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/${VERSION}/ \ | 11 | MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/${VERSION}/ \ | |
12 | http://ftp.isc.org/isc/dhcp/${VERSION}/ | 12 | http://ftp.isc.org/isc/dhcp/${VERSION}/ | |
13 | 13 | |||
14 | MAINTAINER= pkgsrc-users@NetBSD.org | 14 | MAINTAINER= pkgsrc-users@NetBSD.org | |
15 | HOMEPAGE= https://www.isc.org/sw/dhcp | 15 | HOMEPAGE= https://www.isc.org/sw/dhcp | |
16 | LICENSE= isc | 16 | LICENSE= isc | |
17 | 17 | |||
18 | CONFLICTS+= isc-dhcp-base-3.*{,nb*} | 18 | CONFLICTS+= isc-dhcp-base-3.*{,nb*} | |
19 | 19 | |||
20 | VERSION= 4.2.5-P1 | 20 | VERSION= 4.3.0 | |
21 | 21 | |||
22 | .include "../../mk/bsd.prefs.mk" | 22 | .include "../../mk/bsd.prefs.mk" | |
23 | 23 | |||
24 | GNU_CONFIGURE= yes | 24 | GNU_CONFIGURE= yes | |
25 | DHCP_HOME?= ${VARBASE}/db/isc-dhcp | 25 | DHCP_HOME?= ${VARBASE}/db/isc-dhcp | |
26 | DHCP_PID?= ${VARBASE}/run/isc-dhcp | 26 | DHCP_PID?= ${VARBASE}/run/isc-dhcp | |
27 | PKG_SYSCONFSUBDIR= dhcp | 27 | PKG_SYSCONFSUBDIR= dhcp | |
28 | 28 | |||
29 | USE_TOOLS+= gmake gzip tar | 29 | USE_TOOLS+= gmake gzip tar | |
30 | USE_LANGUAGES+= c c++ | 30 | USE_LANGUAGES+= c c++ | |
31 | 31 | |||
32 | PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches | 32 | PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches | |
33 | DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo | 33 | DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo | |
@@ -71,25 +71,25 @@ post-extract: | @@ -71,25 +71,25 @@ post-extract: | |||
71 | (cd ${WRKSRC}/bind && gunzip -c bind.tar.gz | tar xf -) | 71 | (cd ${WRKSRC}/bind && gunzip -c bind.tar.gz | tar xf -) | |
72 | 72 | |||
73 | BIND_CONFIGURE_ARGS+= --disable-kqueue | 73 | BIND_CONFIGURE_ARGS+= --disable-kqueue | |
74 | BIND_CONFIGURE_ARGS+= --disable-epoll | 74 | BIND_CONFIGURE_ARGS+= --disable-epoll | |
75 | BIND_CONFIGURE_ARGS+= --disable-devpoll | 75 | BIND_CONFIGURE_ARGS+= --disable-devpoll | |
76 | BIND_CONFIGURE_ARGS+= --without-openssl | 76 | BIND_CONFIGURE_ARGS+= --without-openssl | |
77 | BIND_CONFIGURE_ARGS+= --without-libxml2 | 77 | BIND_CONFIGURE_ARGS+= --without-libxml2 | |
78 | BIND_CONFIGURE_ARGS+= --enable-exportlib | 78 | BIND_CONFIGURE_ARGS+= --enable-exportlib | |
79 | BIND_CONFIGURE_ARGS+= --enable-threads=no | 79 | BIND_CONFIGURE_ARGS+= --enable-threads=no | |
80 | BIND_CONFIGURE_ARGS+= --with-export-includedir=${WRKSRC}/bind/include | 80 | BIND_CONFIGURE_ARGS+= --with-export-includedir=${WRKSRC}/bind/include | |
81 | BIND_CONFIGURE_ARGS+= --with-export-libdir=${WRKSRC}/bind/lib | 81 | BIND_CONFIGURE_ARGS+= --with-export-libdir=${WRKSRC}/bind/lib | |
82 | BIND_CONFIGURE_ARGS+= --with-gssapi=no | 82 | BIND_CONFIGURE_ARGS+= --with-gssapi=no | |
83 | 83 | |||
84 | BIND_WRKSRC= ${WRKSRC}/bind/bind-9.8.4-P2 | 84 | BIND_WRKSRC= ${WRKSRC}/bind/bind-9.9.5 | |
85 | 85 | |||
86 | post-configure: | 86 | post-configure: | |
87 | ${RUN}${_ULIMIT_CMD} \ | 87 | ${RUN}${_ULIMIT_CMD} \ | |
88 | cd ${BIND_WRKSRC} && \ | 88 | cd ${BIND_WRKSRC} && \ | |
89 | ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ | 89 | ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ | |
90 | ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ | 90 | ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ | |
91 | ${CONFIGURE_SCRIPT} \ | 91 | ${CONFIGURE_SCRIPT} \ | |
92 | ${CONFIGURE_ARGS} \ | 92 | ${CONFIGURE_ARGS} \ | |
93 | ${BIND_CONFIGURE_ARGS} | 93 | ${BIND_CONFIGURE_ARGS} | |
94 | 94 | |||
95 | .include "../../security/openssl/buildlink3.mk" | 95 | .include "../../security/openssl/buildlink3.mk" |
@@ -1,11 +1,12 @@ | @@ -1,11 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.17 2013/05/10 00:58:06 riastradh Exp $ | 1 | $NetBSD: distinfo,v 1.18 2014/02/09 04:34:31 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (dhcp-4.2.5-P1.tar.gz) = 120b6e476b2ac0d35e1dc8dee53752c42449b925 | 3 | SHA1 (dhcp-4.3.0.tar.gz) = deed72a4636461042b74de68c2825dc52623e1d1 | |
4 | RMD160 (dhcp-4.2.5-P1.tar.gz) = 8633cea4a2e5a1900c8a6dac3ebcbd6ff53c2fa9 | 4 | RMD160 (dhcp-4.3.0.tar.gz) = 915e94fb080a6726f4d8357e249aad7104e2fd1a | |
5 | Size (dhcp-4.2.5-P1.tar.gz) = 8255960 bytes | 5 | Size (dhcp-4.3.0.tar.gz) = 8960567 bytes | |
6 | SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9 | 6 | SHA1 (patch-aa) = 27afe063248db97c3022d726f4e1653e83aeedff | |
7 | SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd | 7 | SHA1 (patch-ab) = c87ae71fdd70137a97f918d3240a1025a4dbe0cc | |
8 | SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb | 8 | SHA1 (patch-ac) = 440cd2d3db555fb7f4a433f218e2c9aa6bcf390c | |
9 | SHA1 (patch-bind_bind-9.8.4-P2_lib_export_dns_Makefile.in) = 4369cced9a567eed16617459daa5ddaa1ffecb23 | 9 | SHA1 (patch-bind_bind-9.9.5_configure) = 645603865146fe43b5f0ea109d8dbe590611f124 | |
10 | SHA1 (patch-common_dlpi.c) = e58c1b8d7a6badc62e59677e093c4d01f75b9379 | 10 | SHA1 (patch-bind_bind-9.9.5_lib_export_dns_Makefile.in) = 2cb8fd2a90b577376b0f9512545b82724acb0e1d | |
11 | SHA1 (patch-includes_Makefile.in) = 6004f66e28cd53c0acd09746a284eefe70a3aef2 | 11 | SHA1 (patch-common_dlpi.c) = 76e30ca92a7d3ba10ed73b4f03de0582bccb2acc | |
12 | SHA1 (patch-includes_Makefile.in) = 8b40bd1bf1e828fb99250450fc1b887580fc9233 |
@@ -1,20 +1,26 @@ | @@ -1,20 +1,26 @@ | |||
1 | $NetBSD: patch-aa,v 1.4 2011/04/08 14:09:24 taca Exp $ | 1 | $NetBSD: patch-aa,v 1.5 2014/02/09 04:34:31 taca Exp $ | |
2 | 2 | |||
3 | * Don't install config files. | 3 | * Don't install config files. | |
4 | 4 | |||
5 | --- server/Makefile.in.orig 2011-03-24 21:58:37.000000000 +0000 | 5 | --- server/Makefile.in.orig 2014-01-31 19:20:49.000000000 +0000 | |
6 | +++ server/Makefile.in | 6 | +++ server/Makefile.in | |
7 | @@ -615,13 +615,6 @@ uninstall-man8: | 7 | @@ -808,19 +808,6 @@ uninstall-man8: | |
8 | done | 8 | dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) | |
9 | install-dist_sysconfDATA: $(dist_sysconf_DATA) | 9 | install-dist_sysconfDATA: $(dist_sysconf_DATA) | |
10 | @$(NORMAL_INSTALL) | 10 | @$(NORMAL_INSTALL) | |
11 | - test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" | 11 | - @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ | |
12 | - @list='$(dist_sysconf_DATA)'; for p in $$list; do \ | 12 | - if test -n "$$list"; then \ | |
13 | - echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ | |||
14 | - $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ | |||
15 | - fi; \ | |||
16 | - for p in $$list; do \ | |||
13 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 17 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
14 | - f=$(am__strip_dir) \ | 18 | - echo "$$d$$p"; \ | |
15 | - echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ | 19 | - done | $(am__base_list) | \ | |
16 | - $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ | 20 | - while read files; do \ | |
21 | - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ | |||
22 | - $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ | |||
17 | - done | 23 | - done | |
18 | 24 | |||
19 | uninstall-dist_sysconfDATA: | 25 | uninstall-dist_sysconfDATA: | |
20 | @$(NORMAL_UNINSTALL) | 26 | @$(NORMAL_UNINSTALL) |
@@ -1,20 +1,26 @@ | @@ -1,20 +1,26 @@ | |||
1 | $NetBSD: patch-ab,v 1.4 2011/04/08 14:09:24 taca Exp $ | 1 | $NetBSD: patch-ab,v 1.5 2014/02/09 04:34:31 taca Exp $ | |
2 | 2 | |||
3 | * Don't install config files. | 3 | * Don't install config files. | |
4 | 4 | |||
5 | --- client/Makefile.in.orig 2011-03-24 21:58:36.000000000 +0000 | 5 | --- client/Makefile.in.orig 2014-01-31 19:20:49.000000000 +0000 | |
6 | +++ client/Makefile.in | 6 | +++ client/Makefile.in | |
7 | @@ -351,13 +351,6 @@ uninstall-man8: | 7 | @@ -492,19 +492,6 @@ uninstall-man8: | |
8 | done | 8 | dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) | |
9 | install-dist_sysconfDATA: $(dist_sysconf_DATA) | 9 | install-dist_sysconfDATA: $(dist_sysconf_DATA) | |
10 | @$(NORMAL_INSTALL) | 10 | @$(NORMAL_INSTALL) | |
11 | - test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" | 11 | - @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ | |
12 | - @list='$(dist_sysconf_DATA)'; for p in $$list; do \ | 12 | - if test -n "$$list"; then \ | |
13 | - echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ | |||
14 | - $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ | |||
15 | - fi; \ | |||
16 | - for p in $$list; do \ | |||
13 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 17 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
14 | - f=$(am__strip_dir) \ | 18 | - echo "$$d$$p"; \ | |
15 | - echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ | 19 | - done | $(am__base_list) | \ | |
16 | - $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ | 20 | - while read files; do \ | |
21 | - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ | |||
22 | - $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ | |||
17 | - done | 23 | - done | |
18 | 24 | |||
19 | uninstall-dist_sysconfDATA: | 25 | uninstall-dist_sysconfDATA: | |
20 | @$(NORMAL_UNINSTALL) | 26 | @$(NORMAL_UNINSTALL) |
@@ -1,29 +1,29 @@ | @@ -1,29 +1,29 @@ | |||
1 | $NetBSD: patch-ac,v 1.2 2011/04/08 14:09:24 taca Exp $ | 1 | $NetBSD: patch-ac,v 1.3 2014/02/09 04:34:31 taca Exp $ | |
2 | 2 | |||
3 | * Honor PKG_SYSCONFDIR and PREFIX. | 3 | * Honor PKG_SYSCONFDIR and PREFIX. | |
4 | 4 | |||
5 | --- includes/dhcpd.h.orig 2010-12-03 20:32:14.000000000 +0000 | 5 | --- includes/dhcpd.h.orig 2014-01-31 19:20:49.000000000 +0000 | |
6 | +++ includes/dhcpd.h | 6 | +++ includes/dhcpd.h | |
7 | @@ -1386,7 +1386,7 @@ typedef unsigned char option_mask [16]; | 7 | @@ -1419,7 +1419,7 @@ typedef unsigned char option_mask [16]; | |
8 | #else /* !DEBUG */ | 8 | #else /* !DEBUG */ | |
9 | 9 | |||
10 | #ifndef _PATH_DHCPD_CONF | 10 | #ifndef _PATH_DHCPD_CONF | |
11 | -#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" | 11 | -#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" | |
12 | +#define _PATH_DHCPD_CONF "@@PKG_SYSCONFDIR@@/dhcpd.conf" | 12 | +#define _PATH_DHCPD_CONF "@@PKG_SYSCONFDIR@@/dhcpd.conf" | |
13 | #endif /* DEBUG */ | 13 | #endif /* DEBUG */ | |
14 | 14 | |||
15 | #ifndef _PATH_DHCPD_DB | 15 | #ifndef _PATH_DHCPD_DB | |
16 | @@ -1408,11 +1408,11 @@ typedef unsigned char option_mask [16]; | 16 | @@ -1441,11 +1441,11 @@ typedef unsigned char option_mask [16]; | |
17 | #endif /* DEBUG */ | 17 | #endif /* DEBUG */ | |
18 | 18 | |||
19 | #ifndef _PATH_DHCLIENT_CONF | 19 | #ifndef _PATH_DHCLIENT_CONF | |
20 | -#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" | 20 | -#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" | |
21 | +#define _PATH_DHCLIENT_CONF "@@PKG_SYSCONFDIR@@/dhclient.conf" | 21 | +#define _PATH_DHCLIENT_CONF "@@PKG_SYSCONFDIR@@/dhclient.conf" | |
22 | #endif | 22 | #endif | |
23 | 23 | |||
24 | #ifndef _PATH_DHCLIENT_SCRIPT | 24 | #ifndef _PATH_DHCLIENT_SCRIPT | |
25 | -#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" | 25 | -#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" | |
26 | +#define _PATH_DHCLIENT_SCRIPT "@@PREFIX@@/sbin/dhclient-script" | 26 | +#define _PATH_DHCLIENT_SCRIPT "@@PREFIX@@/sbin/dhclient-script" | |
27 | #endif | 27 | #endif | |
28 | 28 | |||
29 | #ifndef _PATH_DHCLIENT_PID | 29 | #ifndef _PATH_DHCLIENT_PID |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-includes_Makefile.in,v 1.2 2012/07/25 00:56:53 taca Exp $ | 1 | $NetBSD: patch-includes_Makefile.in,v 1.3 2014/02/09 04:34:31 taca Exp $ | |
2 | 2 | |||
3 | Don't need isc-dhcp/dst.h. | 3 | Don't need isc-dhcp/dst.h. | |
4 | 4 | |||
5 | --- includes/Makefile.in.orig 2012-07-13 06:17:54.000000000 +0000 | 5 | --- includes/Makefile.in.orig 2014-01-31 19:19:59.000000000 +0000 | |
6 | +++ includes/Makefile.in | 6 | +++ includes/Makefile.in | |
7 | @@ -147,8 +147,7 @@ top_builddir = @top_builddir@ | 7 | @@ -262,8 +262,7 @@ top_builddir = @top_builddir@ | |
8 | top_srcdir = @top_srcdir@ | 8 | top_srcdir = @top_srcdir@ | |
9 | nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \ | 9 | nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \ | |
10 | omapip/hash.h omapip/isclib.h omapip/omapip.h \ | 10 | omapip/hash.h omapip/isclib.h omapip/omapip.h \ | |
11 | - omapip/omapip_p.h omapip/result.h omapip/trace.h \ | 11 | - omapip/omapip_p.h omapip/result.h omapip/trace.h \ | |
12 | - isc-dhcp/dst.h | 12 | - isc-dhcp/dst.h | |
13 | + omapip/omapip_p.h omapip/result.h omapip/trace.h | 13 | + omapip/omapip_p.h omapip/result.h omapip/trace.h | |
14 | 14 | |||
15 | EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \ | 15 | EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \ | |
16 | heap.h inet.h minires.h osdep.h site.h statement.h tree.h \ | 16 | heap.h inet.h minires.h osdep.h site.h statement.h tree.h \ |
$NetBSD: patch-bind_bind-9.9.5_configure,v 1.1 2014/02/09 04:34:31 taca Exp $
* Avoid using "==" for argument of test(1).
--- bind/bind-9.9.5/configure.orig 2014-01-27 18:58:24.000000000 +0000
+++ bind/bind-9.9.5/configure
@@ -11685,7 +11685,7 @@ done
;;
esac
- if test "X$PYTHON" == "X"
+ if test "X$PYTHON" = "X"
then
case "$use_python" in
unspec)
$NetBSD: patch-bind_bind-9.9.5_lib_export_dns_Makefile.in,v 1.1 2014/02/09 04:34:31 taca Exp $
Build gen with BUILD_CC and the associated BUILD_* flags so it can run
on the build platform when cross-compiling.
--- bind/bind-9.9.5/lib/export/dns/Makefile.in.orig 2014-01-27 18:58:24.000000000 +0000
+++ bind/bind-9.9.5/lib/export/dns/Makefile.in
@@ -168,7 +168,8 @@ code.h: gen
./gen -s ${srcdir} > code.h
gen: ${srcdir}/gen.c
- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
+ ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
#We don't need rbtdb64 for this library
#rbtdb64.@O@: rbtdb.c
@@ -1,28 +1,28 @@ | @@ -1,28 +1,28 @@ | |||
1 | $NetBSD: patch-common_dlpi.c,v 1.1 2013/04/10 11:31:27 fhajny Exp $ | 1 | $NetBSD: patch-common_dlpi.c,v 1.2 2014/02/09 04:34:31 taca Exp $ | |
2 | 2 | |||
3 | Add support for Crossbow style NICs (SunOS). | 3 | Add support for Crossbow style NICs (SunOS). | |
4 | 4 | |||
5 | --- common/dlpi.c.orig 2013-01-03 00:02:24.000000000 +0000 | 5 | --- common/dlpi.c.orig 2014-01-31 19:19:59.000000000 +0000 | |
6 | +++ common/dlpi.c | 6 | +++ common/dlpi.c | |
7 | @@ -131,6 +131,7 @@ static int strioctl (int fd, int cmd, in | 7 | @@ -131,6 +131,7 @@ static int strioctl (int fd, int cmd, in | |
8 | #define DLPI_MAXDLBUF 8192 /* Buffer size */ | 8 | #define DLPI_MAXDLBUF 8192 /* Buffer size */ | |
9 | #define DLPI_MAXDLADDR 1024 /* Max address size */ | 9 | #define DLPI_MAXDLADDR 1024 /* Max address size */ | |
10 | #define DLPI_DEVDIR "/dev/" /* Device directory */ | 10 | #define DLPI_DEVDIR "/dev/" /* Device directory */ | |
11 | +#define DLPI_DEVDIR_NEW "/dev/net/" /* Crossbow Device directory */ | 11 | +#define DLPI_DEVDIR_NEW "/dev/net/" /* Crossbow Device directory */ | |
12 | 12 | |||
13 | static int dlpiopen(const char *ifname); | 13 | static int dlpiopen(const char *ifname); | |
14 | static int dlpiunit (char *ifname); | 14 | static int dlpiunit (char *ifname); | |
15 | @@ -775,14 +776,26 @@ static int dlpiunit (ifname) | 15 | @@ -773,14 +774,26 @@ static int dlpiunit (ifname) | |
16 | */ | 16 | */ | |
17 | static int | 17 | static int | |
18 | dlpiopen(const char *ifname) { | 18 | dlpiopen(const char *ifname) { | |
19 | - char devname [50]; | 19 | - char devname [50]; | |
20 | + char devname [MAXPATHLEN]; | 20 | + char devname [MAXPATHLEN]; | |
21 | char *dp; | 21 | char *dp; | |
22 | const char *cp, *ep; | 22 | const char *cp, *ep; | |
23 | + int fd; | 23 | + int fd; | |
24 | 24 | |||
25 | if (!ifname) { | 25 | if (!ifname) { | |
26 | return -1; | 26 | return -1; | |
27 | } | 27 | } | |
28 | 28 |
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.9 2013/12/13 16:34:17 jakllsch Exp $ | 1 | # $NetBSD: Makefile,v 1.10 2014/02/09 04:34:31 taca Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | PKGNAME= isc-dhcpd-${DHVER} | 4 | PKGNAME= isc-dhcpd-${DHVER} | |
5 | PKGREVISION= 2 | |||
6 | COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server | 5 | COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server | |
7 | BUILD_SUBDIR= bind includes tests common omapip dhcpctl server | 6 | BUILD_SUBDIR= bind includes tests common omapip dhcpctl server | |
8 | SUBDIR= omapip dhcpctl server | 7 | SUBDIR= omapip dhcpctl server | |
9 | 8 | |||
10 | CONF_FILES+= ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf | 9 | CONF_FILES+= ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf | |
11 | #CONF_FILES+= ${EGDIR}/dhcpd6.conf ${PKG_SYSCONFDIR}/dhcpd6.conf | 10 | #CONF_FILES+= ${EGDIR}/dhcpd6.conf ${PKG_SYSCONFDIR}/dhcpd6.conf | |
12 | RCD_SCRIPTS= isc_dhcpd isc_dhcpd6 | 11 | RCD_SCRIPTS= isc_dhcpd isc_dhcpd6 | |
13 | FILES_SUBST+= DHCP_HOME=${DHCP_HOME} | 12 | FILES_SUBST+= DHCP_HOME=${DHCP_HOME} | |
14 | 13 | |||
15 | .include "${.CURDIR}/../isc-dhcp4/options.mk" | 14 | .include "${.CURDIR}/../isc-dhcp4/options.mk" | |
16 | 15 | |||
17 | INSTALLATION_DIRS+= ${EGDIR} | 16 | INSTALLATION_DIRS+= ${EGDIR} | |
18 | 17 |
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.7 2013/04/10 11:31:27 fhajny Exp $ | 1 | # $NetBSD: Makefile,v 1.8 2014/02/09 04:34:31 taca Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | PKGNAME= isc-dhcrelay-${DHVER} | 4 | PKGNAME= isc-dhcrelay-${DHVER} | |
5 | PKGREVISION= 1 | |||
6 | COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Relay | 5 | COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Relay | |
7 | BUILD_SUBDIR= bind includes tests common omapip relay | 6 | BUILD_SUBDIR= bind includes tests common omapip relay | |
8 | SUBDIR= relay | 7 | SUBDIR= relay | |
9 | 8 | |||
10 | RCD_SCRIPTS= isc_dhcrelay | 9 | RCD_SCRIPTS= isc_dhcrelay | |
11 | FILES_SUBST+= DHCP_HOME=${DHCP_HOME} | 10 | FILES_SUBST+= DHCP_HOME=${DHCP_HOME} | |
12 | 11 | |||
13 | .include "${.CURDIR}/../isc-dhcp4/options.mk" | 12 | .include "${.CURDIR}/../isc-dhcp4/options.mk" | |
14 | 13 | |||
15 | .include "../../net/isc-dhcp4/Makefile.common" | 14 | .include "../../net/isc-dhcp4/Makefile.common" | |
16 | .include "../../net/isc-dhcp4/buildlink3.mk" | 15 | .include "../../net/isc-dhcp4/buildlink3.mk" | |
17 | .include "../../mk/bsd.pkg.mk" | 16 | .include "../../mk/bsd.pkg.mk" |