svn commit: r568702 - in head/dns: . dnsmasq dnsmasq-devel

[Matthias Andree]

Author: mandree
Date: Thu Mar 18 00:12:31 2021
New Revision: 568702
URL: https://svnweb.freebsd.org/changeset/ports/568702

Log:
  dnsmasq-devel: add test release 2.85rc1
  
  This is to fix a port randomization flaw that subjects dnsmasq to a cache poisoning attack.
  
  ChangeLog:
  https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=155fc966f9542259596b41594f4b85775d1f9c9a;hb=023ace8e54c2e83e88082a1073a281d659f2a860#l1
  
  Add CONFLICTS_INSTALL markers.
  
  Security: CVE-2021-3448
  Security: 5b72b1ff-877c-11eb-bd4f-2f1d57dafe46

Added:
  head/dns/dnsmasq-devel/
     - copied from r568690, head/dns/dnsmasq/
Modified:
  head/dns/Makefile
  head/dns/dnsmasq-devel/Makefile
  head/dns/dnsmasq-devel/distinfo
  head/dns/dnsmasq/Makefile

Modified: head/dns/Makefile
==============================================================================
--- head/dns/Makefile	Thu Mar 18 00:09:50 2021	(r568701)
+++ head/dns/Makefile	Thu Mar 18 00:12:31 2021	(r568702)
@@ -48,6 +48,7 @@
     SUBDIR += dnshistory
     SUBDIR += dnsjava
     SUBDIR += dnsmasq
+    SUBDIR += dnsmasq-devel
     SUBDIR += dnsmax-perl
     SUBDIR += dnsproxy
     SUBDIR += dnsrecon

Modified: head/dns/dnsmasq-devel/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Wed Mar 17 20:58:24 2021	(r568690)
+++ head/dns/dnsmasq-devel/Makefile	Thu Mar 18 00:12:31 2021	(r568702)
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.84
+DISTVERSION=	2.85rc1
 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps:
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	dns
-MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/ \
+MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/release-candidates/ \
 		LOCAL/mandree/
-PATCH_STRIP=	-p1
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	mandree at FreeBSD.org
 COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server
@@ -32,8 +32,8 @@ CFLAGS+=	-Wall -Wno-unused-function -Wno-unused-parame
 		-Wno-unused-value -Wno-unused-variable
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-CONFLICTS_INSTALL=	dnsmasq-devel-*
-
+CONFLICTS_INSTALL=	dnsmasq-2*
+PATCH_STRIP=	-p1
 SUB_FILES=	pkg-message
 
 PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
@@ -104,7 +104,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB}
 
 post-patch:
 	${REINPLACE_CMD} -e '/^lua_/s/lua5\.2/lua-${LUA_VER}/' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's/2\.84rc2/2.84/' ${WRKSRC}/VERSION
+	${REINPLACE_CMD} -e 's/ifr\.ifr_ifindex/ifr.ifr_index/' ${WRKSRC}/src/network.c
 
 pre-configure: pretty-print-config
 .if ${PORT_OPTIONS:MIDN}

Modified: head/dns/dnsmasq-devel/distinfo
==============================================================================
--- head/dns/dnsmasq/distinfo	Wed Mar 17 20:58:24 2021	(r568690)
+++ head/dns/dnsmasq-devel/distinfo	Thu Mar 18 00:12:31 2021	(r568702)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611563398
-SHA256 (dnsmasq-2.84.tar.xz) = 603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c
-SIZE (dnsmasq-2.84.tar.xz) = 514216
+TIMESTAMP = 1616024487
+SHA256 (dnsmasq-2.85rc1.tar.xz) = 97bf5b606f0a5a9e439b464ac5d2296f64b0b19723985e5bc330beda6407a09a
+SIZE (dnsmasq-2.85rc1.tar.xz) = 537632

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Thu Mar 18 00:09:50 2021	(r568701)
+++ head/dns/dnsmasq/Makefile	Thu Mar 18 00:12:31 2021	(r568702)
@@ -9,11 +9,12 @@ PORTEPOCH=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/ \
 		LOCAL/mandree/
-PATCH_STRIP=	-p1
 
 MAINTAINER=	mandree at FreeBSD.org
 COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server
 
+CONFLICTS_INSTALL=	dnsmasq-devel-*
+
 LICENSE=	GPLv2
 
 USES=		cpe shebangfix tar:xz
@@ -34,6 +35,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 CONFLICTS_INSTALL=	dnsmasq-devel-*
 
+PATCH_STRIP=	-p1
 SUB_FILES=	pkg-message
 
 PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html