update 2022-10-30 09:08:13

haproxy/files/acme.hotplug

@@ -6,7 +6,3 @@ issued|renewed)
 		>"/etc/ssl/acme/$main_domain.combined.cer"
 	;;
 esac
-
-if [ "$ACTION" = renewed ]; then
-	/etc/init.d/haproxy reload
-fi

haproxy/files/haproxy.init

@@ -18,6 +18,10 @@ start_service() {
 	procd_close_instance
 }
 
+service_triggers() {
+	procd_add_raw_trigger acme.renew 5000 /etc/init.d/haproxy reload
+}
+
 extra_command "check" "Check haproxy config"
 check() {
 	$HAPROXY_BIN -c -q -V -f $HAPROXY_CONFIG

luci-app-oaf/luasrc/model/cbi/appfilter/feature.lua

@@ -58,13 +58,7 @@ http.setfilehandler(function(meta, chunk, eof)
         local line = fd2:read("*l");
         fd2:close()
         local ret = string.match(line, "#version")
-        local lang = m.uci:get_all("luci.main.lang")
-        local feature_file = ""
-        if "" == lang or "auto" == lang then
-            feature_file = "/etc/appfilter/feature.cfg"
-        else
-            feature_file = "/etc/appfilter/feature_" .. lang .. ".cfg"
-        end
+        local feature_file = "/etc/appfilter/feature.cfg"
         if ret ~= nil then
             local cmd = "cp /tmp/upload/" .. meta.file .. " " .. feature_file;
             os.execute(cmd);

smartdns/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=smartdns
-PKG_VERSION:=38
+PKG_VERSION:=38.1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/pymumu/smartdns/tar.gz/Release$(PKG_VERSION)?
-PKG_HASH:=58734fade06a2adb9333ec3160f7f641ed1c57d155823d016ec751841768bb00
+PKG_HASH:=32ea4784838a0df1d50841d0f79f86482bb4d0a961a19e4bdbaa8b207ffe8a22
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-Release$(PKG_VERSION)
 
 PKG_MAINTAINER:=Nick Peng <pymumu@gmail.com>