Date: Sun, 17 Jan 2016 19:03:50 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r406528 - in branches/2016Q1/net/isc-dhcp41-server: . files Message-ID: <201601171903.u0HJ3ojN033473@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Sun Jan 17 19:03:50 2016 New Revision: 406528 URL: https://svnweb.freebsd.org/changeset/ports/406528 Log: MFH: r406527 net/isc-dhcp41-server: Update to 4.1-ESV-R12-P1 This fixes CVE-2015-8605. Mark DEPRECATED and provide EXPIRES to coincide with 2016Q2 branch creation. The PORTVERSION scheme of this port is strange, but I am continuing the current version scheme as this is probably the last release of the 4.1 branch. The ISC Software Support Policy states that 4.1 ESV is support ends December 2015. [1] [1] http://www.isc.org/downloads/software-support-policy/ Security: CVE-2015-8605 Approved by: ports-secteam (with hat) Added: branches/2016Q1/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example - copied unchanged from r406527, head/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example Deleted: branches/2016Q1/net/isc-dhcp41-server/files/patch-client__Makefile.in branches/2016Q1/net/isc-dhcp41-server/files/patch-client__dhclient.conf branches/2016Q1/net/isc-dhcp41-server/files/patch-server__Makefile.am branches/2016Q1/net/isc-dhcp41-server/files/patch-server__Makefile.in branches/2016Q1/net/isc-dhcp41-server/files/patch-server__bpf.c Modified: branches/2016Q1/net/isc-dhcp41-server/Makefile branches/2016Q1/net/isc-dhcp41-server/distinfo Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/net/isc-dhcp41-server/Makefile ============================================================================== --- branches/2016Q1/net/isc-dhcp41-server/Makefile Sun Jan 17 19:02:59 2016 (r406527) +++ branches/2016Q1/net/isc-dhcp41-server/Makefile Sun Jan 17 19:03:50 2016 (r406528) @@ -15,10 +15,13 @@ COMMENT?= The ISC Dynamic Host Configura LICENSE= ISCL -PATCHLEVEL= R7 -PORTREVISION_SERVER= 9 -PORTREVISION_CLIENT= 2 -PORTREVISION_RELAY= 5 +PATCHLEVEL= R12-P1 +PORTREVISION_SERVER= 10 +PORTREVISION_CLIENT= 3 +PORTREVISION_RELAY= 6 + +DEPRECATED= isc-dhcp 4.1 is now End of Life +EXPIRES= 2016-03-01 SUBSYS?= server WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} @@ -138,7 +141,7 @@ post-patch: @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${MSG_FILE} > ${PKGMESSAGE} @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/client/dhclient.conf + ${WRKSRC}/client/dhclient.conf.example do-install: ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install @@ -168,7 +171,9 @@ do-install: post-install: .if ${SUBSYS} == client ${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${STAGEDIR}${PREFIX}/sbin/dhclient-script + ${MV} ${STAGEDIR}${PREFIX}/etc/dhclient.conf.example ${STAGEDIR}${PREFIX}/etc/dhclient.conf.sample .elif ${SUBSYS} == server + ${MV} ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.example ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.sample .if ${PORT_OPTIONS:MIPV6} @${LN} -sf isc-dhcpd ${STAGEDIR}${PREFIX}/etc/rc.d/isc-dhcpd6 .endif Modified: branches/2016Q1/net/isc-dhcp41-server/distinfo ============================================================================== --- branches/2016Q1/net/isc-dhcp41-server/distinfo Sun Jan 17 19:02:59 2016 (r406527) +++ branches/2016Q1/net/isc-dhcp41-server/distinfo Sun Jan 17 19:03:50 2016 (r406528) @@ -1,4 +1,2 @@ -SHA256 (dhcp-4.1-ESV-R7.tar.gz) = 25d579291a13ccce39c5dbb0e2f2ce8e974c82015bc4e3ee653cf95a4ed15ca4 -SIZE (dhcp-4.1-ESV-R7.tar.gz) = 1162002 -SHA256 (ldap-for-dhcp-4.1.1-2.tar.gz) = 566b7be2ebefdc583d0bf0095c804ba69807b67e5cc29a2b64b1b39202b37d0d -SIZE (ldap-for-dhcp-4.1.1-2.tar.gz) = 39004 +SHA256 (dhcp-4.1-ESV-R12-P1.tar.gz) = d46af9ce8fb19b797d7bd3d8542a05353522bae8d77231eb07736af0007feb62 +SIZE (dhcp-4.1-ESV-R12-P1.tar.gz) = 1252652 Copied: branches/2016Q1/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example (from r406527, head/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example Sun Jan 17 19:03:50 2016 (r406528, copy of r406527, head/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example) @@ -0,0 +1,11 @@ +--- client/dhclient.conf.example.orig 2016-01-17 18:48:11 UTC ++++ client/dhclient.conf.example +@@ -11,7 +11,7 @@ retry 60; + reboot 10; + select-timeout 5; + initial-interval 2; +-script "/etc/dhclient-script"; ++script "%%PREFIX%%/sbin/dhclient-script"; + media "-link0 -link1 -link2", "link0 link1"; + reject 192.33.137.209; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601171903.u0HJ3ojN033473>