On Friday, August 22, 2014 23:29 CEST, Brad Smith <[email protected]> wrote:
> Here is an update to isc-dhcp 4.3.1.
>
> OK?
>
With a short test, it works for me, additionally, I added rc scripts for
isc_dhcpd and isc_dhcrelay. The names for the scripts are chosen
similar to what isc-bind port does.
Further @sample dhcpd.conf to /etc
and added some FAKE_FLAGS to prevent some warnings on
update-plist.
Does this work for you too?
cheers,
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/isc-dhcp/Makefile,v
retrieving revision 1.34
diff -u -p -u -r1.34 Makefile
--- Makefile 16 Mar 2014 11:45:15 -0000 1.34
+++ Makefile 31 Aug 2014 11:07:23 -0000
@@ -4,7 +4,7 @@ COMMENT-main= ISC DHCP Server
COMMENT-client= ISC DHCP Client
COMMENT-omapi= ISC DHCP OMAPI
-VERSION= 4.3.0
+VERSION= 4.3.1
DISTNAME= isc-dhcp-${VERSION}
PKGNAME= isc-dhcp-${VERSION:S/-P/./}
PKGNAME-main= isc-dhcp-server-${VERSION:S/-P/./}
@@ -38,6 +38,9 @@ CONFIGURE_ARGS+= --enable-early-chroot
NO_TEST= Yes
EXAMPLEDIR= share/examples/isc-dhcp
+
+# prevent of installing *.conf.sample files in fake root
+FAKE_FLAGS= dist_sysconf_DATA=''
# XXX hack, adapt when updating
post-extract:
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/isc-dhcp/distinfo,v
retrieving revision 1.21
diff -u -p -u -r1.21 distinfo
--- distinfo 16 Mar 2014 11:45:15 -0000 1.21
+++ distinfo 31 Aug 2014 11:07:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (dhcp-4.3.0.tar.gz) = p7ZRfVzzLF5J0jI6Y94A7+U5HffLAEXfoOyPbuRuvoo=
-SIZE (dhcp-4.3.0.tar.gz) = 8960567
+SHA256 (dhcp-4.3.1.tar.gz) = Jmy8qKemu4+czFdl2g0rBAmTKTFKVKT8ECLVEK0+mvA=
+SIZE (dhcp-4.3.1.tar.gz) = 8980806
Index: patches/patch-client_Makefile_in
===================================================================
RCS file: /cvs/ports/net/isc-dhcp/patches/patch-client_Makefile_in,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-client_Makefile_in
--- patches/patch-client_Makefile_in 16 Mar 2014 11:45:15 -0000 1.3
+++ patches/patch-client_Makefile_in 31 Aug 2014 11:07:23 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-client_Makefile_in,v 1.3 2014/03/16 11:45:15 brad Exp $
---- client/Makefile.in.orig Fri Dec 13 15:49:44 2013
-+++ client/Makefile.in Tue Dec 24 09:52:38 2013
-@@ -724,7 +724,8 @@ uninstall-man: uninstall-man5 uninstall-man8
+--- client/Makefile.in.orig Thu Aug 7 00:35:01 2014
++++ client/Makefile.in Sun Aug 31 12:39:45 2014
+@@ -845,7 +845,8 @@ uninstall-man: uninstall-man5 uninstall-man8
dhclient.o: dhclient.c
$(COMPILE)
-DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
Index: patches/patch-common_socket_c
===================================================================
RCS file: patches/patch-common_socket_c
diff -N patches/patch-common_socket_c
--- patches/patch-common_socket_c 16 Mar 2014 11:45:15 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-common_socket_c,v 1.3 2014/03/16 11:45:15 brad Exp $
---- common/socket.c.orig Fri Jan 31 14:20:49 2014
-+++ common/socket.c Sat Feb 8 14:53:55 2014
-@@ -819,7 +819,6 @@ ssize_t send_packet6(struct interface_info *interface,
- pktinfo = (struct in6_pktinfo *)CMSG_DATA(cmsg);
- memset(pktinfo, 0, sizeof(*pktinfo));
- pktinfo->ipi6_ifindex = ifindex;
-- m.msg_controllen = cmsg->cmsg_len;
-
- result = sendmsg(interface->wfdesc, &m, 0);
- if (result < 0) {
Index: patches/patch-server_dhcpd_c
===================================================================
RCS file: /cvs/ports/net/isc-dhcp/patches/patch-server_dhcpd_c,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-server_dhcpd_c
--- patches/patch-server_dhcpd_c 16 Mar 2014 11:45:15 -0000 1.3
+++ patches/patch-server_dhcpd_c 31 Aug 2014 11:07:23 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-server_dhcpd_c,v 1.3 2014/03/16 11:45:15 brad Exp $
---- server/dhcpd.c.orig Fri Jan 31 14:20:49 2014
-+++ server/dhcpd.c Fri Feb 7 10:48:46 2014
-@@ -622,6 +622,12 @@ main(int argc, char **argv) {
+--- server/dhcpd.c.orig Thu Aug 7 00:35:02 2014
++++ server/dhcpd.c Sun Aug 31 12:39:45 2014
+@@ -633,6 +633,12 @@ main(int argc, char **argv) {
if (lftest)
exit (0);
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/isc-dhcp/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST-main
--- pkg/PLIST-main 14 Jan 2012 12:43:25 -0000 1.4
+++ pkg/PLIST-main 31 Aug 2014 11:07:23 -0000
@@ -11,4 +11,10 @@
@bin sbin/dhcrelay
share/examples/isc-dhcp/
share/examples/isc-dhcp/dhcpd.conf
+@sample /etc/dhcpd.conf
@extra /var/db/dhcpd.leases
+@mode
+@owner
+@group
+@rcscript ${RCDIR}/isc_dhcpd
+@rcscript ${RCDIR}/isc_dhcrelay
Index: pkg/isc_dhcpd.rc
===================================================================
RCS file: pkg/isc_dhcpd.rc
diff -N pkg/isc_dhcpd.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/isc_dhcpd.rc 31 Aug 2014 11:07:23 -0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/sbin/dhcpd"
+daemon_flags="-cf /etc/dhcpd.conf -user _dhcp -group _dhcp -lf
/var/db/dhcpd.leases"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1
Index: pkg/isc_dhcrelay.rc
===================================================================
RCS file: pkg/isc_dhcrelay.rc
diff -N pkg/isc_dhcrelay.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/isc_dhcrelay.rc 31 Aug 2014 11:07:23 -0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/sbin/dhcrelay"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1
