Openwrt 2410 branch package cleanup

files-generic/config/Config-gargoyle.in

@@ -7,9 +7,17 @@
 menuconfig USE_GARGOYLE_PROFILE_PKGS
 	bool "Gargoyle packages choice shortcut"
 	default y
+	select BUILD_PATENTED
+	select CLEAN_IPKG_PARTIAL
+	select KERNEL_PROC_STRIPPED
 	select BUSYBOX_CUSTOM
 	select BUSYBOX_CONFIG_ARPING
 	select BUSYBOX_CONFIG_SHA1SUM
+	select BUSYBOX_CONFIG_BUNZIP2
+	select BUSYBOX_CONFIG_BZCAT
+	select BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE
+	select BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS
+	select BUSYBOX_CONFIG_FEATURE_SUID
 	select PACKAGE_gargoyle
 	select PACKAGE_gargoyle-i18n
 	select PACKAGE_plugin-gargoyle-i18n-English-EN
@@ -18,27 +26,31 @@ menuconfig USE_GARGOYLE_PROFILE_PKGS
 		menu "Standard Gargoyle package sets"
 			config GARGOYLE_BASIC
 				tristate "Basic Packages"
-				default m
+				default m if !(TARGET_bcm27xx||TARGET_x86)
+				default n
 				select PACKAGE_gargoyle-basic
 				help
 				  Choose basic packages, the minimum required for Gargoyle.
 
 			config GARGOYLE_USB
 				tristate "Basic & USB Functionality"
-				default m
+				default m if !(TARGET_bcm27xx||TARGET_x86)
+				default n
 				select PACKAGE_gargoyle-usb
 				help
 				  Choose basic packages and those required to support USB functionality (but no network sharing).
 
 			config GARGOYLE_VPN
 				tristate "Basic & VPN Functionality"
-				default m
+				default m if !(TARGET_bcm27xx||TARGET_x86)
+				default n
 				select PACKAGE_gargoyle-vpn
 				help
 				  Choose basic packages and those required to support VPN functionality.
 
 			config GARGOYLE_LARGE
 				tristate "Full Functionality"
+				default y if (TARGET_bcm27xx||TARGET_x86)
 				default m
 				select PACKAGE_gargoyle-large
 				help
@@ -47,6 +59,7 @@ menuconfig USE_GARGOYLE_PROFILE_PKGS
 
 		config GARGOYLE_LANGUAGE_PKGS
 			tristate "Language translation packages"
+			default y if TARGET_bcm27xx
 			default m
 			select PACKAGE_plugin-gargoyle-i18n-Arabic-AR
 			select PACKAGE_plugin-gargoyle-i18n-Czech-CS
@@ -60,7 +73,7 @@ menuconfig USE_GARGOYLE_PROFILE_PKGS
 			select PACKAGE_plugin-gargoyle-i18n-Slovak-SK
 			select PACKAGE_plugin-gargoyle-i18n-Spanish-ES
 			help
-				Plugins for languages other than English
+			  Plugins for languages other than English
 
 		config GARGOYLE_THEME_PKGS
 			tristate "Display theme packages"
@@ -75,9 +88,17 @@ menuconfig USE_GARGOYLE_PROFILE_PKGS
 			select PACKAGE_plugin-gargoyle-theme-light
 			select PACKAGE_plugin-gargoyle-theme-xeye
 			help
-				Plugins for alternative display themes
+			  Plugins for alternative display themes
 
 		menu "Extra Gargoyle package sets"
+			config GARGOYLE_EXTRA_UTILITIES
+				tristate "Utility packages"
+				default m
+				select PACKAGE_resolveip
+				select PACKAGE_swap-utils
+				help
+				  Utility packages.
+
 			config GARGOYLE_EXTRA_USB_ETHERNET
 				tristate "USB to Ethernet Drivers"
 				default y if TARGET_bcm27xx
@@ -86,17 +107,87 @@ menuconfig USE_GARGOYLE_PROFILE_PKGS
 				help
 				  Drivers for Acquantia, Asix and Realtek based USB2/USB3 to Ethernet adapters.
 
