From 41c0bccb1b1b49689d1804f20a2f7433e38a9e14 Mon Sep 17 00:00:00 2001 From: Joseph Prochazka Date: Fri, 18 Oct 2024 09:11:46 -0400 Subject: [PATCH 1/6] Custom tcl-tls now installed on Bullseye. --- bash/feeders/piaware.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/bash/feeders/piaware.sh b/bash/feeders/piaware.sh index 4fe9b9d4..0017acc1 100755 --- a/bash/feeders/piaware.sh +++ b/bash/feeders/piaware.sh @@ -3,7 +3,7 @@ # THE FLIGHTAWARE PIAWARE CLIENT SETUP SCRIPT # JPROCHAZKA/PIAWARE_BUILDER REPOSITORY -# ----------------------------------------------------------------------------------- +# ------------------------------------------------------------------------------------- # I submitted a fix to support Debian Trixie and Ubuntu Noble Numbat to FlightAware's # piaware_builder repository. Until the changes are merged into their Git reposiory # the installation will be done using the fork I created along with the branch which @@ -12,13 +12,11 @@ # https://github.com/flightaware/piaware_builder/pull/26 # TCLTLS-REBUILD -# ----------------------------------------------------------------------------------- +# ------------------------------------------------------------------------------------- # Along with PiAware, a version of tcltls maintained by FlightAware can be installed. -# This package is only needed for Debian Buster and possibly Ubuntu Focal Fossa. Once -# these releases pass their end of life date the scripting will be removed. +# This package is only needed for any distribution utilizing tcl-tls 1.7.22-2 or older. # -# Debian Buster's end of life occured June 30, 2024 and is no longer supported. -# Ubuntu Focal Fossa's end of life is scheduled for April 2025. +# This fix may need to remain in place until Debian Bullseye hits end of life. ## PRE INSTALLATION OPERATIONS @@ -90,7 +88,7 @@ fi ## CLONE OR PULL THE TCLTLS REBUILD GIT REPOSITORY -if [[ "${RECEIVER_OS_CODE_NAME}" == "focal" ]]; then +if [[ "${RECEIVER_OS_CODE_NAME}" == "focal" || "${RECEIVER_OS_CODE_NAME}" == "bullseye" ]]; then log_heading "Preparing the FlightAware tcltls-rebuild Git repository" From ade793fe4db2a3768929f04b511c50896b246850 Mon Sep 17 00:00:00 2001 From: Joseph Prochazka Date: Fri, 18 Oct 2024 09:29:52 -0400 Subject: [PATCH 2/6] Added Bullseye tcl-tls change. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 572ee965..e47c8c67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ The following is a history of the changes made to this project. +## v2.8.8 *(August 23rd)* + +* FlightAware's version of the tcl-tls is now built and installed on Bullseye. + ## v2.8.7 *(August 23rd)* * The ability to install dumpvdl2 is now available as a decoder option. From eaae395f0cfa3b8c2d52d26f74dc203740b6cc5f Mon Sep 17 00:00:00 2001 From: Joseph Prochazka Date: Fri, 18 Oct 2024 09:30:21 -0400 Subject: [PATCH 3/6] Updated date. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e47c8c67..3a3fbd7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ The following is a history of the changes made to this project. -## v2.8.8 *(August 23rd)* +## v2.8.8 *(next release)* * FlightAware's version of the tcl-tls is now built and installed on Bullseye. From be156e8c3ed350684c0cabe11b5495eaa02b047c Mon Sep 17 00:00:00 2001 From: Joseph Prochazka Date: Fri, 18 Oct 2024 15:43:04 -0400 Subject: [PATCH 4/6] Clone specific branch. --- bash/feeders/piaware.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bash/feeders/piaware.sh b/bash/feeders/piaware.sh index 0017acc1..964b4ddf 100755 --- a/bash/feeders/piaware.sh +++ b/bash/feeders/piaware.sh @@ -178,7 +178,7 @@ else # --- START TEMPORARY NOBLE FIX --- if [[ "${RECEIVER_OS_CODE_NAME}" == "noble" ]]; then - git clone https://github.com/jprochazka/piaware_builder.git 2>&1 | tee -a $RECEIVER_LOG_FILE + git clone -b trixie https://github.com/jprochazka/piaware_builder.git 2>&1 | tee -a $RECEIVER_LOG_FILE else git clone https://github.com/flightaware/piaware_builder.git 2>&1 | tee -a $RECEIVER_LOG_FILE fi @@ -195,12 +195,6 @@ log_heading "Beginning the FlightAware PiAware installation process" log_message "Entering the piaware_builder git repository directory" cd $RECEIVER_BUILD_DIRECTORY/piaware_builder -# --- START TEMPORARY NOBLE FIX --- -if [[ "${RECEIVER_OS_CODE_NAME}" == "noble" ]]; then - git checkout trixie -fi -# --- END TEMPORARY NOBLE FIX --- - log_message "Determining which piaware_builder build strategy should be use" distro="bookworm" case $RECEIVER_OS_CODE_NAME in From 7428824766c80103da3873bff020da10ba93d876 Mon Sep 17 00:00:00 2001 From: Joseph Prochazka Date: Fri, 18 Oct 2024 15:45:00 -0400 Subject: [PATCH 5/6] Added trixie branch note. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a3fbd7d..642486ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,9 @@ The following is a history of the changes made to this project. ## v2.8.8 *(next release)* * FlightAware's version of the tcl-tls is now built and installed on Bullseye. +* Clones athe trixie branch directly when using the forked version of piaware_builder. -## v2.8.7 *(August 23rd)* +## v2.8.7 *(August 23rd, 2024)* * The ability to install dumpvdl2 is now available as a decoder option. * The ability to install vdlm2dec is now available as a decoder option. From f869054b8fdf7a6291ab21c360c0d4b0553633eb Mon Sep 17 00:00:00 2001 From: jprochazka Date: Fri, 18 Oct 2024 20:15:00 -0400 Subject: [PATCH 6/6] Bumped version to 2.8.8 --- CHANGELOG.md | 5 +-- CREDITS.md | 3 +- README.md | 4 +-- build/portal/html/classes/template.class.php | 2 +- build/portal/html/install/index.php | 2 +- build/portal/html/install/upgrade-v2.8.8.php | 38 ++++++++++++++++++++ build/portal/html/install/upgrade.php | 20 ++++++++++- install.sh | 2 +- 8 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 build/portal/html/install/upgrade-v2.8.8.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 642486ba..32b19120 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ The following is a history of the changes made to this project. -## v2.8.8 *(next release)* +## v2.8.8 *(October 18th, 2024)* * FlightAware's version of the tcl-tls is now built and installed on Bullseye. -* Clones athe trixie branch directly when using the forked version of piaware_builder. +* Clones the trixie branch directly when using the forked version of piaware_builder. +* The portal upgrade path to v2.8.7 was missing. ## v2.8.7 *(August 23rd, 2024)* diff --git a/CREDITS.md b/CREDITS.md index ce1d598b..c3edc783 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -3,7 +3,8 @@ ## Collaborators and Contributors First and foremost I would like to thank the collaborators and contributors who have contributed to -the project directly. Their time and effort is greatly appreciated by myself as well as many others. +the project directly through code contributions made directly to the repository. Their time and effort +is greatly appreciated by myself as well as many others I am sure. * @adamkaplan * @atbPy diff --git a/README.md b/README.md index 5fc911dc..74d470b1 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ The project currently supports the following Linux distributions. * Debian _(Bookworm and Bullseye)_ * DietPi _(Bookworm and Bullseye)_ * Raspberry PI OS _(Bookworm and Bullseye)_ -* Ubuntu _(Jammy Jellyfish, Focal Fossa and Noble Numbat)_ +* Ubuntu _(Jammy Jellyfish, Focal Fossa and Noble Numbat*)_ Support is available via this repository through the use of the issue tracker or discussions. -_Please Note that Ubuntu Noble Numbat support employs an unofficial fix for PiAware._ +_* Please Note that Ubuntu Noble Numbat support employs an unofficial fix for PiAware._ diff --git a/build/portal/html/classes/template.class.php b/build/portal/html/classes/template.class.php index 172c9f33..7289a8d5 100644 --- a/build/portal/html/classes/template.class.php +++ b/build/portal/html/classes/template.class.php @@ -8,7 +8,7 @@ function display(&$pageData) { // Check if the portal is installed or needs upgraded. - $thisVersion = "2.8.7"; + $thisVersion = "2.8.8"; if (!file_exists($_SERVER['DOCUMENT_ROOT']."/classes/settings.class.php")) { header ("Location: /install/install.php"); diff --git a/build/portal/html/install/index.php b/build/portal/html/install/index.php index b01c29af..30ea58ca 100644 --- a/build/portal/html/install/index.php +++ b/build/portal/html/install/index.php @@ -1,6 +1,6 @@ updateSetting("version", "2.8.8"); + $common->updateSetting("patch", ""); + + // The upgrade process completed successfully + $results['success'] = TRUE; + $results['message'] = "Upgrade to v2.8.8 successful."; + return $results; + + } catch(Exception $e) { + // Something went wrong during this upgrade process + $results['success'] = FALSE; + $results['message'] = $e->getMessage(); + return $results; + } + } +?> + diff --git a/build/portal/html/install/upgrade.php b/build/portal/html/install/upgrade.php index 56fe6de4..9cc35a78 100644 --- a/build/portal/html/install/upgrade.php +++ b/build/portal/html/install/upgrade.php @@ -4,7 +4,7 @@ $common = new common(); // The most current stable release. - $thisVersion = "2.8.7"; + $thisVersion = "2.8.8"; // Begin the upgrade process if this release is newer than what is installed. if ($common->getSetting("version") == $thisVersion) { @@ -211,6 +211,24 @@ $version = "2.8.6"; } + // UPGRADE TO V2.8.7 + if ($common->getSetting("version") == "2.8.6" && $success) { + $json = file_get_contents("http://localhost/install/upgrade-v2.8.7.php"); + $results = json_decode($json, TRUE); + $success = $results['success']; + $message = $results['message']; + $version = "2.8.7"; + } + + // UPGRADE TO V2.8.8 + if ($common->getSetting("version") == "2.8.7" && $success) { + $json = file_get_contents("http://localhost/install/upgrade-v2.8.8.php"); + $results = json_decode($json, TRUE); + $success = $results['success']; + $message = $results['message']; + $version = "2.8.8"; + } + require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."header.inc.php"); // Display the instalation wizard. diff --git a/install.sh b/install.sh index 8c68aebe..06d546d8 100755 --- a/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ ## ASSIGN VARIABLE -project_version="2.8.7" +project_version="2.8.8" printf -v date_time '%(%Y-%m-%d_%H-%M-%S)T' -1 log_file="adsb-installer_${date_time}.log"