From 086a1b77503abdf16f67ede23f7aed7f8ddd76d7 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Mon, 28 Mar 2022 19:49:52 +0530 Subject: [PATCH] mongoose: update to 7.6 --- srcpkgs/mongoose/patches/add-makefile.patch | 50 -------------------- srcpkgs/mongoose/patches/fix-makefile.patch | 52 +++++++++++++++++++++ srcpkgs/mongoose/template | 30 +++++++++--- 3 files changed, 75 insertions(+), 57 deletions(-) delete mode 100644 srcpkgs/mongoose/patches/add-makefile.patch create mode 100644 srcpkgs/mongoose/patches/fix-makefile.patch diff --git a/srcpkgs/mongoose/patches/add-makefile.patch b/srcpkgs/mongoose/patches/add-makefile.patch deleted file mode 100644 index fd0b21095472..000000000000 --- a/srcpkgs/mongoose/patches/add-makefile.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,47 @@ -+PROG = mongoose -+LIB = lib$(PROG).so.0 -+ -+ifndef PREFIX -+ PREFIX=/usr/local -+endif -+ -+ifndef DOCDIR -+ DOCDIR=$(PREFIX)/share/$(PROG)/doc -+endif -+ -+CPPFLAGS+=-DMONGOOSE_ENABLE_THREADS -DMG_ENABLE_SSL -+CFLAGS+=-fPIC -c -Wall -+LDFLAGS+=-shared -lssl -pthread -lcrypto -+ -+SRCS=mongoose.c -+OBJS=mongoose.o -+INCLUDE=. -+ -+all: $(LIB) -+ -+$(LIB): $(OBJS) -+ $(CC) $(OBJS) $(LDFLAGS) -o $(LIB) -+ -+$(OBJS): $(SRCS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDE) $(SRCS) -o $(OBJS) -+ -+install: -+ install -d $(DESTDIR)$(PREFIX)/include -+ install -m644 mongoose.h $(DESTDIR)$(PREFIX)/include -+ install -d $(DESTDIR)$(PREFIX)/lib -+ ln -sf $(LIB) $(LIB).0; cp -a $(LIB).0 $(DESTDIR)$(PREFIX)/lib -+ ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib -+ install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib -+ install -dm755 $(DESTDIR)$(DOCDIR) -+ cp -a examples $(DESTDIR)$(DOCDIR) -+ cp -a docs/* $(DESTDIR)$(DOCDIR)/ -+ -+ -+test: -+ $(MAKE) -C test/ -+clean: -+ rm -f $(OBJS) $(LIB) -+ $(MAKE) -C test/ clean -+ -+.PHONY: clean test all -+ diff --git a/srcpkgs/mongoose/patches/fix-makefile.patch b/srcpkgs/mongoose/patches/fix-makefile.patch new file mode 100644 index 000000000000..c67267330619 --- /dev/null +++ b/srcpkgs/mongoose/patches/fix-makefile.patch @@ -0,0 +1,52 @@ +diff --git a/Makefile b/Makefile.new +index 823550db..85330b70 100644 +--- a/Makefile ++++ b/Makefile.new +@@ -2,7 +2,7 @@ SRCS = mongoose.c test/unit_test.c test/packed_fs.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 ++OPTS ?= -O3 -g3 -fPIC + INCS ?= -Isrc -I. + CFLAGS ?= $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(EXTRA) + SSL ?= MBEDTLS +@@ -19,12 +19,12 @@ VERSION ?= $(shell cut -d'"' -f2 src/version.h) + ifeq "$(SSL)" "MBEDTLS" + MBEDTLS ?= /usr + CFLAGS += -DMG_ENABLE_MBEDTLS=1 -I$(MBEDTLS)/include -I/usr/include +-LDFLAGS ?= -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509 ++LDFLAGS += -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509 + endif + ifeq "$(SSL)" "OPENSSL" + OPENSSL ?= /usr + CFLAGS += -DMG_ENABLE_OPENSSL=1 -I$(OPENSSL)/include +-LDFLAGS ?= -L$(OPENSSL)/lib -lssl -lcrypto ++LDFLAGS += -L$(OPENSSL)/lib -lssl -lcrypto + endif + + all: mg_prefix unamalgamated unpacked test test++ arm examples vc98 vc2017 mingw mingw++ linux linux++ fuzz +@@ -108,15 +108,20 @@ linux++: CC = g++ + linux++: WARN += -Wno-missing-field-initializers + linux++: linux + +-linux-libs: CFLAGS += -fPIC +-linux-libs: mongoose.o +- $(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION) ++.PHONY: linux-libs ++linux-libs: libmongoose.a libmongoose.so.$(VERSION) ++libmongoose.a: mongoose.o + $(AR) rcs libmongoose.a mongoose.o ++libmongoose.so.$(VERSION): mongoose.o ++ $(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION) + + install: linux-libs + install -Dm644 libmongoose.a libmongoose.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib + ln -s libmongoose.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libmongoose.so + install -Dm644 mongoose.h $(DESTDIR)$(PREFIX)/include/mongoose.h ++ install -dm755 $(DESTDIR)$(PREFIX)/share/mongoose/doc ++ cp -a examples $(DESTDIR)$(PREFIX)/share/mongoose/doc ++ cp -a docs/* $(DESTDIR)$(PREFIX)/share/mongoose/doc/ + + + uninstall: diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template index eddadc647333..a47a6b08fb4b 100644 --- a/srcpkgs/mongoose/template +++ b/srcpkgs/mongoose/template @@ -1,22 +1,38 @@ # Template file for 'mongoose' pkgname=mongoose -version=6.18 -revision=4 +version=7.6 +revision=1 build_style=gnu-makefile -make_use_env=compliant +make_use_env=yes +make_check_target=test +make_build_target=linux-libs makedepends="openssl-devel" -short_desc="Easy to use Web server" -maintainer="Orphaned " +checkdepends="openssl-devel libsanitizer-devel" +short_desc="Embedded Networking Library for TCP,UDP,HTTP,MQTT,WebSocket and SSL/TLS" +maintainer="Subhaditya Nath " license="GPL-2.0-only" -homepage="https://cesanta.com/" +homepage="https://mongoose.ws/" distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz" -checksum=f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769 +checksum=1ef09d971b6de1a6317c109980d6fb5a9c19b39efef2506d6b76869644b3dafa + +export SSL=OPENSSL + +pre_build() { + export EXTRA="${CFLAGS}" + unset CFLAGS +} + +pre_check() { + export EXTRA="${CFLAGS}" + unset CFLAGS +} mongoose-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include + vmove "usr/lib/*.a" vmove "usr/lib/*.so" } }