+			config GARGOYLE_EXTRA_ETHERNET_STD
+				tristate "Additional Ethernet Drivers"
+				default y if (TARGET_bcm27xx_bcm2712||TARGET_x86_64)
+				default n
+				select PACKAGE_kmod-3c59x if TARGET_x86_64
+				select PACKAGE_kmod-8139too if TARGET_x86_64
+				select PACKAGE_kmod-e100 if TARGET_x86_64
+				select PACKAGE_kmod-natsemi if TARGET_x86_64
+				select PACKAGE_kmod-ne2k-pci if TARGET_x86_64
+				select PACKAGE_kmod-pcnet32 if TARGET_x86_64
+				select PACKAGE_kmod-r8169 if TARGET_bcm27xx_bcm2712
+				select PACKAGE_kmod-sis900 if TARGET_x86_64
+				select PACKAGE_kmod-via-rhine if TARGET_x86_64
+				select PACKAGE_kmod-via-velocity if TARGET_x86_64
+				help
+				  Drivers for additional ethernet adapters.
+
+			config GARGOYLE_EXTRA_ETHERNET_OPT
+				tristate "Optional Ethernet Drivers"
+				default m if (TARGET_x86_generic||TARGET_x86_64)
+				default n
+				select PACKAGE_kmod-bnx2x if TARGET_x86_64
+				select PACKAGE_kmod-mlx4-core if TARGET_x86_64
+				select PACKAGE_kmod-mlx5-core if TARGET_x86_64
+				select PACKAGE_kmod-r8101
+				select PACKAGE_kmod-r8125 if TARGET_x86_64
+				select PACKAGE_kmod-r8125-rss if TARGET_x86_64
+				select PACKAGE_kmod-r8126 if TARGET_x86_64
+				select PACKAGE_kmod-r8126-rss if TARGET_x86_64
+				select PACKAGE_kmod-r8127 if TARGET_x86_64
+				select PACKAGE_kmod-r8127-rss if TARGET_x86_64
+				select PACKAGE_kmod-r8168
+				select PACKAGE_kmod-r8168-rss
+				help
+				  Drivers for additional optional ethernet adapters.
+
+			config GARGOYLE_EXTRA_WIFI_SUPPORT
+				tristate "Optional extra WiFi support"
+				default m if (TARGET_ath79||TARGET_ipq40xx||TARGET_ipq806x||TARGET_rockchip||TARGET_x86)
+				default n
+				select PACKAGE_kmod-ath9k if (TARGET_rockchip||TARGET_x86)
+				select PACKAGE_kmod-ath9k-common if (TARGET_rockchip||TARGET_x86)
+				select PACKAGE_kmod-ath10k if PACKAGE_kmod-ath10k-ct
+				select PACKAGE_kmod-ath10k-ct-smallbuffers if PACKAGE_kmod-ath10k-ct
+				select PACKAGE_kmod-ath10k-smallbuffers if PACKAGE_kmod-ath10k-ct
+				select PACKAGE_ath10k-firmware-qca4019 if PACKAGE_ath10k-firmware-qca4019-ct
+				select PACKAGE_ath10k-firmware-qca4019-ct-full-htt if PACKAGE_ath10k-firmware-qca4019-ct
+				select PACKAGE_ath10k-firmware-qca4019-ct-htt if PACKAGE_ath10k-firmware-qca4019-ct
+				select PACKAGE_ath10k-firmware-qca9887 if PACKAGE_ath10k-firmware-qca9887-ct
+				select PACKAGE_ath10k-firmware-qca9887-ct-full-htt if PACKAGE_ath10k-firmware-qca9887-ct
+				select PACKAGE_ath10k-firmware-qca9888 if PACKAGE_ath10k-firmware-qca9888-ct
+				select PACKAGE_ath10k-firmware-qca9888-ct-full-htt if PACKAGE_ath10k-firmware-qca9888-ct
+				select PACKAGE_ath10k-firmware-qca9888-ct-htt if PACKAGE_ath10k-firmware-qca9888-ct
+				select PACKAGE_ath10k-firmware-qca988x if PACKAGE_ath10k-firmware-qca988x-ct
+				select PACKAGE_ath10k-firmware-qca988x-ct-full-htt if PACKAGE_ath10k-firmware-qca988x-ct
+				select PACKAGE_ath10k-firmware-qca9984 if PACKAGE_ath10k-firmware-qca9984-ct
+				select PACKAGE_ath10k-firmware-qca9984-ct-full-htt if PACKAGE_ath10k-firmware-qca9984-ct
+				select PACKAGE_ath10k-firmware-qca9984-ct-htt if PACKAGE_ath10k-firmware-qca9984-ct
+				select PACKAGE_ath10k-firmware-qca99x0 if PACKAGE_ath10k-firmware-qca99x0-ct
+				select PACKAGE_ath10k-firmware-qca99x0-ct-full-htt if PACKAGE_ath10k-firmware-qca99x0-ct
+				select PACKAGE_ath10k-firmware-qca99x0-ct-htt if PACKAGE_ath10k-firmware-qca99x0-ct
+				help
+				  Optional extra WiFi support for some targets.
+
+			config GARGOYLE_EXTRA_DIAGS
+				tristate "Diagnostics support"
+				default y if (TARGET_bcm27xx||TARGET_ipq806x||TARGET_mediatek||TARGET_rockchip||TARGET_x86_generic||TARGET_x86_64)
+				default m
+				select PACKAGE_plugin-gargoyle-diagnostics
+				help
+				  Diagnostic support packages
+
 		endmenu
 
 		config GARGOYLE_OTHER_PKGS
 			tristate "Other Gargoyle plugins"
 			default m
