Merge pull request #48 from hlst2/main

Main

.github/workflows/ci.yml

@@ -57,7 +57,7 @@ jobs:
         run: |
           mkdir package-output
           rsync -av sdk/"${SDK_FILENAME%.tar.xz}"/bin/packages/mips_24kc/base/"${{ env.owrt-package }}"*.ipk package-output/
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.generate-name.outputs.artifact-name }}
           path: package-output/

Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=blue-merle
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.4
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_MAINTAINER:=Matthias <matthias@srlabs.de>
@@ -44,7 +44,7 @@ define Package/blue-merle/preinst
 		if [ -f "/tmp/sysinfo/model" ] && [ -f "/etc/glversion" ]; then
 			echo "You have a `cat /tmp/sysinfo/model`, running firmware version `cat /etc/glversion`."
 		fi
-		echo "blue-merle has only been tested with GL-E750 Mudi Version 4.3.8."
+		echo "blue-merle has only been tested with GL-E750 Mudi Versions up to 4.3.19"
 		echo "The device or firmware version you are using have not been verified to work with blue-merle."
 		echo -n "Would you like to continue on your own risk? (y/N): "
 		read answer
@@ -63,11 +63,11 @@ define Package/blue-merle/preinst
 	if grep -q "GL.iNet GL-E750" /proc/cpuinfo; then
 	    GL_VERSION=$$(cat /etc/glversion)
 	    case $$GL_VERSION in
-	        4.3.8)
-	            echo Version $$GL_VERSION is supported
-	            exit 0
-	            ;;
-	        4.*)
+		4.3.19)
+		    echo Version $$GL_VERSION is supported
+		    exit 0
+		    ;;
+		4.*)
 	            echo Version $$GL_VERSION is *probably* supported
 	            ABORT_GLVERSION
 	            ;;

README.md

@@ -11,14 +11,14 @@ The *blue-merle* software package enhances anonymity and reduces forensic tracea
 
 ## Compatibility
 
-**This README covers the v2.0 release**, which has been verified to work with GL-E750 Mudi version 4.3.8.
+**This README covers the v2.0 release**, which has been verified to work with GL-E750 Mudi version 4.3.8 - 4.3.12 .
 Refer back to the [v1.0 README file](https://github.com/srlabs/blue-merle/tree/cb4d73731fe432e0f101284307101c250ca4b845) for information about the first release, which works on older firmware releases.
 
 A MCU version >= 1.0.7 is required. The MCU may be updated through the *blue-merle* package installer or [manually](https://github.com/gl-inet/GL-E750-MCU-instruction). SRLabs cannot guarantee that the project assets within this Git repository will be compatible with future firmware updates.
 
 ## Installation
 
-### Online install
+### Online install & upgrade
 
 The online install method requires an **active Internet connection** on your Mudi device to **download up-to-date dependencies**.
 
@@ -28,6 +28,10 @@ Download the [prebuilt v2.0 release package](https://github.com/srlabs/blue-merl
 opkg update
 opkg install blue-merle*.ipk
 ```
+To uprade blue-merle, download the newest blue-merle*.ipk, copy it to your Mudi and reinstall with:
+```sh
+opkg install --force-reinstall blue-merle*.ipk
+```
 
 ### Offline install
 

files/lib/blue-merle/imei_generate.py

@@ -6,6 +6,7 @@ import serial
 import re
 from functools import reduce
 from enum import Enum
+from tacs import tacs
 
 
 class Modes(Enum):
@@ -29,11 +30,11 @@ modes.add_argument("-r", "--random", help="Sets random IMEI",
 # Example IMEI: 490154203237518
 imei_length = 14  # without validation digit
 # IDEA: make prefix configurable via CLI option
-imei_prefix = ["35674108", "35290611", "35397710", "35323210", "35384110",
-               "35982748", "35672011", "35759049", "35266891", "35407115",
-               "35538025", "35480910", "35324590", "35901183", "35139729",
-               "35479164"]
-
+# imei_prefix = ["35674108", "35290611", "35397710", "35323210", "35384110",
+#                "35982748", "35672011", "35759049", "35266891", "35407115",
+#                "35538025", "35480910", "35324590", "35901183", "35139729",
+#                "35479164"]
+imei_prefix = tacs
 verbose = False
 mode = None
 

files/usr/bin/blue-merle-switch-stage2

@@ -34,19 +34,24 @@ sleep 1
 new_imsi=$(READ_IMSI)
 
 if [[ "$old_imsi" == "$new_imsi" ]]; then
-	mcu_send_message "WARNING:        Old IMSI equals new IMSI."
+	mcu_send_message "WARNING:        Old IMSI equals new IMSI. Did you swap the SIM?"
 	sleep 3
 fi
-
+old_imei=$(READ_IMEI)
 mcu_send_message "Setting random   IMEI"
 timeout 15 python3 /lib/blue-merle/imei_generate.py -r
 
 new_imei=$(READ_IMEI)
 
+
 if [[ "$old_imei" == "$new_imei" ]]; then
 	mcu_send_message "WARNING:        Old IMEI equals new IMEI."
 	sleep 3
 else
+	#FIXME old_imei is not the real old imei because in stage1 its already generated a new one
+	# so this is a bit missleading but for the prupose of visualy see the change it works
+	mcu_send_message  "IMEI Old:...... ${old_imei}IMEI New:...... ${new_imei}"
+	sleep 5
 	mkdir -p /tmp/modem.1-1.2
 	echo "$new_imei" > /tmp/modem.1-1.2/modem-imei
 fi