diff options
| author | Stan Grishin <stangri@melmac.ca> | 2023-10-26 14:39:06 +0000 |
|---|---|---|
| committer | Stan Grishin <stangri@melmac.ca> | 2023-10-26 14:40:37 +0000 |
| commit | 6b92b6c6d27a8ec67e63a5726dee0c9e8cc2b7ec (patch) | |
| tree | 243eb13b4160b216d1a8db0f901e5ec574ce49cd /net/https-dns-proxy | |
| parent | 31b871ca1a18029e15ab507c3970d834e4b1eedb (diff) | |
https-dns-proxy: bugfix: crashes on logging from upstream
* update to 2023-10-25 upstream version which fixes the crashes on logging on ath79
* remove no longer needed 030-src-logging.c-fix-crash.patch
* update 010-cmakelists-remove-cflags.patch to work with a new version
* update 020-src-options.c-add-version.patch to work with a new version
Signed-off-by: Stan Grishin <stangri@melmac.ca>
Diffstat (limited to 'net/https-dns-proxy')
4 files changed, 9 insertions, 20 deletions
diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile index e6008ac9f..e66f8e5bd 100644 --- a/net/https-dns-proxy/Makefile +++ b/net/https-dns-proxy/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=https-dns-proxy -PKG_VERSION:=2023-05-25 -PKG_RELEASE:=8 +PKG_VERSION:=2023-10-25 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ PKG_SOURCE_DATE:=$(PKG_VERSION) -PKG_SOURCE_VERSION:=d03e11572562f008f68df217a7378628f1bb7b79 -PKG_MIRROR_HASH:=5af3683c48bc9e493ca2761a6f7ee756431692a695d6008f61b8b92431036dca +PKG_SOURCE_VERSION:=977341a4e35a37ee454e97e82caf4276b1b4961a +PKG_MIRROR_HASH:=8622846f1038ac05436a48d9b36a07c516cbb6504ce68e7ee8c5529788fac39b PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/net/https-dns-proxy/patches/010-cmakelists-remove-cflags.patch b/net/https-dns-proxy/patches/010-cmakelists-remove-cflags.patch index cd60c6dc0..6af8d7ce9 100644 --- a/net/https-dns-proxy/patches/010-cmakelists-remove-cflags.patch +++ b/net/https-dns-proxy/patches/010-cmakelists-remove-cflags.patch @@ -5,10 +5,10 @@ endif() -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros") --set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG") +-set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG") -set(CMAKE_C_FLAGS_RELEASE "-O2") +#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros") -+#set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG") ++#set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG") +#set(CMAKE_C_FLAGS_RELEASE "-O2") if ((CMAKE_C_COMPILER_ID MATCHES GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9) OR diff --git a/net/https-dns-proxy/patches/020-src-options.c-add-version.patch b/net/https-dns-proxy/patches/020-src-options.c-add-version.patch index 8bb2d9361..d34621793 100644 --- a/net/https-dns-proxy/patches/020-src-options.c-add-version.patch +++ b/net/https-dns-proxy/patches/020-src-options.c-add-version.patch @@ -1,11 +1,11 @@ --- a/src/options.c +++ b/src/options.c -@@ -22,7 +22,7 @@ const char * options_sw_version() { +@@ -24,7 +24,7 @@ const char * options_sw_version(void) { #ifdef SW_VERSION return SW_VERSION; #else -- return "2023.01.01-atLeast"; // update date sometimes, like 1-2 times a year -+ return "2023-05-25-1"; // update date sometimes, like 1-2 times a year +- return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year ++ return "2023-10-25-1"; // update date sometimes, like 1-2 times a year #endif } diff --git a/net/https-dns-proxy/patches/030-src-logging.c-fix-crash.patch b/net/https-dns-proxy/patches/030-src-logging.c-fix-crash.patch deleted file mode 100644 index 2cf750b98..000000000 --- a/net/https-dns-proxy/patches/030-src-logging.c-fix-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/logging.c -+++ b/src/logging.c -@@ -78,7 +78,7 @@ void _log(const char *file, int line, in - - struct timeval tv; - gettimeofday(&tv, NULL); -- fprintf(logf, "%s %8lu.%06lu %s:%d ", SeverityStr[severity], -+ fprintf(logf, "%s %8llu.%06llu %s:%d ", SeverityStr[severity], - (uint64_t)tv.tv_sec, - (uint64_t)tv.tv_usec, file, line); - |