View | Details | Raw Unified | Return to bug 222971 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-25 / +14 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	botan
4
PORTNAME=	botan
5
PORTVERSION=	1.10.13
5
DISTVERSION=	1.10.17
6
PORTREVISION=	6
7
CATEGORIES=	security
6
CATEGORIES=	security
8
MASTER_SITES=	http://botan.randombit.net/releases/
7
MASTER_SITES=	http://botan.randombit.net/releases/
9
PKGNAMESUFFIX=	110
8
PKGNAMESUFFIX=	110
Lines 15-24 Link Here
15
LICENSE=	BSD2CLAUSE
14
LICENSE=	BSD2CLAUSE
16
LICENSE_FILE=	${WRKSRC}/doc/license.txt
15
LICENSE_FILE=	${WRKSRC}/doc/license.txt
17
16
17
BROKEN_aarch64=		Fails to configure: unknown or unidentifiable processor arm64
18
18
OPTIONS_DEFINE=		SSL GMP DOCS
19
OPTIONS_DEFINE=		SSL GMP DOCS
19
OPTIONS_DEFAULT=	SSL GMP
20
OPTIONS_DEFAULT=	SSL GMP
20
21
21
USES=		compiler gmake python:build tar:tgz
22
USES=		compiler gmake python:build shebangfix tar:tgz
22
HAS_CONFIGURE=	yes
23
HAS_CONFIGURE=	yes
23
CONFIGURE_SCRIPT=	configure.py
24
CONFIGURE_SCRIPT=	configure.py
24
CONFIGURE_ARGS=	--prefix=${PREFIX} --cc ${CHOSEN_COMPILER_TYPE} \
25
CONFIGURE_ARGS=	--prefix=${PREFIX} --cc ${CHOSEN_COMPILER_TYPE} \
Lines 26-62 Link Here
26
MAKE_ARGS=	CXX="${CXX}" LIB_OPT="${CXXFLAGS}"
27
MAKE_ARGS=	CXX="${CXX}" LIB_OPT="${CXXFLAGS}"
27
USE_LDCONFIG=	yes
28
USE_LDCONFIG=	yes
28
PLIST_FILES=	bin/botan-config-1.10 lib/libbotan-1.10.a lib/libbotan-1.10.so lib/libbotan-1.10.so.1 \
29
PLIST_FILES=	bin/botan-config-1.10 lib/libbotan-1.10.a lib/libbotan-1.10.so lib/libbotan-1.10.so.1 \
29
		lib/libbotan-1.10.so.1.13 libdata/pkgconfig/botan-1.10.pc
30
		lib/libbotan-1.10.so.1.17 libdata/pkgconfig/botan-1.10.pc
31
SHEBANG_FILES=	configure.py
30
32
31
DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
33
DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
32
PORTDOCS=	*
34
PORTDOCS=	*
33
35
34
BROKEN_aarch64=		Fails to configure: unknown or unidentifiable processor arm64
36
SSL_USES=		ssl
37
SSL_CONFIGURE_WITH=	openssl
38
SSL_VARS=		BROKEN_SSL=	openssl-devel
35
39
36
.include <bsd.port.options.mk>
40
GMP_USES=		localbase:ldflags
41
GMP_LIB_DEPENDS=	libgmp.so:math/gmp
42
GMP_CONFIGURE_WITH=	gnump
37
43
38
.if ${PORT_OPTIONS:MSSL}
44
post-patch-DOCS-off:
39
USES+=		ssl
40
CONFIGURE_ARGS+=--with-openssl
41
.endif
42
43
.if ${PORT_OPTIONS:MGMP}
44
USES+=		localbase:ldflags
45
LIB_DEPENDS+=	libgmp.so:math/gmp
46
CONFIGURE_ARGS+=--with-gnump
47
.endif
48
49
.include <bsd.port.pre.mk>
50
51
post-patch:
52
	${REINPLACE_CMD} -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \
53
			${WRKSRC}/configure.py
54
.if ! ${PORT_OPTIONS:MDOCS}
55
	${REINPLACE_CMD} -e '/DOCDIR/d' \
45
	${REINPLACE_CMD} -e '/DOCDIR/d' \
56
			${WRKSRC}/src/build-data/makefile/unix_shr.in
46
			${WRKSRC}/src/build-data/makefile/unix_shr.in
57
.endif
58
47
59
post-install:
48
post-install:
60
	@(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s include/botan-1.10 -not -type d) >> ${TMPPLIST}
49
	@(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s include/botan-1.10 -not -type d) >> ${TMPPLIST}
61
50
62
.include <bsd.port.post.mk>
51
.include <bsd.port.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1465867941
1
TIMESTAMP = 1507819766
2
SHA256 (Botan-1.10.13.tgz) = 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90
2
SHA256 (Botan-1.10.17.tgz) = 6847ffb64b8d2f939dccfecc17bd2c80385d08f7621e2c56d3a335118e823613
3
SIZE (Botan-1.10.13.tgz) = 2710181
3
SIZE (Botan-1.10.17.tgz) = 2706678
(-)files/patch-src_engine_openssl_ossl__bc.cpp (+11 lines)
Line 0 Link Here
1
--- src/engine/openssl/ossl_bc.cpp.orig	2017-10-02 06:00:00 UTC
2
+++ src/engine/openssl/ossl_bc.cpp
3
@@ -8,7 +8,7 @@
4
 #include <botan/internal/openssl_engine.h>
5
 #include <openssl/evp.h>
6
 
7
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
8
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined LIBRESSL_VERSION_NUMBER
9
   #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
10
 #endif
11
 
(-)files/patch-src_engine_openssl_ossl__md.cpp (+11 lines)
Line 0 Link Here
1
--- src/engine/openssl/ossl_md.cpp.orig	2017-10-02 06:00:00 UTC
2
+++ src/engine/openssl/ossl_md.cpp
3
@@ -8,7 +8,7 @@
4
 #include <botan/internal/openssl_engine.h>
5
 #include <openssl/evp.h>
6
 
7
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
8
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined LIBRESSL_VERSION_NUMBER
9
   #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
10
 #endif
11
 

Return to bug 222971