Merge ~myamada/ubuntu-dev-tools:mk-sbuild into ubuntu-dev-tools:master

[Masahiro Yamada]

This merge request fixes the security update repository setup in
/etc/apt/sources.list for Debian bullseye and later.

The first commit adds a new helper, debian_dist_ge(), which is similar
to the existing ubuntu_dist_ge().

The second commit fixes the path of the security update repository.

[Mattia Rizzolo (mapreri)]

review: Approve

diff --git a/mk-sbuild b/mk-sbuild
index e280fbb..52e15a1 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -397,29 +397,41 @@ fi
 # By default DEBOOTSTRAP_SCRIPT must match RELEASE
 DEBOOTSTRAP_SCRIPT="$RELEASE"
 
-if [ "$DISTRO" = "ubuntu" ]; then
-    ubuntu_dist_ge() {
-      local releases="$(ubuntu-distro-info --all)"
-      local left=999
-      local right=0
-      local seq=1
-      for i in $releases; do
+dist_ge() {
+    local releases="$($3-distro-info --all)"
+    local left=999
+    local right=0
+    local seq=1
+
+    for i in $releases; do
         if [ $1 = $i ]; then
-          local left=$seq
-          break
+            local left=$seq
+            break
         fi
         seq=$((seq+1))
-      done
-      seq=1
-      for i in $releases; do
+    done
+
+    seq=1
+    for i in $releases; do
         if [ $2 = $i ]; then
-          local right=$seq
-          break
+            local right=$seq
+            break
         fi
         seq=$((seq+1))
-      done
-      [ $left -ge $right ] && return 0 || return 1
-    }
+    done
+
+    [ $left -ge $right ] && return 0 || return 1
+}
+
+ubuntu_dist_ge () {
+    dist_ge $1 $2 ubuntu
+}
+
+debian_dist_ge () {
+    dist_ge $1 $2 debian
+}
+
+if [ "$DISTRO" = "ubuntu" ]; then
     # On Ubuntu, set DEBOOTSTRAP_SCRIPT to gutsy to allow building new RELEASES without new debootstrap
     DEBOOTSTRAP_SCRIPT=gutsy
 fi
@@ -663,7 +675,11 @@ debian)
     # Debian only performs security updates
     SKIP_UPDATES=1
     if [ -z "$SOURCES_SECURITY_SUITE" ]; then
-        SOURCES_SECURITY_SUITE="RELEASE/updates"
+        if debian_dist_ge "$RELEASE" "bullseye"; then
+            SOURCES_SECURITY_SUITE="RELEASE-security"
+        else
+            SOURCES_SECURITY_SUITE="RELEASE/updates"
+        fi
     fi
     if [ -z "$SOURCES_SECURITY_URL" ]; then
         SOURCES_SECURITY_URL="http://security.debian.org/"