modified: README.md

modified:   patch.py

.github/workflows/mikrotik_patch_6.yml

@@ -98,10 +98,10 @@ jobs:
       RELEASE: ${{ needs.Set_Variables.outputs.RELEASE }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
         
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.11' 
 

.github/workflows/mikrotik_patch_7.yml

@@ -22,6 +22,7 @@ on:
         type: choice
         options:
           - stable
+          - long-term
           - testing
       version:
         description: "Specify version (e.g., 7.19.2), empty for latest"
@@ -87,7 +88,7 @@ jobs:
             BUILD_TIME=$(date +'%s')
             RELEASE=true
             MATRIX_JSON='[{"arch":"x86","channel":"stable"},{"arch":"arm64","channel":"stable"},{"arch":"arm","channel":"stable"},{"arch":"x86","channel":"testing"},{"arch":"arm64","channel":"testing"},{"arch":"arm","channel":"testing"}]'
-            MATRIX_JSON='[{"arch":"x86","channel":"stable"},{"arch":"arm64","channel":"stable"},{"arch":"x86","channel":"testing"},{"arch":"arm64","channel":"testing"}]'
+            MATRIX_JSON='[{"arch":"x86","channel":"stable"},{"arch":"arm64","channel":"stable"},{"arch":"x86","channel":"long-term"},{"arch":"arm64","channel":"long-term"},{"arch":"x86","channel":"testing"},{"arch":"arm64","channel":"testing"}]'
           fi
           echo "BUILD_TIME=$BUILD_TIME" >> $GITHUB_OUTPUT
           echo "RELEASE=$RELEASE" >> $GITHUB_OUTPUT
@@ -108,10 +109,10 @@ jobs:
       RELEASE: ${{ needs.Set_Variables.outputs.RELEASE }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
         
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.11' 
 
@@ -190,11 +191,11 @@ jobs:
         sudo mksquashfs option-root option.sfs -quiet -comp xz -no-xattrs -b 256k
         sudo rm -rf option-root
         if [ "${{ matrix.arch }}" == "x86" ]; then
-          sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-x86_64-unknown-linux-musl-install_only_stripped.tar.gz
+          sudo wget -O cpython.tar.gz -nv https://github.com/astral-sh/python-build-standalone/releases/download/20241206/cpython-3.11.11+20241206-x86_64-unknown-linux-musl-install_only_stripped.tar.gz
         elif [ "${{ matrix.arch }}" == "arm64" ]; then
-          sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz
+          sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20241206/cpython-3.11.11+20241206-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz
         elif [ "${{ matrix.arch }}" == "arm" ]; then
-          sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20250708/cpython-3.11.13+20250708-armv7-unknown-linux-gnueabi-install_only_stripped.tar.gz
+          sudo wget -O cpython.tar.gz -nv https://github.com/indygreg/python-build-standalone/releases/download/20241206/cpython-3.11.11+20241206-armv7-unknown-linux-gnueabi-install_only_stripped.tar.gz
         fi
         sudo tar -xf cpython.tar.gz
         sudo rm cpython.tar.gz
@@ -206,7 +207,7 @@ jobs:
     - name: Cache mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
       if: steps.get_latest.outputs.has_new_version == 'true'  && (matrix.arch == 'x86' || matrix.arch == 'arm64')
       id: cache-mikrotik
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           mikrotik.iso
@@ -218,11 +219,23 @@ jobs:
       run: |
           sudo wget -nv -O mikrotik.iso https://download.mikrotik.com/routeros/$LATEST_VERSION/mikrotik-$LATEST_VERSION$ARCH.iso
 
+    - name: Cache refind
+      if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86'
+      id: cache-refind
+      uses: actions/cache@v5
+      with:
+        path: refind-bin-0.14.2.zip
+        key: refind
+        restore-keys: refind
+
+    - name: Get refind
+      if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.cache-refind.outputs.cache-hit != 'true'
+      run: sudo wget -O refind-bin-0.14.2.zip https://downloads.sourceforge.net/project/refind/0.14.2/refind-bin-0.14.2.zip
 
     - name: Patch mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}.iso
       if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
       run: |
-        sudo apt-get install -y mkisofs xorriso > /dev/null
+        sudo apt-get install -y build-essential binutils-arm-linux-gnueabi mkisofs xorriso > /dev/null
         sudo mkdir ./iso 
         sudo mount -o loop,ro mikrotik.iso ./iso
         sudo mkdir ./new_iso
@@ -262,12 +275,23 @@ jobs:
         sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION$ARCH.npk ./python3-$LATEST_VERSION$ARCH.npk python3 ./python3.sfs -desc="python 3.11.13"
         sudo cp python3-$LATEST_VERSION$ARCH.npk ./new_iso/
         sudo mkdir ./efiboot
-        sudo mount -o loop ./new_iso/efiboot.img ./efiboot
         if [ "${{ matrix.arch }}" == "x86" ]; then
-          sudo -E python3 patch.py kernel ./efiboot/linux.x86_64
-          sudo cp ./efiboot/linux.x86_64 ./BOOTX64.EFI
-          sudo cp ./BOOTX64.EFI ./new_iso/isolinux/linux
-          sudo umount ./efiboot
+          truncate --size 32M efiboot.img
+          sudo mkfs.fat -F16 -n ROUTEROS efiboot.img
+          sudo mount -o loop efiboot.img efiboot
+          sudo mkdir -p efiboot/EFI/BOOT
+          sudo unzip refind-bin-0.14.2.zip refind-bin-0.14.2/refind/refind_x64.efi
+          sudo cp refind-bin-0.14.2/refind/refind_x64.efi ./efiboot/EFI/BOOT/BOOTX64.EFI
+          sudo rm -rf refind-bin-0.14.2
+          echo -e 'timeout 0\ntextonly\ntextmode 0\nshowtools shutdown, reboot, exit\nmenuentry "Install RouterOS" {\n\tloader /linux.x86_64\n\toptions "load_ramdisk=1 root=/dev/ram0 -install -cdrom debug"\n}\ndefault_selection /EFI/BOOT/BOOTX64.EFI' \
+          > refind.conf
+          sudo cp refind.conf ./efiboot/EFI/BOOT/
+          sudo rm refind.conf
+          sudo -E python3 patch.py kernel ./new_iso/isolinux/linux
+          sudo cp ./new_iso/isolinux/linux ./efiboot/linux.x86_64
+          sudo cp ./new_iso/isolinux/linux ./linux.x86_64
+          sudo umount ./efiboot 
+          sudo cp -f efiboot.img ./new_iso/efiboot.img
           sudo mkisofs -o mikrotik-$LATEST_VERSION$ARCH.iso \
                       -V "MikroTik $LATEST_VERSION ${{ matrix.arch }}" \
                       -sysid "" -preparer "MiKroTiK" \
@@ -284,6 +308,7 @@ jobs:
                       -R -J \
                       ./new_iso
         elif [ "${{ matrix.arch }}" == "arm64" ]; then
+          sudo mount -o loop ./new_iso/efiboot.img ./efiboot
           sudo -E python3 patch.py kernel ./efiboot/EFI/BOOT/BOOTAA64.EFI
           sudo umount ./efiboot
           sudo xorriso -as mkisofs -o mikrotik-$LATEST_VERSION$ARCH.iso \
@@ -307,7 +332,7 @@ jobs:
     - name: Cache chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
       id: cache-chr-img
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           chr.img
@@ -414,7 +439,7 @@ jobs:
             </VirtualHardwareSection>
             <AnnotationSection ovf:required="false">
               <Info>A human-readable annotation</Info>
-              <Annotation>MikroTik RouterOS CHR v7.19.4</Annotation>
+              <Annotation>MikroTik RouterOS CHR</Annotation>
             </AnnotationSection>
           </VirtualSystem>
         </Envelope>' 
@@ -563,7 +588,7 @@ jobs:
     - name: Cache all_packages${{ env.ARCH }}-${{ env.LATEST_VERSION }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch != 'x86' && matrix.arch != 'arm64'
       id: cache-all-packages
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: all_packages.zip
         key: all_packages${{ env.ARCH }}-${{ env.LATEST_VERSION }}.zip
@@ -577,7 +602,7 @@ jobs:
     - name: Cache Main package routeros-${{ env.LATEST_VERSION }}${{ env.ARCH }}.npk
       if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch != 'x86' && matrix.arch != 'arm64'
       id: cache-main-package
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: routeros.npk
         key: routeros-${{ env.LATEST_VERSION }}${{ env.ARCH }}.npk
@@ -605,19 +630,6 @@ jobs:
         sudo zip ../all_packages-${{ matrix.arch }}-$LATEST_VERSION.zip *.npk
         cd ..
 
-    - name: Cache refind
-      if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
-      id: cache-refind
-      uses: actions/cache@v4
-      with:
-        path: refind-bin-0.14.2.zip
-        key: refind
-        restore-keys: refind
-
-    - name: Get refind
-      if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && steps.cache-refind.outputs.cache-hit != 'true' && env.RELEASE == 'true'
-      run: sudo wget -nv -O refind-bin-0.14.2.zip https://nchc.dl.sourceforge.net/project/refind/0.14.2/refind-bin-0.14.2.zip
-
     - name: Create install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
       if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
       run: |
@@ -641,7 +653,7 @@ jobs:
           > syslinux.cfg
         sudo cp syslinux.cfg ./install/
         sudo rm syslinux.cfg
-        sudo cp ./BOOTX64.EFI ./install/linux
+        sudo cp ./linux.x86_64 ./install/linux
         NPK_FILES=($(find ./all_packages/*.npk))
         for ((i=1; i<=${#NPK_FILES[@]}; i++))
         do
@@ -660,7 +672,7 @@ jobs:
     - name: Cache NetInstall ${{ env.LATEST_VERSION }}${{ env.ARCH }}
       if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86' && env.RELEASE == 'true'
       id: cache-netinstall
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           netinstall.zip
@@ -699,6 +711,20 @@ jobs:
     - name: Upload Files
       if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'
       run: |
+        sudo apt-get install -y knockd lftp > /dev/null
+        knock -4  ${{ secrets.SSH_SERVER }} ${{ secrets.SSH_KNOCK_PORT }} 
+        echo "Knocking on server..."
+        for i in 1 2 3; do
+          if knock -4  ${{ secrets.SSH_SERVER }} ${{ secrets.SSH_KNOCK_PORT }} ; then
+            echo "Knock successful"
+            break
+          else
+            echo "Knock attempt $i failed, retrying..."
+            sleep 2
+          fi
+        done
+        echo "Waiting for firewall to open SSH port..."
+        sleep 3
         sudo chown -R root:root ./publish/
         LOCAL_PATH=./publish/$LATEST_VERSION
         REMOTE_PATH=${{ secrets.SSH_DIRECTORY }}
@@ -763,7 +789,7 @@ jobs:
 
     - name: Create Release tag ${{ env.LATEST_VERSION }} ${{ env.ARCH }}
       if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@v3
       with:
         name: "RouterOS ${{ env.LATEST_VERSION }} ${{ env.ARCH }}"
         body_path: "CHANGELOG"
@@ -780,7 +806,7 @@ jobs:
           
     - name: Upload Files as Artifact (No Release)
       if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'false'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: mikrotik-${{ env.LATEST_VERSION }}${{ env.ARCH }}
         path: |

README.md

@@ -3,7 +3,6 @@
 
 ### 感谢赞助
 [![DigitalOcean Referral Badge](https://web-platforms.sfo2.cdn.digitaloceanspaces.com/WWW/Badge%201.svg)](https://www.digitalocean.com/?refcode=dbf6ed365068&utm_campaign=Referral_Invite&utm_medium=Referral_Program&utm_source=badge)
-
 [DartNode(aff)](https://dartnode.com?aff=SnazzyLobster067)  | [ZMTO(aff)](https://console.zmto.com/?affid=1588) | [Vultr(aff)](https://www.vultr.com/?ref=9807160-9J)
 
 # MikroTik RouterOS Patch  [[English](README_EN.md)]
@@ -63,7 +62,7 @@ graph TD
 ### patch.py
     替换公钥并签名
     
-## 所有的修补操作都自动运行在[Github Action](https://github.com/elseif/MikroTikPatch/blob/main/.github/workflows/)。
+[![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source")
 
 
 

index.html

@@ -274,6 +274,14 @@
                         <span class="iconify text-xl transition-transform duration-300 group-hover:rotate-12" data-icon="ph:github-logo-bold"></span>
                         <span class="font-semibold text-sm">GitHub</span>
                     </a>
+
+                    <!-- Telegram Keyget Bot link -->
+                    <a href="https://t.me/ROS_Keygen_Bot" target="_blank" 
+                       class="group flex items-center gap-3 px-6 py-3 rounded-xl bg-gradient-to-r from-blue-500 to-blue-600 hover:from-blue-600 hover:to-blue-700 text-white shadow-md hover:shadow-lg transition-all duration-300 hover:scale-105">
+                        <span class="iconify text-xl transition-transform duration-300 group-hover:rotate-12" data-icon="ph:telegram-logo-bold"></span>
+                        <span class="font-semibold text-sm">Keygen Bot</span>
+                    </a>
+                    
                 </div>
             </div>
         </footer>

patch.py

@@ -321,46 +321,79 @@ def patch_loader(loader_file):
         print("loader module import failed. cannot run patch_loader.py")
         
 def patch_squashfs(path,key_dict):
+    url_replacements = {
+        os.environ.get('MIKRO_LICENCE_URL', '').encode(): os.environ.get('CUSTOM_LICENCE_URL', '').encode(),
+        os.environ.get('MIKRO_UPGRADE_URL', '').encode(): os.environ.get('CUSTOM_UPGRADE_URL', '').encode(),
+        os.environ.get('MIKRO_CLOUD_URL', '').encode(): os.environ.get('CUSTOM_CLOUD_URL', '').encode(),
+        os.environ.get('MIKRO_CLOUD_PUBLIC_KEY', '').encode(): os.environ.get('CUSTOM_CLOUD_PUBLIC_KEY', '').encode(),
+    }
+    url_replacements = {k: v for k, v in url_replacements.items() if k and v}
+    renew_replacements = {
+        os.environ.get('MIKRO_RENEW_URL', '').encode(): os.environ.get('CUSTOM_RENEW_URL', '').encode(),
+    }
+    renew_replacements = {k: v for k, v in renew_replacements.items() if k and v}
+
     for root, dirs, files in os.walk(path):
-        for _file in files:
-            file = os.path.join(root,_file)
-            if os.path.isfile(file):
-                if _file =='loader':
-                    patch_loader(file)
-                    continue
-                if _file =='BOOTX64.EFI':
-                    print(f'patch {file} ...')
-                    data = open(file,'rb').read()
-                    data = patch_kernel(data,key_dict)
-                    open(file,'wb').write(data)
-                    continue
-                data = open(file,'rb').read()
+        if 'mode' in files and 'keyman' in files:
+            for file_path in [os.path.join(root, 'mode'),os.path.join(root, 'keyman')]:
+                with open(file_path, 'rb') as f:
+                    data = f.read()
+                modified = False
                 for old_public_key,new_public_key in key_dict.items():
-                    _data = replace_key(old_public_key,new_public_key,data,file)
-                    if _data != data:
-                        open(file,'wb').write(_data)
-                url_dict = {
-                    os.environ['MIKRO_LICENCE_URL'].encode():os.environ['CUSTOM_LICENCE_URL'].encode(),
-                    os.environ['MIKRO_UPGRADE_URL'].encode():os.environ['CUSTOM_UPGRADE_URL'].encode(),
-                    os.environ['MIKRO_CLOUD_URL'].encode():os.environ['CUSTOM_CLOUD_URL'].encode(),
-                    os.environ['MIKRO_CLOUD_PUBLIC_KEY'].encode():os.environ['CUSTOM_CLOUD_PUBLIC_KEY'].encode(),
-                }
-                data = open(file,'rb').read()
-                for old_url,new_url in url_dict.items():
+                    new_data  = replace_key(old_public_key,new_public_key,data,file_path)
+                    if new_data != data:
+                        data = new_data
+                        modified = True
+                assert modified, f'{file_path} key not patched'
+                with open(f'{file_path}_', 'wb') as f:
+                    f.write(data)
+        if 'loader' in files and os.path.isfile(os.path.join(root, 'loader')):
+            loader_file = os.path.join(root, 'loader')
+            patch_loader(loader_file)
+
+        if 'BOOTX64.EFI' in files and os.path.isfile(os.path.join(root, 'BOOTX64.EFI')):
+            efi_file = os.path.join(root, 'BOOTX64.EFI')
+            with open(efi_file, 'rb') as f:
+                data = f.read()
+            new_data = patch_kernel(data,key_dict)
+            assert new_data != data, f'{file_path} key not patched'
+            with open(efi_file, 'wb') as f:
+                f.write(new_data)
+
+
+        for filename in files:
+            if filename in ['mode','keyman','loader','BOOTX64.EFI']:
+                continue
+            file_path  = os.path.join(root,filename)
+            if not os.path.isfile(file_path):
+                continue
+  
+            modified = False
+            with open(file_path, 'rb') as f:
+                data = f.read()
+
+            for old_public_key,new_public_key in key_dict.items():
+                new_data  = replace_key(old_public_key,new_public_key,data,file_path)
+                if new_data != data:
+                    data = new_data
+                    modified = True
+
+            for old_url,new_url in url_replacements.items():
+                if old_url in data:
+                    print(f'{file_path} url patched {old_url.decode()[:7]}...')
+                    data = data.replace(old_url,new_url)
+                    modified = True
+                    
+            if filename == 'licupgr':
+                for old_url,new_url in renew_replacements.items():
                     if old_url in data:
-                        print(f'{file} url patched {old_url.decode()[:7]}...')
+                        print(f'{file_path} url patched {old_url.decode()[:7]}...')
                         data = data.replace(old_url,new_url)
-                        open(file,'wb').write(data)
-                        
-                if os.path.split(file)[1] == 'licupgr':
-                    url_dict = {
-                        os.environ['MIKRO_RENEW_URL'].encode():os.environ['CUSTOM_RENEW_URL'].encode(),
-                    }
-                    for old_url,new_url in url_dict.items():
-                        if old_url in data:
-                            print(f'{file} url patched {old_url.decode()[:7]}...')
-                            data = data.replace(old_url,new_url)
-                            open(file,'wb').write(data)
+                        modified = True
+
+            if modified:
+                with open(file_path, 'wb') as f:
+                    f.write(data)
                     
 def run_shell_command(command):
     process = subprocess.run(command, shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)