1
0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-15 20:03:57 +02:00

https-dns-proxy: update to 2023-05-25-1

* update to a new upstream commit, fixes #19366
* update patches/010-cmakelists-remove-cflags.patch as upstream file was update
* remove patches/020-cmakelists-add-version.patch as version is now set elsewhere
* add patches/020-src-options.c-add-version.patch to set the version information
* adjust PROCD START time to 95

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin 2023-05-26 08:24:00 +00:00
parent de130fadb5
commit eb40aa1b5d
5 changed files with 18 additions and 58 deletions

View File

@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=https-dns-proxy
PKG_VERSION:=2022-10-15
PKG_RELEASE:=12
PKG_VERSION:=2023-05-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:=f52a85f3edabecfbab41d9244c63a1c6b8aaf49b
PKG_MIRROR_HASH:=dd8a55255e8859a462fcfd736577fec40731b39a4783325640518745009b0dee
PKG_SOURCE_VERSION:=d03e11572562f008f68df217a7378628f1bb7b79
PKG_MIRROR_HASH:=5af3683c48bc9e493ca2761a6f7ee756431692a695d6008f61b8b92431036dca
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE

View File

@ -3,7 +3,7 @@
# shellcheck disable=SC1091,SC3043,SC3060
# shellcheck disable=SC2034
START=80
START=95
# shellcheck disable=SC2034
USE_PROCD=1

View File

@ -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")

View File

@ -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

View File

@ -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
}