Merge Official Source

Signed-off-by: Tianling Shen <[email protected]>
SakuraFallingMad · Nov 27, 2024 · 9cd64aa · 9cd64aa
2 parents 8450988 + ec14d30
commit 9cd64aa
Show file tree

Hide file tree

Showing 21 changed files with 391 additions and 1,347 deletions.
diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile
@@ -9,17 +9,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=debootstrap
-PKG_VERSION:=1.0.128+nmu2+deb12u1
-PKG_RELEASE:=1
+PKG_REAL_VERSION:=1.0.128+nmu2+deb12u1
+PKG_VERSION:=1.0.128.2~deb121
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb
+PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_REAL_VERSION)_all.udeb
 PKG_SOURCE_URL:=@DEBIAN/pool/main/d/debootstrap
 PKG_HASH:=4fa4ec7c144ed047c47d0d8eb9b91b56eaa9b2db2b52510777abbabf5965d268
 
 PKG_MAINTAINER:=Daniel Golle <[email protected]>
 PKG_LICENSE:=Unique
 PKG_LICENSE_FILES:=debian/copyright
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_REAL_VERSION)
+
 UNPACK_CMD=ar -p "$(DL_DIR)/$(PKG_SOURCE)" data.tar.xz | xzcat | tar -C $(1) -xf -
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/libs/ell/Makefile b/libs/ell/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ell
-PKG_VERSION:=0.69
+PKG_VERSION:=0.70
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/ell/ell.git
-PKG_SOURCE_VERSION:=7bed251f8020ef896043f008276f41cd13fdd43f
-PKG_MIRROR_HASH:=b462215391bf6f952b14743b4c54ac3538d4394c785f71c1bcb1623e2cb1cbc9
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_MIRROR_HASH:=b077e3de93ec18108780fc5840d0b678f9cb6b5c0f5ad1ca4c7e3e15ef9fdca6
 
 PKG_MAINTAINER:=Daniel Golle <[email protected]>
 PKG_LICENSE:=GPL-2.0-only

diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile
@@ -46,6 +46,9 @@ CMAKE_OPTIONS += \
 
 define Build/InstallDev
 	$(call Build/InstallDev/cmake,$(1))
+ifdef CONFIG_DEBUG
+	$(LN) libpng16d.so $(1)/usr/lib/libpng16.so
+endif
 	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/libpng{,16}-config
 	$(SED) '/^includedir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/libpng{,16}-config
 	$(SED) '/^libdir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/libpng{,16}-config
@@ -59,7 +62,10 @@ endef
 
 define Package/libpng/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng16.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng16$(if $(CONFIG_DEBUG),d).so* $(1)/usr/lib/
+ifdef CONFIG_DEBUG
+	$(LN) libpng16d.so $(1)/usr/lib/libpng16.so
+endif
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng.so $(1)/usr/lib/
 endef
 

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=4.2.2
-PKG_RELEASE:=8
+PKG_VERSION:=4.2.3
+PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <[email protected]>
 

diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md
@@ -177,6 +177,7 @@ Available commands:
 | adb_repchunksize   | 1                                  | report chunk size used by tcpdump in MB                                                        |
 | adb_represolve     | 0, disabled                        | resolve reporting IP addresses using reverse DNS (PTR) lookups                                 |
 | adb_backup         | 1, enabled                         | set to 0 to disable the backup function                                                        |
+| adb_tld            | 1, enabled                         | set to 0 to disable the top level domain compression (tld) function                            |
 | adb_backupdir      | /tmp                               | path for adblock backups                                                                       |
 | adb_tmpbase        | /tmp                               | path for all adblock related runtime operations, e.g. downloading, sorting, merging etc.       |
 | adb_safesearch     | 0, disabled                        | set to 1 to enforce SafeSearch for google, bing, duckduckgo, yandex, youtube and pixabay       |
@@ -257,17 +258,16 @@ To get the status in the CLI, just call _/etc/init.d/adblock status_ or _/etc/in
 ~#@blackhole:~# /etc/init.d/adblock status
 ::: adblock runtime information
   + adblock_status  : enabled
-  + adblock_version : 4.1.4
-  + blocked_domains : 268355
-  + active_sources  : adaway, adguard, adguard_tracking, android_tracking, bitcoin, disconnect, firetv_tracking, games_t
-                      racking, hblock, oisd_basic, phishing_army, smarttv_tracking, stopforumspam, wally3k, winspy, yoyo
-  + dns_backend     : unbound (unbound-control), /var/lib/unbound
-  + run_utils       : download: /usr/bin/curl, sort: /usr/libexec/sort-coreutils, awk: /bin/busybox
-  + run_ifaces      : trigger: wan, report: br-lan
-  + run_directories : base: /tmp, backup: /mnt/data/adblock-Backup, report: /mnt/data/adblock-Report, jail: /tmp
-  + run_flags       : backup: ✔, flush: ✘, force: ✔, search: ✘, report: ✔, mail: ✔, jail: ✘
-  + last_run        : restart, 3m 17s, 249/73/68, 2022-09-10T13:43:07+02:00
-  + system          : ASUS RT-AX53U, OpenWrt SNAPSHOT r20535-2ca5602864
+  + adblock_version : 4.2.3-r1
+  + blocked_domains : 785573
+  + active_sources  : adguard, doh_blocklist, hagezi, winspy
+  + dns_backend     : dnsmasq (-), /tmp/dnsmasq.d
+  + run_utils       : download: /usr/bin/curl, sort: /usr/libexec/sort-coreutils, awk: /usr/bin/gawk
+  + run_ifaces      : trigger: trm_wwan, report: br-lan
+  + run_directories : base: /tmp, backup: /tmp/adblock-Backup, report: /tmp/adblock-Report, jail: /tmp
+  + run_flags       : backup: ✔, tld: ✔, force: ✔, flush: ✘, search: ✘, report: ✔, mail: ✘, jail: ✘
+  + last_run        : reload, 1m 3s, 650 MB available, 1664 KB max. used, 2024-11-23T18:11:41+01:00
+  + system          : OpenWrt One, mediatek/filogic, OpenWrt SNAPSHOT r28034-ca53f2d430
 </code></pre>
 The 'last\_run' line includes the used start type, the run duration, the memory footprint after DNS backend loading (total/free/available) and the date/time of the last run.
 

diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
@@ -36,8 +36,8 @@ start_service() {
 		procd_set_param command "${adb_script}" "${@}"
 		procd_set_param pidfile "${adb_pidfile}"
 		procd_set_param nice "$(uci_get adblock global adb_nice "0")"
-		procd_set_param stdout 1
-		procd_set_param stderr 1
+		procd_set_param stdout 0
+		procd_set_param stderr 0
 		procd_close_instance
 	fi
 }
@@ -188,7 +188,7 @@ service_triggers() {
 	delay="$(uci_get adblock global adb_triggerdelay "5")"
 
 	PROCD_RELOAD_DELAY="$((delay * 1000))"
-	[ -n "${iface}" ] && procd_add_interface_trigger "interface.*.up" "${iface}" "${adb_init}" "start"
+	[ -n "${iface}" ] && procd_add_interface_trigger "interface.*.up" "${iface}" "${adb_init}" start
 
 	PROCD_RELOAD_DELAY="$((2 * 1000))"
 	procd_add_reload_trigger "adblock"