From owner-svn-ports-head@FreeBSD.ORG Fri Jul 4 22:19:18 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9EBE4A3D; Fri, 4 Jul 2014 22:19:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 7F515280C; Fri, 4 Jul 2014 22:19:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64MJIWM014461; Fri, 4 Jul 2014 22:19:18 GMT (envelope-from vsevolod@svn.freebsd.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64MJH5w014458; Fri, 4 Jul 2014 22:19:17 GMT (envelope-from vsevolod@svn.freebsd.org) Message-Id: <201407042219.s64MJH5w014458@svn.freebsd.org> From: Vsevolod Stakhov Date: Fri, 4 Jul 2014 22:19:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360672 - in head/dns/curvedns: . 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.18 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: Fri, 04 Jul 2014 22:19:18 -0000 Author: vsevolod Date: Fri Jul 4 22:19:17 2014 New Revision: 360672 URL: http://svnweb.freebsd.org/changeset/ports/360672 QAT: https://qat.redports.org/buildarchive/r360672/ Log: - Support staging - Use portable libsodium - Use my local github fork for this port to decouple from nacl - Take maintainership Deleted: head/dns/curvedns/files/freebsd.patch Modified: head/dns/curvedns/Makefile head/dns/curvedns/distinfo head/dns/curvedns/pkg-plist Modified: head/dns/curvedns/Makefile ============================================================================== --- head/dns/curvedns/Makefile Fri Jul 4 22:17:11 2014 (r360671) +++ head/dns/curvedns/Makefile Fri Jul 4 22:19:17 2014 (r360672) @@ -3,21 +3,27 @@ PORTNAME= curvedns PORTVERSION= 0.88.b -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= dns -MASTER_SITES= http://curvedns.on2it.net/releases/ DISTNAME= curvedns-0.88-unstable -MAINTAINER= ports@FreeBSD.org +MAINTAINER= vsevolod@FreeBSD.org COMMENT= Forwarder adding DNSCurve to an authoritative nameserver -LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev +USE_GITHUB= yes +GH_ACCOUNT= vstakhov +GH_TAGNAME= 0.87 +GH_COMMIT= a88e27e + +ALL_TARGET= targets + +LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev \ + libsodium.so:${PORTSDIR}/security/libsodium RUN_DEPENDS= setuidgid:${PORTSDIR}/sysutils/daemontools BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= configure.nacl -ALL_TARGET= # yes, an empty target. +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USERS= bind GROUPS= bind @@ -26,37 +32,15 @@ CURVE_GID= 53 SUB_FILES= pkg-message -NO_STAGE= yes .include -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64 -.endif - -post-patch: - @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/freebsd.patch - -pre-configure: - @${ECHO_MSG} "===> configuring may take a couple of minutes" - -post-configure: -.if ${ARCH} == "amd64" - @cd ${WRKSRC} && ./configure.curvedns amd64 -.else - @cd ${WRKSRC} && ./configure.curvedns -.endif - -post-install: - ${CP} ${WRKSRC}/curvedns ${WRKSRC}/curvedns-keygen ${PREFIX}/bin/ - ${MKDIR} ${PREFIX}/etc/curvedns/log ${PREFIX}/etc/curvedns/env - ${CP} ${WRKSRC}/contrib/curvedns-run ${PREFIX}/etc/curvedns/run.sample - ${CP} ${WRKSRC}/contrib/curvedns-log-run ${PREFIX}/etc/curvedns/log/run.sample - ${ECHO_CMD} ${CURVE_UID} > ${PREFIX}/etc/curvedns/env/UID - ${ECHO_CMD} ${CURVE_GID} > ${PREFIX}/etc/curvedns/env/GID - ${CHOWN} -R ${CURVE_UID}:${CURVE_GID} ${PREFIX}/etc/curvedns - ${CHMOD} 755 ${PREFIX}/etc/curvedns/run.sample \ - ${PREFIX}/etc/curvedns/log/run.sample - ${CHMOD} 0700 ${PREFIX}/etc/curvedns/env - @${CAT} ${PKGMESSAGE} +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/curvedns ${WRKSRC}/curvedns-keygen ${STAGEDIR}${PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/curvedns/log ${STAGEDIR}${PREFIX}/etc/curvedns/env + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/curvedns-run ${STAGEDIR}${PREFIX}/etc/curvedns/run.sample + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/curvedns-log-run ${STAGEDIR}${PREFIX}/etc/curvedns/log/run.sample + ${ECHO_CMD} ${CURVE_UID} > ${STAGEDIR}${PREFIX}/etc/curvedns/env/UID + ${ECHO_CMD} ${CURVE_GID} > ${STAGEDIR}${PREFIX}/etc/curvedns/env/GID + ${CHMOD} 0700 ${STAGEDIR}${PREFIX}/etc/curvedns/env .include Modified: head/dns/curvedns/distinfo ============================================================================== --- head/dns/curvedns/distinfo Fri Jul 4 22:17:11 2014 (r360671) +++ head/dns/curvedns/distinfo Fri Jul 4 22:19:17 2014 (r360672) @@ -1,2 +1,2 @@ -SHA256 (curvedns-0.88-unstable.tar.gz) = d43e068d2710cc3fc4bf3e7e46d3fac79c0ff66d28cb04148adec2237d339d49 -SIZE (curvedns-0.88-unstable.tar.gz) = 330546 +SHA256 (curvedns-0.88-unstable.tar.gz) = f2eab452177db925fc8e05d327bb18c4a4ac50645a75be68d7a293c128717ae6 +SIZE (curvedns-0.88-unstable.tar.gz) = 28703 Modified: head/dns/curvedns/pkg-plist ============================================================================== --- head/dns/curvedns/pkg-plist Fri Jul 4 22:17:11 2014 (r360671) +++ head/dns/curvedns/pkg-plist Fri Jul 4 22:19:17 2014 (r360672) @@ -1,13 +1,13 @@ bin/curvedns bin/curvedns-keygen +@owner %%CURVE_UID%% +@group %%CURVE_GID%% %%ETCDIR%%/env/UID %%ETCDIR%%/env/GID -@unexec cmp -s %B/%F %B/run && rm -f %B/run || true -%%ETCDIR%%/run.sample -@exec [ -f %%ETCDIR%%/run ] || cp -p %%ETCDIR%%/run.sample %%ETCDIR%%/run -@unexec cmp -s %B/%F %B/run && rm -f %B/run || true -%%ETCDIR%%/log/run.sample -@exec [ -f %%ETCDIR%%/log/run ] || cp -p %%ETCDIR%%/log/run.sample %%ETCDIR%%/log/run +@sample %%ETCDIR%%/run.sample +@sample %%ETCDIR%%/log/run.sample +@mode 0700 @dirrmtry %%ETCDIR%%/env +@mode @dirrmtry %%ETCDIR%%/log @dirrmtry %%ETCDIR%%