From 3d8787664ea5d4c87531c7a912319e7e7800215a Mon Sep 17 00:00:00 2001
From: Felix Palmen <felix@palmen-it.de>
Date: Mon, 25 Oct 2021 11:36:11 +0200
Subject: [PATCH] security/s2n: update to 1.1.2

---
 security/s2n/Makefile                   |  8 +++++---
 security/s2n/distinfo                   |  6 +++---
 security/s2n/files/patch-CMakeLists.txt | 11 -----------
 security/s2n/files/patch-bin_s2nc.c     | 10 ++++++++++
 security/s2n/files/patch-bin_s2nd.c     | 10 ++++++++++
 security/s2n/pkg-plist                  |  3 ++-
 6 files changed, 30 insertions(+), 18 deletions(-)
 delete mode 100644 security/s2n/files/patch-CMakeLists.txt
 create mode 100644 security/s2n/files/patch-bin_s2nc.c
 create mode 100644 security/s2n/files/patch-bin_s2nd.c

diff --git a/security/s2n/Makefile b/security/s2n/Makefile
index 6f558d412e73..afd250f5ba3c 100644
--- a/security/s2n/Makefile
+++ b/security/s2n/Makefile
@@ -1,7 +1,7 @@
 # Created by: Danilo Egea Gondolfo <danilo@FreeBSD.org>
 
 PORTNAME=	s2n
-PORTVERSION=	0.10.23
+PORTVERSION=	1.1.2
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	security
@@ -14,12 +14,14 @@ LICENSE=	APACHE20
 USES=		cmake ssl
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	awslabs
+GH_ACCOUNT=	aws
+GH_PROJECT=	s2n-tls
 
 OPTIONS_DEFINE=	DOCS EXAMPLES TEST
 
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
+CFLAGS+=	-D__USE_MISC
 
 SUB_FILES=	pkg-message
 
@@ -33,7 +35,7 @@ post-build-TEST-on:
 	(cd ${WRKDIR}/.build && ninja test)
 
 post-install:
-	${LN} -s libs2n.so ${STAGEDIR}${LOCALBASE}/lib/libs2n.so.0
+	${LN} -s libs2n.so ${STAGEDIR}${LOCALBASE}/lib/libs2n.so.1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -r ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/security/s2n/distinfo b/security/s2n/distinfo
index 2d967bd8da99..3d0aec950fb8 100644
--- a/security/s2n/distinfo
+++ b/security/s2n/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609762871
-SHA256 (awslabs-s2n-v0.10.23_GH0.tar.gz) = 0f752e384cfa929da3dcd8f6223b2fe262f937e7cc771ac4c824cd4b33849dd5
-SIZE (awslabs-s2n-v0.10.23_GH0.tar.gz) = 6188649
+TIMESTAMP = 1635153109
+SHA256 (aws-s2n-tls-v1.1.2_GH0.tar.gz) = 91b5940ff345482cfd582a4c6d04950a9788f70ac3e383af41ac1eeee0441d1e
+SIZE (aws-s2n-tls-v1.1.2_GH0.tar.gz) = 7387552
diff --git a/security/s2n/files/patch-CMakeLists.txt b/security/s2n/files/patch-CMakeLists.txt
deleted file mode 100644
index 399e74eb7fbc..000000000000
--- a/security/s2n/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2021-01-05 11:46:44 UTC
-+++ CMakeLists.txt
-@@ -177,7 +177,7 @@ set(CMAKE_C_FLAGS_DEBUGOPT "")
- 
- target_compile_options(${PROJECT_NAME} PRIVATE -pedantic -std=gnu99 -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts
-         -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security
--        -Wno-missing-braces -fvisibility=hidden -DS2N_EXPORTS)
-+        -Wno-missing-braces -DS2N_EXPORTS)
- 
- if(S2N_NO_PQ)
-     target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_NO_PQ)
diff --git a/security/s2n/files/patch-bin_s2nc.c b/security/s2n/files/patch-bin_s2nc.c
new file mode 100644
index 000000000000..6e1fcf4b449f
--- /dev/null
+++ b/security/s2n/files/patch-bin_s2nc.c
@@ -0,0 +1,10 @@
+--- bin/s2nc.c.orig	2021-10-25 09:20:51 UTC
++++ bin/s2nc.c
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <sys/param.h>
++#include <sys/socket.h>
+ #include <netdb.h>
+ 
+ #include <unistd.h>
diff --git a/security/s2n/files/patch-bin_s2nd.c b/security/s2n/files/patch-bin_s2nd.c
new file mode 100644
index 000000000000..5b38c776b2c0
--- /dev/null
+++ b/security/s2n/files/patch-bin_s2nd.c
@@ -0,0 +1,10 @@
+--- bin/s2nd.c.orig	2021-10-25 09:23:09 UTC
++++ bin/s2nd.c
+@@ -13,6 +13,7 @@
+  * permissions and limitations under the License.
+  */
+ 
++#include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <netdb.h>
diff --git a/security/s2n/pkg-plist b/security/s2n/pkg-plist
index ef33dc4a4b45..a4be8312f29d 100644
--- a/security/s2n/pkg-plist
+++ b/security/s2n/pkg-plist
@@ -1,6 +1,6 @@
 include/s2n.h
 lib/libs2n.so
-lib/libs2n.so.0
+lib/libs2n.so.1
 lib/s2n/cmake/modules/FindLibCrypto.cmake
 lib/s2n/cmake/s2n-config.cmake
 lib/s2n/cmake/shared/s2n-targets-release.cmake
@@ -8,6 +8,7 @@ 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
-- 
2.33.0