From 2962957cd07a031e50e022782a2dfafa5eb438d6 Mon Sep 17 00:00:00 2001 From: zyb Date: Tue, 18 Jun 2024 17:22:20 +0800 Subject: [PATCH] modified: .github/workflows/mikrotik_patch.yml modified: README.md new file: README_CN.md --- .github/workflows/mikrotik_patch.yml | 158 ++------------------------- README.md | 2 + README_CN.md | 36 ++++++ 3 files changed, 46 insertions(+), 150 deletions(-) create mode 100644 README_CN.md diff --git a/.github/workflows/mikrotik_patch.yml b/.github/workflows/mikrotik_patch.yml index e3e8fd1..ee7218d 100644 --- a/.github/workflows/mikrotik_patch.yml +++ b/.github/workflows/mikrotik_patch.yml @@ -49,13 +49,16 @@ jobs: name: squashfs path: ./*.sfs - Patch_Latest_Stable_RouterOS: + Patch_Latest_RouterOS: runs-on: ubuntu-latest needs: Create_SquashFS + strategy: + matrix: + channel: [stable, testing] env: TZ: 'Asia/Shanghai' - LATEST_VERSION_URL: 'https://upgrade.mikrotik.com/routeros/NEWESTa7.stable' - LATEST_VERSION: "7.15" + LATEST_VERSION_URL: 'https://upgrade.mikrotik.com/routeros/NEWESTa7.' + LATEST_VERSION: "" CUSTOM_LICENSE_PRIVATE_KEY: ${{ secrets.CUSTOM_LICENSE_PRIVATE_KEY }} CUSTOM_LICENSE_PUBLIC_KEY: ${{ secrets.CUSTOM_LICENSE_PUBLIC_KEY }} CUSTOM_NPK_SIGN_PRIVATE_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PRIVATE_KEY }} @@ -76,10 +79,10 @@ jobs: with: name: squashfs - - name: Get latest routeros stable version + - name: Get latest routeros version run: | echo $(uname -a) - LATEST_VERSION=$(wget -nv -O - $LATEST_VERSION_URL | cut -d ' ' -f1) + LATEST_VERSION=$(wget -nv -O - $LATEST_VERSION_URL${{ matrix.channel }} | cut -d ' ' -f1) echo Latest Stabel Version:$LATEST_VERSION echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV @@ -187,151 +190,6 @@ jobs: name: "MikroTik ${{ env.LATEST_VERSION }}" body: "MikroTik ${{ env.LATEST_VERSION }}" tag_name: ${{ env.LATEST_VERSION }} - make_latest: "true" - files: | - mikrotik-${{ env.LATEST_VERSION }}.iso - install-image-${{ env.LATEST_VERSION }}.zip - netinstall-${{ env.LATEST_VERSION }}.zip - - Patch_Latest_Testing_RouterOS: - runs-on: ubuntu-latest - needs: Create_SquashFS - env: - TZ: 'Asia/Shanghai' - LATEST_VERSION_URL: 'https://upgrade.mikrotik.com/routeros/NEWESTa7.testing' - LATEST_VERSION: "7.15" - CUSTOM_LICENSE_PRIVATE_KEY: ${{ secrets.CUSTOM_LICENSE_PRIVATE_KEY }} - CUSTOM_LICENSE_PUBLIC_KEY: ${{ secrets.CUSTOM_LICENSE_PUBLIC_KEY }} - CUSTOM_NPK_SIGN_PRIVATE_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PRIVATE_KEY }} - CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }} - MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} - MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }} - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: Download Artifact - uses: actions/download-artifact@v4 - with: - name: squashfs - - - name: Get latest routeros stable version - run: | - echo $(uname -a) - LATEST_VERSION=$(wget -nv -O - $LATEST_VERSION_URL | cut -d ' ' -f1) - echo Latest Stabel Version:$LATEST_VERSION - echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV - - - name: Get netinstall-${{ env.LATEST_VERSION }}.zip - run: | - sudo wget -nv -O netinstall-$LATEST_VERSION.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/netinstall-$LATEST_VERSION.zip - sudo unzip netinstall-$LATEST_VERSION.zip - - name: Patch netinstall.exe - run: | - sudo -E python3 patch.py netinstall netinstall.exe - sudo zip netinstall-$LATEST_VERSION.zip ./netinstall.exe - - - - name: Get mikrotik-${{ env.LATEST_VERSION }}.iso - run: | - sudo wget -nv -O mikrotik-$LATEST_VERSION.iso https://download.mikrotik.com/routeros/$LATEST_VERSION/mikrotik-$LATEST_VERSION.iso - - - name: Patch mikrotik-${{ env.LATEST_VERSION }}.iso - run: | - sudo apt-get install -y mkisofs > /dev/null - sudo mkdir ./iso - sudo mount -o loop,ro mikrotik-$LATEST_VERSION.iso ./iso - sudo mkdir ./new_iso - sudo cp -r ./iso/* ./new_iso/ - sudo rsync -a ./iso/ ./new_iso/ - sudo umount ./iso - sudo rm -rf ./iso - sudo rm -f mikrotik-$LATEST_VERSION.iso - sudo mv ./new_iso/routeros-$LATEST_VERSION.npk ./ - sudo -E python3 patch.py npk routeros-$LATEST_VERSION.npk - sudo cp keygen.zip ./new_iso/ - NPK_FILES=$(find ./new_iso/*.npk) - for file in $NPK_FILES; do - sudo -E python3 npk.py sign $file $file - done - sudo cp routeros-$LATEST_VERSION.npk ./new_iso/ - sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION.npk ./option-$LATEST_VERSION.npk option ./option.sfs -desc="busybox and ash" - sudo cp option-$LATEST_VERSION.npk ./new_iso/ - sudo -E python3 npk.py create ./new_iso/gps-$LATEST_VERSION.npk ./python3-$LATEST_VERSION.npk python3 ./python3.sfs -desc="python 3.11.9" - sudo cp python3-$LATEST_VERSION.npk ./new_iso/ - sudo cp linux ./new_iso/isolinux/ - sudo mkdir ./efiboot - sudo mount -o loop ./new_iso/efiboot.img ./efiboot - sudo cp linux ./efiboot/linux.x86_64 - sudo umount ./efiboot - sudo rm -rf ./efiboot - sudo mkisofs -o mikrotik-$LATEST_VERSION.iso \ - -V "MikroTik $LATEST_VERSION Patched" \ - -sysid "" -preparer "MiKroTiK" \ - -publisher "" -A "MiKroTiK RouterOS" \ - -b isolinux/isolinux.bin \ - -c isolinux/boot.cat \ - -no-emul-boot \ - -boot-load-size 4 \ - -boot-info-table \ - -eltorito-alt-boot \ - -e efiboot.img \ - -no-emul-boot \ - -R \ - ./new_iso - sudo rm -rf ./new_iso - - - name: Get install-image-${{ env.LATEST_VERSION }}.img - run: | - sudo wget -nv -O install-image-$LATEST_VERSION.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/install-image-$LATEST_VERSION.zip - - - name: Patch install-image-${{ env.LATEST_VERSION }}.img - run: | - sudo unzip install-image-$LATEST_VERSION.zip - sudo mkdir ./install - sudo mount -o loop install-image-$LATEST_VERSION.img ./install - sudo rm install-image-$LATEST_VERSION.zip - sudo rm ./install/1.npk - NPK_FILES=$(find ./install/*.npk) - for file in $NPK_FILES; do - sudo -E python3 npk.py sign $file $file - done - sudo cp routeros-$LATEST_VERSION.npk ./install/1.npk - sudo cp keygen.zip ./install/ - sudo cp option-$LATEST_VERSION.npk ./install/100.npk - sudo cp python3-$LATEST_VERSION.npk ./install/101.npk - sudo cp linux ./install/ - sudo umount ./install - sudo rm -rf ./install - sudo zip install-image-$LATEST_VERSION.zip ./install-image-$LATEST_VERSION.img - - - name: Delete Release tag ${{ env.LATEST_VERSION }} - run: | - HEADER="Authorization: token ${{ secrets.GITHUB_TOKEN }}" - RELEASE_INFO=$(curl -s -H $HEADER https://api.github.com/repos/${{ github.repository }}/releases/tags/$LATEST_VERSION) - RELEASE_ID=$(echo $RELEASE_INFO | jq -r '.id') - echo "Release ID: $RELEASE_ID" - if [ "$RELEASE_ID" != "null" ]; then - curl -X DELETE -H "$HEADER" https://api.github.com/repos/${{ github.repository }}/git/refs/tags/$LATEST_VERSION - echo "Tag $LATEST_VERSION deleted successfully." - curl -X DELETE -H "$HEADER" https://api.github.com/repos/${{ github.repository }}/releases/$RELEASE_ID - echo "Release with tag $LATEST_VERSION deleted successfully." - else - echo "Release not found for tag: $LATEST_VERSION)" - fi - - - name: Create Release tag ${{ env.LATEST_VERSION }} - uses: softprops/action-gh-release@v2 - with: - name: "MikroTik ${{ env.LATEST_VERSION }}" - body: "MikroTik ${{ env.LATEST_VERSION }}" - tag_name: ${{ env.LATEST_VERSION }} - make_latest: "false" files: | mikrotik-${{ env.LATEST_VERSION }}.iso install-image-${{ env.LATEST_VERSION }}.zip diff --git a/README.md b/README.md index 9701d6b..a3c9dc1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Patch MikroTik RouterOS +## [中文](README_CN.md) + ### Download [Latest Patched](https://github.com/elseif/MikroTikPatch/releases/latest) iso file,install it and enjoy. ![](install.png) diff --git a/README_CN.md b/README_CN.md new file mode 100644 index 0000000..478a57e --- /dev/null +++ b/README_CN.md @@ -0,0 +1,36 @@ +# Patch MikroTik RouterOS + +## [English](README.md) + +### 下载 [最新](https://github.com/elseif/MikroTikPatch/releases/latest) 的iso文件安装RouterOS. + +![](install.png) +![](routeros.png) + +### 使用ISO或IMG内的Keygen生成授权许可 +![](keygen.png) + +## 如何生成授权许可 + 解压缩 keygen.zip + 运行 keygen.exe software_id +## 如何使用Shell + 安装 option-{version}.npk 包 + telnet到RouterOS,用户名devel,密码与admin的密码相同 +## 如何使用Python + 安装 python3-{version}.npk 包 + telnet到RouterOS,用户名devel,密码与admin的密码相同 + 运行 python -V +### npk.py + 对npk文件进行解包，修改，创建，签名和验证 +### patch.py + 替换公钥并签名 +### netinstall.py + 替换 netinstallexe 中的bootloader的公钥，使通过网络安装时可以安装ISO文件内的npk文件 +### upgrade.py + 在RouterOS内增加静态域名解析，使升级时可以安装ISO文件内的npk文件 +## 所有的修补操作都在[github workflow](https://github.com/elseif/MikroTikPatch/blob/main/.github/workflows/mikrotik_patch.yml)中进行。 + + + + +