-			select PACKAGE_msmtp
-			select PACKAGE_msmtp-nossl
 			select PACKAGE_plugin-gargoyle-adblock
 			select PACKAGE_plugin-gargoyle-cron
 			select PACKAGE_plugin-gargoyle-ddns-cloudflare
-			select PACKAGE_plugin-gargoyle-diagnostics
+			select PACKAGE_plugin-gargoyle-doh
 			select PACKAGE_plugin-gargoyle-email-notifications
 			select PACKAGE_plugin-gargoyle-email-notifications-nossl
 			select PACKAGE_plugin-gargoyle-initd
@@ -107,13 +198,13 @@ menuconfig USE_GARGOYLE_PROFILE_PKGS
 			select PACKAGE_plugin-gargoyle-spectrum-analyser
 			select PACKAGE_plugin-gargoyle-spectrum-analyser-minimal
 			select PACKAGE_plugin-gargoyle-stamgr
+			select PACKAGE_plugin-gargoyle-tor
 			select PACKAGE_plugin-gargoyle-upnp
 			select PACKAGE_plugin-gargoyle-webshell
 			select PACKAGE_plugin-gargoyle-wifi-schedule
-			select PACKAGE_resolveip
 			select PACKAGE_ksmbd-server if !GARGOYLE_SMB_KSMBD
 			select PACKAGE_samba36-server if !GARGOYLE_SMB_SAMBA
 			help
-				Other plugin packages
+			  Other plugin packages
 
 	endif

package/gargoyle-extras/Makefile

@@ -23,9 +23,10 @@ endef
 define Package/gargoyle-extra-usb-ethernet
 	$(call Package/gargoyle-extras/Default)
 	TITLE+= USB ethernet drivers
-	DEPENDS:=+kmod-usb-net +kmod-usb-net-aqc111 \
+	DEPENDS:=+kmod-usb-net-aqc111 \
 		+kmod-usb-net-asix +kmod-usb-net-asix-ax88179 \
-		+kmod-usb-net-rtl8150 +kmod-usb-net-rtl8152
+		+kmod-usb-net-rtl8150 +kmod-usb-net-rtl8152 \
+		+TARGET_bcm27xx_bcm2712:kmod-usb-net-lan78xx
 endef
 
 define Package/gargoyle-extra-usb-ethernet/description

package/gargoyle-firewall-util-fw3/Makefile

