Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Re-work a bit the mongoose plugin
Marin Atanasov Nikolov committed 13 years ago
commit db31d32cd803c4380553ae8218db345efdb96f82
parent 5deaeca
2 files changed +165 -145
modified plugins/pkg-plugins-serve/mongoose/Makefile
@@ -1,151 +1,20 @@
-
# This file is part of Mongoose project, http://code.google.com/p/mongoose
-
# $Id: Makefile 473 2009-09-02 11:20:06Z valenok $
+
.include <bsd.own.mk>

-
PROG=	mongoose
+
LIB=		mongoose
+
INCS=		mongoose.h
+
#WARNS=		6
+
PREFIX?=	/usr/local
+
LIBDIR=		${PREFIX}/lib
+
INCLUDEDIR=	${PREFIX}/include
+
SHLIB_MAJOR=	0

-
all:
-
	@echo "make (linux|bsd|solaris|mac|windows|mingw)"
+
SRCS=		mongoose.c

-
# Possible COPT values: (in brackets are rough numbers for 'gcc -O2' on i386)
-
# -DHAVE_MD5              - use system md5 library (-2kb)
-
# -DNDEBUG                - strip off all debug code (-5kb)
-
# -DDEBUG                 - build debug version (very noisy) (+7kb)
-
# -DNO_CGI                - disable CGI support (-5kb)
-
# -DNO_SSL                - disable SSL functionality (-2kb)
-
# -DCONFIG_FILE=\"file\"  - use `file' as the default config file
-
# -DHAVE_STRTOUI64        - use system strtoui64() function for strtoull()
-
# -DSSL_LIB=\"libssl.so.<version>\"   - use system versioned SSL shared object
-
# -DCRYPTO_LIB=\"libcrypto.so.<version>\" - use system versioned CRYPTO so
+
CFLAGS+=	-std=c99 -W -Wall -pedantic -O2 -fPIC -shared
+
CFLAGS+=	-I${INCLUDEDIR}

+
LDADD+=		-lpthread

-
##########################################################################
-
###                 UNIX build: linux, bsd, mac, rtems
-
##########################################################################
+
DEBUG_FLAGS+=  -g -O0

-
GCC_WARNS   = -W -Wall -pedantic
-
#  -Wno-missing-field-initializers  -Wno-unused-parameter -Wno-format-zero-length -Wno-missing-braces
-
CFLAGS      = -W -Wall -std=c99 -O2 $(GCC_WARNS) $(COPT)
-
MAC_SHARED  = -flat_namespace -bundle -undefined suppress
-
LINFLAGS    = -ldl -pthread $(CFLAGS)
-
LIB         = _$(PROG).so
-
CC          = gcc
-

-
# Make sure that the compiler flags come last in the compilation string.
-
# If not so, this can break some on some Linux distros which use
-
# "-Wl,--as-needed" turned on by default  in cc command.
-
# Also, this is turned in many other distros in static linkage builds.
-
linux:
-
	$(CC) mongoose.c -shared -fPIC -fpic -o $(LIB) $(LINFLAGS)
-
	$(CC) mongoose.c main.c -o $(PROG) $(LINFLAGS)
-

-
bsd:
-
	$(CC) mongoose.c -shared -pthread -fpic -fPIC -o $(LIB) $(CFLAGS)
-
	$(CC) mongoose.c main.c -pthread -o $(PROG) $(CFLAGS)
-

-
mac:
-
	$(CC) mongoose.c -pthread -o $(LIB) $(MAC_SHARED) $(CFLAGS)
-
	$(CC) mongoose.c main.c -pthread -o $(PROG) $(CFLAGS)
-

-
solaris:
-
	$(CC) mongoose.c -pthread -lnsl \
-
		-lsocket -fpic -fPIC -shared -o $(LIB) $(CFLAGS)
-
	$(CC) mongoose.c main.c -pthread -lnsl -lsocket -o $(PROG) $(CFLAGS)
-

-

-
##########################################################################
-
###            WINDOWS build: Using Visual Studio or Mingw
-
##########################################################################
-

-
# Using Visual Studio 6.0. To build Mongoose:
-
#  o  Set VC variable below to where VS 6.0 is installed on your system
-
#  o  Run "PATH_TO_VC6\bin\nmake windows"
-

-
VC    = z:
-
CYA   = y:
-
#DBG  = /Zi /DDEBUG /Od
-
DBG   = /DNDEBUG /O1
-
CL    = cl /MD /TC /nologo $(DBG) /Gz /W3 /DNO_SSL_DL
-
GUILIB= user32.lib shell32.lib
-
LINK  = /link /incremental:no /libpath:$(VC)\lib /subsystem:windows \
-
        ws2_32.lib advapi32.lib cyassl.lib
