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

* https://github.com/sirpdboy/sirpdboy-package:
  restore aria2 1.36.0
  d
  d
  d
  d
  Update ddns-go 5.7.1

aria2/Config.in

@@ -34,7 +34,7 @@ endchoice
 
 choice
 	prompt "XML Library"
-	default ARIA2_EXPAT
+	default ARIA2_NOXML
 
 config ARIA2_LIBXML2
 	bool "Libxml2"

aria2/Makefile

@@ -1,21 +1,20 @@
 #
-# Copyright (C) 2012-2021 OpenWrt.org
+# Copyright (C) 2012-2018 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aria2
-PKG_VERSION:=1.37.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.36.0
+PKG_RELEASE:=21
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/
-PKG_HASH:=60a420ad7085eb616cb6e2bdf0a7206d68ff3d37fb5a956dc44242eb2f79b66b
+PKG_HASH:=skip
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
 
 PKG_MAINTAINER:=Imre Kaloz <[email protected]>, \
 	Hsing-Wang Liao <[email protected]>
@@ -56,7 +55,7 @@ define Package/aria2
   DEPENDS:=+zlib +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls \
 	+ARIA2_NETTLE:libnettle +ARIA2_LIBGCRYPT:libgcrypt +ARIA2_GMP:libgmp \
 	+ARIA2_LIBXML2:libxml2 +ARIA2_EXPAT:libexpat +ARIA2_SFTP:libssh2 \
-	+ARIA2_ASYNC_DNS:libcares +ARIA2_COOKIE:libsqlite3 +block-mount
+	+ARIA2_ASYNC_DNS:libcares +ARIA2_COOKIE:libsqlite3
   USERID:=aria2=6800:aria2=6800
 endef
 
@@ -85,12 +84,26 @@ CONFIGURE_ARGS += \
 	--with-libz
 
 TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto
-TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed,--no-undefined,--no-allow-shlib-undefined -flto
+TARGET_LDFLAGS += -Wl,--gc-sections -flto
 
 define Package/aria2/conffiles
 /etc/config/aria2
 endef
 
+define Download/aria2.conf
+  URL:=https://github.com/P3TERX/aria2.conf/archive
+  URL_FILE:=master.zip
+  FILE:=aria2.conf
+  HASH:=skip
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	unzip $(DL_DIR)/aria2.conf -d $(PKG_BUILD_DIR)/
+	sed -i '/rpc-secret/d' $(PKG_BUILD_DIR)/aria2.conf-master/*
+endef
+
+
 define Package/aria2/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aria2c $(1)/usr/bin
@@ -100,9 +113,10 @@ define Package/aria2/install
 
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/aria2.conf $(1)/etc/config/aria2
-
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/99_aria2-settings $(1)/etc/uci-defaults/99_aria2-settings
+	
+	$(INSTALL_DIR) $(1)/usr/share/aria2
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/aria2.conf-master/* $(1)/usr/share/aria2/
 endef
 
+$(eval $(call Download,aria2.conf))
 $(eval $(call BuildPackage,aria2))

aria2/files/aria2.conf

@@ -1,33 +1,23 @@
+
+# You can use most aria2 command-line options, replace '-' with '_'.
+# eg. 'rpc-secret' ==> 'rpc_secret'
+#
+# We do not support all options at this time. But you can add any option
+# with 'list extra_settings'.
+#
+# You can also add new config sections to define multi instance.
+#
 config aria2 'main'
 	option enabled '0'
-	option nice '0'
-	option user 'root'
+	option user 'aria2'
+	option dir '/mnt/sda1/aria2'
 	option config_dir '/var/etc/aria2'
 	option bt_enable_lpd 'true'
 	option enable_dht 'true'
-	option bt_max_peers '100'
 	option follow_torrent 'true'
-	option quiet 'false'
 	option file_allocation 'none'
 	option save_session_interval '30'
-	option enable_logging '0'
-	option rpc_auth_method 'none'
-	option rpc_secure 'false'
-	option enable_proxy '0'
-	option check_certificate 'true'
-	option enable_dht6 'false'
-	option enable_log 'false'
-	option max_connection_per_server '8'
-	option split '8'
-	option overall_speed_limit '1'
-	option max_overall_upload_limit '1'
-	option max_concurrent_downloads '5'
-	option enable_peer_exchange 'true'
-	option disk_cache 64M
-	option peer_agent 'Deluge 1.3.15'
-	option peer_id_prefix '-DE13F0-'
-	option user_agent 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36 Edg/93.0.961.47'
-	list extra_settings 'check-certificate=false'
-	list extra_settings 'seed-time=0'
-
-
+	option split '128'
+	option min_split_size '100K'
+	option max_connection_per_server '128'
+	list extra_settings 'dht-file-path=/usr/share/aria2/dht.dat'