Re: net/lagrange update to 1.3.1

Omar Polo <op@omarpolo.com> writes:

> Omar Polo <op@omarpolo.com> writes:
>
>> Solene Rapenne <solene@perso.pw> writes:
>>
>>> this update lagrange to 1.3.1, I force the software rendering because
>>> I'm hitting an issue with hardware rendering preventing lagrange
>>> to start with an empty profile and upstream can't find why (currently
>>> blaming i915 driver, I can't tell if it's true or not).
>>>
>>> I didn't notice performance difference with the software rendering.
>>
>> with this update lagrange always crashes on startup for me, regardless
>> of hardware rendering; it seems something TLS related:
>
> sorry, replied too fast. The problem goes away after I delete
> ~/.config/lagrange. I'll see if I can replicate this starting with an
> empty profile.
>
> FWIW: the hardware rendering seems to work fine here (amdgpu.)

I opened an issue and it was quickly fixed. I'm attaching an updated
patch that includes the fix from upstream, please see

https://github.com/skyjake/lagrange/issues/243

Are we still in time to include this update for the 6.9?


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/lagrange/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 14 Mar 2021 13:49:01 -0000 1.15
+++ Makefile 8 Apr 2021 15:50:10 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.15 2021/03/14 13:49:01 solene Exp $

COMMENT = SDL multi protocol navigator
-VERSION = 1.2.3
+VERSION = 1.3.1

DISTNAME = lagrange-${VERSION}

@@ -17,6 +17,8 @@ PERMIT_PACKAGE =Yes
WANTLIB += SDL2 mpg123 pcre unistring
WANTLIB += c crypto m ssl z pthread

+DEBUG_PACKAGES =${BUILD_PACKAGES}
+
MASTER_SITES = https://git.skyjake.fi/skyjake/lagrange/releases/download/v${VERSION}/

COMPILER = base-clang ports-gcc
@@ -33,7 +35,8 @@ LIB_DEPENDS = audio/mpg123 \
devel/sdl2

# Don't enable SSE4.1, it fails at runtime on old amd64 machines and i386
-CONFIGURE_ARGS += -DTFDN_ENABLE_SSE41=No
+CONFIGURE_ARGS += -DTFDN_ENABLE_SSE41=No \
+ -DENABLE_X11_SWRENDER=Yes

NO_TEST = Yes

Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/lagrange/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 14 Mar 2021 13:49:01 -0000 1.12
+++ distinfo 8 Apr 2021 10:45:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (lagrange-1.2.3.tar.gz) = otR57Wi/D4+PEyQfHlt6TZviCXIAxRz8TZp6L22hJUY=
-SIZE (lagrange-1.2.3.tar.gz) = 14356216
+SHA256 (lagrange-1.3.1.tar.gz) = II96LtGZFqTjJTWvS72Ala+c2D7UhqMinDq/rWuOBcQ=
+SIZE (lagrange-1.3.1.tar.gz) = 20938107
Index: patches/patch-src_app_c
===================================================================
RCS file: patches/patch-src_app_c
diff -N patches/patch-src_app_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_app_c 8 Apr 2021 15:50:51 -0000
@@ -0,0 +1,37 @@
+$OpenBSD$
+
+backport of commit 42691b66514e903396d708e13721b9d457be5d03 to fix
+OpenSSL validation.
+
+see https://github.com/skyjake/lagrange/issues/243
+
+Index: src/app.c
+--- src/app.c.orig
++++ src/app.c
+@@ -302,6 +302,7 @@ static const iString *prefsFileName_(void) {
+
+ static void loadPrefs_App_(iApp *d) {
+ iUnused(d);
++ iBool haveCA = iFalse;
+ /* Create the data dir if it doesn't exist yet. */
+ makeDirs_Path(collectNewCStr_String(dataDir_App_()));
+ iFile *f = new_File(prefsFileName_());
+@@ -326,6 +327,7 @@ static void loadPrefs_App_(iApp *d) {
+ /* Background requests may be started before these commands would get
+ handled via the event loop. */
+ handleCommand_App(cmd);
++ haveCA = iTrue;
+ }
+ else if (equal_Command(cmd, "customframe")) {
+ d->prefs.customFrame = arg_Command(cmd);
+@@ -347,8 +349,8 @@ static void loadPrefs_App_(iApp *d) {
+ }
+ delete_String(str);
+ }
+- else {
+- /* default preference values */
++ if (!haveCA) {
++ /* Default CA setup. */
+ setCACertificates_TlsRequest(&d->prefs.caFile, &d->prefs.caPath);
+ }
+ #if !defined (LAGRANGE_CUSTOM_FRAME)