@@ -15,7 +15,7 @@ define Package/gargoyle-firewall-util-fw3
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=A couple of shell script routines for firewall (fw3) initialization
-	DEPENDS:=+iptables-zz-legacy +ip6tables-zz-legacy +ebtables-legacy +kmod-ebtables-ipv4 +kmod-ebtables-ipv6 +libericstools +uci +libiptbwctl +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra +iptables-mod-nat-extra +iptables-mod-extra +iptables-mod-iprange +iptables-mod-bandwidth +iptables-mod-timerange +iptables-mod-weburl +kmod-tun +kmod-nf-nathelper +kmod-nf-nathelper-extra +ipset +kmod-ipt-ipset
+	DEPENDS:=+iptables-zz-legacy +ip6tables-zz-legacy +ebtables-legacy +kmod-ebtables-ipv4 +kmod-ebtables-ipv6 +libericstools +uci +libiptbwctl +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra +iptables-mod-nat-extra +iptables-mod-extra +iptables-mod-iprange +iptables-mod-bandwidth +iptables-mod-timerange +iptables-mod-weburl +kmod-tun +kmod-nf-nathelper +kmod-nf-nathelper-extra +ipset +kmod-ipt-ipset +kmod-nf-ipt6
 	MAINTAINER:=Eric Bishop <eric@gargoyle-router.com>
 endef
 

package/gargoyle-firewall-util/Makefile

@@ -15,7 +15,7 @@ define Package/gargoyle-firewall-util
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=A couple of shell script routines for firewall (fw4) initialization
-	DEPENDS:=+nftables-json +libericstools +uci +libnftbwctl +kmod-nft-bandwidth +kmod-nft-timerange +kmod-nft-weburl +kmod-tun +kmod-nf-nathelper +kmod-nf-nathelper-extra
+	DEPENDS:=+nftables-json +libericstools +uci +libnftbwctl +kmod-nft-bandwidth +kmod-nft-timerange +kmod-nft-weburl +kmod-tun +kmod-nf-nathelper +kmod-nf-nathelper-extra +kmod-nf-conntrack-netlink +kmod-nft-bridge
 	MAINTAINER:=Eric Bishop <eric@gargoyle-router.com>
 endef
 

package/msmtp/Makefile

@@ -64,7 +64,7 @@ define Package/msmtp-nossl
 $(call Package/msmtp/Default)
   TITLE+= (without SSL support)
   VARIANT:=nossl
-  PROVIDES:=msmtp
+#  PROVIDES:=msmtp
 endef
 
 define Package/msmtp-nossl/description

package/openvpn-easy-rsa/Config.in

@@ -4,7 +4,8 @@ comment "SSL support"
 
 choice
 	prompt "Selected SSL library"
-	default OPENVPN_GARGOYLE_EASYRSA_MBEDTLS
+	default OPENVPN_GARGOYLE_EASYRSA_MBEDTLS if !GARGOYLE_SSL_OPENSSL
+	default OPENVPN_GARGOYLE_EASYRSA_OPENSSL if GARGOYLE_SSL_OPENSSL
 
 	config OPENVPN_GARGOYLE_EASYRSA_MBEDTLS
 		bool "mbed TLS"

package/openvpn-easy-rsa/Makefile

@@ -40,17 +40,21 @@ define Package/openvpn-gargoyle-easy-rsa
   PROVIDES:=openvpn-easy-rsa
 endef
 
+define Package/openvpn-gargoyle-easy-rsa/description
+  CLI utility to build and manage a PKI CA.
+endef
+
+define Package/openvpn-gargoyle-easy-rsa/config
+  source "$(SOURCE)/Config.in"
+endef
+
 define Package/openvpn-gargoyle-easy-rsa/conffiles
 /etc/easy-rsa/vars
 /etc/easy-rsa/openssl-3.0.cnf
 /etc/easy-rsa/openssl-easyrsa.cnf
 /etc/profile.d/50-$(PKG_NAME).sh
 endef
 
-define Package/openvpn-gargoyle-easy-rsa/config
-  source "$(SOURCE)/Config.in"
-endef
-
 define Build/Configure
 endef
 
@@ -96,4 +100,4 @@ define Package/openvpn-gargoyle-easy-rsa/install
 	$(INSTALL_DATA) files/openvpn-easy-rsa.profile $(1)/etc/profile.d/50-$(PKG_NAME).sh
 endef
 
-$(eval $(call BuildPackage,openvpn-gargoyle-easy-rsa))
+$(eval $(call BuildPackage,openvpn-gargoyle-easy-rsa))

package/openvpn/Makefile

@@ -42,16 +42,16 @@ define Package/openvpn/Default
   PROVIDES:=openvpn openvpn-gargoyle openvpn-crypto
 endef
 
