From d210444434340a2eb73313797704fee00c12b7ad Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Wed, 31 Aug 2016 10:15:09 -0400 Subject: [PATCH] crelay: update to 0.10.1 Signed-off-by: Ted Hess --- utils/crelay/Makefile | 2 +- utils/crelay/files/crelay.init | 4 ++-- utils/crelay/patches/020-link_using_LDFLAGS.patch | 11 ----------- .../patches/030-remove_daemonize_call.patch | 15 --------------- 4 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 utils/crelay/patches/020-link_using_LDFLAGS.patch delete mode 100644 utils/crelay/patches/030-remove_daemonize_call.patch diff --git a/utils/crelay/Makefile b/utils/crelay/Makefile index 26c7afee9..5e14052c2 100644 --- a/utils/crelay/Makefile +++ b/utils/crelay/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crelay -PKG_VERSION:=0.10 +PKG_VERSION:=0.10.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git diff --git a/utils/crelay/files/crelay.init b/utils/crelay/files/crelay.init index 53183a8cf..b7c5123d9 100644 --- a/utils/crelay/files/crelay.init +++ b/utils/crelay/files/crelay.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2016 OpenWrt.org NAME=crelay START=93 @@ -17,7 +17,7 @@ start_service() { procd_set_param respawn procd_set_param command "$PROG" - # daemon mode (not daemonized) - starts HTTP server + # daemon mode in foreground - starts HTTP server procd_append_param command -d procd_close_instance diff --git a/utils/crelay/patches/020-link_using_LDFLAGS.patch b/utils/crelay/patches/020-link_using_LDFLAGS.patch deleted file mode 100644 index 5b4a7a2e0..000000000 --- a/utils/crelay/patches/020-link_using_LDFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -64,7 +64,7 @@ all: $(BIN) - - $(BIN): $(OBJ) - @echo "[Link $(BIN)] with libs $(LIBS)" -- @$(CC) -o $(BIN) $(OBJ) $(LIBS) -+ @$(CC) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIBS) - - .c.o: - @echo "[Compile $<]" diff --git a/utils/crelay/patches/030-remove_daemonize_call.patch b/utils/crelay/patches/030-remove_daemonize_call.patch deleted file mode 100644 index 9b2216e3e..000000000 --- a/utils/crelay/patches/030-remove_daemonize_call.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/crelay.c -+++ b/src/crelay.c -@@ -678,10 +678,12 @@ int main(int argc, char *argv[]) - listen(sock, 5); - syslog(LOG_DAEMON | LOG_NOTICE, "HTTP server listening on %s:%d\n", inet_ntoa(iface), port); - -+#if 0 - if (daemon(0, 0) == -1) { - syslog(LOG_DAEMON | LOG_ERR, "Failed to daemonize: %s", strerror(errno)); - exit(EXIT_FAILURE); - } -+#endif - - while (1) - {