From 774eb447f4302c83e57978af5a429b9cbe306ab3 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 31 Aug 2018 23:06:50 +0200
Subject: bin/gen-DSA: Fix package removal from the needed_file. Don't remove
 packages starting with the same string as the to be removed package.

 Before this patch (spice was to be removed, spice-gtk got removed, too).

 ```
 diff --git a/data/dla-needed.txt b/data/dla-needed.txt
 index 106dbb0477..a8e6526c01 100644
 --- a/data/dla-needed.txt
 +++ b/data/dla-needed.txt
 @@ -99,12 +99,6 @@ qemu (Santiago)
  --
  samba (Holger Levsen)
  --
 -spice (Mike Gabriel)
 -  NOTE: 20180819: Patch is possibly incomplete. See http://www.openwall.com/lists/oss-security/2018/08/17/2 (Brian May)
 ---
 -spice-gtk (Mike Gabriel)
 -  NOTE: 20180819: Patch is possibly incomplete. See http://www.openwall.com/lists/oss-security/2018/08/17/2 (Brian May)
 ---
  suricata (Thorsten Alteholz)
  --
  symfony (Thorsten Alteholz)
 ```

 With this patch (only spice gets removed, spice-gtk stays):

 ```
---
 bin/gen-DSA | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/gen-DSA')

diff --git a/bin/gen-DSA b/bin/gen-DSA
index fd88f2679b..230a4bfe17 100755
--- a/bin/gen-DSA
+++ b/bin/gen-DSA
@@ -386,7 +386,7 @@ EOF
     cat $daid_entry data/$IDMODE/list > $tmp_list
     cat $tmp_list > data/$IDMODE/list
     rm -f $tmp_list
-    sed -rn '/^'"$PACKAGE"'\b/{: next;n;/^\s/b next;d};p' $needed_file > $needed_file.new
+    sed -rn '/^'"$PACKAGE"'(\s.*|$)\b/{: next;n;/^\s/b next;d};p' $needed_file > $needed_file.new
     mv $needed_file.new $needed_file
     echo "$IDMODE text written to ./$IDMODE-$DAID"
     if [ "$IDMODE" = "DLA" ] || [ "$IDMODE" = "ELA" ]; then
-- 
cgit v1.2.3