From owner-svn-ports-head@freebsd.org Sun Oct 11 02:02:44 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4104CA0FD52; Sun, 11 Oct 2015 02:02:44 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0448D1BA6; Sun, 11 Oct 2015 02:02:43 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9B22h8t033055; Sun, 11 Oct 2015 02:02:43 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9B22gd1033050; Sun, 11 Oct 2015 02:02:42 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201510110202.t9B22gd1033050@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Sun, 11 Oct 2015 02:02:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399078 - in head/net/isc-dhcp43-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Oct 2015 02:02:44 -0000 Author: zi Date: Sun Oct 11 02:02:42 2015 New Revision: 399078 URL: https://svnweb.freebsd.org/changeset/ports/399078 Log: - Update to 4.3.3 Deleted: head/net/isc-dhcp43-server/files/patch-server_confpars.c Modified: head/net/isc-dhcp43-server/Makefile head/net/isc-dhcp43-server/distinfo head/net/isc-dhcp43-server/files/extra-patch-bind__Makefile head/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example head/net/isc-dhcp43-server/pkg-plist Modified: head/net/isc-dhcp43-server/Makefile ============================================================================== --- head/net/isc-dhcp43-server/Makefile Sun Oct 11 01:46:11 2015 (r399077) +++ head/net/isc-dhcp43-server/Makefile Sun Oct 11 02:02:42 2015 (r399078) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dhcp -DISTVERSION= 4.3.2 +DISTVERSION= 4.3.3 PORTREVISION= ${DHCP_PORTREVISION} CATEGORIES= net MASTER_SITES= ISC/${PORTNAME}/${DISTVERSION} @@ -18,7 +18,7 @@ LICENSE= ISCL USES= gmake #PATCHLEVEL= P1 -PORTREVISION_SERVER= 1 +PORTREVISION_SERVER= 0 PORTREVISION_CLIENT= 0 PORTREVISION_RELAY= 0 @@ -94,12 +94,12 @@ SUB_LIST+= PARANOIA="no" .endif .if ${PORT_OPTIONS:MLDAP} -CONFIGURE_ARGS+=--with-ldap +CONFIGURE_ARGS+=--with-ldap --with-ldapcrypto USE_OPENLDAP= yes LDAP_SCRIPT= ${WRKSRC}/contrib/ldap/dhcpd-conf-to-ldap LDAP_SCHEMA= ${WRKSRC}/contrib/ldap/dhcp.schema LDAP_README= ${WRKSRC}/contrib/ldap/README.ldap -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LIBS+= -L${LOCALBASE}/lib PORTDOCS+= README.ldap PLIST_SUB+= SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" LDAP="" @@ -142,7 +142,7 @@ do-install: ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install .if ${SUBSYS} == server ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dhcpctl install - ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dst install +#${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dst install ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/omapip install ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/includes install ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/common install Modified: head/net/isc-dhcp43-server/distinfo ============================================================================== --- head/net/isc-dhcp43-server/distinfo Sun Oct 11 01:46:11 2015 (r399077) +++ head/net/isc-dhcp43-server/distinfo Sun Oct 11 02:02:42 2015 (r399078) @@ -1,2 +1,2 @@ -SHA256 (dhcp-4.3.2.tar.gz) = 6246c9b358759f6cdcc45104caaf76e732a211dbbbbf64a21f499c8db1298165 -SIZE (dhcp-4.3.2.tar.gz) = 9230340 +SHA256 (dhcp-4.3.3.tar.gz) = 553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede +SIZE (dhcp-4.3.3.tar.gz) = 9205539 Modified: head/net/isc-dhcp43-server/files/extra-patch-bind__Makefile ============================================================================== --- head/net/isc-dhcp43-server/files/extra-patch-bind__Makefile Sun Oct 11 01:46:11 2015 (r399077) +++ head/net/isc-dhcp43-server/files/extra-patch-bind__Makefile Sun Oct 11 02:02:42 2015 (r399078) @@ -1,11 +1,11 @@ ---- ./bind/Makefile.orig 2012-06-05 20:35:33.000000000 -0400 -+++ ./bind/Makefile 2012-06-05 20:35:41.000000000 -0400 -@@ -52,7 +52,7 @@ - else \ - echo Configuring BIND Export libraries for DHCP. ; \ - rm -rf ./lib ./include ./configure.log ./build.log ./install.log ; \ -- (cd ${bindsrcdir} && ./configure --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log); \ -+ (cd ${bindsrcdir} && ./configure --disable-symtable --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log); \ - fi +--- bind/Makefile.in.orig 2015-09-11 20:09:28 UTC ++++ bind/Makefile.in +@@ -26,7 +26,7 @@ include ./bindvar.tmp - # Build and install the export libraries + bindsrcdir=bind-${version} + +-bindconfig = --disable-kqueue --disable-epoll --disable-devpoll \ ++bindconfig = --disable-symtable --disable-kqueue --disable-epoll --disable-devpoll \ + --without-openssl --without-libxml2 --enable-exportlib \ + --with-gssapi=no --enable-threads=no @BINDCONFIG@ \ + --with-export-includedir=${binddir}/include \ Modified: head/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example ============================================================================== --- head/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example Sun Oct 11 01:46:11 2015 (r399077) +++ head/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example Sun Oct 11 02:02:42 2015 (r399078) @@ -1,6 +1,6 @@ ---- ./client/dhclient.conf.example.orig 2013-01-25 20:26:40.000000000 -0500 -+++ ./client/dhclient.conf.example 2013-01-25 20:26:53.000000000 -0500 -@@ -11,7 +11,7 @@ +--- client/dhclient.conf.example.orig 2015-09-11 20:11:21 UTC ++++ client/dhclient.conf.example +@@ -11,7 +11,7 @@ retry 60; reboot 10; select-timeout 5; initial-interval 2; Modified: head/net/isc-dhcp43-server/pkg-plist ============================================================================== --- head/net/isc-dhcp43-server/pkg-plist Sun Oct 11 01:46:11 2015 (r399077) +++ head/net/isc-dhcp43-server/pkg-plist Sun Oct 11 02:02:42 2015 (r399078) @@ -26,5 +26,4 @@ include/omapip/isclib.h include/omapip/result.h lib/libdhcpctl.a lib/libomapi.a -lib/libdst.a %%LDAP%%%%SCHEMA_DIR%%/dhcp.schema