From owner-svn-ports-head@freebsd.org Wed Oct 24 17:30:48 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0E92FFE39D; Wed, 24 Oct 2018 17:30:48 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7477B70299; Wed, 24 Oct 2018 17:30:48 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F6CE2D66B; Wed, 24 Oct 2018 17:30:48 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9OHUmfS094260; Wed, 24 Oct 2018 17:30:48 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9OHUlRj093524; Wed, 24 Oct 2018 17:30:47 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201810241730.w9OHUlRj093524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 24 Oct 2018 17:30:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482915 - head/net/axa X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: head/net/axa X-SVN-Commit-Revision: 482915 X-SVN-Commit-Repository: ports 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.29 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: Wed, 24 Oct 2018 17:30:49 -0000 Author: truckman Date: Wed Oct 24 17:30:47 2018 New Revision: 482915 URL: https://svnweb.freebsd.org/changeset/ports/482915 Log: Upgrade net/axa to version 2.2.0: * Add timestamp indexing * Fix negotiation of AXA protocol version upon successful connection Simplify and unbreak CONFIGURE_ENV. Passing /usr/lib/libssl.so to the linker as an object when building libaxa.so does not cause the linker to record libssl as a dependency. Sponsored by: Farsight Security, Inc. Modified: head/net/axa/Makefile head/net/axa/distinfo head/net/axa/pkg-plist Modified: head/net/axa/Makefile ============================================================================== --- head/net/axa/Makefile Wed Oct 24 17:19:25 2018 (r482914) +++ head/net/axa/Makefile Wed Oct 24 17:30:47 2018 (r482915) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= axa -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 CATEGORIES= net dns MASTER_SITES= FARSIGHT LOCAL/truckman/farsight @@ -15,7 +15,8 @@ LICENSE_FILE_PD= ${WRKSRC}/license_pd BUILD_DEPENDS= bash:shells/bash \ sie-nmsg>0:net/sie-nmsg -LIB_DEPENDS= libcheck.so:devel/check \ +LIB_DEPENDS= liblmdb.so:databases/lmdb \ + libcheck.so:devel/check \ libprotobuf-c.so:devel/protobuf-c \ libnmsg.so:net/nmsg \ libwdns.so:dns/wdns \ @@ -28,7 +29,7 @@ USES= autoreconf gmake libedit libtool pathfix pkgcon GNU_CONFIGURE= yes CONFIGURE_SHELL= ${LOCALBASE}/bin/bash USE_LDCONFIG= yes -SHEBANG_FILES= cert_tools/axa_link_certs.in +SHEBANG_FILES= tools/axa_link_certs.in PORTDOCS= * @@ -45,12 +46,10 @@ LDFLAGS+= -lm .include -.if ${SSL_DEFAULT} == base -CONFIGURE_ENV+= libcrypto_CFLAGS="-I${OPENSSLINC}" \ - libcrypto_LIBS="${OPENSSLLIB}/libcrypto.so" \ - libssl_CFLAGS="-I${OPENSSLINC}" \ - libssl_LIBS="${OPENSSLLIB}/libssl.so" -.endif +CONFIGURE_ENV+= libcrypto_CFLAGS="-I${OPENSSLINC}" \ + libcrypto_LIBS="-lcrypto" \ + libssl_CFLAGS="-I${OPENSSLINC}" \ + libssl_LIBS="-lssl" post-extract: (${ECHO} "For libmy/b64_encode.c:" ; \ Modified: head/net/axa/distinfo ============================================================================== --- head/net/axa/distinfo Wed Oct 24 17:19:25 2018 (r482914) +++ head/net/axa/distinfo Wed Oct 24 17:30:47 2018 (r482915) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538155875 -SHA256 (axa-2.1.0.tar.gz) = 80ab8b0272c8d41ee09e96c4eb5334197caffd33ba9f6e4433789d471945bfea -SIZE (axa-2.1.0.tar.gz) = 572634 +TIMESTAMP = 1540359102 +SHA256 (axa-2.2.0.tar.gz) = d309b64e3661c0f063f785f55eac5fa0a2de2ee87c70b61920b417459076f3fd +SIZE (axa-2.2.0.tar.gz) = 577610 Modified: head/net/axa/pkg-plist ============================================================================== --- head/net/axa/pkg-plist Wed Oct 24 17:19:25 2018 (r482914) +++ head/net/axa/pkg-plist Wed Oct 24 17:30:47 2018 (r482915) @@ -1,6 +1,7 @@ bin/axa_link_certs bin/axa_make_cert bin/axa_server_cert +bin/axa_tsindextool bin/radtool bin/radtunnel bin/sratool @@ -14,6 +15,7 @@ include/axa/client_config.h include/axa/dns_walk.h include/axa/fields.h include/axa/json.h +include/axa/mdb.h include/axa/strbuf.h include/axa/open_nmsg_out.h include/axa/protocol.h @@ -26,7 +28,7 @@ include/libmy/b64_encode.h lib/libaxa.a lib/libaxa.so lib/libaxa.so.1 -lib/libaxa.so.1.0.0 +lib/libaxa.so.1.1.0 libdata/pkgconfig/libaxa.pc man/man1/radtool.1.gz man/man1/radtunnel.1.gz @@ -35,3 +37,4 @@ man/man1/sratunnel.1.gz man/man8/axa_link_certs.8.gz man/man8/axa_make_cert.8.gz man/man8/axa_server_cert.8.gz +man/man8/axa_tsindextool.8.gz