[pkgsrc/trunk]: pkgsrc/net Despite supporting --sysconfdir isc-dhcp hard sets...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf259d3a9fee
branches:  trunk
changeset: 551986:cf259d3a9fee
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sun Dec 21 21:24:08 2008 +0000

description:
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.

diffstat:

 net/isc-dhclient4/Makefile     |   3 ++-
 net/isc-dhclient4/distinfo     |   3 ++-
 net/isc-dhcp4/Makefile         |   3 ++-
 net/isc-dhcp4/Makefile.common  |   9 ++++++++-
 net/isc-dhcp4/distinfo         |   3 ++-
 net/isc-dhcp4/patches/patch-ac |  27 +++++++++++++++++++++++++++
 net/isc-dhcpd4/Makefile        |   3 ++-
 net/isc-dhcpd4/distinfo        |   3 ++-
 net/isc-dhcrelay4/Makefile     |   3 ++-
 net/isc-dhcrelay4/distinfo     |   3 ++-
 10 files changed, 51 insertions(+), 9 deletions(-)

diffs (162 lines):

diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhclient4/Makefile
--- a/net/isc-dhclient4/Makefile        Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhclient4/Makefile        Sun Dec 21 21:24:08 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/13 22:05:21 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
 #
 
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Client
 COMPONENT=     client
+PKGREVISION=   1
 SUBDIR=                client
 
 CONF_FILES+=   ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhclient4/distinfo
--- a/net/isc-dhclient4/distinfo        Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhclient4/distinfo        Sun Dec 21 21:24:08 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/13 22:05:21 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
 
 SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
 RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
 Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
 SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
 SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
+SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhcp4/Makefile
--- a/net/isc-dhcp4/Makefile    Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhcp4/Makefile    Sun Dec 21 21:24:08 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
 #
 
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Base
 COMPONENT=     base
+PKGREVISION=   1
 SUBDIR=                includes common minires dst
 
 .include "options.mk"
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhcp4/Makefile.common
--- a/net/isc-dhcp4/Makefile.common     Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhcp4/Makefile.common     Sun Dec 21 21:24:08 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2008/12/02 12:07:47 martti Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/12/21 21:24:08 adrianp Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
@@ -35,6 +35,13 @@
 CONFIGURE_ARGS+=       --with-cli-pid-file=${DHCP_PID}/isc-dhclient.pid
 CONFIGURE_ARGS+=       --with-relay-pid-file=${DHCP_PID}/isc-dhcrelay.pid
 
+SUBST_CLASSES+=                config
+SUBST_STAGE.config=    post-patch
+SUBST_FILES.config=    includes/dhcpd.h
+SUBST_SED.config=       -e "s|@@PREFIX@@|${PREFIX}|g"
+SUBST_SED.config+=      -e "s|@@PKG_SYSCONFDIR@@|${PKG_SYSCONFDIR}|g"
+SUBST_MESSAGE.config=   Fixing configuration files.
+
 do-install:
 .      for d in ${SUBDIR}
                cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${MAKE} install
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhcp4/distinfo
--- a/net/isc-dhcp4/distinfo    Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhcp4/distinfo    Sun Dec 21 21:24:08 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
 
 SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
 RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
 Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
 SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
 SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
+SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhcp4/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/isc-dhcp4/patches/patch-ac    Sun Dec 21 21:24:08 2008 +0000
@@ -0,0 +1,27 @@
+$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
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhcpd4/Makefile
--- a/net/isc-dhcpd4/Makefile   Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhcpd4/Makefile   Sun Dec 21 21:24:08 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/13 22:06:15 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
 #
 
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Server
 COMPONENT=     server
+PKGREVISION=   1
 SUBDIR=                omapip dhcpctl server
 
 CONF_FILES+=   ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhcpd4/distinfo
--- a/net/isc-dhcpd4/distinfo   Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhcpd4/distinfo   Sun Dec 21 21:24:08 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/13 22:06:15 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
 
 SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
 RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
 Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
 SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
 SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
+SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhcrelay4/Makefile
--- a/net/isc-dhcrelay4/Makefile        Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhcrelay4/Makefile        Sun Dec 21 21:24:08 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/13 22:06:55 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
 #
 
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Relay
 COMPONENT=     relay
+PKGREVISION=   1
 SUBDIR=                relay
 
 RCD_SCRIPTS=   isc_dhcrelay
diff -r 688502d57a20 -r cf259d3a9fee net/isc-dhcrelay4/distinfo
--- a/net/isc-dhcrelay4/distinfo        Sun Dec 21 20:04:54 2008 +0000
+++ b/net/isc-dhcrelay4/distinfo        Sun Dec 21 21:24:08 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/13 22:06:55 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
 
 SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
 RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
 Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
 SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
 SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
+SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea