[Secure-testing-commits] r34572 - bin data

[Mike Gabriel]

Author: sunweaver
Date: 2015-05-29 07:29:47 +0000 (Fri, 29 May 2015)
New Revision: 34572

Modified:
   bin/gen-DSA
   data/dla-needed.txt
Log:
take libxml2, fuse

Modified: bin/gen-DSA
===================================================================
--- bin/gen-DSA	2015-05-29 05:12:52 UTC (rev 34571)
+++ bin/gen-DSA	2015-05-29 07:29:47 UTC (rev 34572)
@@ -157,8 +157,12 @@
 shift
 
 TYPE=security
-if [ regression = "$1" ]; then
+REGRESSION_DAID=
+if printf '%s' "$1" | grep -Eq '^regression(|:[0-9]+(-[0-9]+|))$'; then
     TYPE=regression
+    if printf '%s' "$1" | grep -Eq '^regression:([0-9]+(-[0-9]+|))$'; then
+	REGRESSION_DAID=$(printf '%s' "$1" | sed -r 's/^regression:([0-9]+(-[0-9]+|))/\1/')
+    fi
     shift
 fi
 
@@ -235,7 +239,11 @@
 
 if [ -z "$DAID" ]; then
     if [ "$TYPE" = regression ]; then
-	latest_daid="$(sed -nr '/'"$IDMODE"'-[0-9]+-[0-9]+'" $PACKAGE "'/{s/^.+'"$IDMODE"'-[0]*([0-9-]+).*$/\1/;p;q}' data/$IDMODE/list)"
+	if [ -z "$REGRESSION_DAID" ]; then
+		latest_daid="$(sed -nr '/'"$IDMODE"'-[0-9]+-[0-9]+'" $PACKAGE "'/{s/^.+'"$IDMODE"'-[0]*([0-9-]+).*$/\1/;p;q}' data/$IDMODE/list)"
+	else
+		latest_daid="$REGRESSION_DAID"
+	fi
 	revision=${latest_daid#*-}
 	daid=${latest_daid%-*}
     else

Modified: data/dla-needed.txt
===================================================================
--- data/dla-needed.txt	2015-05-29 05:12:52 UTC (rev 34571)
+++ data/dla-needed.txt	2015-05-29 07:29:47 UTC (rev 34572)
@@ -9,7 +9,7 @@
 --
 flightgear
 --
-fuse
+fuse (Mike Gabriel)
   http://lists.debian.org/CAKjSHr0Y2_c13ksrqo=m3miHabkAi_jFTDinqknN+1aM2YiX8w@mail.gmail.com
 --
 hostapd
@@ -40,7 +40,7 @@
 libphp-snoopy
   NOTE: maintainer might take care of it, cf http://lists.debian.org/1424805686.2351.19.camel@debian.org
 --
-libxml2
+libxml2 (Mike Gabriel)
 --
 linux-2.6
   NOTE: some fixes already committed to squeeze-security branch in svn repo