-
CYAFL = /c /I $(CYA)/include -I $(CYA)/include/openssl \
-
        /I $(CYA)/ctaocrypt/include /D _LIB /D OPENSSL_EXTRA
-

-
CYASRC= \
-
	$(CYA)/src/cyassl_int.c \
-
	$(CYA)/src/cyassl_io.c \
-
	$(CYA)/src/keys.c \
-
	$(CYA)/src/tls.c \
-
	$(CYA)/src/ssl.c \
-
	$(CYA)/ctaocrypt/src/aes.c \
-
	$(CYA)/ctaocrypt/src/arc4.c \
-
	$(CYA)/ctaocrypt/src/asn.c \
-
	$(CYA)/ctaocrypt/src/coding.c \
-
	$(CYA)/ctaocrypt/src/ctc_asm.c \
-
	$(CYA)/ctaocrypt/src/ctc_misc.c \
-
	$(CYA)/ctaocrypt/src/cyassl_memory.c \
-
	$(CYA)/ctaocrypt/src/des3.c \
-
	$(CYA)/ctaocrypt/src/dh.c \
-
	$(CYA)/ctaocrypt/src/dsa.c \
-
	$(CYA)/ctaocrypt/src/ecc.c \
-
	$(CYA)/ctaocrypt/src/hc128.c \
-
	$(CYA)/ctaocrypt/src/hmac.c \
-
	$(CYA)/ctaocrypt/src/integer.c \
-
	$(CYA)/ctaocrypt/src/md4.c \
-
	$(CYA)/ctaocrypt/src/md5.c \
-
	$(CYA)/ctaocrypt/src/pwdbased.c \
-
	$(CYA)/ctaocrypt/src/rabbit.c \
-
	$(CYA)/ctaocrypt/src/random.c \
-
	$(CYA)/ctaocrypt/src/ripemd.c \
-
	$(CYA)/ctaocrypt/src/rsa.c \
-
	$(CYA)/ctaocrypt/src/sha.c \
-
	$(CYA)/ctaocrypt/src/sha256.c \
-
	$(CYA)/ctaocrypt/src/sha512.c \
-
	$(CYA)/ctaocrypt/src/tfm.c
-

-
cyassl:
-
	$(CL) $(CYASRC) $(CYAFL) $(DEF)
-
	lib *.obj /out:cyassl.lib
-

-
windows:
-
	rc win32\res.rc
-
	$(CL) /I win32 main.c mongoose.c /GA $(LINK) win32\res.res \
-
		$(GUILIB) /out:$(PROG).exe
-
	$(CL) mongoose.c /GD $(LINK) /DLL /DEF:win32\dll.def /out:_$(PROG).dll
-

-
# Build for Windows under MinGW
-
#MINGWDBG= -DDEBUG -O0 -ggdb
-
MINGWDBG= -DNDEBUG -Os
-
MINGWOPT=   -std=c99 -mthreads -Wl,--subsystem,console $(MINGWDBG) -DHAVE_STDINT $(GCC_WARNINGS) $(COPT)
-
#MINGWOPT=  -std=c99 -mthreads -Wl,--subsystem,windows $(MINGWDBG) -DHAVE_STDINT $(GCC_WARNINGS) $(COPT)
-
mingw:
-
	windres win32\res.rc win32\res.o
-
	$(CC) $(MINGWOPT) mongoose.c -lws2_32 \
-
		-shared -Wl,--out-implib=$(PROG).lib -o _$(PROG).dll
-
	$(CC) $(MINGWOPT) -Iwin32 mongoose.c main.c win32\res.o -lws2_32 -ladvapi32 \
-
		-o $(PROG).exe
-

-

-
##########################################################################
-
###            Manuals, cleanup, test, release
-
##########################################################################
-

-
man:
-
	groff -man -T ascii mongoose.1 | col -b > mongoose.txt
-
	groff -man -T ascii mongoose.1 | less
-

-
# "TEST=unit make test" - perform unit test only
-
# "TEST=embedded" - test embedded API by building and testing test/embed.c
-
# "TEST=basic_tests" - perform basic tests only (no CGI, SSI..)
-
tests:
-
	perl test/test.pl $(TEST)
-

-
release: clean
-
	F=mongoose-`perl -lne '/define\s+MONGOOSE_VERSION\s+"(\S+)"/ and print $$1' mongoose.c`.tgz ; cd .. && tar -czf x mongoose/{LICENSE,Makefile,bindings,examples,test,win32,mongoose.c,mongoose.h,mongoose.1,main.c} && mv x mongoose/$$F
