From 85506ed2cb0346d355130e79a86ebd85f0c74b88 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 7 Dec 2019 21:38:06 +0800 Subject: [PATCH] Revert "uhttpd: downgrade to 2018-11-28" This reverts commit 9984f7882e483400b44853860c9e0c2cc3fab038. --- package/network/services/uhttpd/Makefile | 8 ++++---- .../010-fix-compile-with-gcc-8.3.x.patch | 20 ------------------- 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 package/network/services/uhttpd/patches/010-fix-compile-with-gcc-8.3.x.patch diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 2a6fa3bbb0..cc2dc2bd47 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git -PKG_SOURCE_DATE:=2018-11-28 -PKG_SOURCE_VERSION:=cdfc902a4cb77bc538a729f9e1c8a8578454a0e5 -PKG_MIRROR_HASH:=6b21111547a4453355bd6c941a47f0116a652a77d87c1e05a035168b8ab2aa6f +PKG_SOURCE_DATE:=2019-08-17 +PKG_SOURCE_VERSION:=6b03f9605323df23d12e3876feb466f53f8d50c4 +PKG_MIRROR_HASH:=4df96054a4fce659e6c849feae7850d542b37ad5caffc1485b7a63c7c2764cb1 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=ISC @@ -34,7 +34,7 @@ endef define Package/uhttpd $(Package/uhttpd/default) - DEPENDS:=+libubox +libblobmsg-json +libjson-script + DEPENDS:=+libubox +libblobmsg-json +libjson-script +libjson-c endef define Package/uhttpd/description diff --git a/package/network/services/uhttpd/patches/010-fix-compile-with-gcc-8.3.x.patch b/package/network/services/uhttpd/patches/010-fix-compile-with-gcc-8.3.x.patch deleted file mode 100644 index ecd5cec081..0000000000 --- a/package/network/services/uhttpd/patches/010-fix-compile-with-gcc-8.3.x.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/utils.c -+++ b/utils.c -@@ -47,7 +47,7 @@ - ustream_printf(cl->us, "%X\r\n", len); - ustream_write(cl->us, data, len, true); - if (chunked) -- ustream_printf(cl->us, "\r\n", len); -+ ustream_printf(cl->us, "\r\n"); - } - - void uh_chunk_vprintf(struct client *cl, const char *format, va_list arg) -@@ -74,7 +74,7 @@ - ustream_write(cl->us, buf, len, true); - else - ustream_vprintf(cl->us, format, arg); -- ustream_printf(cl->us, "\r\n", len); -+ ustream_printf(cl->us, "\r\n"); - } - - void uh_chunk_printf(struct client *cl, const char *format, ...)