fix 2

Source: https://github.com/Slava-Shchipunov/awg-openwrt

.github/workflows/build.yml

@@ -3,6 +3,19 @@ name: build
 on:
   workflow_dispatch:
     inputs:
+      test_build:
+        description: 'Test build'
+        required: true
+        default: 'false'
+        type: choice
+        options:
+        - true
+        - false
+      target_name:
+        description: 'Target Name'
+        required: false
+        default: 'r3d'
+        type: string
       fake_build:
         description: 'Fake build'
         required: true
@@ -18,11 +31,14 @@ on:
         type: string
 
 env:
-  FAKE_BUILD: ${{ github.event.inputs.fake_build }}
+  TEST_BUILD: ${{ github.event.inputs.test_build == 'true' }}
+  TARGET_NAME: ${{ github.event.inputs.target_name }}
+  FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
+  TAG_SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || github.event.inputs.test_build == 'true' && '-test' || '' }}
   REPO_URL: https://github.com/openwrt-xiaomi/openwrt
   REPO_LNK: openwrt-xiaomi/openwrt
-  REPO_BRANCH: xq-24.10
+  REPO_BRANCH: xq-25.12
-  TAG_PREFIX: v24-
+  TAG_PREFIX: v25-
   BUILD_ROOT: ${{ github.workspace }}/openwrt
   DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
   TZ: UTC
@@ -45,6 +61,9 @@ jobs:
       fw_date: ${{ steps.gh.outputs.fw_date }}
       fw_ver: ${{ steps.gh.outputs.fw_ver }}
       is_active: ${{ steps.activity.outputs.is_active }}
+      test_build: ${{ env.TEST_BUILD }}
+      target_name: ${{ env.TARGET_NAME }}
+      fake_build: ${{ env.FAKE_BUILD }}
     steps:
       - name: Get repo data via GH API
         id: gh
@@ -124,6 +143,12 @@ jobs:
           - tuf_ax4200
           - tuf_ax6000
           - zen-bt8
+        isTest:
+          - ${{ needs.check.outputs.test_build == 'true' }}
+        exclude:
+          - { isTest: true }
+        include:
+          - target: ${{ github.event.inputs.target_name }}
     steps:
       - name: Initialization environment
         env:
@@ -159,7 +184,7 @@ jobs:
           rsync -avq --exclude=".*" --exclude="$(basename $BUILD_ROOT)" $BLDROOT/ $BUILD_ROOT/
           cd $BUILD_ROOT
           chmod +x *.sh
-          wget https://github.com/fantastic-packages/packages/raw/refs/heads/24.10/keys/usign/53FF2B6672243D28.pub
+          wget https://github.com/fantastic-packages/packages/raw/refs/heads/25.12/keys/usign/53FF2B6672243D28.pub
 
       - name: Update OpenWrt packages
         id: update
@@ -193,7 +218,13 @@ jobs:
               exit 41
           fi
           # run build
-          [ "$FAKE_BUILD" != "true" ] && make -j $MAKE_JOBS download world
+          if [ "$FAKE_BUILD" != "true" ]; then
+              if [ "$TEST_BUILD" != "true" ]; then
+                  make -j $MAKE_JOBS download world
+              else
+                  make V=sc download world
+              fi
+          fi
           # process results
           FILE_DATE=$(date --utc +'%y%m%d')
           OUT_DIR=$BUILD_ROOT/bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
@@ -249,6 +280,7 @@ jobs:
           rm -f *-preloader*
           rm -f *-bl31-uboot*
           rm -f *-initramfs-recovery*
+          rm -f *-bt8-factory.bin
 
       - name: Upload OUT directory
         uses: actions/upload-artifact@main
@@ -290,8 +322,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG: ${{ needs.check.outputs.tag }}
         with:
-          prerelease: false
+          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
-          tag_name: ${{ needs.check.outputs.tag }}
+          tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
           name: '${{ needs.check.outputs.tag }}'
           body: |
             OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]

_addons.config

@@ -13,16 +13,16 @@ CONFIG_FEED__alpine_fan_control=m
 #GIT_PACKAGE luci-app-temp-status=https://github.com/openwrt-xiaomi/luci-app-temp-status.git master
 
 ### luci-app-disks-info
