From ed597da0fc9bca01fac177e79d58a9d0543f0ec4 Mon Sep 17 00:00:00 2001
From: Eric F Crist <ecrist@secure-computing.net>
Date: Wed, 2 Sep 2015 19:53:04 -0500
Subject: [PATCH] Prepare for v3.0.0 release

* Update ChangeLog to reflect minor last-minute commits.
* Modify build-dist.sh to create both zip and tgz files
* Add notable changes to Upgrade-Notes
---
 ChangeLog                    | 15 +++++++++++++++
 build/build-dist.sh          | 10 ++++++++--
 doc/EasyRSA-Upgrade-Notes.md |  6 ++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 484c89a..911950d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 Easy-RSA 3 ChangeLog
 
+3.0.0 (2015-09-07)
+
+    * cab4a07 Fix typo: Hellman
+        (ljani: Github)
+
+    * 171834d Fix typo: Default
+        (allo-: Github)
+
+    * 8b42eea Make aes256 default, replacing 3des
+        (keros: Github)
+    
+    * f2f4ac8 Make -utf8 default
+        (roubert: Github)
+
+	
 3.0.0-rc2 (2014/07/27)
 
     * 1551e5f docs: fix typo
diff --git a/build/build-dist.sh b/build/build-dist.sh
index 6b42813..467963c 100755
--- a/build/build-dist.sh
+++ b/build/build-dist.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Easy-RSA 3 distribution packager:
 # creates ready-to-use tarball files for Unixes
@@ -47,6 +47,7 @@ main() {
 	dist_clean
 	stage_files
 	make_tar
+	make_zip
 }
 
 # prep DIST_ROOT
@@ -69,7 +70,7 @@ stage_files() {
 	done
 
 	# files not included
-	rm "$DIST_ROOT/$PV/doc/TODO" || die "failed rm TODO"
+	rm -rf "$DIST_ROOT/$PV/doc/TODO" || die "failed rm TODO"
 }
 
 make_tar() {
@@ -77,6 +78,11 @@ make_tar() {
 	note "tarball created at: $BIN_DEST/${PV}.tgz" 
 }
 
+make_zip() {
+	(cd "$DIST_ROOT"; zip -qr "../$BIN_DEST/${PV}.zip" "$PV") || die "zip failed"
+	note "zip file created at: $BIN_DEST/${PV}.zip" 
+}
+
 # parse CLI options:
 while [ -n "$1" ]
 do
diff --git a/doc/EasyRSA-Upgrade-Notes.md b/doc/EasyRSA-Upgrade-Notes.md
index 974dff6..f5c1514 100644
--- a/doc/EasyRSA-Upgrade-Notes.md
+++ b/doc/EasyRSA-Upgrade-Notes.md
@@ -25,6 +25,12 @@ List of important changes
  * The 3.0 release lacks PKCS#11 (smartcard/token) support. This is anticipated
    to be supported in a future point-release to target each platform's need.
 
+ * The -utf8 option has been added for all supported commands.  This should be
+   backwards compatible with ASCII strings.
+
+ * The default private key encryption has been changed from 3des to aes256.
+
+
 Some new concepts
 ----