cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to isc-dhcp-4.4.2 and build the new "keama" tool (Kea migration assistant)

Browse Source
This commit is contained in:
sthen 2020-01-22 16:11:55 +00:00
parent 896fd76076
commit 0728e049f2
12 changed files with 93 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/isc-dhcp/Makefile
View File

@ -1,20 +1,20 @@
# $OpenBSD: Makefile,v 1.53 2019/12/20 21:06:17 sthen Exp $
# $OpenBSD: Makefile,v 1.54 2020/01/22 16:11:55 sthen Exp $
COMMENT-main= ISC DHCP Server
COMMENT-client= ISC DHCP Client
COMMENT-omapi= ISC DHCP OMAPI
VERSION= 4.4.1
VERSION= 4.4.2
DISTNAME= isc-dhcp-${VERSION}
PKGNAME= isc-dhcp-${VERSION:S/-P/./}
PKGNAME-main= isc-dhcp-server-${VERSION:S/-P/./}
PKGNAME-client= isc-dhcp-client-${VERSION:S/-P/./}
PKGNAME-omapi= isc-dhcp-omapi-${VERSION:S/-P/./}
CATEGORIES= net
REVISION= 2
DISTFILES= dhcp-${VERSION}.tar.gz
WRKDIST= ${WRKDIR}/dhcp-${VERSION}
PATCHORIG= .orig.port
MASTER_SITES= ${MASTER_SITE_ISC:=dhcp/${VERSION}/} \
${MASTER_SITE_ISC:=dhcp/}
@ -30,7 +30,7 @@ MULTI_PACKAGES= -main -omapi -client
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-early-chroot \
CONFIGURE_ARGS+= --enable-early-chroot \
--enable-paranoia \
NO_TEST= Yes
@ -43,7 +43,13 @@ MAKE_ENV += CC='${CC}'
post-extract:
cd ${WRKDIST}/bind && tar zxf bind.tar.gz
post-build:
cd ${WRKSRC}/keama; \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
post-install:
cd ${WRKSRC}/keama; \
${SETENV} ${MAKE_ENV} ${FAKE_SETUP} ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} install
${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLEDIR}
${INSTALL_SCRIPT} ${FILESDIR}/dhclient-script ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf.example \

4
net/isc-dhcp/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dhcp-4.4.1.tar.gz) = KiJQiSKrNntK9GZKBHLcIgzJYDSCzzwW2a/xTzp2tgg=
SIZE (dhcp-4.4.1.tar.gz) = 11164378
SHA256 (dhcp-4.4.2.tar.gz) = GnzNZKFuXmj3teD1J/0HJAookupT/iRWIPT19gcARSE=
SIZE (dhcp-4.4.2.tar.gz) = 9906235

4
net/isc-dhcp/patches/patch-bind_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-bind_Makefile_in,v 1.4 2019/12/20 21:06:17 sthen Exp $
$OpenBSD: patch-bind_Makefile_in,v 1.5 2020/01/22 16:11:55 sthen Exp $
Index: bind/Makefile.in
--- bind/Makefile.in.orig
+++ bind/Makefile.in
@@ -24,7 +24,7 @@ exec_prefix = @exec_prefix@
bindconfig = --without-openssl --without-libxml2 --without-libjson \
--without-gssapi --disable-threads --without-lmdb \
--includedir=@includedir@ --libdir=@libdir@ \
--includedir=@includedir@ --libdir=@libdir@ --without-python\
- @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report
+ @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report --disable-backtrace

4
net/isc-dhcp/patches/patch-client_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-client_Makefile_in,v 1.9 2018/03/06 08:37:39 sthen Exp $
$OpenBSD: patch-client_Makefile_in,v 1.10 2020/01/22 16:11:55 sthen Exp $
Index: client/Makefile.in
--- client/Makefile.in.orig
+++ client/Makefile.in
@@ -368,7 +368,8 @@ top_srcdir = @top_srcdir@
@@ -371,7 +371,8 @@ top_srcdir = @top_srcdir@
# production code. Sadly, we are not there yet.
SUBDIRS = . tests
AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \

