Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Oct 2018 17:30:47 +0000 (UTC)
From:      Don Lewis <truckman@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482915 - head/net/axa
Message-ID:  <201810241730.w9OHUlRj093524@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 
-.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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810241730.w9OHUlRj093524>