[Git][security-tracker-team/security-tracker][master] 6 commits: Remove old comment about LTS releases

[Salvatore Bonaccorso]

Salvatore Bonaccorso pushed to branch master at Debian Security Tracker / security-tracker


Commits:
52e4c2a7 by Salvatore Bonaccorso at 2020-06-20T09:13:18+02:00
Remove old comment about LTS releases

Signed-off-by: Salvatore Bonaccorso <carnil at debian.org>

- - - - -
dc358ab2 by Salvatore Bonaccorso at 2020-06-22T10:36:33+02:00
add-dsa-needed: Add code comment on intention of package addition

We do this in two steps. In a first step for all supported releases
where there is a common package which needs an update (thus after the
sorting of the common list and filter out only the duplicated lines) we
add those to dsa-needed.txt without suffix to indicate the package needs
an update in multiple (supported) suites.

In the later step, we only -- for each release -- add pkg/release to
dsa-needed.txt to indicate the package needs only an update in the
respective release.

v2: Fix typo in comment about adding packages with /$release suffix

Signed-off-by: Salvatore Bonaccorso <carnil at debian.org>

- - - - -
7a31ddd1 by Salvatore Bonaccorso at 2020-06-22T10:36:49+02:00
Fix indentation in while loop lost in an earlier refactoring

Fixes: 2df873e89355 ("Replace tabs with spaces for add-dsa-needed.sh script")

- - - - -
6a7946cf by Salvatore Bonaccorso at 2020-06-22T10:36:49+02:00
Introduce new pkgs_print() helper function

Depending on if a suffix should be included in the printout of the
package set accordingly the format string for the printf invocation.

The idea is depending on if only on release is supported the listing in
the dsa-needed.txt should be either:

	--
	pkg
	--

if only one suite is supported. In the case multiple suites are
supported but the package needs an update only in one release, the
listing should be

	--
	$pkg/release
	--

Introduce helper function taking arguments as package, flag for suffix
inclusion an to be used suffix.

A later commit will use the new helper function where needed.

Signed-off-by: Salvatore Bonaccorso <carnil at debian.org>

- - - - -
39708979 by Salvatore Bonaccorso at 2020-06-22T10:36:49+02:00
Use the new introduced pkgs_print() helper function

In the former code block we target packages which need an update in
multiple supported release. The later block is iterating only over
individual releases to add packages individually per release where
needed.

Signed-off-by: Salvatore Bonaccorso <carnil at debian.org>

- - - - -
ede574c3 by Salvatore Bonaccorso at 2020-06-22T08:40:03+00:00
Merge branch 'add-dsa-needed-handle-multiple-suites' into 'master'

add-dsa-needed.sh: Handle multiple suites more consistently

See merge request security-tracker-team/security-tracker!56
- - - - -


1 changed file:

- bin/add-dsa-needed.sh


Changes:

=====================================
bin/add-dsa-needed.sh
=====================================
@@ -34,6 +34,18 @@ cleanup() {
 }
 trap cleanup EXIT
 
+pkgs_print() {
+    local pkg=$1
+    local include_suffix=$2
+    local suffix=$3
+
+    if $include_suffix ; then
+        printf "%s/%s\n--\n" "$pkg" "$suffix"
+    else
+        printf "%s\n--\n" "$pkg"
+    fi
+}
+
 output=data/dsa-needed.txt
 case "${1:-}" in
     --stdout)
@@ -87,16 +99,18 @@ for release in $releases; do
     done < $tmpd/$release.txt
 done
 
+# Handle packages which need update in multiple releases
+# These are added without /$release suffix
 cat $tmpd/toadd-*.txt | sort | uniq -d |
 while read pkg; do
-    printf "%s\n--\n" "$pkg" >> $output
+    pkgs_print "$pkg" false false >> $output
     sed -ri "/^$pkg\$/d" $tmpd/toadd-*.txt
 done
 
-# Skip oldoldstable for now as it is an LTS release, tracked with
-# dla-needed:
+# Handle package which need update in distinct releases
+# and that are added with /$release suffix
 for release in $releases; do
     while read pkg; do
-    printf "%s/%s\n--\n" "$pkg" "$release" >> $output
+        pkgs_print "$pkg" "$include_oldstable" "$release" >> $output
     done < $tmpd/toadd-$release.txt
 done



View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/compare/03810e00f4b2138d8b27bb6fde6b3dfad2b5c5cb...ede574c3dca6309d1645a717dee2ab5e9da5e61e

-- 
View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/compare/03810e00f4b2138d8b27bb6fde6b3dfad2b5c5cb...ede574c3dca6309d1645a717dee2ab5e9da5e61e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-security-tracker-commits/attachments/20200622/95f58226/attachment-0001.html>