From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 19 Dec 2016 10:32:05 +0000 (+0100)
Subject: bugfix #1160: Provide sha256 for release tarballs
X-Git-Tag: release-1.7.0~2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553be99c32fdc46ceb3c11d7bf4aa1c9219b214c;p=thirdparty%2Fldns.git

bugfix #1160: Provide sha256 for release tarballs

+ make release tarballs from current branch by default
---

diff --git a/Changelog b/Changelog
index ebf51ddb..03985662 100644
--- 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 545b8ee3..6ee5150d 100755
--- 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."