From 9b02875bbd69d515bea94f1726c6922963246958 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 Feb 2024 05:22:28 +0100 Subject: mongrel2: update to 1.13.0 --- package/mongrel2/Makefile | 8 ++--- package/mongrel2/patches/patch-Makefile | 36 ++++++++-------------- package/mongrel2/patches/patch-tools_m2sh_Makefile | 14 ++++----- 3 files changed, 24 insertions(+), 34 deletions(-) (limited to 'package/mongrel2') diff --git a/package/mongrel2/Makefile b/package/mongrel2/Makefile index 8fa6393b2..9ae849160 100644 --- a/package/mongrel2/Makefile +++ b/package/mongrel2/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mongrel2 -PKG_VERSION:= 1.11.0 +PKG_VERSION:= 1.13.0 PKG_RELEASE:= 1 -PKG_HASH:= 917f2ce07c0908cae63ac03f3039815839355d46568581902377ba7e41257bed +PKG_HASH:= b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10 PKG_DESCR:= application, language, and network architecture agnostic web server PKG_SECTION:= net/http -PKG_BUILDDEP:= zeromq sqlite -PKG_DEPENDS:= zeromq libsqlite +PKG_BUILDDEP:= zeromq sqlite-host sqlite mbedtls +PKG_DEPENDS:= zeromq libsqlite mbedtls PKG_NEEDS:= threads c++ PKG_URL:= http://mongrel2.org PKG_SITES:= https://github.com/mongrel2/mongrel2/releases/download/v$(PKG_VERSION)/ diff --git a/package/mongrel2/patches/patch-Makefile b/package/mongrel2/patches/patch-Makefile index 182389538..14ede92ab 100644 --- a/package/mongrel2/patches/patch-Makefile +++ b/package/mongrel2/patches/patch-Makefile @@ -1,30 +1,20 @@ ---- mongrel2-v1.11.0.orig/Makefile 2015-12-31 10:25:17.000000000 +0100 -+++ mongrel2-v1.11.0/Makefile 2016-04-25 20:21:46.996240089 +0200 -@@ -1,6 +1,7 @@ --CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 -+CFLAGS?= -+CFLAGS+=-Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS) +--- mongrel2-v1.13.0.orig/Makefile 2021-12-25 01:03:28.000000000 +0100 ++++ mongrel2-v1.13.0/Makefile 2024-02-22 19:19:16.724583955 +0100 +@@ -2,7 +2,7 @@ CFLAGS?=-g -O2 + CFLAGS += -Wall -Wextra -Wno-implicit-fallthrough -Wno-unused-const-variable -I./src -DNDEBUG -D_FILE_OFFSET_BITS=64 -pthread + CFLAGS += ${OPTFLAGS} + LIBS+=-lzmq -ldl -lsqlite3 -lmbedtls -lmbedx509 -lmbedcrypto -PREFIX?=/usr/local +PREFIX?=/usr get_objs = $(addsuffix .o,$(basename $(wildcard $(1)))) -@@ -29,7 +30,7 @@ ifdef $($(shell \ - fi )) - endif +@@ -18,7 +18,7 @@ TEST_SRC=$(wildcard tests/*_tests.c) + TESTS=$(patsubst %.c,%,${TEST_SRC}) + MAKEOPTS=OPTFLAGS="${CFLAGS} ${NOEXTCFLAGS} ${OPTFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" --all: builddirs bin/mongrel2 tests m2sh procer -+all: builddirs bin/mongrel2 m2sh procer +-all: bin/mongrel2 tests m2sh procer ++all: bin/mongrel2 m2sh procer - dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - dev: all -@@ -160,8 +161,6 @@ install: all - || ( install -d $(DESTDIR)/$(PREFIX)/bin/ \ - && install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ ) - ${MAKE} ${MAKEOPTS} -C tools/m2sh install -- ${MAKE} ${MAKEOPTS} -C tools/config_modules install -- ${MAKE} ${MAKEOPTS} -C tools/filters install - ${MAKE} ${MAKEOPTS} -C tools/procer install - - examples/python/mongrel2/sql/config.sql: src/config/config.sql src/config/mimetypes.sql + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} + ${OBJECTS}: | builddirs diff --git a/package/mongrel2/patches/patch-tools_m2sh_Makefile b/package/mongrel2/patches/patch-tools_m2sh_Makefile index c6296496a..abec82a1f 100644 --- a/package/mongrel2/patches/patch-tools_m2sh_Makefile +++ b/package/mongrel2/patches/patch-tools_m2sh_Makefile @@ -1,5 +1,5 @@ ---- mongrel2-v1.11.0.orig/tools/m2sh/Makefile 2015-12-31 10:25:18.000000000 +0100 -+++ mongrel2-v1.11.0/tools/m2sh/Makefile 2016-04-25 20:14:36.744476585 +0200 +--- mongrel2-v1.13.0.orig/tools/m2sh/Makefile 2021-12-25 01:03:28.000000000 +0100 ++++ mongrel2-v1.13.0/tools/m2sh/Makefile 2024-02-22 19:03:20.332596928 +0100 @@ -1,7 +1,8 @@ -CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) +CFLAGS?= @@ -11,17 +11,17 @@ SOURCES=$(wildcard src/*.c src/**/*.c) OBJECTS=$(patsubst %.c,%.o,${SOURCES}) TEST_SRC=$(wildcard tests/*.c) -@@ -9,7 +10,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC}) - LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) - LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) +@@ -12,7 +13,7 @@ RAGEL_OBJECTS=src/lexer.o src/cli.o + + $(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter -all: ../lemon/lemon tests build/m2sh +all: ../lemon/lemon build/m2sh dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS) dev: all -@@ -27,7 +28,7 @@ build/m2sh: ../lemon/lemon ../../build/l - $(CC) $(CFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LIBS) +@@ -32,7 +33,7 @@ build/m2sh: ../lemon/lemon ../../build/l + $(CC) $(CFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LDFLAGS) $(LIBS) ../lemon/lemon: ../lemon/lemon.c - $(CC) -O2 ../lemon/lemon.c -o ../lemon/lemon -- cgit v1.2.3