Index: Makefile =================================================================== --- Makefile (revision 452687) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= botan -PORTVERSION= 1.10.13 -PORTREVISION= 6 +DISTVERSION= 1.10.17 CATEGORIES= security MASTER_SITES= http://botan.randombit.net/releases/ PKGNAMESUFFIX= 110 @@ -15,10 +14,12 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/doc/license.txt +BROKEN_aarch64= Fails to configure: unknown or unidentifiable processor arm64 + OPTIONS_DEFINE= SSL GMP DOCS OPTIONS_DEFAULT= SSL GMP -USES= compiler gmake python:build tar:tgz +USES= compiler gmake python:build shebangfix tar:tgz HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.py CONFIGURE_ARGS= --prefix=${PREFIX} --cc ${CHOSEN_COMPILER_TYPE} \ @@ -26,37 +27,25 @@ MAKE_ARGS= CXX="${CXX}" LIB_OPT="${CXXFLAGS}" USE_LDCONFIG= yes PLIST_FILES= bin/botan-config-1.10 lib/libbotan-1.10.a lib/libbotan-1.10.so lib/libbotan-1.10.so.1 \ - lib/libbotan-1.10.so.1.13 libdata/pkgconfig/botan-1.10.pc + lib/libbotan-1.10.so.1.17 libdata/pkgconfig/botan-1.10.pc +SHEBANG_FILES= configure.py DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= * -BROKEN_aarch64= Fails to configure: unknown or unidentifiable processor arm64 +SSL_USES= ssl +SSL_CONFIGURE_WITH= openssl +SSL_VARS= BROKEN_SSL= openssl-devel -.include +GMP_USES= localbase:ldflags +GMP_LIB_DEPENDS= libgmp.so:math/gmp +GMP_CONFIGURE_WITH= gnump -.if ${PORT_OPTIONS:MSSL} -USES+= ssl -CONFIGURE_ARGS+=--with-openssl -.endif - -.if ${PORT_OPTIONS:MGMP} -USES+= localbase:ldflags -LIB_DEPENDS+= libgmp.so:math/gmp -CONFIGURE_ARGS+=--with-gnump -.endif - -.include - -post-patch: - ${REINPLACE_CMD} -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \ - ${WRKSRC}/configure.py -.if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e '/DOCDIR/d' \ +post-patch-DOCS-off: + @${REINPLACE_CMD} -e '/DOCDIR/d' \ ${WRKSRC}/src/build-data/makefile/unix_shr.in -.endif post-install: @(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s include/botan-1.10 -not -type d) >> ${TMPPLIST} -.include +.include Index: distinfo =================================================================== --- distinfo (revision 452687) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465867941 -SHA256 (Botan-1.10.13.tgz) = 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 -SIZE (Botan-1.10.13.tgz) = 2710181 +TIMESTAMP = 1507819766 +SHA256 (Botan-1.10.17.tgz) = 6847ffb64b8d2f939dccfecc17bd2c80385d08f7621e2c56d3a335118e823613 +SIZE (Botan-1.10.17.tgz) = 2706678 Index: files/patch-src_build-data_makefile_unix__shr.in =================================================================== --- files/patch-src_build-data_makefile_unix__shr.in (nonexistent) +++ files/patch-src_build-data_makefile_unix__shr.in (working copy) @@ -0,0 +1,22 @@ +--- src/build-data/makefile/unix_shr.in.orig 2017-10-02 06:00:00 UTC ++++ src/build-data/makefile/unix_shr.in +@@ -14,13 +14,13 @@ VERSION = %{version} + SERIES = %{version_major}.%{version_minor} + + # Installation Settings +-DESTDIR = %{prefix} ++PREFIX = %{prefix} + +-BINDIR = $(DESTDIR)/bin +-LIBDIR = $(DESTDIR)/%{libdir} +-HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan +-DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) +-PKGCONF_DIR = $(LIBDIR)/pkgconfig ++BINDIR = $(DESTDIR)$(PREFIX)/bin ++LIBDIR = $(DESTDIR)$(PREFIX)/%{libdir} ++HEADERDIR = $(DESTDIR)$(PREFIX)/%{includedir}/botan-$(SERIES)/botan ++DOCDIR = $(DESTDIR)$(PREFIX)/%{docdir}/botan-$(VERSION) ++PKGCONF_DIR = $(DESTDIR)$(PREFIX)/libdata/pkgconfig + + CONFIG_SCRIPT = %{botan_config} + PKGCONFIG = %{botan_pkgconfig} Property changes on: files/patch-src_build-data_makefile_unix__shr.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_build_data_makefile_unix_shr.in =================================================================== --- files/patch-src_build_data_makefile_unix_shr.in (revision 452687) +++ files/patch-src_build_data_makefile_unix_shr.in (nonexistent) @@ -1,22 +0,0 @@ ---- src/build-data/makefile/unix_shr.in.orig 2013-12-29 19:30:46.000000000 +0100 -+++ src/build-data/makefile/unix_shr.in 2014-01-29 12:56:53.163471296 +0100 -@@ -14,13 +14,13 @@ VERSION = %{version} - SERIES = %{version_major}.%{version_minor} - - # Installation Settings --DESTDIR = %{prefix} -+PREFIX = %{prefix} - --BINDIR = $(DESTDIR)/bin --LIBDIR = $(DESTDIR)/%{libdir} --HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan --DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) --PKGCONF_DIR = $(LIBDIR)/pkgconfig -+BINDIR = $(DESTDIR)$(PREFIX)/bin -+LIBDIR = $(DESTDIR)$(PREFIX)/%{libdir} -+HEADERDIR = $(DESTDIR)$(PREFIX)/%{includedir}/botan-$(SERIES)/botan -+DOCDIR = $(DESTDIR)$(PREFIX)/%{docdir}/botan-$(VERSION) -+PKGCONF_DIR = $(DESTDIR)$(PREFIX)/libdata/pkgconfig - - CONFIG_SCRIPT = %{botan_config} - PKGCONFIG = %{botan_pkgconfig} Property changes on: files/patch-src_build_data_makefile_unix_shr.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_engine_openssl_ossl__bc.cpp =================================================================== --- files/patch-src_engine_openssl_ossl__bc.cpp (nonexistent) +++ files/patch-src_engine_openssl_ossl__bc.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/engine/openssl/ossl_bc.cpp.orig 2017-10-02 06:00:00 UTC ++++ src/engine/openssl/ossl_bc.cpp +@@ -8,7 +8,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined LIBRESSL_VERSION_NUMBER + #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" + #endif + Property changes on: files/patch-src_engine_openssl_ossl__bc.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_engine_openssl_ossl__md.cpp =================================================================== --- files/patch-src_engine_openssl_ossl__md.cpp (nonexistent) +++ files/patch-src_engine_openssl_ossl__md.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/engine/openssl/ossl_md.cpp.orig 2017-10-02 06:00:00 UTC ++++ src/engine/openssl/ossl_md.cpp +@@ -8,7 +8,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined LIBRESSL_VERSION_NUMBER + #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" + #endif + Property changes on: files/patch-src_engine_openssl_ossl__md.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property