Sun Dec 21 21:24:08 2008 UTC ()
Despite supporting --sysconfdir isc-dhcp hard sets the location of
configuration files and binaries in a number of cases.  This should hopefully
fix them all.  Without this patch they look in /etc only and fail to start
if the file is not present.


(adrianp)
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhclient4/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhclient4/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/distinfo
diff -r1.2 -r1.3 pkgsrc/net/isc-dhcp4/Makefile.common
diff -r0 -r1.1 pkgsrc/net/isc-dhcp4/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcpd4/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcpd4/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcrelay4/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcrelay4/distinfo
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhclient4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/isc-dhclient4/Makefile 2008/02/13 22:05:21 1.1.1.1
+++ pkgsrc/net/isc-dhclient4/Makefile 2008/12/21 21:24:08 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/02/13 22:05:21 adrianp Exp $ 1# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
2# 2#
3 3
4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client 4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client
5COMPONENT= client 5COMPONENT= client
 6PKGREVISION= 1
6SUBDIR= client 7SUBDIR= client
7 8
8CONF_FILES+= ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf 9CONF_FILES+= ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
9 10
10RCD_SCRIPTS= isc_dhclient 11RCD_SCRIPTS= isc_dhclient
11FILES_SUBST+= DHCP_HOME=${DHCP_HOME} 12FILES_SUBST+= DHCP_HOME=${DHCP_HOME}
12 13
13.include "${.CURDIR}/../isc-dhcp4/options.mk" 14.include "${.CURDIR}/../isc-dhcp4/options.mk"
14 15
15post-install: 16post-install:
16 ${INSTALL_DATA_DIR} ${EGDIR} 17 ${INSTALL_DATA_DIR} ${EGDIR}
17 ${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf ${EGDIR} 18 ${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf ${EGDIR}
18 19
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhclient4/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/isc-dhclient4/Attic/distinfo 2008/02/13 22:05:21 1.1.1.1
+++ pkgsrc/net/isc-dhclient4/Attic/distinfo 2008/12/21 21:24:08 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/02/13 22:05:21 adrianp Exp $ 1$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
2 2
3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201 3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d 4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes 5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905 6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1 7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
 8SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/Makefile 2008/02/13 22:03:58 1.1.1.1
+++ pkgsrc/net/isc-dhcp4/Makefile 2008/12/21 21:24:08 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $ 1# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
2# 2#
3 3
4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base 4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base
5COMPONENT= base 5COMPONENT= base
 6PKGREVISION= 1
6SUBDIR= includes common minires dst 7SUBDIR= includes common minires dst
7 8
8.include "options.mk" 9.include "options.mk"
9 10
10post-install: 11post-install:
11 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/isc-dhcp-${COMPONENT} 12 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
12 13
13 ${INSTALL_DATA} ${WRKSRC}/README \ 14 ${INSTALL_DATA} ${WRKSRC}/README \
14 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT} 15 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
15 ${INSTALL_DATA} ${WRKSRC}/RELNOTES \ 16 ${INSTALL_DATA} ${WRKSRC}/RELNOTES \
16 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT} 17 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
17 ${INSTALL_DATA} ${WRKSRC}/doc/References.txt \ 18 ${INSTALL_DATA} ${WRKSRC}/doc/References.txt \
18 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT} 19 ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcp4/distinfo (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/distinfo 2008/02/13 22:03:58 1.1.1.1
+++ pkgsrc/net/isc-dhcp4/distinfo 2008/12/21 21:24:08 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $ 1$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
2 2
3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201 3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d 4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes 5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905 6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1 7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
 8SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
cvs diff -r1.2 -r1.3 pkgsrc/net/isc-dhcp4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/Makefile.common 2008/12/02 12:07:47 1.2
+++ pkgsrc/net/isc-dhcp4/Makefile.common 2008/12/21 21:24:08 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.2 2008/12/02 12:07:47 martti Exp $ 1# $NetBSD: Makefile.common,v 1.3 2008/12/21 21:24:08 adrianp 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
8DISTNAME= dhcp-4.0.0 8DISTNAME= dhcp-4.0.0
9PKGNAME= ${DISTNAME:S/dhcp/isc-dhcp-${COMPONENT}/} 9PKGNAME= ${DISTNAME:S/dhcp/isc-dhcp-${COMPONENT}/}
10CATEGORIES= net 10CATEGORIES= net
11MASTER_SITES= http://ftp.isc.org/isc/dhcp/ 11MASTER_SITES= http://ftp.isc.org/isc/dhcp/
12 12
13MAINTAINER= adrianp@NetBSD.org 13MAINTAINER= adrianp@NetBSD.org
14HOMEPAGE= http://www.isc.org/sw/dhcp/dhcp4_0.php 14HOMEPAGE= http://www.isc.org/sw/dhcp/dhcp4_0.php
@@ -25,19 +25,26 @@ PKG_SYSCONFSUBDIR= dhcp @@ -25,19 +25,26 @@ PKG_SYSCONFSUBDIR= dhcp
25FILESDIR= ${.CURDIR}/../isc-dhcp4/files 25FILESDIR= ${.CURDIR}/../isc-dhcp4/files
26PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches 26PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches
27EGDIR= ${PREFIX}/share/examples/isc-dhcp-${COMPONENT} 27EGDIR= ${PREFIX}/share/examples/isc-dhcp-${COMPONENT}
28BUILD_DEFS+= VARBASE DHCP_HOME DHCP_PID 28BUILD_DEFS+= VARBASE DHCP_HOME DHCP_PID
29 29
30CONFIGURE_ARGS+= --localstatedir=${VARBASE} 30CONFIGURE_ARGS+= --localstatedir=${VARBASE}
31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
32CONFIGURE_ARGS+= --with-srv-lease-file=${DHCP_HOME}/dhcpd.leases 32CONFIGURE_ARGS+= --with-srv-lease-file=${DHCP_HOME}/dhcpd.leases
33CONFIGURE_ARGS+= --with-cli-lease-file=${DHCP_HOME}/dhclient.leases 33CONFIGURE_ARGS+= --with-cli-lease-file=${DHCP_HOME}/dhclient.leases
34CONFIGURE_ARGS+= --with-srv-pid-file=${DHCP_PID}/isc-dhcpd.pid 34CONFIGURE_ARGS+= --with-srv-pid-file=${DHCP_PID}/isc-dhcpd.pid
35CONFIGURE_ARGS+= --with-cli-pid-file=${DHCP_PID}/isc-dhclient.pid 35CONFIGURE_ARGS+= --with-cli-pid-file=${DHCP_PID}/isc-dhclient.pid
36CONFIGURE_ARGS+= --with-relay-pid-file=${DHCP_PID}/isc-dhcrelay.pid 36CONFIGURE_ARGS+= --with-relay-pid-file=${DHCP_PID}/isc-dhcrelay.pid
37 37
 38SUBST_CLASSES+= config
 39SUBST_STAGE.config= post-patch
 40SUBST_FILES.config= includes/dhcpd.h
 41SUBST_SED.config= -e "s|@@PREFIX@@|${PREFIX}|g"
 42SUBST_SED.config+= -e "s|@@PKG_SYSCONFDIR@@|${PKG_SYSCONFDIR}|g"
 43SUBST_MESSAGE.config= Fixing configuration files.
 44
38do-install: 45do-install:
39. for d in ${SUBDIR} 46. for d in ${SUBDIR}
40 cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${MAKE} install 47 cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${MAKE} install
41. endfor 48. endfor
42 49
43.include "../../security/openssl/buildlink3.mk" 50.include "../../security/openssl/buildlink3.mk"
File Added: pkgsrc/net/isc-dhcp4/patches/patch-ac
$NetBSD: patch-ac,v 1.1 2008/12/21 21:24:08 adrianp Exp $

--- includes/dhcpd.h.orig	2007-12-08 19:36:00.000000000 +0000
+++ includes/dhcpd.h
@@ -1241,7 +1241,7 @@ typedef unsigned char option_mask [16];
 #else /* !DEBUG */
 
 #ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
+#define _PATH_DHCPD_CONF	"@@PKG_SYSCONFDIR@@/dhcpd.conf"
 #endif /* DEBUG */
 
 #ifndef _PATH_DHCPD_DB
@@ -1263,11 +1263,11 @@ typedef unsigned char option_mask [16];
 #endif /* DEBUG */
 
 #ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
+#define _PATH_DHCLIENT_CONF	"@@PKG_SYSCONFDIR@@/dhclient.conf"
 #endif
 
 #ifndef _PATH_DHCLIENT_SCRIPT
-#define _PATH_DHCLIENT_SCRIPT	"/sbin/dhclient-script"
+#define _PATH_DHCLIENT_SCRIPT	"@@PREFIX@@/sbin/dhclient-script"
 #endif
 
 #ifndef _PATH_DHCLIENT_PID
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcpd4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcpd4/Makefile 2008/02/13 22:06:15 1.1.1.1
+++ pkgsrc/net/isc-dhcpd4/Makefile 2008/12/21 21:24:08 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/02/13 22:06:15 adrianp Exp $ 1# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
2# 2#
3 3
4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server 4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Server
5COMPONENT= server 5COMPONENT= server
 6PKGREVISION= 1
6SUBDIR= omapip dhcpctl server 7SUBDIR= omapip dhcpctl server
7 8
8CONF_FILES+= ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf 9CONF_FILES+= ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf
9RCD_SCRIPTS= isc_dhcpd 10RCD_SCRIPTS= isc_dhcpd
10FILES_SUBST+= DHCP_HOME=${DHCP_HOME} 11FILES_SUBST+= DHCP_HOME=${DHCP_HOME}
11 12
12.include "${.CURDIR}/../isc-dhcp4/options.mk" 13.include "${.CURDIR}/../isc-dhcp4/options.mk"
13 14
14post-install: 15post-install:
15 ${INSTALL_DATA_DIR} ${EGDIR} 16 ${INSTALL_DATA_DIR} ${EGDIR}
16 ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${EGDIR} 17 ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${EGDIR}
17 18
18.include "../../net/isc-dhcp4/Makefile.common" 19.include "../../net/isc-dhcp4/Makefile.common"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcpd4/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcpd4/Attic/distinfo 2008/02/13 22:06:15 1.1.1.1
+++ pkgsrc/net/isc-dhcpd4/Attic/distinfo 2008/12/21 21:24:08 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/02/13 22:06:15 adrianp Exp $ 1$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
2 2
3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201 3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d 4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes 5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905 6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1 7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
 8SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcrelay4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcrelay4/Makefile 2008/02/13 22:06:55 1.1.1.1
+++ pkgsrc/net/isc-dhcrelay4/Makefile 2008/12/21 21:24:08 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/02/13 22:06:55 adrianp Exp $ 1# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
2# 2#
3 3
4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Relay 4COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Relay
5COMPONENT= relay 5COMPONENT= relay
 6PKGREVISION= 1
6SUBDIR= relay 7SUBDIR= relay
7 8
8RCD_SCRIPTS= isc_dhcrelay 9RCD_SCRIPTS= isc_dhcrelay
9FILES_SUBST+= DHCP_HOME=${DHCP_HOME} 10FILES_SUBST+= DHCP_HOME=${DHCP_HOME}
10 11
11.include "${.CURDIR}/../isc-dhcp4/options.mk" 12.include "${.CURDIR}/../isc-dhcp4/options.mk"
12 13
13.include "../../net/isc-dhcp4/Makefile.common" 14.include "../../net/isc-dhcp4/Makefile.common"
14.include "../../net/isc-dhcp4/buildlink3.mk" 15.include "../../net/isc-dhcp4/buildlink3.mk"
15.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/isc-dhcrelay4/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcrelay4/Attic/distinfo 2008/02/13 22:06:55 1.1.1.1
+++ pkgsrc/net/isc-dhcrelay4/Attic/distinfo 2008/12/21 21:24:08 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/02/13 22:06:55 adrianp Exp $ 1$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
2 2
3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201 3SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d 4RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes 5Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905 6SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1 7SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
 8SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea