* modified: .SRCINFO

	-> Rebuild SRCINFO
 * renamed:    fix-tinyca-paths.patch -> 10-fix-tinyca-paths.patch
 * renamed:    stolen-from-debian.patch -> 20-stolen-from-debian.patch
	-> Renamed existing patches

 * new file:   30-sha2.patch
	-> Stolen a pathc from Debian Bug Tracking (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759481#10) by Ross Vandegrift <ross@kallisti.us> for sha2 support
 * modified:   PKGBUILD
	-> Updated pkgbuild version

5 files changed, 104 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34bdfa32f265..1c15db69a0bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tinyca2
 	pkgdesc = Simple graphical user interface to manage a small CA (Certification Authority)
-	pkgver = 0.7.5
+	pkgver = 0.7.5-2
 	pkgrel = 2
 	url = http://tinyca.sm-zone.net/
 	arch = i686
@@ -11,11 +11,13 @@ pkgbase = tinyca2
 	depends = openssl
 	optdepends = zip
 	source = tinyca2::git://github.com/glennie/tinyca2
-	source = fix-tinyca-paths.patch
-	source = stolen-from-debian.patch
+	source = 10-fix-tinyca-paths.patch
+	source = 20-stolen-from-debian.patch
+	source = 30-sha2.patch
 	md5sums = SKIP
 	md5sums = d0b8fc9e3fc312ed9fbd98bf2dacbfea
 	md5sums = d5ad0010db954820837a3d09c90d018d
+	md5sums = 95db1c26243fb9a70faf6dffdeccf20f
 
 pkgname = tinyca2
 
diff --git a/fix-tinyca-paths.patch b/10-fix-tinyca-paths.patch
index 82717e4d1485..82717e4d1485 100644
--- a/fix-tinyca-paths.patch
+++ b/10-fix-tinyca-paths.patch
diff --git a/stolen-from-debian.patch b/20-stolen-from-debian.patch
index e37414cf8bee..e37414cf8bee 100644
--- a/stolen-from-debian.patch
+++ b/20-stolen-from-debian.patch
diff --git a/30-sha2.patch b/30-sha2.patch
new file mode 100644
index 000000000000..e133bff25d34
--- /dev/null
+++ b/30-sha2.patch
@@ -0,0 +1,91 @@
+--- tinyca2.orig/lib/CA.pm	2015-08-29 11:26:54.000000000 +0200
++++ tinyca2/lib/CA.pm	2015-08-29 12:21:01.770748099 +0200
+@@ -349,7 +349,7 @@
+       $opts = {};
+       $opts->{'days'} = 3650; # set default to 10 years
+       $opts->{'bits'} = 4096;
+-      $opts->{'digest'} = 'sha1';
++      $opts->{'digest'} = 'sha512';
+ 
+       if(defined($mode) && $mode eq "sub") { # create SubCA, use defaults
+          $opts->{'parentca'} = $main->{'CA'}->{'actca'};
+@@ -453,7 +453,7 @@
+       $opts = {};
+       $opts->{'days'} = 3650; # set default to 10 years
+       $opts->{'bits'} = 4096;
+-      $opts->{'digest'} = 'sha1';
++      $opts->{'digest'} = 'sha512';
+       
+       $main->show_ca_import_dialog($opts);
+       return;
+diff -ur tinyca2/lib/GUI.pm tinyca2/lib/GUI.pm
+--- tinyca2/lib/GUI.pm.orig	2014-11-01 12:51:39.000000000 -0500
++++ tinyca2/lib/GUI.pm	2014-11-01 12:25:31.123392155 -0500
+@@ -37,6 +37,10 @@
+ 		     'ripemd160' => 'RIPEMD-160',
+ #		     'sha' => 'SHA',
+ 		     'sha1' => 'SHA-1',
++		     'sha224' => 'SHA-224',
++		     'sha256' => 'SHA-256',
++		     'sha384' => 'SHA-384',
++		     'sha512' => 'SHA-512',
+ 		     );
+
+ my %bit_lengths = (
+diff -ur tinyca2/lib/REQ.pm tinyca2/lib/REQ.pm
+--- tinyca2/lib/REQ.pm.orig	2006-07-25 15:12:00.000000000 -0500
++++ tinyca2/lib/REQ.pm	2014-11-01 12:30:12.025870028 -0500
+@@ -59,7 +59,7 @@
+          GUI::HELPERS::print_error($t);
+       }
+       $opts->{'bits'}   = 4096;
+-      $opts->{'digest'} = 'sha1';
++      $opts->{'digest'} = 'sha512';
+       $opts->{'algo'}   = 'rsa';
+       if(defined($opts) && $opts eq "sign") {
+          $opts->{'sign'} = 1;
+@@ -426,6 +426,14 @@
+          $opts->{'digest'} = "md5";
+       } elsif ($opts->{'digest'} =~ /^sha1/) {
+          $opts->{'digest'} = "sha1";
++      } elsif ($opts->{'digest'} =~ /^sha224/) {
++         $opts->{'digest'} = "sha224";
++      } elsif ($opts->{'digest'} =~ /^sha256/) {
++         $opts->{'digest'} = "sha256";
++      } elsif ($opts->{'digest'} =~ /^sha384/) {
++         $opts->{'digest'} = "sha384";
++      } elsif ($opts->{'digest'} =~ /^sha512/) {
++         $opts->{'digest'} = "sha512";
+       } elsif ($opts->{'digest'} =~ /^ripemd160/) {
+          $opts->{'digest'} = "ripemd160";
+       } else {
+diff -ur tinyca2/templates/openssl.cnf tinyca2/templates/openssl.cnf
+--- tinyca2/templates/openssl.cnf.orig	2006-07-25 15:12:01.000000000 -0500
++++ tinyca2/templates/openssl.cnf	2014-11-01 12:30:43.238590285 -0500
+@@ -15,7 +15,7 @@
+ x509_extensions = client_cert
+ default_days    = 365
+ default_crl_days= 30
+-default_md      = sha1
++default_md      = sha512
+ preserve        = no
+ policy          = policy_client
+
+@@ -33,7 +33,7 @@
+ x509_extensions = server_cert
+ default_days    = 365
+ default_crl_days= 30
+-default_md      = sha1
++default_md      = sha512
+ preserve        = no
+ policy          = policy_server
+
+@@ -51,7 +51,7 @@
+ x509_extensions = v3_ca
+ default_days    = 365
+ default_crl_days= 30
+-default_md      = sha1
++default_md      = sha512
+ preserve        = no
+ policy          = policy_ca
+
diff --git a/PKGBUILD b/PKGBUILD
index 4bf3af804d3e..2ef5c1f8c88f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Glennie Vignarajah <glennie@glennie.fr>
 
 pkgname=tinyca2
-pkgver=0.7.5
+pkgver=0.7.5-2
 pkgrel=2
 pkgdesc="Simple graphical user interface to manage a small CA (Certification Authority)"
 arch=(i686 x86_64)
@@ -12,12 +12,15 @@ license=('GPL') # GPLv2+
 depends=(gtk2-perl perl-locale-gettext openssl)
 optdepends=('zip')
 source=("$pkgname::git://github.com/glennie/tinyca2"
-        fix-tinyca-paths.patch
-        stolen-from-debian.patch)
+        10-fix-tinyca-paths.patch
+        20-stolen-from-debian.patch
+        30-sha2.patch)
 
 md5sums=('SKIP'
          'd0b8fc9e3fc312ed9fbd98bf2dacbfea'
-         'd5ad0010db954820837a3d09c90d018d')
+         'd5ad0010db954820837a3d09c90d018d'
+         '95db1c26243fb9a70faf6dffdeccf20f'
+         )
 
 pkgver() {
   echo $pkgver
@@ -27,6 +30,7 @@ prepare() {
 #{{{
   cd ${srcdir}
   for PATCH in $(ls *.patch); do
+    echo "* patch: $PATCH"
     patch -p0 < ${PATCH} || exit 2
   done
 }