sec-updater: Use latest versions

diff --git a/src/sec-updater/sec-updater.sh b/src/sec-updater/sec-updater.sh
index 16e5614591ef9f48512c445dd50578f7eccefca7..9c8c05ba66e632b10aa570552d4f97eda73d43a1 100755 (executable)
--- a/src/sec-updater/sec-updater.sh
+++ b/src/sec-updater/sec-updater.sh
@@ -4,17 +4,17 @@ DIR="/etc/pts"
 DISTS_DIR="$DIR/dists"
 DATE=`date +%Y%m%d-%H%M`
 UBUNTU="http://security.ubuntu.com/ubuntu"
-UBUNTU_VERSIONS="bionic xenial"
+UBUNTU_VERSIONS="focal bionic"
 UBUNTU_DIRS="main multiverse restricted universe"
 UBUNTU_ARCH="binary-amd64"
 DEBIAN="http://security.debian.org"
-DEBIAN_VERSIONS="stretch jessie wheezy"
+DEBIAN_VERSIONS="buster"
 DEBIAN_DIRS="main contrib non-free"
 DEBIAN_ARCH="binary-amd64 binary-armhf"
-RASPIAN="http://archive.raspberrypi.org/debian"
-RASPIAN_VERSIONS="jessie wheezy"
-RASPIAN_DIRS="main"
-RASPIAN_ARCH="binary-armhf"
+RASPBIAN="http://archive.raspberrypi.org/debian"
+RASPBIAN_VERSIONS="buster"
+RASPBIAN_DIRS="main"
+RASPBIAN_ARCH="binary-armhf"
 CMD=/usr/sbin/sec-updater
 CMD_LOG="$DIR/logs/$DATE-sec-update.log"
 DEL_LOG=1
@@ -48,39 +48,33 @@ do
     mkdir -p $v-updates/$a
     for d in $DEBIAN_DIRS
     do
-      if [ $v = "stretch" ]
-      then
-        wget -nv $DEBIAN/dists/$v/updates/$d/$a/Packages.xz  -O $v-updates/$a/Packages-$d.xz
-        unxz -f $v-updates/$a/Packages-$d.xz
-      else
-        wget -nv $DEBIAN/dists/$v/updates/$d/$a/Packages.bz2  -O $v-updates/$a/Packages-$d.bz2
-        bunzip2 -f $v-updates/$a/Packages-$d.bz2
-      fi
+      wget -nv $DEBIAN/dists/$v/updates/$d/$a/Packages.xz  -O $v-updates/$a/Packages-$d.xz
+      unxz -f $v-updates/$a/Packages-$d.xz
     done
   done
 done
 
-# Download Raspian distribution information
+# Download Raspbian distribution information
 
-for v in $RASPIAN_VERSIONS
+for v in $RASPBIAN_VERSIONS
 do
-  for a in $RASPIAN_ARCH
+  for a in $RASPBIAN_ARCH
   do
-    mkdir -p $v-raspian/$a
-    for d in $RASPIAN_DIRS
+    mkdir -p $v-raspbian/$a
+    for d in $RASPBIAN_DIRS
     do
-      wget -nv $RASPIAN/dists/$v/$d/$a/Packages.gz  -O $v-raspian/$a/Packages-$d.gz
-      gunzip -f $v-raspian/$a/Packages-$d.gz
+      wget -nv $RASPBIAN/dists/$v/$d/$a/Packages.gz  -O $v-raspbian/$a/Packages-$d.gz
+      gunzip -f $v-raspbian/$a/Packages-$d.gz
     done
   done
 done
 
 # Run sec-updater in distribution information
 
