From c322b3982fdeb934a30aa44ca2bd4d42530c8294 Mon Sep 17 00:00:00 2001 From: bernd Date: Mon, 7 Jan 2008 21:24:07 +0000 Subject: [PATCH] Security update to maradns-1.2.12.09. http://secunia.com/advisories/28329/ ok sturm@ (MAINTAINER) --- net/maradns/Makefile | 14 +++----------- net/maradns/distinfo | 10 +++++----- net/maradns/patches/patch-server_MaraDNS_c | 12 ------------ 3 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 net/maradns/patches/patch-server_MaraDNS_c diff --git a/net/maradns/Makefile b/net/maradns/Makefile index bb5d5056223..50185ef5433 100644 --- a/net/maradns/Makefile +++ b/net/maradns/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2007/09/15 22:36:55 merdely Exp $ +# $OpenBSD: Makefile,v 1.9 2008/01/07 21:24:07 bernd Exp $ -VERSION= 1.2.12.06 +VERSION= 1.2.12.09 COMMENT= simple and performant DNS server DISTNAME= maradns-${VERSION} -PKGNAME= ${DISTNAME}p0 CATEGORIES= net HOMEPAGE= http://www.maradns.org/ @@ -17,19 +16,12 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c pthread -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=maradns/} +MASTER_SITES= http://www.maradns.org/download/1.2/${VERSION}/ MAKE_FLAGS= CC="${CC}" FLAGS="${CFLAGS} -D_THREAD_SAFE -pthread" NO_REGRESS= Yes -post-extract: - rm ${WRKSRC}/doc/en/source/csv2.ej.orig - rm ${WRKSRC}/doc/en/source/mararc.ej.orig - rm ${WRKSRC}//parse/Csv2_rr_wks.c.orig - rm ${WRKSRC}/server/MaraDNS.c.orig - rm ${WRKSRC}/server/recursive.c.orig - post-configure: @find ${WRKSRC} -type f | xargs perl -pi -e "s,/etc,${SYSCONFDIR},g" @perl -pi -e "s, = 99, = 537," ${WRKSRC}/doc/en/examples/ex* diff --git a/net/maradns/distinfo b/net/maradns/distinfo index f9963a0a830..ea83c840bb9 100644 --- a/net/maradns/distinfo +++ b/net/maradns/distinfo @@ -1,5 +1,5 @@ -MD5 (maradns-1.2.12.06.tar.gz) = DiHey3p3lSbO/n9EOULLmg== -RMD160 (maradns-1.2.12.06.tar.gz) = +kGzg1NyLmQeF6iYiDL8qhkzBmA= -SHA1 (maradns-1.2.12.06.tar.gz) = i+QLMQCog7Y8IcwmA28o9kj+qig= -SHA256 (maradns-1.2.12.06.tar.gz) = Xcx8rqRXFcLSNul1qqMUE5286j0gKSaX8wFtDEpbFao= -SIZE (maradns-1.2.12.06.tar.gz) = 1423125 +MD5 (maradns-1.2.12.09.tar.gz) = aLWynaatuXcpOTI9lamC4g== +RMD160 (maradns-1.2.12.09.tar.gz) = ijHu+ACw4Qj/Cb/wY16Y0icmV9s= +SHA1 (maradns-1.2.12.09.tar.gz) = grX3ij0pTV9xBaZdASxLoM11uRw= +SHA256 (maradns-1.2.12.09.tar.gz) = LhVorTFRMGCw7dCN7K4xFz3P6c3lwe3CEYCwbfnBSV0= +SIZE (maradns-1.2.12.09.tar.gz) = 1375325 diff --git a/net/maradns/patches/patch-server_MaraDNS_c b/net/maradns/patches/patch-server_MaraDNS_c deleted file mode 100644 index 4fbe66f0237..00000000000 --- a/net/maradns/patches/patch-server_MaraDNS_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-server_MaraDNS_c,v 1.1 2007/06/09 11:15:48 rui Exp $ ---- server/MaraDNS.c.orig Sat Jun 9 00:01:15 2007 -+++ server/MaraDNS.c Sat Jun 9 00:02:32 2007 -@@ -2999,6 +2999,8 @@ int star_collision(js_string *lookfor, mhash *bighash) - spot_data.datatype == MARA_DNS_LIST) { - /* There is a RR phohibiting the star record. Return - * name error */ -+ be_anal->string--; -+ js_destroy(be_anal); - return 1; - } - be_anal->string--;