-

-
mongoose.c: mongoose.h
-
main.c: mongoose.h
-
.PHONY: mongoose.c main.c
-

-
clean:
-
	rm -rf *.o *.core $(PROG) *.obj *.so $(PROG).txt *.dSYM *.tgz $(PROG).exe *.dll *.lib
+
.include <bsd.lib.mk>
added plugins/pkg-plugins-serve/mongoose/Makefile.orig
@@ -0,0 +1,151 @@
+
# This file is part of Mongoose project, http://code.google.com/p/mongoose
+
# $Id: Makefile 473 2009-09-02 11:20:06Z valenok $
+

+
PROG=	mongoose
+

+
all:
+
	@echo "make (linux|bsd|solaris|mac|windows|mingw)"
+

+
# Possible COPT values: (in brackets are rough numbers for 'gcc -O2' on i386)
+
# -DHAVE_MD5              - use system md5 library (-2kb)
+
# -DNDEBUG                - strip off all debug code (-5kb)
+
# -DDEBUG                 - build debug version (very noisy) (+7kb)
+
# -DNO_CGI                - disable CGI support (-5kb)
+
# -DNO_SSL                - disable SSL functionality (-2kb)
+
# -DCONFIG_FILE=\"file\"  - use `file' as the default config file
+
# -DHAVE_STRTOUI64        - use system strtoui64() function for strtoull()
+
# -DSSL_LIB=\"libssl.so.<version>\"   - use system versioned SSL shared object
+
# -DCRYPTO_LIB=\"libcrypto.so.<version>\" - use system versioned CRYPTO so
+

+

+
##########################################################################
+
###                 UNIX build: linux, bsd, mac, rtems
+
##########################################################################
+

+
GCC_WARNS   = -W -Wall -pedantic
+
#  -Wno-missing-field-initializers  -Wno-unused-parameter -Wno-format-zero-length -Wno-missing-braces
+
CFLAGS      = -W -Wall -std=c99 -O2 $(GCC_WARNS) $(COPT)
+
MAC_SHARED  = -flat_namespace -bundle -undefined suppress
+
LINFLAGS    = -ldl -pthread $(CFLAGS)
+
LIB         = _$(PROG).so
+
CC          = gcc
+

+
# Make sure that the compiler flags come last in the compilation string.
+
# If not so, this can break some on some Linux distros which use
+
# "-Wl,--as-needed" turned on by default  in cc command.
+
# Also, this is turned in many other distros in static linkage builds.
+
linux:
+
	$(CC) mongoose.c -shared -fPIC -fpic -o $(LIB) $(LINFLAGS)
+
	$(CC) mongoose.c main.c -o $(PROG) $(LINFLAGS)
+

+
bsd:
+
	$(CC) mongoose.c -shared -pthread -fpic -fPIC -o $(LIB) $(CFLAGS)
+
	$(CC) mongoose.c main.c -pthread -o $(PROG) $(CFLAGS)
+

+
mac:
+
	$(CC) mongoose.c -pthread -o $(LIB) $(MAC_SHARED) $(CFLAGS)
+
	$(CC) mongoose.c main.c -pthread -o $(PROG) $(CFLAGS)
+

+
solaris:
+
	$(CC) mongoose.c -pthread -lnsl \
+
		-lsocket -fpic -fPIC -shared -o $(LIB) $(CFLAGS)
+
	$(CC) mongoose.c main.c -pthread -lnsl -lsocket -o $(PROG) $(CFLAGS)
+

+

+
##########################################################################
+
###            WINDOWS build: Using Visual Studio or Mingw
+
##########################################################################
+

+
# Using Visual Studio 6.0. To build Mongoose:
+
#  o  Set VC variable below to where VS 6.0 is installed on your system
+
#  o  Run "PATH_TO_VC6\bin\nmake windows"
+

+
VC    = z:
+
CYA   = y:
+
#DBG  = /Zi /DDEBUG /Od
+
DBG   = /DNDEBUG /O1
+
CL    = cl /MD /TC /nologo $(DBG) /Gz /W3 /DNO_SSL_DL
+
GUILIB= user32.lib shell32.lib
+
LINK  = /link /incremental:no /libpath:$(VC)\lib /subsystem:windows \
+
        ws2_32.lib advapi32.lib cyassl.lib
+
CYAFL = /c /I $(CYA)/include -I $(CYA)/include/openssl \
+
        /I $(CYA)/ctaocrypt/include /D _LIB /D OPENSSL_EXTRA
+

+
CYASRC= \
+
	$(CYA)/src/cyassl_int.c \