-#GIT_PACKAGE luci-app-disks-info=https://github.com/openwrt-xiaomi/luci-app-disks-info.git master
+#GIT_PACKAGE luci-app-disks-info=https://github.com/gSpotx2f/luci-app-disks-info.git master
 
 ### luci-app-diskman
-#GIT_PACKAGE luci-app-diskman=https://github.com/openwrt-xiaomi/luci-app-diskman.git master
+#GIT_PACKAGE luci-app-diskman=https://github.com/lisaac/luci-app-diskman.git master
 
 ### luci-theme-argon
-#GIT_PACKAGE luci-theme-argon=https://github.com/openwrt-xiaomi/luci-theme-argon.git master
+#GIT_PACKAGE luci-theme-argon=https://github.com/jerrykuku/luci-theme-argon.git master
 
 ### luci-app-argon-config
-#GIT_PACKAGE luci-app-argon-config=https://github.com/openwrt-xiaomi/luci-app-argon-config.git master
+#GIT_PACKAGE luci-app-argon-config=https://github.com/jerrykuku/luci-app-argon-config.git master
 
 ### luci-app-tn-netports
 #GIT_PACKAGE luci-app-tn-netports=https://github.com/openwrt-xiaomi/luci-app-tn-netports.git master
@@ -42,9 +42,15 @@ CONFIG_FEED__alpine_fan_control=m
 
 
 ### AmneziaWG
-#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-24.10
+#GIT_FEED _amneziawg=https://github.com/Slava-Shchipunov/awg-openwrt.git
 CONFIG_FEED__amneziawg=m
 
+### Zapret
+#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git;zap1
+CONFIG_FEED__zapret=m
+#GIT_FEED _zapret2=https://github.com/remittor/zapret-openwrt.git;master
+CONFIG_FEED__zapret2=m
+
 ### ruantiblock
 #GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git
 CONFIG_FEED__ruantiblock=m

_base.config

@@ -162,6 +162,7 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
 #CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED=y
 #CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED=y
+CONFIG_PACKAGE_px5g-mbedtls=y
 
 ### OpenSSL lib
 CONFIG_PACKAGE_libopenssl=y
@@ -204,8 +205,8 @@ CONFIG_PACKAGE_luci-app-ddns=y
 CONFIG_PACKAGE_luci-i18n-ddns-ru=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-i18n-firewall-ru=y
-CONFIG_PACKAGE_luci-app-opkg=y
+CONFIG_PACKAGE_luci-app-package-manager=y
-CONFIG_PACKAGE_luci-i18n-opkg-ru=y
+CONFIG_PACKAGE_luci-i18n-package-manager-ru=y
 CONFIG_PACKAGE_luci-app-uhttpd=y
 CONFIG_PACKAGE_luci-i18n-uhttpd-ru=y
 CONFIG_PACKAGE_luci-app-upnp=y
@@ -217,6 +218,28 @@ CONFIG_PACKAGE_luci-theme-material=y
 CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 
+### Luci extensions
+CONFIG_PACKAGE_luci-full=y
+CONFIG_PACKAGE_luci-lib-uqr=y
+CONFIG_PACKAGE_luci-ssl=y
+CONFIG_PACKAGE_cgi-io=y
+CONFIG_PACKAGE_libiwinfo=y
+CONFIG_PACKAGE_libiwinfo-data=y
+CONFIG_PACKAGE_liblucihttp=y
+CONFIG_PACKAGE_liblucihttp-ucode=y
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-file=y
+CONFIG_PACKAGE_rpcd-mod-iwinfo=y
+CONFIG_PACKAGE_rpcd-mod-luci=y
+CONFIG_PACKAGE_rpcd-mod-rpcsys=y
+CONFIG_PACKAGE_rpcd-mod-rrdns=y
+CONFIG_PACKAGE_rpcd-mod-ucode=y
+CONFIG_PACKAGE_ucode-mod-html=y
+CONFIG_PACKAGE_ucode-mod-log=y
+CONFIG_PACKAGE_ucode-mod-math=y
+CONFIG_PACKAGE_uhttpd=y
+CONFIG_PACKAGE_uhttpd-mod-ubus=y
+
 ### Luci menu customizer
 CONFIG_PACKAGE_cozymenu=y
 

_base_initrd.config

