diff --git a/security/s2n/Makefile b/security/s2n/Makefile index e6dc7c3de7a4..a9f14d11cc86 100644 --- a/security/s2n/Makefile +++ b/security/s2n/Makefile @@ -1,43 +1,42 @@ # Created by: Danilo Egea Gondolfo PORTNAME= s2n -PORTVERSION= 1.1.2 +PORTVERSION= 1.3.4 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= security MAINTAINER= danilo@FreeBSD.org COMMENT= C99 implementation of the TLS/SSL protocols LICENSE= APACHE20 USES= cmake ssl USE_GITHUB= yes GH_ACCOUNT= aws GH_PROJECT= s2n-tls OPTIONS_DEFINE= DOCS EXAMPLES TEST USE_LDCONFIG= yes CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON SUB_FILES= pkg-message .include .if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != arm && ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 CMAKE_ARGS+= -DS2N_NO_PQ:BOOL=ON .endif post-build-TEST-on: (cd ${WRKDIR}/.build && ninja test) post-install: - ${LN} -s libs2n.so ${STAGEDIR}${LOCALBASE}/lib/libs2n.so.0 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} -r ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/bin/*.c ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/security/s2n/distinfo b/security/s2n/distinfo index 10456aafbbb3..c7cbf47c9268 100644 --- a/security/s2n/distinfo +++ b/security/s2n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634841045 -SHA256 (aws-s2n-tls-v1.1.2_GH0.tar.gz) = 91b5940ff345482cfd582a4c6d04950a9788f70ac3e383af41ac1eeee0441d1e -SIZE (aws-s2n-tls-v1.1.2_GH0.tar.gz) = 7387552 +TIMESTAMP = 1642615552 +SHA256 (aws-s2n-tls-v1.3.4_GH0.tar.gz) = 50946506413687e0c41922da05f470e4a0a5fff425639d72c1a5da7eb845020b +SIZE (aws-s2n-tls-v1.3.4_GH0.tar.gz) = 7407664 diff --git a/security/s2n/files/patch-bin_s2nc.c b/security/s2n/files/patch-bin_s2nc.c deleted file mode 100644 index ee470cd8636b..000000000000 --- a/security/s2n/files/patch-bin_s2nc.c +++ /dev/null @@ -1,10 +0,0 @@ ---- bin/s2nc.c.orig 2021-10-21 18:41:25 UTC -+++ bin/s2nc.c -@@ -14,6 +14,7 @@ - */ - - #include -+#include - #include - - #include diff --git a/security/s2n/files/patch-utils_s2n__asn1__time.c b/security/s2n/files/patch-utils_s2n__asn1__time.c deleted file mode 100644 index d419b0b40a23..000000000000 --- a/security/s2n/files/patch-utils_s2n__asn1__time.c +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/s2n_asn1_time.c.orig 2021-10-21 18:40:29 UTC -+++ utils/s2n_asn1_time.c -@@ -47,7 +47,7 @@ typedef enum parser_state { - - static inline long get_gmt_offset(struct tm *t) { - /* See: https://sourceware.org/git/?p=glibc.git;a=blob;f=include/features.h;h=ba272078cf2263ec88e039fda7524c136a4a7953;hb=HEAD */ --#if defined(__USE_MISC) || defined(__ANDROID__) || defined(ANDROID) || (defined(__APPLE__) && defined(__MACH__)) -+#if defined(__USE_MISC) || defined(__ANDROID__) || defined(ANDROID) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) - return t->tm_gmtoff; - #else - return t->__tm_gmtoff; diff --git a/security/s2n/pkg-plist b/security/s2n/pkg-plist index aeab0d2a3ef6..570e45f7d2ff 100644 --- a/security/s2n/pkg-plist +++ b/security/s2n/pkg-plist @@ -1,29 +1,28 @@ include/s2n.h lib/libs2n.so -lib/libs2n.so.0 lib/s2n/cmake/modules/FindLibCrypto.cmake lib/s2n/cmake/s2n-config.cmake lib/s2n/cmake/shared/s2n-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/s2n/cmake/shared/s2n-targets.cmake %%PORTDOCS%%%%DOCSDIR%%/BINDINGS.md %%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT-GUIDE.md %%PORTDOCS%%%%DOCSDIR%%/READING-LIST.md %%PORTDOCS%%%%DOCSDIR%%/SAFETY-MACROS.md %%PORTDOCS%%%%DOCSDIR%%/STATE-MACHINE.md %%PORTDOCS%%%%DOCSDIR%%/USAGE-GUIDE.md %%PORTDOCS%%%%DOCSDIR%%/images/s2n-logo-final.pdf %%PORTDOCS%%%%DOCSDIR%%/images/s2n-logo-final.svg %%PORTDOCS%%%%DOCSDIR%%/images/s2n-logo-github.svg %%PORTDOCS%%%%DOCSDIR%%/images/s2n_lambda.png %%PORTDOCS%%%%DOCSDIR%%/images/s2n_logo_github.png %%PORTDOCS%%%%DOCSDIR%%/images/s2n_stuffer_layout.png %%PORTDOCS%%%%DOCSDIR%%/images/s2n_tls_layers.png %%PORTDOCS%%%%DOCSDIR%%/images/scram_example.png %%PORTDOCS%%%%DOCSDIR%%/images/scram_intro.png %%PORTDOCS%%%%DOCSDIR%%/images/tls12_state_machine.svg %%PORTDOCS%%%%DOCSDIR%%/images/tls13_state_machine.svg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/common.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/s2nc.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/s2nd.c