+
	$(CYA)/src/cyassl_io.c \
+
	$(CYA)/src/keys.c \
+
	$(CYA)/src/tls.c \
+
	$(CYA)/src/ssl.c \
+
	$(CYA)/ctaocrypt/src/aes.c \
+
	$(CYA)/ctaocrypt/src/arc4.c \
+
	$(CYA)/ctaocrypt/src/asn.c \
+
	$(CYA)/ctaocrypt/src/coding.c \
+
	$(CYA)/ctaocrypt/src/ctc_asm.c \
+
	$(CYA)/ctaocrypt/src/ctc_misc.c \
+
	$(CYA)/ctaocrypt/src/cyassl_memory.c \
+
	$(CYA)/ctaocrypt/src/des3.c \
+
	$(CYA)/ctaocrypt/src/dh.c \
+
	$(CYA)/ctaocrypt/src/dsa.c \
+
	$(CYA)/ctaocrypt/src/ecc.c \
+
	$(CYA)/ctaocrypt/src/hc128.c \
+
	$(CYA)/ctaocrypt/src/hmac.c \
+
	$(CYA)/ctaocrypt/src/integer.c \
+
	$(CYA)/ctaocrypt/src/md4.c \
+
	$(CYA)/ctaocrypt/src/md5.c \
+
	$(CYA)/ctaocrypt/src/pwdbased.c \
+
	$(CYA)/ctaocrypt/src/rabbit.c \
+
	$(CYA)/ctaocrypt/src/random.c \
+
	$(CYA)/ctaocrypt/src/ripemd.c \
+
	$(CYA)/ctaocrypt/src/rsa.c \
+
	$(CYA)/ctaocrypt/src/sha.c \
+
	$(CYA)/ctaocrypt/src/sha256.c \
+
	$(CYA)/ctaocrypt/src/sha512.c \
+
	$(CYA)/ctaocrypt/src/tfm.c
+

+
cyassl:
+
	$(CL) $(CYASRC) $(CYAFL) $(DEF)
+
	lib *.obj /out:cyassl.lib
+

+
windows:
+
	rc win32\res.rc
+
	$(CL) /I win32 main.c mongoose.c /GA $(LINK) win32\res.res \
+
		$(GUILIB) /out:$(PROG).exe
+
	$(CL) mongoose.c /GD $(LINK) /DLL /DEF:win32\dll.def /out:_$(PROG).dll
+

+
# Build for Windows under MinGW
+
#MINGWDBG= -DDEBUG -O0 -ggdb
+
MINGWDBG= -DNDEBUG -Os
+
MINGWOPT=   -std=c99 -mthreads -Wl,--subsystem,console $(MINGWDBG) -DHAVE_STDINT $(GCC_WARNINGS) $(COPT)
+
#MINGWOPT=  -std=c99 -mthreads -Wl,--subsystem,windows $(MINGWDBG) -DHAVE_STDINT $(GCC_WARNINGS) $(COPT)
+
mingw:
+
	windres win32\res.rc win32\res.o
+
	$(CC) $(MINGWOPT) mongoose.c -lws2_32 \
+
		-shared -Wl,--out-implib=$(PROG).lib -o _$(PROG).dll
+
	$(CC) $(MINGWOPT) -Iwin32 mongoose.c main.c win32\res.o -lws2_32 -ladvapi32 \
+
		-o $(PROG).exe
+

+

+
##########################################################################
+
###            Manuals, cleanup, test, release
+
##########################################################################
+

+
man:
+
	groff -man -T ascii mongoose.1 | col -b > mongoose.txt
+
	groff -man -T ascii mongoose.1 | less
+

+
# "TEST=unit make test" - perform unit test only
+
# "TEST=embedded" - test embedded API by building and testing test/embed.c
+
# "TEST=basic_tests" - perform basic tests only (no CGI, SSI..)
+
tests:
+
	perl test/test.pl $(TEST)
+

+
release: clean
+
	F=mongoose-`perl -lne '/define\s+MONGOOSE_VERSION\s+"(\S+)"/ and print $$1' mongoose.c`.tgz ; cd .. && tar -czf x mongoose/{LICENSE,Makefile,bindings,examples,test,win32,mongoose.c,mongoose.h,mongoose.1,main.c} && mv x mongoose/$$F
+

+
mongoose.c: mongoose.h
+
main.c: mongoose.h
+
.PHONY: mongoose.c main.c
+

+
clean:
+
	rm -rf *.o *.core $(PROG) *.obj *.so $(PROG).txt *.dSYM *.tgz $(PROG).exe *.dll *.lib