From 83dce1f79630857c2155244aafb9eacaa7ee761c Mon Sep 17 00:00:00 2001
From: Dennis Neufeld <Dennis14e@users.noreply.github.com>
Date: Thu, 23 May 2024 16:15:24 +0000
Subject: [PATCH] Alpine 3.20.0, fr24feed 1.0.48-0

---
 CHANGELOG.md   |  6 +++---
 Dockerfile     |  6 +++---
 dl-fr24feed.sh | 22 +++++++++++-----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f9568f..c1ba2cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Changed
-- Update Alpine from 3.14 to 3.17
-- Update fr24feed to 1.0.34-0
-- Check fr24feed md5sum on image build
+- Update Alpine from 3.14 to 3.20
+- Update fr24feed to 1.0.48-0
+- Check fr24feed sha1sum on image build
 
 ## [1.0.0] - 2021-11-24
 ### Changed
diff --git a/Dockerfile b/Dockerfile
index ed56773..235e827 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Builder
-FROM alpine:3.18.5 AS builder
+FROM alpine:3.20.0 AS builder
 
 # Workdir
 WORKDIR /app
@@ -13,10 +13,10 @@ RUN chmod +x /tmp/dl-fr24feed.sh && \
 
 
 # Release
-FROM alpine:3.18.5 AS release
+FROM alpine:3.20.0 AS release
 
 # Packages
-RUN apk add --no-cache bash sed libc6-compat libstdc++6
+RUN apk add --no-cache bash sed libstdc++
 
 # Workdir
 WORKDIR /usr/lib/fr24
diff --git a/dl-fr24feed.sh b/dl-fr24feed.sh
index f6cfec5..5b78e1f 100644
--- a/dl-fr24feed.sh
+++ b/dl-fr24feed.sh
@@ -2,18 +2,18 @@
 
 case `uname -m` in
     x86_64)
-        archive_url="https://repo-feed.flightradar24.com/linux_x86_64_binaries/fr24feed_1.0.34-0_amd64.tgz"
-        archive_md5="9a407411846eaf104946dac1355c723d"
+        archive_url="https://repo-feed.flightradar24.com/linux_binaries/fr24feed_1.0.48-0_amd64.tgz"
+        archive_sha1="3f5db150127d786b80b25b4eecd7aaf1c4d7e070"
         ;;
 
     i386|i686)
-        archive_url="https://repo-feed.flightradar24.com/linux_x86_binaries/fr24feed_1.0.34-0_i386.tgz"
-        archive_md5="68f74f624ec60d63016df554682aeb8e"
+        archive_url="https://repo-feed.flightradar24.com/linux_binaries/fr24feed_1.0.48-0_i386.tgz"
+        archive_sha1="87ac244a0adc20c3c8f387275655c519360f0c63"
         ;;
 
     armv6l|armv7l|aarch64)
-        archive_url="https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.34-0_armhf.tgz"
-        archive_md5="08dd87fca7eeede316932dbacc22a417"
+        archive_url="https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.48-0_arm64.tgz"
+        archive_sha1="7f41d7ed1ad157939c7dbf6f049093deba8b0763"
         ;;
 
     *)
@@ -29,15 +29,15 @@ then
     exit 1
 fi
 
-# Check md5
-calculated_md5=$(md5sum /tmp/fr24feed.tar.gz | cut -d " " -f1)
-if [ "$archive_md5" != "$calculated_md5" ]
+# Check sha1
+calculated_sha1=$(sha1sum /tmp/fr24feed.tar.gz | cut -d " " -f1)
+if [ "$archive_sha1" != "$calculated_sha1" ]
 then
-    >&2 echo "Verification failed ($archive_md5 != $calculated_md5)"
+    >&2 echo "Verification failed ($archive_sha1 != $calculated_sha1)"
     exit 1
 fi
 
-echo "Verification successful ($archive_md5 == $calculated_md5)"
+echo "Verification successful ($archive_sha1 == $calculated_sha1)"
 
 # Extract
 tar -xvzf /tmp/fr24feed.tar.gz --strip 1 -C /app