-for f in bionic-security/binary-amd64/*
+for f in focal-security/binary-amd64/*
 do
   echo "security: $f"
-  $CMD --os "Ubuntu 18.04" --arch "x86_64" --file $f --security \
+  $CMD --os "Ubuntu 20.04" --arch "x86_64" --file $f --security \
        --uri $UBUNTU >> $CMD_LOG 2>&1
   if [ $? -eq 0 ]
   then
@@ -88,10 +82,10 @@ do
   fi
 done
 
-for f in bionic-updates/binary-amd64/*
+for f in focal-updates/binary-amd64/*
 do
   echo "updates:  $f"
-  $CMD --os "Ubuntu 18.04" --arch "x86_64" --file $f \
+  $CMD --os "Ubuntu 20.04" --arch "x86_64" --file $f \
        --uri $UBUNTU >> $CMD_LOG 2>&1
   if [ $? -eq 0 ]
   then
@@ -99,10 +93,10 @@ do
   fi
 done
 
-for f in xenial-security/binary-amd64/*
+for f in bionic-security/binary-amd64/*
 do
   echo "security: $f"
-  $CMD --os "Ubuntu 16.04" --arch "x86_64" --file $f --security \
+  $CMD --os "Ubuntu 18.04" --arch "x86_64" --file $f --security \
        --uri $UBUNTU >> $CMD_LOG 2>&1
   if [ $? -eq 0 ]
   then
@@ -110,10 +104,10 @@ do
   fi
 done
 
-for f in xenial-updates/binary-amd64/*
+for f in bionic-updates/binary-amd64/*
 do
   echo "updates:  $f"
-  $CMD --os "Ubuntu 16.04" --arch "x86_64" --file $f \
+  $CMD --os "Ubuntu 18.04" --arch "x86_64" --file $f \
        --uri $UBUNTU >> $CMD_LOG 2>&1
   if [ $? -eq 0 ]
   then
@@ -121,32 +115,10 @@ do
   fi
 done
 
-for f in stretch-updates/binary-amd64/*
-do
-  echo "security: $f"
-  $CMD --os "Debian 9.0" --arch "x86_64" --file $f --security \
-       --uri $DEBIAN >> $CMD_LOG 2>&1
-  if [ $? -eq 0 ]
-  then
-    DEL_LOG=0
-  fi
-done
-
-for f in jessie-updates/binary-amd64/*
-do
-  echo "security: $f"
-  $CMD --os "Debian 8.0" --arch "x86_64" --file $f --security \
-       --uri $DEBIAN >> $CMD_LOG 2>&1
-  if [ $? -eq 0 ]
-  then
-    DEL_LOG=0
-  fi
-done
-
-for f in wheezy-updates/binary-amd64/*
+for f in buster-updates/binary-amd64/*
 do
   echo "security: $f"
-  $CMD --os "Debian 7.0" --arch "x86_64" --file $f --security \
+  $CMD --os "Debian 10" --arch "x86_64" --file $f --security \
        --uri $DEBIAN >> $CMD_LOG 2>&1
   if [ $? -eq 0 ]
   then
@@ -154,10 +126,10 @@ do
   fi
 done
 
-for f in stretch-updates/binary-armhf/*
+for f in buster-updates/binary-armhf/*
 do
   echo "security: $f"
-  $CMD --os "Debian 9.0" --arch "armhf" --file $f --security \
+  $CMD --os "Debian 10" --arch "armhf" --file $f --security \
        --uri $DEBIAN >> $CMD_LOG 2>&1
   if [ $? -eq 0 ]
   then
@@ -165,44 +137,11 @@ do
   fi
 done
 
-for f in jessie-updates/binary-armhf/*
-do
-  echo "security: $f"
-  $CMD --os "Debian 8.0" --arch "armhf" --file $f --security \
-       --uri $DEBIAN >> $CMD_LOG 2>&1
-  if [ $? -eq 0 ]
-  then
-    DEL_LOG=0
-  fi
-done
-
-for f in wheezy-updates/binary-armhf/*
-do
-  echo "security: $f"
-  $CMD --os "Debian 7.0" --arch "armhf" --file $f --security \
-       --uri $DEBIAN >> $CMD_LOG 2>&1
-  if [ $? -eq 0 ]
-  then
-    DEL_LOG=0
-  fi
-done
-
-for f in jessie-raspian/binary-armhf/*
-do
-  echo "security: $f"
-  $CMD --os "Debian 8.0" --arch "armv7l" --file $f --security \
-       --uri $RASPIAN >> $CMD_LOG 2>&1
-  if [ $? -eq 0 ]
-  then
-    DEL_LOG=0
-  fi
-done
-
-for f in wheezy-raspian/binary-armhf/*
+for f in buster-raspbian/binary-armhf/*
 do
   echo "security: $f"
-  $CMD --os "Debian 7.11" --arch "armv7l" --file $f --security \
-       --uri $RASPIAN >> $CMD_LOG 2>&1
+  $CMD --os "Raspbian 10" --arch "armhf" --file $f --security \
+       --uri $RASPBIAN >> $CMD_LOG 2>&1
   if [ $? -eq 0 ]
   then
     DEL_LOG=0