-Package/openvpn-gargoyle-openssl=$(call Package/openvpn/Default,openssl,OpenSSL,+PACKAGE_openvpn-gargoyle-openssl:libopenssl)
 Package/openvpn-gargoyle-mbedtls=$(call Package/openvpn/Default,mbedtls,mbedTLS,+PACKAGE_openvpn-gargoyle-mbedtls:libmbedtls)
+Package/openvpn-gargoyle-openssl=$(call Package/openvpn/Default,openssl,OpenSSL,+PACKAGE_openvpn-gargoyle-openssl:libopenssl)
 Package/openvpn-gargoyle-wolfssl=$(call Package/openvpn/Default,wolfssl,WolfSSL,+PACKAGE_openvpn-gargoyle-wolfssl:libwolfssl)
 
 define Package/openvpn/config/Default
 	source "$(SOURCE)/Config-$(1).in"
 endef
 
-Package/openvpn-gargoyle-openssl/config=$(call Package/openvpn/config/Default,openssl)
 Package/openvpn-gargoyle-mbedtls/config=$(call Package/openvpn/config/Default,mbedtls)
+Package/openvpn-gargoyle-openssl/config=$(call Package/openvpn/config/Default,openssl)
 Package/openvpn-gargoyle-wolfssl/config=$(call Package/openvpn/config/Default,wolfssl)
 
 ifeq ($(BUILD_VARIANT),mbedtls)
@@ -143,6 +143,6 @@ define Package/openvpn-gargoyle-$(BUILD_VARIANT)/install
 		$(1)/lib/upgrade/keep.d/openvpn
 endef
 
-$(eval $(call BuildPackage,openvpn-gargoyle-openssl))
 $(eval $(call BuildPackage,openvpn-gargoyle-mbedtls))
-$(eval $(call BuildPackage,openvpn-gargoyle-wolfssl))
+$(eval $(call BuildPackage,openvpn-gargoyle-openssl))
+$(eval $(call BuildPackage,openvpn-gargoyle-wolfssl))

package/plugin-gargoyle-email-notifications/Makefile

@@ -22,14 +22,14 @@ endef
 
 define Package/plugin-gargoyle-email-notifications
 $(call Package/plugin-gargoyle-email-notifications/Default)
-	DEPENDS+=msmtp
+	DEPENDS+=+msmtp
 	TITLE+= (with SSL support)
 	VARIANT:=ssl
 endef
 
 define Package/plugin-gargoyle-email-notifications-nossl
 $(call Package/plugin-gargoyle-email-notifications/Default)
-	DEPENDS+=msmtp-nossl
+	DEPENDS+=+msmtp-nossl
 	TITLE+= (without SSL support)
 	VARIANT:=nossl
 endef

patches-generic/027-gpkg-as-default-not-opkg.patch

@@ -0,0 +1,19 @@
+--- a/include/default-packages.mk
++++ b/include/default-packages.mk
+@@ -1,5 +1,5 @@
+ ifneq ($(CONFIG_USE_APK),)
+   DEFAULT_PACKAGES += apk-mbedtls
+ else
+-  DEFAULT_PACKAGES += opkg
++  DEFAULT_PACKAGES += gpkg
+ endif
+--- a/package/system/opkg/Makefile
++++ b/package/system/opkg/Makefile
+@@ -39,7 +39,6 @@
+   CATEGORY:=Base system
+   TITLE:=opkg package manager
+   DEPENDS:=+uclient-fetch +libpthread +libubox
+-  DEFAULT:=y if !USE_APK
+   URL:=$(PKG_SOURCE_URL)
+   MENU:=1
+ endef

patches-generic/028-dont-include-procd-ujail-by-default.patch

@@ -0,0 +1,15 @@
+--- a/include/target.mk
++++ b/include/target.mk
+@@ -91,9 +91,9 @@
+ endif
+
+ # include ujail on systems with enough storage
+-ifeq ($(filter small_flash,$(FEATURES)),)
+-  DEFAULT_PACKAGES+=procd-ujail
+-endif
++#ifeq ($(filter small_flash,$(FEATURES)),)
++#  DEFAULT_PACKAGES+=procd-ujail
++#endif
+
+ # Add device specific packages (here below to allow device type set from subtarget)
+ DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))