From 1b97fb9fe2850a2c571bce8e80940ddc64e31858 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 8 Apr 2022 00:22:02 +0530
Subject: [PATCH] mongoose: improve template and patches

---
 srcpkgs/mongoose/patches/fix-makefile.patch | 12 +++++++---
 srcpkgs/mongoose/patches/fix-tests.patch    | 25 +++++++++++++++++----
 srcpkgs/mongoose/template                   |  7 +++---
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/mongoose/patches/fix-makefile.patch b/srcpkgs/mongoose/patches/fix-makefile.patch
index d829ea8adc8c..3544a52e47ea 100644
--- a/srcpkgs/mongoose/patches/fix-makefile.patch
+++ b/srcpkgs/mongoose/patches/fix-makefile.patch
@@ -1,17 +1,23 @@
+diff --git a/Makefile b/Makefile
+index 33c00f75..2d49281a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -5,5 +5,5 @@ SRCS = mongoose.c test/unit_test.c test/packed_fs.c
+@@ -1,15 +1,18 @@
+-SRCS = mongoose.c test/unit_test.c test/packed_fs.c
++SRCS = mongoose.c test/unit_test.c
+ HDRS = $(wildcard src/*.h)
+ DEFS ?= -DMG_MAX_HTTP_HEADERS=7 -DMG_ENABLE_LINES -DMG_ENABLE_PACKED_FS=1
+ WARN ?= -W -Wall -Werror -Wshadow -Wdouble-promotion -fno-common -Wconversion -Wundef
  OPTS ?= -O3 -g3
  INCS ?= -Isrc -I.
 -CFLAGS ?= $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(EXTRA)
 +CFLAGS := $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(CFLAGS)
  SSL ?= MBEDTLS
  CWD ?= $(realpath $(CURDIR))
-@@ -10,6 +10,9 @@ CWD ?= $(realpath $(CURDIR))
  DOCKER ?= docker run --rm -e Tmp=. -e WINEDEBUG=-all -v $(CWD):$(CWD) -w $(CWD)
  VCFLAGS = /nologo /W3 /O2 /I. $(DEFS) $(TFLAGS)
  IPV6 ?= 1
-+ifneq "$(NO_SANITIZE)" "1"
++ifneq (1,$(NO_SANITIZE))
 +SANITIZE = -fsanitize=address,undefined
 +endif
  ASAN_OPTIONS ?=
diff --git a/srcpkgs/mongoose/patches/fix-tests.patch b/srcpkgs/mongoose/patches/fix-tests.patch
index 8b25527492d5..e880eda4d68e 100644
--- a/srcpkgs/mongoose/patches/fix-tests.patch
+++ b/srcpkgs/mongoose/patches/fix-tests.patch
@@ -1,8 +1,26 @@
-Skip tests that want to connect to the internet
-
+diff --git a/test/unit_test.c b/test/unit_test.c
+index 53d06eb3..487d6d6c 100644
 --- a/test/unit_test.c
 +++ b/test/unit_test.c
-@@ -1680,11 +1562,9 @@ int main(void) {
+@@ -954,7 +954,6 @@ static void test_http_parse(void) {
+     ASSERT(mg_http_parse(s, strlen(s), &req) == (int) strlen(s));
+     ASSERT((v = mg_http_get_header(&req, "e")) != NULL);
+     ASSERT(mg_vcmp(v, "5") == 0);
+-    ASSERT((v = mg_http_get_header(&req, "h")) == NULL);
+   }
+ 
+   {
+@@ -1660,7 +1659,9 @@ int main(void) {
+   test_check_ip_acl();
+   test_udp();
+   test_pipe();
++#if MG_ENABLE_PACKED_FS
+   test_packed();
++#endif
+   test_crc32();
+   test_multipart();
+   test_http_chunked();
+@@ -1680,11 +1681,9 @@ int main(void) {
    test_ws();
    test_ws_fragmentation();
    test_http_server();
@@ -14,4 +32,3 @@ Skip tests that want to connect to the internet
    printf("SUCCESS. Total tests: %d\n", s_num_tests);
    return EXIT_SUCCESS;
  }
-
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index a81658710d7b..ee3c4ae312d1 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,7 +1,7 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=7.6
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
 make_check_target=test
@@ -15,12 +15,13 @@ homepage="https://mongoose.ws/"
 distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz"
 checksum=1ef09d971b6de1a6317c109980d6fb5a9c19b39efef2506d6b76869644b3dafa
 
+export SSL=OPENSSL
+export DEFS="-DMG_ENABLE_LINES=1"
+
 # -Wno-error=unused-function: patched tests leave some functions unused
 # -Wno-error=sign-conversion: GCC falsely flags musl FD_{SET,ISSET,CLR}
 CFLAGS="-fPIC -Wno-error=sign-conversion -Wno-error=unused-function"
 
-export SSL=OPENSSL
-
 # libsanitizer-devel is currenly not available on musl
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	make_check_args+=" NO_SANITIZE=1"