Attachment #247885 for bug #274414




PORTNAME=	lagrange
DISTVERSION=	1.17.6
CATEGORIES=	www
MASTER_SITES=	https://git.skyjake.fi/gemini/${PORTNAME}/releases/download/v${DISTVERSION}/


		libwebp.so:graphics/webp

USES=		cmake compiler:c11 desktop-file-utils pkgconfig sdl ssl xorg

BROKEN_SSL=	libressl
BROKEN_SSL_REASON_libressl=	needs features only available in OpenSSL

USE_SDL=	sdl2
USE_XORG=	ice sm x11 xext

CMAKE_ARGS+=	-DTFDN_ENABLE_WARN_ERROR=OFF

OPTIONS_DEFINE=	SSE41

SSE41_DESC=	Enable SSE4.1 support

Lines 1-3 Link Here

(-)b/www/lagrange/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1689437065	1	TIMESTAMP = 1705993805
2	SHA256 (lagrange-1.16.5.tar.gz) = c8d37a32d99ff444e4e61d73269f6244e08a5232c91bb97e2b74823dc6e29d53	2	SHA256 (lagrange-1.17.6.tar.gz) = b9d0982617fec495565ac9c09fb788a0be207d6fdf2324edc390e5cac8b1523b
3	SIZE (lagrange-1.16.5.tar.gz) = 10141202	3	SIZE (lagrange-1.17.6.tar.gz) = 10212490




--- lib/the_Foundation/src/tlsrequest.c.orig	2024-01-23 07:23:46 UTC
+++ lib/the_Foundation/src/tlsrequest.c
@@ -72,9 +72,9 @@ static iBool readAllFromBIO_(BIO *bio, iBlock *out) {
 /*----------------------------------------------------------------------------------------------*/
 
 iDeclareClass(CachedSession)
-    
+
 static const int maxSessionAge_CachedSession_ = 10 * 60; /* seconds */
-    
+
 struct Impl_CachedSession {
     iObject          object;
     iBlock           pemSession;
@@ -249,7 +249,9 @@ void init_Context(iContext *d) {
     SSL_load_error_strings();
     ERR_load_crypto_strings();

     d->ctx = SSL_CTX_new(TLS_client_method());
     if (!d->ctx) {
         iDebug("[TlsRequest] failed to initialize OpenSSL\n");
@@ -1012,7 +1014,7 @@ static iBool readIncoming_TlsRequest_(iTlsRequest *d) 
 
 static iThreadResult run_TlsRequest_(iThread *thread) {
     iTlsRequest *d = userData_Thread(thread);
-    /* Thread-local pointer to the current request so it can be accessed in the 
+    /* Thread-local pointer to the current request so it can be accessed in the
        verify callback. */
     iDebug("[TlsRequest] run_TlsRequest_: %zu bytes to send\n", size_Block(&d->sending));
     setCurrentRequestForThread_Context_(context_, d);
- 

Return to bug 274414

Lines 1-5 Link Here

(-)b/www/lagrange/Makefile (-3 / +3 lines)
1	PORTNAME= lagrange	1	PORTNAME= lagrange
2	DISTVERSION= 1.16.5	2	DISTVERSION= 1.17.6
3	CATEGORIES= www	3	CATEGORIES= www
4	MASTER_SITES= https://git.skyjake.fi/gemini/${PORTNAME}/releases/download/v${DISTVERSION}/	4	MASTER_SITES= https://git.skyjake.fi/gemini/${PORTNAME}/releases/download/v${DISTVERSION}/
5		5
Lines 19-31 LIB_DEPENDS= libfribidi.so:converters/fribidi \ Link Here
19	libwebp.so:graphics/webp	19	libwebp.so:graphics/webp
20		20
21	USES= cmake compiler:c11 desktop-file-utils pkgconfig sdl ssl xorg	21	USES= cmake compiler:c11 desktop-file-utils pkgconfig sdl ssl xorg
22
23	BROKEN_SSL= libressl	22	BROKEN_SSL= libressl
24	BROKEN_SSL_REASON_libressl= needs features only available in OpenSSL	23	BROKEN_SSL_REASON_libressl= needs features only available in OpenSSL
25
26	USE_SDL= sdl2	24	USE_SDL= sdl2
27	USE_XORG= ice sm x11 xext	25	USE_XORG= ice sm x11 xext
28		26
		27	CMAKE_ARGS+= -DTFDN_ENABLE_WARN_ERROR=OFF
		28
29	OPTIONS_DEFINE= SSE41	29	OPTIONS_DEFINE= SSE41
30		30
31	SSE41_DESC= Enable SSE4.1 support	31	SSE41_DESC= Enable SSE4.1 support

Lines 1-17 Link Here

(-)b/www/lagrange/files/patch-lib_the__Foundation_src_tlsrequest.c (-23 / +1 lines)
1	--- lib/the_Foundation/src/tlsrequest.c.orig 2023-08-07 17:23:22 UTC	1	--- lib/the_Foundation/src/tlsrequest.c.orig 2024-01-23 07:23:46 UTC
2	+++ lib/the_Foundation/src/tlsrequest.c	2	+++ lib/the_Foundation/src/tlsrequest.c
3	@@ -72,9 +72,9 @@ static iBool readAllFromBIO_(BIO bio, iBlock out) {
4	/----------------------------------------------------------------------------------------------/
5
6	iDeclareClass(CachedSession)
7	-
8	+
9	static const int maxSessionAge_CachedSession_ = 10 * 60; /* seconds */
10	-
11	+
12	struct Impl_CachedSession {
13	iObject object;
14	iBlock pemSession;
15	@@ -249,7 +249,9 @@ void init_Context(iContext *d) {	3	@@ -249,7 +249,9 @@ void init_Context(iContext *d) {
16	SSL_load_error_strings();	4	SSL_load_error_strings();
17	ERR_load_crypto_strings();	5	ERR_load_crypto_strings();
Lines 22-33 Link Here
22	d->ctx = SSL_CTX_new(TLS_client_method());	10	d->ctx = SSL_CTX_new(TLS_client_method());
23	if (!d->ctx) {	11	if (!d->ctx) {
24	iDebug("[TlsRequest] failed to initialize OpenSSL\n");	12	iDebug("[TlsRequest] failed to initialize OpenSSL\n");
25	@@ -1012,7 +1014,7 @@ static iBool readIncoming_TlsRequest_(iTlsRequest *d)
26
27	static iThreadResult run_TlsRequest_(iThread *thread) {
28	iTlsRequest *d = userData_Thread(thread);
29	- /* Thread-local pointer to the current request so it can be accessed in the
30	+ /* Thread-local pointer to the current request so it can be accessed in the
31	verify callback. */
32	iDebug("[TlsRequest] run_TlsRequest_: %zu bytes to send\n", size_Block(&d->sending));
33	setCurrentRequestForThread_Context_(context_, d);
34	-