summaryrefslogtreecommitdiffstats
path: root/bin/gen-DSA
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-08-31 23:06:50 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-08-31 23:12:42 +0200
commitb3070631dfbbc8a23426194a88286096d8a72b3f (patch)
tree7ea2d4f3ac3757543470fabd346479fd277bbbad /bin/gen-DSA
parent710adf0363129aac0c8523f5afd2274e74b7560e (diff)
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): ``` diff --git a/data/dla-needed.txt b/data/dla-needed.txt index 106dbb0477..c7a975a471 100644 --- a/data/dla-needed.txt +++ b/data/dla-needed.txt @@ -99,9 +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) -- ```
Diffstat (limited to 'bin/gen-DSA')
-rwxr-xr-xbin/gen-DSA2
1 files changed, 1 insertions, 1 deletions
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

© 2014-2024 Faster IT GmbH | imprint | privacy policy