diff options
-rw-r--r-- | www/mongoose/Makefile | 10 | ||||
-rw-r--r-- | www/mongoose/distinfo | 4 | ||||
-rw-r--r-- | www/mongoose/files/patch-mongoose.c | 16 |
3 files changed, 17 insertions, 13 deletions
diff --git a/www/mongoose/Makefile b/www/mongoose/Makefile index 7cfb3b94c23b..8bcb4748f93f 100644 --- a/www/mongoose/Makefile +++ b/www/mongoose/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mongoose -PORTVERSION= 5.3 +PORTVERSION= 5.6 CATEGORIES= www MAINTAINER= lytboris@gmail.com @@ -13,13 +13,13 @@ LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= cesanta GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= 30a7965 +GH_COMMIT= 632b3a3 USES= gmake dos2unix -ALL_TARGET= server +ALL_TARGET= web_server MAKE_ENV= LIBS=-lpthread -BUILD_WRKSRC= ${WRKSRC}/examples +BUILD_WRKSRC= ${WRKSRC}/examples/web_server USE_RC_SUBR= mongoose @@ -83,7 +83,7 @@ MAKE_ENV+= CFLAGS_EXTRA="-DMONGOOSE_NO_WEBSOCKET ${CFLAGS_EXTRA}" PLIST_FILES= bin/mongoose do-install: - ${MV} ${BUILD_WRKSRC}/server ${BUILD_WRKSRC}/mongoose + ${MV} ${BUILD_WRKSRC}/web_server ${BUILD_WRKSRC}/mongoose ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mongoose ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/www/mongoose/distinfo b/www/mongoose/distinfo index 58a4958819ee..ea15e4e71307 100644 --- a/www/mongoose/distinfo +++ b/www/mongoose/distinfo @@ -1,2 +1,2 @@ -SHA256 (mongoose-5.3.tar.gz) = 3ced399521edfa75a020f2b9457c5b4ba40c518139bb5237c1d88e4b2c85de16 -SIZE (mongoose-5.3.tar.gz) = 109908 +SHA256 (mongoose-5.6.tar.gz) = 8d8bef7ec3b14b5fbc20bb52ddb9916cd847240feed9f60c614d6db6d360f357 +SIZE (mongoose-5.6.tar.gz) = 111409 diff --git a/www/mongoose/files/patch-mongoose.c b/www/mongoose/files/patch-mongoose.c index 94ec1c4595ab..a390358b1afe 100644 --- a/www/mongoose/files/patch-mongoose.c +++ b/www/mongoose/files/patch-mongoose.c @@ -1,10 +1,10 @@ --- mongoose.c +++ mongoose.c -@@ -1162,19 +1162,6 @@ typedef pid_t process_id_t; - #define MONGOOSE_IDLE_TIMEOUT_SECONDS 30 +@@ -1162,20 +1162,6 @@ typedef pid_t process_id_t; + #define MONGOOSE_IDLE_TIMEOUT_SECONDS 300 #endif --#ifdef MONGOOSE_NO_SOCKETPAIR +-#ifdef NS_DISABLE_SOCKETPAIR -#define MONGOOSE_NO_CGI -#endif - @@ -15,6 +15,7 @@ -#define MONGOOSE_NO_DIRECTORY_LISTING -#define MONGOOSE_NO_LOGGING -#define MONGOOSE_NO_SSI +-#define MONGOOSE_NO_DL -#endif - struct vec { @@ -22,11 +23,11 @@ int len; --- mongoose.h +++ mongoose.h -@@ -22,6 +22,40 @@ +@@ -22,6 +22,43 @@ - #define MONGOOSE_VERSION "5.4" + #define MONGOOSE_VERSION "5.6" -+#ifdef MONGOOSE_NO_SOCKETPAIR ++#ifdef NS_DISABLE_SOCKETPAIR +#ifndef MONGOOSE_NO_CGI +#define MONGOOSE_NO_CGI +#endif @@ -51,6 +52,9 @@ +#ifndef MONGOOSE_NO_SSI +#define MONGOOSE_NO_SSI +#endif ++#ifndef MONGOOSE_NO_DL ++#define MONGOOSE_NO_DL ++#endif +#endif + +// DAV requires MONGOOSE_NO_DIRECTORY_LISTING |