bugfix #1160: Provide sha256 for release tarballs

+ make release tarballs from current branch by default

diff --git a/Changelog b/Changelog
index ebf51ddb9373c87c0704b881d3524df80b7bf860..0398566225b5bdce97f49f7d8c4f68ca6d5649ff 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -109,6 +109,7 @@
        * Clarify data ownership with consts for tsig parameters.
          Thanks Michael Weiser
        * bugfix: Fix detection of DSA support with OpenSSL >= 1.1.0
+       * bugfix #1160: Provide sha256 for release tarballs
 
 1.6.17 2014-01-10
        * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a

diff --git a/makedist.sh b/makedist.sh
index 545b8ee385d2cc1c16adaed54eb08efdf56ef232..6ee5150d8b63a8bc024ee2a2b40891caaafd0b13 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -23,7 +23,7 @@ Generate a distribution tar file for libdns.
     -rc <nr>     Build a release candidate, the given string will be added
                  to the version number 
                  (which will then be ldns-<version>rc<number>)
-    -c <tag/br>  Checkout this tag or branch (defaults to master).
+    -c <tag/br>  Checkout this tag or branch (defaults to current branch).
 EOF
     exit 1
 }
@@ -108,9 +108,9 @@ if [ -z "$CHECKOUT" ]
 then
        if [ "$RC" = "no" ]
        then
-               CHECKOUT=master
+               CHECKOUT=`(git status | head -1 | awk '{print$3}') || echo master`
        else
-               CHECKOUT=develop
+               CHECKOUT=`(git status | head -1 | awk '{print$3}') || echo develop`
        fi
 fi
 
@@ -231,23 +231,28 @@ echo "ostype $OSTYPE"
 case $OSTYPE in
         linux*)
                 sha=`sha1sum ldns-$version.tar.gz |  awk '{ print $1 }'`
+                sha2=`sha256sum ldns-$version.tar.gz |  awk '{ print $1 }'`
                 ;;
         freebsd*)
                 sha=`sha1  ldns-$version.tar.gz |  awk '{ print $5 }'`
+                sha2=`sha256  ldns-$version.tar.gz |  awk '{ print $4 }'`
                 ;;
         *)
                uname=`uname`
                case $uname in
                        Linux*)
                                sha=`sha1sum ldns-$version.tar.gz |  awk '{ print $1 }'`
+                               sha2=`sha256sum ldns-$version.tar.gz |  awk '{ print $1 }'`
                                ;;
                        FreeBSD*)
                                sha=`sha1  ldns-$version.tar.gz |  awk '{ print $4 }'`
+                               sha2=`sha256  ldns-$version.tar.gz |  awk '{ print $4 }'`
                                ;;
                esac
                ;;
 esac
 echo $sha > ldns-$version.tar.gz.sha1
+echo $sha2 > ldns-$version.tar.gz.sha256
 gpg --armor --detach-sig ldns-$version.tar.gz
 
 info "LDNS distribution created successfully."