Browse Source

remove mongrel2 and mbedtls

Waldemar Brodkorb 2 months ago
parent
commit
059e3eb321

+ 0 - 30
package/mbedtls/Makefile

@@ -1,30 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		mbedtls
-PKG_VERSION:=		2.28.7
-PKG_RELEASE:=		1
-PKG_HASH:=		1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a
-PKG_DESCR:=		embedded ssl/tls library
-PKG_SECTION:=		libs/crypto
-PKG_URL:=		https://tls.mbed.org
-PKG_SITES:=		https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/
-PKG_LIBNAME:=		libmbedtls
-PKG_OPTS:=		dev
-
-DISTFILES:=             v$(PKG_VERSION).tar.gz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBMBEDTLS,libmbedtls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
-
-CONFIG_STYLE:=		manual
-ALL_TARGET:=		lib
-TARGET_CFLAGS+=		-DSHARED
-
-libmbedtls-install:
-	$(INSTALL_DIR) $(IDIR_LIBMBEDTLS)/usr/lib
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 0 - 35
package/mbedtls/patches/patch-Makefile

@@ -1,35 +0,0 @@
---- mbedtls-3.5.2.orig/Makefile	2024-01-24 10:49:11.000000000 +0100
-+++ mbedtls-3.5.2/Makefile	2024-02-22 19:10:23.460591189 +0100
-@@ -79,22 +79,22 @@ $(VISUALC_FILES):
- 
- ifndef WINDOWS
- install: no_test
--	mkdir -p $(DESTDIR)/include/mbedtls
--	cp -rp include/mbedtls $(DESTDIR)/include
--	mkdir -p $(DESTDIR)/include/psa
--	cp -rp include/psa $(DESTDIR)/include
-+	mkdir -p $(DESTDIR)/usr/include/mbedtls
-+	cp -rp include/mbedtls $(DESTDIR)/usr/include
-+	mkdir -p $(DESTDIR)/usr/include/psa
-+	cp -rp include/psa $(DESTDIR)/usr/include
- 
--	mkdir -p $(DESTDIR)/lib
--	cp -RP library/libmbedtls.*    $(DESTDIR)/lib
--	cp -RP library/libmbedx509.*   $(DESTDIR)/lib
--	cp -RP library/libmbedcrypto.* $(DESTDIR)/lib
-+	mkdir -p $(DESTDIR)/usr/lib
-+	cp -RP library/libmbedtls.*    $(DESTDIR)/usr/lib
-+	cp -RP library/libmbedx509.*   $(DESTDIR)/usr/lib
-+	cp -RP library/libmbedcrypto.* $(DESTDIR)/usr/lib
- 
--	mkdir -p $(DESTDIR)/bin
-+	mkdir -p $(DESTDIR)/usr/bin
- 	for p in programs/*/* ; do              \
- 	    if [ -x $$p ] && [ ! -d $$p ] ;     \
- 	    then                                \
- 	        f=$(PREFIX)`basename $$p` ;     \
--	        cp $$p $(DESTDIR)/bin/$$f ;     \
-+	        cp $$p $(DESTDIR)/usr/bin/$$f ;     \
- 	    fi                                  \
- 	done
- 

+ 0 - 37
package/mongrel2/Makefile

@@ -1,37 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		mongrel2
-PKG_VERSION:=		1.13.0
-PKG_RELEASE:=		1
-PKG_HASH:=		b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10
-PKG_DESCR:=		application, language, and network architecture agnostic web server
-PKG_SECTION:=		net/http
-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)/
-
-DISTFILES:=             $(PKG_NAME)-v$(PKG_VERSION).tar.bz2
-WRKDIST=		${WRKDIR}/$(PKG_NAME)-v$(PKG_VERSION)
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,MONGREL2,mongrel2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-CONFIG_STYLE:=		manual
-
-mongrel2-install:
-	$(INSTALL_DIR) $(IDIR_MONGREL2)/etc/mongrel2
-	$(CP) $(WRKBUILD)/examples/configs/sample.conf \
-		$(IDIR_MONGREL2)/etc/mongrel2/site.conf
-	$(INSTALL_DIR) $(IDIR_MONGREL2)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/m2sh \
-		$(IDIR_MONGREL2)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/mongrel2 \
-		$(IDIR_MONGREL2)/usr/bin
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 0 - 20
package/mongrel2/patches/patch-Makefile

@@ -1,20 +0,0 @@
---- 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))))
- 
-@@ -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: bin/mongrel2 tests m2sh procer
-+all: bin/mongrel2 m2sh procer
- 
- ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS}
- ${OBJECTS}: | builddirs

+ 0 - 31
package/mongrel2/patches/patch-tools_m2sh_Makefile

@@ -1,31 +0,0 @@
---- 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?=
-+CFLAGS+=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
- LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS)
- 
--PREFIX?=/usr/local
-+PREFIX?=/usr
- SOURCES=$(wildcard src/*.c src/**/*.c)
- OBJECTS=$(patsubst %.c,%.o,${SOURCES})
- TEST_SRC=$(wildcard tests/*.c)
-@@ -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
-@@ -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
-+	$(CC) $(CFLAGS) ../lemon/lemon.c -o ../lemon/lemon
- 
- tests: build/libm2sh.a ${TESTS}
- 	sh ./tests/runtests.sh

+ 0 - 11
package/mongrel2/patches/patch-tools_procer_Makefile

@@ -1,11 +0,0 @@
---- mongrel2-v1.11.0.orig/tools/procer/Makefile	2015-12-31 10:25:18.000000000 +0100
-+++ mongrel2-v1.11.0/tools/procer/Makefile	2016-04-25 20:05:39.765826160 +0200
-@@ -1,5 +1,6 @@
--CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
--PREFIX?=/usr/local
-+CFLAGS?=
-+CFLAGS+=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
-+PREFIX?=/usr
- LIBS?=-lzmq 
- SOURCES=$(wildcard *.c)
- OBJECTS=$(patsubst %.c,%.o,${SOURCES})