Merge pull request #1 from grizmin/debian-trixie

Debian trixie

README.md

@@ -43,7 +43,7 @@ To build new image you should follow the steps below:
 1. checkout pi-gen  
     ``` git clone https://github.com/RPi-Distro/pi-gen.git pmbuild ```
 2. copy the content of pi-pm3 folder to pmbuild  
-    ``` cp -rp pi-gen pmbuild/ ```
+    ``` cp -rp pi-gen/* pmbuild/ ```
 3. Checkout the arm64 branch of pi-gen  
     ``` cd pmbuild; git checkout arm64 ```
 4. make sure you have a docker server running (or any of it's alternatives https://spacelift.io/blog/docker-alternatives)
@@ -52,3 +52,9 @@ To build new image you should follow the steps below:
 
 On a successful build you should get something like the screenshot blow:
         ![build](images/build.jpg)
+
+
+# CHANGELOG
+
+* v1.1.0
+    - Updated dependencies for debain Trixie.

pi-gen/config

@@ -1,6 +1,6 @@
 IMG_NAME="Proxmark3"
 USE_QCOW2=0
-RELEASE="bookworm"
+RELEASE="trixie"
 DEPLOY_ZIP=1
 USE_QEMU=0
 LOCALE_DEFAULT="en_US.UTF-8"

pi-gen/pm3.config

@@ -1,6 +1,6 @@
 IMG_NAME="Proxmark3"
 USE_QCOW2=0
-RELEASE="bookworm"
+RELEASE="trixie"
 DEPLOY_ZIP=1
 USE_QEMU=0
 LOCALE_DEFAULT="en_US.UTF-8"

pi-gen/stageDTPM3/00-install-packages/00-packages-nr

@@ -17,7 +17,7 @@ lighttpd
 iptables-persistent
 vnstat
 qrencode
-php8.2-cgi
+php8.4-cgi
 openvpn
 wireguard
 jq

pi-gen/stageDTPM3/02-Wireless-AP/00-run-chroot.sh

@@ -63,8 +63,8 @@ systemctl disable systemd-networkd
 cp config/raspap-bridge-br0.netdev /etc/systemd/network/raspap-bridge-br0.netdev
 cp config/raspap-br0-member-eth0.network /etc/systemd/network/raspap-br0-member-eth0.network 
 
-sed -i -E 's/^session\.cookie_httponly\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/session.cookie_httponly = 1/' /etc/php/8.2/cgi/php.ini
-sed -i -E 's/^;?opcache\.enable\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/opcache.enable = 1/' /etc/php/8.2/cgi/php.ini
+sed -i -E 's/^session\.cookie_httponly\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/session.cookie_httponly = 1/' /etc/php/8.4/cgi/php.ini
+sed -i -E 's/^;?opcache\.enable\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/opcache.enable = 1/' /etc/php/8.4/cgi/php.ini
 phpenmod opcache
 
 echo "net.ipv4.ip_forward=1" | tee /etc/sysctl.d/90_raspap.conf > /dev/null