Commit 9860746f authored by Davide Viti's avatar Davide Viti Committed by Peter Korsgaard
Browse files

mongoose: bump to version 6.1 



- provide only libmongoose.a
- rework package description

[Peter: move under Libraries->Networking]
Signed-off-by: default avatarDavide Viti <zinosat@tiscali.it>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 22518980

package/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -1102,6 +1102,7 @@ menu "Networking" 
	source "package/libvncserver/Config.in"

	source "package/libwebsock/Config.in"

	source "package/libwebsockets/Config.in"

	source "package/mongoose/Config.in"

	source "package/neon/Config.in"

	source "package/nss-mdns/Config.in"

	source "package/nss-pam-ldapd/Config.in"
@@ -1361,7 +1362,6 @@ endif 
	source "package/minidlna/Config.in"

	source "package/mjpg-streamer/Config.in"

	source "package/modem-manager/Config.in"

	source "package/mongoose/Config.in"

	source "package/mongrel2/Config.in"

	source "package/monkey/Config.in"

	source "package/mosh/Config.in"

package/mongoose/Config.in

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ config BR2_PACKAGE_MONGOOSE 
	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_USE_MMU # fork()

	help

	  Mongoose is a small and easy to use web server

	  Mongoose is an embedded networking library, which can turn

	  anything into a web server



	  https://github.com/cesanta/mongoose

package/mongoose/S85mongoose

deleted100755 → 0
+0 −41
Original line number Diff line number Diff line 
#!/bin/sh

#

# Start/stop the mongoose HTTP server

#



set -e



PATH=/sbin:/bin:/usr/sbin:/usr/bin

NAME=mongoose

DESC="Mongoose HTTP server"



DAEMON=`which mongoose`

OPTIONS="-document_root /var/www -listening_port 80"



[ -e /etc/default/mongoose ] && . /etc/default/mongoose



case "$1" in

  start)

	echo "Starting $DESC:"

	start-stop-daemon -S -x "$DAEMON" -b -- $OPTIONS

	echo "$NAME."

	;;

  stop)

	printf "Stopping $DESC: "

	start-stop-daemon -K -x "$DAEMON"

	echo "$NAME."

	;;

  restart|force-reload)

	printf "Restarting $DESC: "

	start-stop-daemon -K -x "$DAEMON"

	sleep 1

	start-stop-daemon -S -x "$DAEMON" -b -- $OPTIONS

	echo "$NAME."

	;;

  *)

	echo "Usage: $0 {start|stop|restart|force-reload}" >&2

	exit 1

	;;

esac



exit 0

package/mongoose/mongoose.hash

+1 −1
Original line number Diff line number Diff line 
# Locally computed:

sha256	cc2557c7cf9f15e1e691f285a4c6c705cc7e56cb70c64cb49703a428a0677065  mongoose-5.6.tar.gz
 
sha256	512b406714d31a178fc41263ca6ecafd0c1e2dd091e9685a7b2462fecdaaea8e  mongoose-6.1.tar.gz

package/mongoose/mongoose.mk

+1 −22
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



MONGOOSE_VERSION = 5.6

MONGOOSE_VERSION = 6.1

MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION))

MONGOOSE_LICENSE = GPLv2

MONGOOSE_LICENSE_FILES = LICENSE
@@ -19,31 +19,10 @@ MONGOOSE_CFLAGS += -DNS_ENABLE_SSL -lssl -lcrypto -lz 
endif



define MONGOOSE_BUILD_CMDS

	$(TARGET_CC) $(@D)/examples/web_server/web_server.c $(@D)/mongoose.c \

		-I$(@D) -o $(@D)/examples/web_server/web_server \

		$(MONGOOSE_CFLAGS) -pthread

	$(TARGET_CC) -c $(@D)/mongoose.c $(MONGOOSE_CFLAGS) -o $(@D)/mongoose.o

	$(TARGET_AR) rcs $(@D)/libmongoose.a $(@D)/mongoose.o

endef



define MONGOOSE_INSTALL_TARGET_CMDS

	$(INSTALL) -D -m 755 $(@D)/examples/web_server/web_server \

		$(TARGET_DIR)/usr/sbin/mongoose

endef



define MONGOOSE_INSTALL_INIT_SYSV

	$(INSTALL) -D -m 755 package/mongoose/S85mongoose \

		$(TARGET_DIR)/etc/init.d/S85mongoose

endef



define MONGOOSE_INSTALL_INIT_SYSTEMD

	$(INSTALL) -D -m 644 package/mongoose/mongoose.service \

		$(TARGET_DIR)/usr/lib/systemd/system/mongoose.service

	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants

	ln -sf ../../../../usr/lib/systemd/system/mongoose.service \

		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mongoose.service

endef



define MONGOOSE_INSTALL_STAGING_CMDS

	$(INSTALL) -D -m 644 $(@D)/libmongoose.a \

		$(STAGING_DIR)/usr/lib/libmongoose.a