svn commit: r417911 - in head/net/axa: . files
Don Lewis
truckman at FreeBSD.org
Sat Jul 2 07:13:46 UTC 2016
Author: truckman
Date: Sat Jul 2 07:13:44 2016
New Revision: 417911
URL: https://svnweb.freebsd.org/changeset/ports/417911
Log:
Upgrade axa to version 1.3.0.
Axa now contains some third party public domain code, add license info for
that.
Respect the chosen default SSL version. The base version of OpenSSL in
FreeBSD 9 isn't good enough, so mark this port as IGNORE for that case.
Make the port work with the OpenSSL in base for the newer FreeBSD
branches.
Patch the source so that it doesn't install an unnecessary header that
would conflict with converters/libb64, and fix a format string type
mismatch bug.
Sponsored by: Farsight Security, Inc.
Added:
head/net/axa/files/
head/net/axa/files/patch-Makefile.am (contents, props changed)
head/net/axa/files/patch-sratool_print.c (contents, props changed)
Modified:
head/net/axa/Makefile
head/net/axa/distinfo
head/net/axa/pkg-plist
Modified: head/net/axa/Makefile
==============================================================================
--- head/net/axa/Makefile Sat Jul 2 06:42:21 2016 (r417910)
+++ head/net/axa/Makefile Sat Jul 2 07:13:44 2016 (r417911)
@@ -1,32 +1,31 @@
# $FreeBSD$
PORTNAME= axa
-PORTVERSION= 1.2.1
+PORTVERSION= 1.3.0
CATEGORIES= net dns
-MASTER_SITES= FARSIGHT/${PORTNAME}/${PORTVERSION} LOCAL/truckman/farsight
-DISTNAME= ${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES= FARSIGHT/${PORTNAME} LOCAL/truckman/farsight
MAINTAINER= truckman at FreeBSD.org
COMMENT= AXA library and tools
-LICENSE= APACHE20
-LICENSE_FILE= ${WRKSRC}/copyright
+LICENSE= APACHE20 PD
+LICENSE_COMB= multi
+LICENSE_FILE_APACHE20= ${WRKSRC}/copyright
+LICENSE_FILE_PD= ${WRKSRC}/license_pd
BUILD_DEPENDS= bash:shells/bash \
sie-nmsg>0:net/sie-nmsg
-LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c \
+LIB_DEPENDS= libcheck.so:devel/libcheck \
+ libprotobuf-c.so:devel/protobuf-c \
libnmsg.so:net/nmsg \
- libwdns.so:dns/wdns
+ libwdns.so:dns/wdns \
+ libyajl.so:devel/yajl
RUN_DEPENDS= sie-nmsg>0:net/sie-nmsg
-WRKSRC= ${WRKDIR}/axa-tools
-
GNU_CONFIGURE= yes
-USES= autoreconf gmake libedit libtool pathfix pkgconfig
+USES= autoreconf gmake libedit libtool pathfix pkgconfig ssl
CONFIGURE_SHELL= ${LOCALBASE}/bin/bash
USE_LDCONFIG= yes
-USE_OPENSSL= yes
-WITH_OPENSSL_PORT= yes
PORTDOCS= *
@@ -40,7 +39,24 @@ DOXYGEN_ALL_TARGET= html-local
LDFLAGS+= -lm
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT} == base
+. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+IGNORE= base OpenSSL in FreeBSD 9 is too old, specify a ports version of SSL by adding DEFAULT_VERSIONS+=ssl=... to /etc/make.conf and rebuild everything that needs SSL
+. else
+CONFIGURE_ENV+= libcrypto_CFLAGS="-I${OPENSSLINC}" \
+ libcrypto_LIBS="-L${OPENSSLLIB} -lcrypto" \
+ libssl_CFLAGS="-I${OPENSSLINC}" \
+ libssl_LIBS="-L${OPENSSLLIB} -lssl"
+. endif
+.endif
+
+post-extract:
+ (${ECHO} "For libmy/b64_encode.c:" ; \
+ ${SED} -ne "1,/\*\//p" ${WRKSRC}/libmy/b64_encode.c ) > ${LICENSE_FILE_PD}
+
post-install-DOXYGEN-on:
(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/net/axa/distinfo
==============================================================================
--- head/net/axa/distinfo Sat Jul 2 06:42:21 2016 (r417910)
+++ head/net/axa/distinfo Sat Jul 2 07:13:44 2016 (r417911)
@@ -1,2 +1,3 @@
-SHA256 (axa_1.2.1.tar.gz) = b4414f149fb1d6fb28453b388dc9aa12344a856176920efc7deff6032f0e9133
-SIZE (axa_1.2.1.tar.gz) = 775750
+TIMESTAMP = 1467236842
+SHA256 (axa-1.3.0.tar.gz) = dba2a2eafc1b44accc398e260cadcb756a43aada72e9865ac47bc1c74406d4d8
+SIZE (axa-1.3.0.tar.gz) = 539237
Added: head/net/axa/files/patch-Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/axa/files/patch-Makefile.am Sat Jul 2 07:13:44 2016 (r417911)
@@ -0,0 +1,12 @@
+--- Makefile.am.orig 2016-06-29 19:21:44 UTC
++++ Makefile.am
+@@ -88,8 +88,7 @@ nobase_include_HEADERS = \
+ axa/socket.h \
+ axa/strbuf.h \
+ axa/trie.h \
+- axa/wire.h \
+- libmy/b64_encode.h
++ axa/wire.h
+ lib_LTLIBRARIES = axa/libaxa.la
+
+ axa_libaxa_la_SOURCES = \
Added: head/net/axa/files/patch-sratool_print.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/axa/files/patch-sratool_print.c Sat Jul 2 07:13:44 2016 (r417911)
@@ -0,0 +1,11 @@
+--- sratool/print.c.orig 2016-06-29 19:21:44 UTC
++++ sratool/print.c
+@@ -1202,7 +1202,7 @@ print_mgmt(axa_p_mgmt_t *mgmt, size_t mg
+ }
+
+ if (axa_debug != 0) {
+- printf(" mgmt_len : %zdb\n", AXA_P2H32(mgmt_len));
++ printf(" mgmt_len : %"PRIu32"\n", AXA_P2H32(mgmt_len));
+ }
+
+ /* UINT32_MAX or UINT64_MAX == server error in gathering stat */
Modified: head/net/axa/pkg-plist
==============================================================================
--- head/net/axa/pkg-plist Sat Jul 2 06:42:21 2016 (r417910)
+++ head/net/axa/pkg-plist Sat Jul 2 07:13:44 2016 (r417911)
@@ -12,6 +12,8 @@ include/axa/bits.h
include/axa/client.h
include/axa/dns_walk.h
include/axa/fields.h
+include/axa/json.h
+include/axa/strbuf.h
include/axa/open_nmsg_out.h
include/axa/protocol.h
include/axa/rad_mod.h
More information about the svn-ports-all
mailing list