Merge ~alexmurray/ubuntu-security-tools:check-source-package-improvements into ubuntu-security-tools:master

[Alex Murray]

A couple improvements to check-source-package to make umt check a bit better.

[Seth Arnold (seth-arnold)]

Makes sense to me :) Thanks

[Alex Murray (alexmurray)]

Actually turns out we can't use $rmadout as https://git.launchpad.net/~alexmurray/ubuntu-security-tools/commit/?id=547da08e7a582382311071a1174bcfb14d7ddf2c since this is the rmadison output but only for the current release of the package - but we need it for all the releases... so I'll have to try and come up with something else...

[Alex Murray (alexmurray)]

review: Needs Fixing

diff --git a/package-tools/check-source-package b/package-tools/check-source-package
index 63afba1..27513b5 100755
--- a/package-tools/check-source-package
+++ b/package-tools/check-source-package
@@ -50,6 +50,8 @@ error=""
 
 # rmadison output is called only once and stored here
 rmadout=""
+# also store the rmadison output just for the release of this package
+rmadoutrel=""
 
 FILTERDIFF=${FILTERDIFF:-/usr/bin/filterdiff}
 
@@ -127,7 +129,7 @@ exit_script() {
 check_merge() {
     format_test_name "Merged changelog"
     dist=$(awk '/^Distribution: / { print $2 }' "$schanges")
-    if [ "$dist" = "$devel" ] && [ -n "$rmadout" ]; then
+    if [ "$dist" = "$devel" ] && [ -n "$rmadoutrel" ]; then
         # Verify that no merge entries are missing...
         newest="0~"
         while read -r pkg n1 ver n2 rel rest
@@ -135,7 +137,7 @@ check_merge() {
             if dpkg --compare-versions "$newest" le "$ver"; then
                 newest="$ver"
             fi
-        done < <(echo "$rmadout")
+        done < <(echo "$rmadoutrel")
 
         changelog_text=$(cd "$unpacked" && dpkg-parsechangelog --since "$newest" 2>/dev/null | $UST/utilities/snip '^Changes:\s*$' '^[^ ]')
         changelog_count=$(echo "$changelog_text" | grep "^ $PKG " | wc -l)
@@ -153,7 +155,7 @@ check_merge() {
 
 check_lp_autoclose() {
     format_test_name "Changelog autocloses LP bugs"
-    if [ -n "$rmadout" ]; then
+    if [ -n "$rmadoutrel" ]; then
         # Verify that no merge entries are missing...
         newest="0~"
         while read -r pkg n1 ver n2 rel rest
@@ -161,7 +163,7 @@ check_lp_autoclose() {
             if dpkg --compare-versions "$newest" le "$ver"; then
                 newest="$ver"
             fi
-        done < <(echo "$rmadout")
+        done < <(echo "$rmadoutrel")
 
         changelog_text=$(cd "$unpacked" && dpkg-parsechangelog --since "$newest" 2>/dev/null | $UST/utilities/snip '^Changes:\s*$' '^[^ ]')
         bad_lp_references=$(echo "$changelog_text" | grep -q -E "LP: +[0-9]" | wc -l)
@@ -690,7 +692,7 @@ check_version() {
     # check that no other version snuck in (based on KeesCook's
     # code (don't bother with -backports pocket)
     format_test_name "Newest version"
-    madvers=$(echo "$rmadout" | awk -F\| '{print $2}' | uniq)
+    madvers=$(echo "$rmadoutrel" | awk -F\| '{print $2}' | uniq)
     older=""
     for v in $madvers
     do
@@ -731,7 +733,7 @@ check_version() {
         else
           echo "SKIP: Unable to get date_created for old release $olddist"
         fi
-      done < <(rmadison -u ubuntu "$package" | awk '{print $3 " " $5}')
+      done < <(echo "$rmadout" | awk '{print $3 " " $5}')
       if [ -n "$superceded" ]; then
         failed "FAIL"
         echo " Current: $version in $dist"
@@ -876,7 +878,7 @@ check_reverse_debdiff() {
     else
         failed "FAIL"
         echo "Debdiff Errors:"
-        patch -i "$abs_debdiff" --dry-run -R -p$patchlevel || true
+        patch -i "$abs_debdiff" --dry-run -t -R -p$patchlevel || true
         echo ""
     fi
     cd "$prevdir" >/dev/null
@@ -1213,7 +1215,7 @@ check_security_changelog() {
     format_test_name "Security formatted changelog"
     prevdir=$(pwd)
 
-    if [ -n "$rmadout" ]; then
+    if [ -n "$rmadoutrel" ]; then
         # Verify that no merge entries are missing...
         newest="0~"
         while read -r pkg n1 ver n2 rel rest
@@ -1221,7 +1223,7 @@ check_security_changelog() {
             if dpkg --compare-versions "$newest" le "$ver"; then
                 newest="$ver"
             fi
-        done < <(echo "$rmadout")
+        done < <(echo "$rmadoutrel")
         changelog_text=$(cd "$unpacked" && dpkg-parsechangelog --since "$newest" 2>/dev/null | $UST/utilities/snip '^Changes:\s*$' '^[^ ]')
         changelog_count=$(echo "$changelog_text" | grep "^ $PKG " | wc -l)
         changes_text=$($UST/utilities/snip '^Changes:\s*$' '^[^ ]' "$schanges")
@@ -1512,25 +1514,28 @@ echo ""
 format_test_name "Retrieving madison output"
 pkg_dist=$(grep -E "^Distribution: " "$schanges" | awk '{print $2}' | cut -d '-' -f 1)
 if [ "$pkg_dist" = "unstable" ]; then
-    rmadout=$(rmadison -u debian "$package" | grep -E " (unstable|sid) +\| ") || true
+    rmadoutrel=$(rmadison -u debian "$package" | grep -E " (unstable|sid) +\| ") || true
+    rmadout=$rmadoutrel
 else
     if [ "$pkg_dist" == "precise" ] || [ "$pkg_dist" == "trusty" ]; then
         # TODO: fix this through lp api, but for now this workaround fix the precise issue
-        tmp=$(/usr/bin/apt-cache madison $package | grep "ubuntu-esm" | grep "$pkg_dist" || true)
+        rmadout=$(/usr/bin/apt-cache madison $package)
+        tmp=$(echo $rmadout | grep "ubuntu-esm" | grep "$pkg_dist" || true)
         # if the pkg is not in -esm yet, try to get the prev-ppa
         if [ -z "$tmp" ]; then
-            tmp=$(/usr/bin/apt-cache madison $package | grep "$pkg_dist" || true)
+            tmp=$(echo $rmadout | grep "$pkg_dist" || true)
         fi
-        rmadout=$tmp
+        rmadoutrel=$tmp
     elif [ "$force_rmadison" != "yes" ] && [ -x "$UQT/security-tools/lpmad" ]; then
-        rmadout=$($UQT/security-tools/lpmad "$pkg_dist" "$package" | grep "^$package" | grep -v " | ${pkg_dist}-backports" || true)
+        rmadout=$($UQT/security-tools/lpmad "$package" || true)
+        rmadoutrel=$(echo $rmadout | grep "$pkg_dist" | grep "^$package" | grep -v " | ${pkg_dist}-backports" || true)
     else
-        tmp=$(rmadison "$package")
+        rmadout=$(rmadison "$package")
         # it's ok if the package doesn't exist yet
-        rmadout=$(echo $tmp | grep -E " ${pkg_dist}(-[a-z]+)?(/[a-z]+)? ") || true
+        rmadoutrel=$(echo $rmadout | grep -E " ${pkg_dist}(-[a-z]+)?(/[a-z]+)? ") || true
     fi
 fi
-if [ -z "$rmadout" ]; then
+if [ -z "$rmadoutrel" ]; then
     echo -n "pass (empty-- ok if new)"
 else
     echo -n "pass"