diff options
Diffstat (limited to 'net/https-dns-proxy/patches')
3 files changed, 13 insertions, 53 deletions
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 a765a5bbd..cd60c6dc0 100644 --- a/net/https-dns-proxy/patches/010-cmakelists-remove-cflags.patch +++ b/net/https-dns-proxy/patches/010-cmakelists-remove-cflags.patch @@ -4,10 +4,10 @@ set(CMAKE_INSTALL_BINDIR bin) endif() --set(CMAKE_C_FLAGS "-Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros") +-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_RELEASE "-O2") -+#set(CMAKE_C_FLAGS "-Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros") ++#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_RELEASE "-O2") diff --git a/net/https-dns-proxy/patches/020-cmakelists-add-version.patch b/net/https-dns-proxy/patches/020-cmakelists-add-version.patch deleted file mode 100644 index 8debfe94f..000000000 --- a/net/https-dns-proxy/patches/020-cmakelists-add-version.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2ca80486ba6a4e5acbdf0ff581d9754af17fa33b Mon Sep 17 00:00:00 2001 -From: baranyaib90 <5031516+baranyaib90@users.noreply.github.com> -Date: Mon, 24 Oct 2022 22:53:37 +0200 -Subject: [PATCH] Allow external setting of GIT_VERSION - ---- - CMakeLists.txt | 34 ++++++++++++++++++---------------- - 1 file changed, 18 insertions(+), 16 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,22 +36,24 @@ endif() - - # VERSION - --find_package(Git) --if(Git_FOUND) -- execute_process( -- COMMAND "${GIT_EXECUTABLE}" show --date=format:%Y.%m.%d --format=%ad-%h --no-patch -- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" -- OUTPUT_VARIABLE GIT_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- message(STATUS "Version: ${GIT_VERSION}") -+if(NOT GIT_VERSION) -+ find_package(Git) -+ if(Git_FOUND) -+ execute_process( -+ COMMAND "${GIT_EXECUTABLE}" show --date=format:%Y.%m.%d --format=%ad-%h --no-patch -+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" -+ OUTPUT_VARIABLE GIT_VERSION -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+ message(STATUS "Version: ${GIT_VERSION}") - -- # May not update version in some cases (example: git commit --amend) -- set_property(GLOBAL APPEND -- PROPERTY CMAKE_CONFIGURE_DEPENDS -- "${CMAKE_SOURCE_DIR}/.git/index") --else() -- set(GIT_VERSION "UNKNOWN") -- message(WARNING "Could not find git command! Version is set to: ${GIT_VERSION}") -+ # May not update version in some cases (example: git commit --amend) -+ set_property(GLOBAL APPEND -+ PROPERTY CMAKE_CONFIGURE_DEPENDS -+ "${CMAKE_SOURCE_DIR}/.git/index") -+ else() -+ set(GIT_VERSION "UNKNOWN") -+ message(WARNING "Could not find git command! Version is set to: ${GIT_VERSION}") -+ endif() - endif() - - # LIBRARY DEPENDENCIES 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 new file mode 100644 index 000000000..8bb2d9361 --- /dev/null +++ b/net/https-dns-proxy/patches/020-src-options.c-add-version.patch @@ -0,0 +1,11 @@ +--- a/src/options.c ++++ b/src/options.c +@@ -22,7 +22,7 @@ const char * options_sw_version() { + #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 + #endif + } + |