[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: upx: fix hash (coolsnowwolf#10479) fix ntpd path problem (coolsnowwolf#10478)
Sneezyw · Nov 22, 2022 · 7842a61 · 7842a61
2 parents c9eeb4d + 1d07088
commit 7842a61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package/lean/upx/Makefile b/package/lean/upx/Makefile
@@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=COPYING LICENSE
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-01-15
-PKG_SOURCE_VERSION:=a46b63817a9c6ad5af7cf519332e859f11558592
+PKG_SOURCE_VERSION:=1050de5171f70fd4ba113016e4db994e898c7be3
 PKG_SOURCE_URL:=https://github.com/upx/upx.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
 

diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
@@ -4,7 +4,7 @@
 START=98
 
 USE_PROCD=1
-PROG=ntpd
+PROG=/usr/sbin/ntpd
 HOTPLUG_SCRIPT=/usr/sbin/ntpd-hotplug
 
 get_dhcp_ntp_servers() {