@@ -77,8 +77,8 @@ CONFIG_PACKAGE_luci-mod-status=y
 CONFIG_PACKAGE_luci-mod-system=y
 CONFIG_PACKAGE_luci-app-commands=y
 CONFIG_PACKAGE_luci-i18n-commands-ru=y
-CONFIG_PACKAGE_luci-app-opkg=y
+CONFIG_PACKAGE_luci-app-package-manager=y
-CONFIG_PACKAGE_luci-i18n-opkg-ru=y
+CONFIG_PACKAGE_luci-i18n-package-manager-ru=y
 
 ### Luci themes
 CONFIG_PACKAGE_luci-theme-bootstrap=y

_proxy.config

@@ -7,3 +7,14 @@ CONFIG_PACKAGE_luci-app-https-dns-proxy=y
 CONFIG_PACKAGE_luci-i18n-https-dns-proxy-ru=y
 
 CONFIG_PACKAGE_igmpproxy=y
+
+CONFIG_PACKAGE_zapret=y
+CONFIG_PACKAGE_zapret-tpws=y
+CONFIG_PACKAGE_zapret-mdig=y
+CONFIG_PACKAGE_zapret-ip2net=y
+CONFIG_PACKAGE_luci-app-zapret=y
+
+CONFIG_PACKAGE_zapret2=y
+CONFIG_PACKAGE_zapret2-mdig=y
+CONFIG_PACKAGE_zapret2-ip2net=y
+CONFIG_PACKAGE_luci-app-zapret2=y

_vpn.config

@@ -24,6 +24,7 @@ CONFIG_PACKAGE_luci-proto-wireguard=y
 CONFIG_PACKAGE_kmod-amneziawg=y
 CONFIG_PACKAGE_amneziawg-tools=y
 CONFIG_PACKAGE_luci-proto-amneziawg=y
+CONFIG_PACKAGE_luci-i18n-amneziawg-ru=y
 
 CONFIG_PACKAGE_shadowsocks-libev-ss-local=y
 CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y
@@ -40,3 +41,4 @@ CONFIG_PACKAGE_luci-i18n-ruantiblock-ru=y
 
 CONFIG_PACKAGE_podkop=y
 CONFIG_PACKAGE_luci-app-podkop=y
+CONFIG_PACKAGE_luci-i18n-podkop-ru=y

kng_re.config

@@ -24,10 +24,6 @@ CONFIG_PACKAGE_hdparm=y
 CONFIG_PACKAGE_luci-app-tn-netports=y
 CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
 
-### Network traffic
-CONFIG_PACKAGE_luci-app-sqm=y
-CONFIG_PACKAGE_luci-i18n-sqm-ru=y
-
 ### TimeControl
 CONFIG_PACKAGE_luci-app-timecontrol=m
 

r3d.config

@@ -12,7 +12,7 @@ CONFIG_TARGET_ipq806x_generic_DEVICE_xiaomi_r3d=y
 #include _argon.config
 #include _vpn.config
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y

rt-ax89x.config

@@ -12,7 +12,7 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
 #include _argon.config
 #include _vpn.config
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y

rt-ax89x_initramfs.config

@@ -5,7 +5,7 @@ CONFIG_TARGET_qualcommax_ipq807x_DEVICE_asus_rt-ax89x=y
 #include _addons.config
 #include _base_initrd.config
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 CONFIG_TARGET_INITRAMFS_FORCE=y
 CONFIG_TARGET_ROOTFS_INITRAMFS=y

xmake.sh