14
net/isc-dhcp/patches/patch-common_socket_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-common_socket_c,v 1.7 2018/03/06 08:37:39 sthen Exp $
Index: common/socket.c
--- common/socket.c.orig
+++ common/socket.c
@@ -877,8 +877,7 @@ ssize_t send_packet6(struct interface_info *interface,
m.msg_name = &dst;
m.msg_namelen = sizeof(dst);
ifindex = if_nametoindex(interface->name);
- if (no_global_v6_socket)
- dst.sin6_scope_id = ifindex;
+ dst.sin6_scope_id = ifindex;
/*
* Set the data buffer we're sending. (Using this wacky

13
net/isc-dhcp/patches/patch-keama_confparse_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-keama_confparse_c,v 1.1 2020/01/22 16:11:55 sthen Exp $
Index: keama/confparse.c
--- keama/confparse.c.orig
+++ keama/confparse.c
@@ -26,6 +26,7 @@
#include "keama.h"
#include <sys/errno.h>
+#include <errno.h>
#include <arpa/inet.h>
#include <assert.h>
#include <ctype.h>

13
net/isc-dhcp/patches/patch-keama_data_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-keama_data_c,v 1.1 2020/01/22 16:11:55 sthen Exp $
Index: keama/data.c
--- keama/data.c.orig
+++ keama/data.c
@@ -23,6 +23,7 @@
#include "data.h"
#include <sys/types.h>
+#include <sys/socket.h>
#include <arpa/inet.h>
#include <assert.h>
#include <stdlib.h>

13
net/isc-dhcp/patches/patch-keama_eval_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-keama_eval_c,v 1.1 2020/01/22 16:11:55 sthen Exp $
Index: keama/eval.c
--- keama/eval.c.orig
+++ keama/eval.c
@@ -24,6 +24,7 @@
#include "keama.h"
#include <sys/errno.h>
+#include <errno.h>
#include <sys/types.h>
#include <arpa/inet.h>
#include <ctype.h>

14
net/isc-dhcp/patches/patch-keama_keama_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-keama_keama_c,v 1.1 2020/01/22 16:11:55 sthen Exp $
Index: keama/keama.c
--- keama/keama.c.orig
+++ keama/keama.c
@@ -22,6 +22,8 @@
*/
#include <sys/errno.h>
+#include <sys/socket.h>
+#include <errno.h>
#include <arpa/inet.h>
#include <assert.h>
#include <fcntl.h>

13
net/isc-dhcp/patches/patch-keama_keama_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-keama_keama_h,v 1.1 2020/01/22 16:11:55 sthen Exp $
Index: keama/keama.h
--- keama/keama.h.orig
+++ keama/keama.h
@@ -29,6 +29,7 @@
#include "dhctoken.h"
#include <time.h>
+#include <sys/socket.h>
/* Resolution of FQDNs into IPv4 addresses */
enum resolve {

12
net/isc-dhcp/pkg/PLIST-main
View File

@ -1,18 +1,20 @@
@comment $OpenBSD: PLIST-main,v 1.5 2014/10/12 20:10:16 sthen Exp $
@newgroup _isc-dhcp:744
@newuser _isc-dhcp:744:_isc-dhcp:daemon:ISC DHCP user:/nonexistent:/sbin/nologin
@comment $OpenBSD: PLIST-main,v 1.6 2020/01/22 16:11:55 sthen Exp $
@conflict isc-dhcp-*
@pkgpath net/isc-dhcp
@newgroup _isc-dhcp:744
@newuser _isc-dhcp:744:_isc-dhcp:daemon:ISC DHCP user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/isc_dhcpd
@rcscript ${RCDIR}/isc_dhcrelay
@man man/man5/dhcp-eval.5
@man man/man5/dhcp-options.5
@man man/man5/dhcpd.conf.5
@man man/man5/dhcpd.leases.5
@man man/man8/dhcpd.8
@man man/man8/dhcrelay.8
@man man/man8/keama.8
@bin sbin/dhcpd
@bin sbin/dhcrelay
@bin sbin/keama
share/examples/isc-dhcp/
share/examples/isc-dhcp/dhcpd.conf
@extra /var/db/dhcpd.leases
@rcscript ${RCDIR}/isc_dhcpd
@rcscript ${RCDIR}/isc_dhcrelay

8
net/isc-dhcp/pkg/PLIST-omapi
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-omapi,v 1.6 2018/03/06 08:37:39 sthen Exp $
@comment $OpenBSD: PLIST-omapi,v 1.7 2020/01/22 16:11:55 sthen Exp $
@conflict isc-dhcp-*
@bin bin/omshell
include/dhcpctl/
@ -13,9 +13,9 @@ include/omapip/omapip.h
include/omapip/omapip_p.h
include/omapip/result.h
include/omapip/trace.h
lib/libdhcp.a
lib/libdhcpctl.a
lib/libomapi.a
@static-lib lib/libdhcp.a
@static-lib lib/libdhcpctl.a
@static-lib lib/libomapi.a
@man man/man1/omshell.1
@man man/man3/dhcpctl.3
@man man/man3/omapi.3