Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

https-dns-proxy: prepare migration to APK #23716

Merged
merged 1 commit into from Mar 24, 2024
Merged

https-dns-proxy: prepare migration to APK #23716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions net/https-dns-proxy/Makefile
View file
Open in desktop
@@ -1,14 +1,15 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=https-dns-proxy
PKG_VERSION:=2023-11-19
PKG_RELEASE:=1
PKG_VERSION:=2023.11.19
PKG_RELEASE:=r1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
PKG_SOURCE_DATE:=$(PKG_VERSION)
PKG_SOURCE_DATE:=$(subst(.,-,$(PKG_VERSION)))
PKG_SOURCE_RELEASE:=$(subst(r,,$(PKG_RELEASE)))
Comment on lines +9 to +10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aparcar Is this wanted behavior? I think there will be several exceptions like this.

While looking at your treewide commit in the main repo: openwrt/openwrt@e8725a9

It sounds like we can drop those two lines as they are not required. Is that right?

PKG_SOURCE_VERSION:=489c57efd46983e688579974a2ab7aeaa7df8d83
PKG_MIRROR_HASH:=6c8e0e158dfbfde29b1c22f1a1c90a7deae540111c26daac13c8fbb5a49081a5
PKG_MIRROR_HASH:=0ef2008a2d328ad28e30e7b4d63fa7f769fc0daf2b8f4caf45f6e530655d3726

PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=MIT
Expand All @@ -17,7 +18,7 @@ PKG_LICENSE_FILES:=LICENSE
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

CMAKE_OPTIONS += -DCLANG_TIDY_EXE= -DGIT_VERSION=$(PKG_VERSION)-$(PKG_RELEASE)
CMAKE_OPTIONS += -DCLANG_TIDY_EXE= -DGIT_VERSION=$(PKG_SOURCE_DATE)-$(PKG_SOURCE_RELEASE)

define Package/https-dns-proxy
SECTION:=net
Expand Down
2 changes: 2 additions & 0 deletions net/https-dns-proxy/files/etc/init.d/https-dns-proxy
View file
Open in desktop
Expand Up @@ -300,7 +300,9 @@ service_triggers() {
local wan wan6 i
local procd_trigger_wan6
if [ "$on_boot_trigger" = '1' ]; then
output "Setting $serviceName raw_trigger for 'interface.*.up'"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not revelant to APK migration.

procd_add_raw_trigger "interface.*.up" 3000 "/etc/init.d/${packageName}" restart 'on_interface_up'
output_okn
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not relevant anyhow to APK migration. If it is not going to be addressed and you will still merge it, I will revert it.

else
config_load "$packageName"
config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0'
Expand Down
2 changes: 1 addition & 1 deletion net/https-dns-proxy/patches/020-src-options.c-add-version.patch
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
return SW_VERSION;
#else
- return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year
+ return "2023-11-19-1"; // update date sometimes, like 1-2 times a year
+ return "2023.11.19-r1"; // update date sometimes, like 1-2 times a year
#endif
}