From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 16 22:30:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B398F106567A for ; Wed, 16 Apr 2008 22:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8EED48FC0C for ; Wed, 16 Apr 2008 22:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m3GMU1XG019061 for ; Wed, 16 Apr 2008 22:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m3GMU199019058; Wed, 16 Apr 2008 22:30:01 GMT (envelope-from gnats) Resent-Date: Wed, 16 Apr 2008 22:30:01 GMT Resent-Message-Id: <200804162230.m3GMU199019058@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Logvinov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 591F8106566B for ; Wed, 16 Apr 2008 22:25:33 +0000 (UTC) (envelope-from user@blg.akavia.ru) Received: from blg.akavia.ru (blg.akavia.ru [62.33.174.250]) by mx1.freebsd.org (Postfix) with ESMTP id 6CFB18FC0C for ; Wed, 16 Apr 2008 22:25:32 +0000 (UTC) (envelope-from user@blg.akavia.ru) Received: from blg.akavia.ru (localhost [127.0.0.1]) by blg.akavia.ru (8.14.2/8.14.2) with ESMTP id m3GMPTBc053544; Thu, 17 Apr 2008 08:25:29 +1000 (YAKST) (envelope-from user@blg.akavia.ru) Received: (from root@localhost) by blg.akavia.ru (8.14.2/8.14.2/Submit) id m3GMPSch053543; Thu, 17 Apr 2008 08:25:28 +1000 (YAKST) (envelope-from user) Message-Id: <200804162225.m3GMPSch053543@blg.akavia.ru> Date: Thu, 17 Apr 2008 08:25:28 +1000 (YAKST) From: Alexander Logvinov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Alexander Logvinov Subject: ports/122834: [maintainer update] dns/opendd: update to 0.7.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexander Logvinov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2008 22:30:01 -0000 >Number: 122834 >Category: ports >Synopsis: [maintainer update] dns/opendd: update to 0.7.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 16 22:30:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Alexander Logvinov >Release: FreeBSD 6.3-RELEASE-p1 i386 >Organization: >Environment: >Description: Update to 0.7.9 Fix segmentation fault when compiled with SSL [1] Fix build with security/openssl Respect ETCDIR Submitted by: Patrick Cheung ports/121711 [1] >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/dns/opendd/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 17 Nov 2006 09:43:33 -0000 1.2 +++ Makefile 17 Mar 2008 12:00:17 -0000 @@ -5,7 +5,7 @@ # $FreeBSD: ports/dns/opendd/Makefile,v 1.2 2006/11/17 09:43:33 miwi Exp $ PORTNAME= opendd -PORTVERSION= 0.7.8 +PORTVERSION= 0.7.9 CATEGORIES= dns MASTER_SITES= http://www.bsdmon.com/download/ DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -16,13 +16,13 @@ OPTIONS= OPENDD_SSL "Build with SSL support" off \ RC_NG "Install RC_NG script" on -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= COPYING COPYRIGHT README PLIST_FILES= sbin/${PORTNAME} \ - "@unexec if cmp -s %D/etc/${PORTNAME}/${PORTNAME}.conf %D/etc/${PORTNAME}/${PORTNAME}.conf.default; then ${RM} -f %D/etc/${PORTNAME}/${PORTNAME}.conf; fi " \ - "etc/${PORTNAME}/${PORTNAME}.conf.default" \ - "etc/${PORTNAME}/${PORTNAME}.pem" \ - "@dirrmtry etc/${PORTNAME}" + "@unexec if cmp -s %D/%%ETCDIR%%/${PORTNAME}.conf %D/%%ETCDIR%%/${PORTNAME}.conf.default; then ${RM} -f %D/%%ETCDIR%%/${PORTNAME}.conf; fi " \ + "%%ETCDIR%%/${PORTNAME}.conf.default" \ + "@exec [ -f %B/${PORTNAME}.conf ] || ${CP} %B/%f %B/${PORTNAME}.conf" \ + "%%ETCDIR%%/${PORTNAME}.pem" \ + "@dirrmtry %%ETCDIR%%" .include @@ -38,18 +38,19 @@ .endif pre-patch: - @${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION} + @${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}.${PORTVERSION} post-patch: .if defined(WITH_OPENDD_SSL) && !defined(WITHOUT_SSL) @${REINPLACE_CMD} 's|use_ssl = 0|use_ssl = 1|' ${WRKSRC}/${PORTNAME}.conf - @${REINPLACE_CMD} -e "s|^FLAGS =|FLAGS = ${CFLAGS}|" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e "s|^FLAGS =|FLAGS = ${CFLAGS}|" -e "s|^SSL =|SSL = ${LDFLAGS}|" \ + ${WRKSRC}/Makefile .endif .for i in ${PORTNAME}.conf globals.h - @${REINPLACE_CMD} 's|/etc/${PORTNAME}.pem|${PREFIX}/etc/${PORTNAME}/${PORTNAME}.pem|' \ + @${REINPLACE_CMD} 's|/etc/${PORTNAME}.pem|${ETCDIR}/${PORTNAME}.pem|' \ ${WRKSRC}/${i} .endfor - @${REINPLACE_CMD} 's|/etc/${PORTNAME}.conf|${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf|' \ + @${REINPLACE_CMD} 's|/etc/${PORTNAME}.conf|${ETCDIR}/${PORTNAME}.conf|' \ ${WRKSRC}/globals.h .if defined(WITH_RC_NG) @${REINPLACE_CMD} 's|runasdaemon = 0|runasdaemon = 1|' ${WRKSRC}/${PORTNAME}.conf @@ -57,13 +58,13 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin - @${MKDIR} ${PREFIX}/etc/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf.default - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pem ${PREFIX}/etc/${PORTNAME}/ -.if !exists(${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf) - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}/ + @${MKDIR} ${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${ETCDIR}/${PORTNAME}.conf.default + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pem ${ETCDIR} +.if !exists(${ETCDIR}/${PORTNAME}.conf) + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${ETCDIR} .endif - @${CHMOD} 600 ${PREFIX}/etc/${PORTNAME}/*.conf + @${CHMOD} 600 ${ETCDIR}/*.conf .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/dns/opendd/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 17 Nov 2006 09:43:33 -0000 1.2 +++ distinfo 17 Mar 2008 12:00:17 -0000 @@ -1,3 +1,3 @@ -MD5 (opendd.0.7.8.tar.gz) = 91a642987dc1b93ec024383e35388453 -SHA256 (opendd.0.7.8.tar.gz) = 1ec6073ec2b1cdf65cba7deddfa7de208a810bb62ee40b2eb307f68336f7f474 -SIZE (opendd.0.7.8.tar.gz) = 49426 +MD5 (opendd.0.7.9.tar.gz) = cb18cc056eedb10a0decd1797c803dfe +SHA256 (opendd.0.7.9.tar.gz) = f6b1854f931ddbac096015ac253fc6d2b481f98783ab5ebfbdb89ff4f49da0b5 +SIZE (opendd.0.7.9.tar.gz) = 49543 Index: files/opendd.in =================================================================== RCS file: /home/pcvs/ports/dns/opendd/files/opendd.in,v retrieving revision 1.1 diff -u -r1.1 opendd.in --- files/opendd.in 15 Nov 2006 21:23:52 -0000 1.1 +++ files/opendd.in 17 Mar 2008 12:00:17 -0000 @@ -21,7 +21,7 @@ : ${opendd_pidfile="/var/run/opendd.pid"} command="%%PREFIX%%/sbin/opendd" -required_files="%%PREFIX%%/etc/opendd/opendd.conf" +required_files="%%ETCDIR%%/opendd.conf" pidfile="/var/run/opendd.pid" start_precmd="opendd_check" >Release-Note: >Audit-Trail: >Unformatted: