From 94a20e922a94d4a240608558c8079ba1f04c27d1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 26 Apr 2024 10:57:54 +0200
Subject: Updating.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 web/update | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'web/update')

diff --git a/web/update b/web/update
index 5eaaffe..e67906f 100755
--- a/web/update
+++ b/web/update
@@ -47,6 +47,7 @@ case "${MODE}" in
 	graograman)
 		UPSTREAM_DISTRIBUTIONS="bookworm bookworm-updates bookworm-proposed-updates"
 		DOWNSTREAM_DISTRIBUTION="graograman"
+		DOWNSTREAM_DISTRIBUTIONS="graograman graograman-security graograman-updates"
 		DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages"
 		DOWNSTREAM_TAG="progress"
 		;;
@@ -75,10 +76,10 @@ esac
 
 UPSTREAM_SECTIONS="main contrib non-free"
 UPSTREAM_MIRROR="http://debian.ethz.ch/debian"
+UPSTREAM_MIRROR_SECURITY="http://security.debian.org"
 
 DOWNSTREAM_SECTIONS="main contrib non-free"
 
-#ARCHITECTURES="amd64 armel armhf arm64 i386 all source"
 ARCHITECTURES="amd64 arm64 all source"
 
 Download_downstream_indices ()
@@ -92,9 +93,12 @@ Download_downstream_indices ()
 
 	if [ ! -e "downstream.${MODE}.sources" ]
 	then
-		for SECTION in ${DOWNSTREAM_SECTIONS}
+		for DISTRIBUTION in ${DOWNSTREAM_DISTRIBUTIONS}
 		do
-			wget -q -O - "${DOWNSTREAM_MIRROR}/dists/${DOWNSTREAM_DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "downstream.${MODE}.sources"
+			for SECTION in ${DOWNSTREAM_SECTIONS}
+			do
+				wget -q -O - "${DOWNSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "downstream.${MODE}.sources"
+			done
 		done
 	fi
 }
@@ -125,7 +129,7 @@ Download_upstream_indices ()
 					;;
 
 				*)
-					if wget -q -O /dev/null "http://security.debian.org/dists/${DISTRIBUTION}/updates/Release"
+					if wget -q -O /dev/null "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}/updates/Release"
 					then
 						for SECTION in ${UPSTREAM_SECTIONS}
 						do
@@ -135,13 +139,13 @@ Download_upstream_indices ()
 
 								case "${ARCHITECTURE}" in
 									source)
-										wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
+										wget -q -O - "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}/updates/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
 										;;
 
 									*)
-										if wget -q -O /dev/null "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz"
+										if wget -q -O /dev/null "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz"
 										then
-											wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries"
+											wget -q -O - "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}/updates/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries"
 										fi
 										;;
 								esac
@@ -149,7 +153,7 @@ Download_upstream_indices ()
 						done
 					fi
 
-					if wget -q -O /dev/null "http://security.debian.org/dists/${DISTRIBUTION}-security/Release"
+					if wget -q -O /dev/null "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}-security/Release"
 					then
 						for SECTION in ${UPSTREAM_SECTIONS}
 						do
@@ -159,11 +163,11 @@ Download_upstream_indices ()
 
 								case "${ARCHITECTURE}" in
 									source)
-										wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}-security/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
+										wget -q -O - "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}-security/${SECTION}/${ARCHITECTURE}/Sources.xz" | xz -d >> "upstream.${MODE}.sources"
 										;;
 
 									*)
-										wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}-security/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries"
+										wget -q -O - "${UPSTREAM_MIRROR_SECURITY}/dists/${DISTRIBUTION}-security/${SECTION}/binary-${ARCHITECTURE}/Packages.xz" | xz -d >> "upstream.${MODE}.binaries"
 										;;
 								esac
 							done
@@ -209,7 +213,7 @@ echo -n "Comparing versions... "
 
 for PACKAGE in ${DOWNSTREAM_PACKAGES}
 do
-	DOWNSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" downstream.${MODE}.sources | awk '/^Version: / { print $2 }')"
+	DOWNSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" downstream.${MODE}.sources | awk '/^Version: / { print $2 }' | sort -rV | head -n1)"
 
 	case "${MODE}" in
 		*-backports)
-- 
cgit v1.2.3