Release 6.2.4

joecupano · May 26, 2023 · 61cbbe2 · 61cbbe2
1 parent b9633a3
commit 61cbbe2
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # SIGpi
 
-RELEASE 6.2.3
+RELEASE 6.2.4
 
 ## Introduction
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## Release 6.2.4: 2023-05-26
+- Maintenance Release
+- SDRangel 7.14.1 Release
+
 ## Release 6.2.3: 2023-04-29
 - Maintenance Release
 - SDRangel 7.13.0 Release

diff --git a/SIGpi_installer.sh b/SIGpi_installer.sh
@@ -5,7 +5,7 @@
 ###
 
 ###
-###  REVISION: 20230129-2300
+###  REVISION: 20230526-0300
 ###
 
 ###
@@ -235,6 +235,8 @@ select_usefulapps() {
         "sigdigger" "SigDigger, free digital signal analyzer " OFF \
         "srsran" "srsRAN, Open-source 4G/5G software radio suite (amd64 only)" OFF \
         "uniradhack" "Universal Radio Hacker. Offline wireless protocol investigation" OFF \
+        "wireshark" "Network protocol analyzer" OFF \
+        "kismet" "Wireless sniffer and monitor " OFF \
         3>&1 1>&2 2>&3)
     RET=$?
     if [ $RET -eq 1 ]; then
@@ -644,11 +646,18 @@ if grep sigdigger "$SIGPI_INSTALLER"; then
 fi
 
 # Install Wireshark
-source $SIGPI_PACKAGES/pkg_wireshark install
+if grep wireshark "$SIGPI_INSTALLER"; then
+    source $SIGPI_PACKAGES/pkg_wireshark install
+fi
+
 # Install Kismet
-source $SIGPI_PACKAGES/pkg_kismet install
+if grep kismet "$SIGPI_INSTALLER"; then
+    source $SIGPI_PACKAGES/pkg_kismet install
+fi
+
 # Install Audacity
 source $SIGPI_PACKAGES/pkg_audacity install 
+
 # Install PAVU 
 source $SIGPI_PACKAGES/pkg_pavucontrol install
 
@@ -659,6 +668,7 @@ fi
 
 # Install DOSbox
 source $SIGPI_PACKAGES/pkg_dosbox install
+
 # Install SIGpi Menus
 source $SIGPI_SCRIPTS/install_desktop-post.sh
 

diff --git a/debs/sdrangel_7.11.0-1_amd64.deb → debs/sdrangel_7.14.1-1_amd64.deb b/debs/sdrangel_7.11.0-1_amd64.deb → debs/sdrangel_7.14.1-1_amd64.deb
diff --git a/debs/sdrangel_7.11.0-1_arm64.deb → debs/sdrangel_7.14.1-1_arm64.deb b/debs/sdrangel_7.11.0-1_arm64.deb → debs/sdrangel_7.14.1-1_arm64.deb
diff --git a/packages/pkg_sdrangel b/packages/pkg_sdrangel
@@ -120,16 +120,17 @@ case "$1" in
         sudo apt-get install -y libqt5serialport5-dev
         sudo apt-get install -y libqt5positioning5
         sudo apt-get install -y libqt5positioning5-plugins
+        sudo apt-get install -y libqt5gamepad5-dev
 
         cd $SIGPI_PACKAGES        
         if [[ "$SIGPI_HWARCH" == "x86_64" ]]; then
 	        cd $SIGPI_DEBS
-	        sudo dpkg -i sdrangel_7.13.0-1_amd64.deb
+	        sudo dpkg -i sdrangel_7.14.0-1_amd64.deb
         fi
 
         if [[ "$SIGPI_HWARCH" == "aarch64" ]]; then
 	        cd $SIGPI_DEBS
-	        sudo dpkg -i sdrangel_7.13.0-1_arm64.deb
+	        sudo dpkg -i sdrangel_7.14.0-1_arm64.deb
         fi
         echo "sdrangel" >> $SIGPI_CONFIG 
 
@@ -213,15 +214,16 @@ case "$1" in
         sudo apt-get install -y libqt5serialport5-dev
         sudo apt-get install -y libqt5positioning5
         sudo apt-get install -y libqt5positioning5-plugins
-
+        sudo apt-get install -y libqt5gamepad5-dev
+
         cd $SIGPI_SOURCE
-        git clone https://github.com/f4exbfftwf-wisdom -v -n -o fftw-wisdom 128 256 512 1024 2048 4096 8192 16384 32768
-/sdrangel.git
+        git clone https://github.com/f4exb/sdrangel.git
         cd sdrangel
         #git reset --hard d67aac3  # v7.11.0
         #git reset --hard cf0489d  # v7.12.0
-        git reset --hard 3f9f81c  # v7.13.0
-        mkdir build; cd build
+        #git reset --hard 3f9f81c  # v7.13.0
+        git reset --hard b12e282   # v7.14.1
+        mkdir build && cd build
         cmake -Wno-dev ..
         make -j4
         sudo checkinstall --install=no

diff --git a/packages/pkg_sdrangelsrv b/packages/pkg_sdrangelsrv
@@ -152,7 +152,7 @@ case "$1" in
         git clone https://github.com/f4exb/sdrangel.git
         cd sdrangel
         git reset --hard d67aac3  # v7.11.0
-        mkdir build; cd build
+        mkdir build && cd build
         cmake .. -Wno-dev -DBUILD_GUI=off
         make -j4
         sudo checkinstall --install=no

diff --git a/scripts/scr_install-srv_welcome.txt b/scripts/scr_install-srv_welcome.txt
@@ -1,9 +1,9 @@
-   _____ __________      _    _____  ___    _____
-  / ___//  _/ ____/___  (_)  / ___/ |__ \  |__  /
-  \__ \ / // / __/ __ \/ /  / __ \  __/ /   /_ < 
- ___/ // // /_/ / /_/ / /  / /_/ / / __/_ ___/ / 
-/____/___/\____/ .___/_/   \____(_)____(_)____/  
-              /_/                                                                                                                       
+   _____ __________      _    _____  ___   __ __
+  / ___//  _/ ____/___  (_)  / ___/ |__ \ / // /
+  \__ \ / // / __/ __ \/ /  / __ \  __/ // // /_
+ ___/ // // /_/ / /_/ / /  / /_/ / / __//__  __/
+/____/___/\____/ .___/_/   \____(_)____(_)/_/   
+              /_/                                                                                                                                                    
 
 Welcome to SIGpi Node
 

diff --git a/scripts/scr_install_welcome.txt b/scripts/scr_install_welcome.txt
@@ -1,10 +1,10 @@
-   _____ __________      _    _____  ___    _____
-  / ___//  _/ ____/___  (_)  / ___/ |__ \  |__  /
-  \__ \ / // / __/ __ \/ /  / __ \  __/ /   /_ < 
- ___/ // // /_/ / /_/ / /  / /_/ / / __/_ ___/ / 
-/____/___/\____/ .___/_/   \____(_)____(_)____/  
-              /_/                                
-                                                                                        
+   _____ __________      _    _____  ___   __ __
+  / ___//  _/ ____/___  (_)  / ___/ |__ \ / // /
+  \__ \ / // / __/ __ \/ /  / __ \  __/ // // /_
+ ___/ // // /_/ / /_/ / /  / /_/ / / __//__  __/
+/____/___/\____/ .___/_/   \____(_)____(_)/_/   
+              /_/                                                                                                
+
 Welcome to SIGpi
 
 This script installs drivers and applications for signals intelligence (SIGINT)