[feature] update qt

Author: batchar2

conanfile.py

@@ -119,7 +119,7 @@ def requirements(self):
         self._register_local_recipe("boringssl", "openssl", "boringssl", True, False)
         self._register_local_recipe("yaff", "yaff", "0.0.0", visible=False)
         if self.options.with_gui_client:
-            self.requires("qt/6.7.3")
+            self.requires("qt/6.11.1")
         if self.settings.os != "Windows":
             self.requires("meson/1.10.2", override=True, force=True)
         if not self.options.build_only_fptn_lib:

deploy/linux/deb/create-server-deb-package.sh

@@ -78,9 +78,24 @@ DEFAULT_PROXY_DOMAIN=cdnvideo.com
 #   This allows: example.com, test.org and ALL their subdomains
 ALLOWED_SNI_LIST=
 
+# Block ads and trackers
+# (accepted values: true or false; enabled unless set to false).
+# A TLS handshake whose SNI is a listed domain (or a subdomain of one) is
+# dropped, and so is every packet addressed to an IP such a domain resolves to.
+ENABLE_ADS_FILTER=true
+
+# Comma-separated URLs of the ad/tracker domain lists. Each one is cached in
+# DATA_DIR and downloaded again once the cached copy is older than three days.
+# Empty uses the built-in URLs.
+ADS_BLOCKLIST_URLS=
+
+# Directory for the files the server downloads at runtime (the ad/tracker
+# domain lists)
+DATA_DIR=/etc/fptn/data
+
 # Block BitTorrent traffic to prevent abuse
 # (accepted values: true or false; enabled unless set to false)
-DISABLE_TORRENT_FILTER=true
+ENABLE_TORRENT_FILTER=true
 
 # Block the client traffic that gets this server blacklisted
 # (accepted values: true or false; enabled unless set to false). It drops:
@@ -91,7 +106,18 @@ DISABLE_TORRENT_FILTER=true
 #   - amplification reflectors: UDP 1900, 11211
 # NOTE: the mail part also stops desktop mail clients (Thunderbird, Outlook)
 # of your legitimate users from sending mail through the tunnel.
-DISABLE_SPAM_FILTER=true
+ENABLE_SPAM_FILTER=true
+
+# Block the blacklisted domains: a TLS handshake whose SNI is a listed domain
+# (or a subdomain of one) is dropped, and so are the QUIC and ICMP packets
+# addressed to an IP such a domain resolves to
+# (accepted values: true or false; enabled unless set to false).
+ENABLE_DOMAIN_BLACKLIST_FILTER=true
+
+# Comma-separated URLs of the domain lists to block. Each one is cached in
+# DATA_DIR/blacklist and downloaded again once the cached copy is older than
+# an hour. Empty uses the built-in URLs.
+DOMAIN_BLACKLIST_URLS=
 
 # Optional: path to a file with extra domains to block, one per line
 # ('#' starts a comment). Traffic to the addresses these domains and their
@@ -143,8 +169,13 @@ ExecStart=/usr/bin/$(basename "$SERVER_BIN") \
   --tun-interface-name=\${TUN_INTERFACE_NAME} \
   --mtu-size=\${MTU_SIZE} \
   --userfile=\${USERFILE} \
-  --disable-torrent-filter=\${DISABLE_TORRENT_FILTER} \
-  --disable-spam-filter=\${DISABLE_SPAM_FILTER} \
+  --enable-ads-filter=\${ENABLE_ADS_FILTER} \
+  --ads-blocklist-urls=\${ADS_BLOCKLIST_URLS} \
+  --data-dir=\${DATA_DIR} \
+  --enable-torrent-filter=\${ENABLE_TORRENT_FILTER} \
+  --enable-spam-filter=\${ENABLE_SPAM_FILTER} \
+  --enable-domain-blacklist-filter=\${ENABLE_DOMAIN_BLACKLIST_FILTER} \
+  --domain-blacklist-urls=\${DOMAIN_BLACKLIST_URLS} \
   --domain-blacklist-file=\${DOMAIN_BLACKLIST_FILE} \
   --prometheus-access-key=\${PROMETHEUS_SECRET_ACCESS_KEY} \
   --use-remote-server-auth=\${USE_REMOTE_SERVER_AUTH} \

deploy/macos/create-pkg.py

@@ -89,8 +89,8 @@ def create_app(
             lib_path = pathlib.Path(lib)
             lib_name = lib_path.name
             if r"qtbase/lib/" in lib:
-                if r".6.7.3.dylib" in lib_name:
-                    lib_name = lib_name.replace(".6.7.3.dylib", ".6.dylib")
+                if r".6.11.1.dylib" in lib_name:
+                    lib_name = lib_name.replace(".6.11.1.dylib", ".6.dylib")
                 print(f"Copy {lib} -> {frameworks_path / lib_name}")
                 shutil.copy(lib, frameworks_path / lib_name)
             elif "qtbase/plugins/" in str(lib_path):

deploy/windows/create-installer.py

@@ -109,8 +109,8 @@ def copy_qt_libraries(frameworks_path: pathlib.Path):
         lib_path = pathlib.Path(lib)
         lib_name = lib_path.name
         if r"qtbase/bin/" in str(lib_path.as_posix()):
-            if r".6.7.3.dll" in lib_name:
-                lib_name = lib_name.replace(".6.7.3.dll", ".6.dll")
+            if r".6.11.1.dll" in lib_name:
+                lib_name = lib_name.replace(".6.11.1.dll", ".6.dll")
             print(f"Copy {lib} -> {frameworks_path / lib_name}")
             shutil.copy(lib, frameworks_path / lib_name)
         elif "qtbase/plugins" in str(lib_path.as_posix()):