@@ -127,6 +127,54 @@ function build_target {
 		fi
 	fi
 
+	AWG_KMOD_MK=$XDIR/package/feeds/_amneziawg/kmod-amneziawg/Makefile
+	if [ -f $AWG_KMOD_MK ]; then
+		if grep "876bf7571e47e349d0e86b70c244330b470d9642" $AWG_KMOD_MK >/dev/null ; then
+			sed -i 's/PKG_SOURCE_VERSION:=876bf7571e47e349d0e86b70c244330b470d9642/PKG_SOURCE_VERSION:=b96e12d00112dbee9d51d18d8438aa991cec0f6a/g' $AWG_KMOD_MK
+		fi
+	fi
+
+	PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
+	if [ -f $PODKOP_MK ]; then
+		sed -i 's/+sing-box / /g' $PODKOP_MK
+		sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK
+	fi
+	PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop
+	if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
+		sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
+	fi
+
+	DROPBEAR_DIR=$XDIR/package/network/services/dropbear
+	TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
+	if [ -f $DROPBEAR_MK ]; then
+		# download dropbear 2024.86 (OpenWrt v24.10)
+		if [ ! -f $TMP_DROPBEAR_DIR/Makefile ]; then
+			rm -rf $TMP_DROPBEAR_DIR
+			git clone --depth 1 --filter=blob:none --sparse https://github.com/openwrt/openwrt.git $TMP_DROPBEAR_DIR && (
+				cd $TMP_DROPBEAR_DIR
+				git sparse-checkout set package/network/services/dropbear
+				git checkout a2f0cd35ac1d15e69f4897b35c049e175dd06825 # commit 2024-12-12 https://github.com/openwrt/openwrt/commits/openwrt-25.12/package/network/services/dropbear
+				mv package/network/services/dropbear/* .
+			)
+			rm -rf $TMP_DROPBEAR_DIR/package
+			rm -rf $TMP_DROPBEAR_DIR/.git
+		fi
+		rm -rf $DROPBEAR_DIR/files
+		rm -rf $DROPBEAR_DIR/patches
+	fi
+	DROPBEAR_MK=$DROPBEAR_DIR/Makefile
+	if [ -f $DROPBEAR_MK ]; then
+		# downgrade dropbear to 2024.86 (OpenWrt v24.10)
+		cp -a $TMP_DROPBEAR_DIR/. $DROPBEAR_DIR/
+		# patch: Disable MODERN and enable RSA/DH-SHA1
+		sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
+		sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
+		sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
+		sed -i 's/ CONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
+		sed -i 's/DROPBEAR_DH_GROUP14_SHA1,0/ /g' $DROPBEAR_MK
+		sed -i 's/DROPBEAR_SHA1_HMAC,0/ /g' $DROPBEAR_MK
+	fi
+
 	make defconfig
 
 	NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )
@@ -221,6 +269,19 @@ function build_target {
 		fi
 	fi
 	
+	XPATCHES=$XDIR/patches
+	for incfn in $XPATCHES/*.patch; do
+		[ ! -f "$incfn" ] && continue
+		inc=`patch -p1 -N -r - < "$incfn"`
+		if [ $? != 0 ]; then
+			if ! echo "$inc" | grep -q "patch detected!  Skipping patch."; then
+				echo "Patch '$(basename $incfn)' FAILED"
+				exit 1
+			fi
+		fi
+		echo "Patch '$(basename $incfn)' result: OK"
+	done
+	
 	OPKG_DIR=$XDIR/files/etc/opkg
 	if [ -d $OPKG_DIR ]; then
 		rm -rf $OPKG_DIR
@@ -240,7 +301,7 @@ function build_target {
 		echo "src/gz  fantastic_packages_special   $PKG_LINK/special"   >> $OPKG_CFEED_FN
 		TARGET_ARCH_PACKAGES=$( get_cfg_opt_value $CFG TARGET_ARCH_PACKAGES )
 		[ -z "$TARGET_ARCH_PACKAGES" ] && die "Cannot find TARGET ARCH"
-		sed -i "s/<<VER>>/24.10/g" $OPKG_CFEED_FN
+		sed -i "s/<<VER>>/25.12/g" $OPKG_CFEED_FN
 		sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
 		logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
 	fi

xupdate.sh

@@ -27,6 +27,7 @@ if [ "$OPT_FULL_UPDATE" = "true" ]; then
 	#rm -rf feeds
 	#rm -rf package/feeds
 	rm -rf staging_dir/packages
+	rm -rf feeds/_*
 	rm -rf $XADDONSDIR
 fi
 

zen-bt8.config

@@ -12,7 +12,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
 #include _argon.config
 #include _vpn.config
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 ### Temp and sensors
 CONFIG_PACKAGE_lm-sensors=y

zen-bt8_initramfs.config

@@ -2,7 +2,7 @@ CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_filogic=y
 CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
 
-CONFIG_KERNEL_KALLSYMS=y
+#CONFIG_KERNEL_KALLSYMS=y
 
 #include _addons.config
 #include _base_initrd.config