From 7a028de1eb1cee6899590b3b2aef9b9064aee64c Mon Sep 17 00:00:00 2001
From: Alex Dunn <dunn.alex@gmail.com>
Date: Fri, 7 Aug 2015 12:59:08 -0700
Subject: [PATCH] botan 1.10.10, 1.11.19 (devel)

Closes Homebrew/homebrew#42629.
---
 Formula/botan.rb   | 28 +++++++++++++++++++++++-----
 Formula/softhsm.rb |  1 +
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Formula/botan.rb b/Formula/botan.rb
index b55c4a2368..e853735f19 100644
--- a/Formula/botan.rb
+++ b/Formula/botan.rb
@@ -1,8 +1,13 @@
 class Botan < Formula
   desc "Cryptographic algorithms and formats library in C++"
   homepage "http://botan.randombit.net/"
-  url "http://botan.randombit.net/releases/Botan-1.10.9.tgz"
-  sha256 "487d27d3a081ae403cf87c0fc78c2a64183f001b48f9feb87e8de1e16fba8df2"
+
+  stable do
+    url "http://botan.randombit.net/releases/Botan-1.10.10.tgz"
+    sha256 "6b67b14746410461fe4a8ce6a625e7eef789243454fe30eab7329d5984be4163"
+    # upstream ticket: https://bugs.randombit.net/show_bug.cgi?id=267
+    patch :DATA
+  end
 
   bottle do
     revision 1
@@ -11,6 +16,11 @@ class Botan < Formula
     sha256 "c8899f3e0b379e27e37fd7e3e83bbec52803cce45800c7bf88c509f09a7e520b" => :mountain_lion
   end
 
+  devel do
+    url "http://botan.randombit.net/releases/Botan-1.11.19.tgz"
+    sha256 "4b0f3be4262bdc71629ea4a38e2ed85ff53e573054ad84ba37d65fc1477b3028"
+  end
+
   option "with-debug", "Enable debug build of Botan"
 
   deprecated_option "enable-debug" => "with-debug"
@@ -18,10 +28,11 @@ class Botan < Formula
   depends_on "pkg-config" => :build
   depends_on "openssl"
 
-  # upstream ticket: https://bugs.randombit.net/show_bug.cgi?id=267
-  patch :DATA
+  needs :cxx11 if build.devel?
 
   def install
+    ENV.cxx11 if build.devel?
+
     args = %W[
       --prefix=#{prefix}
       --docdir=share/doc
@@ -42,7 +53,14 @@ class Botan < Formula
   end
 
   test do
-    assert_match /lcrypto/, shell_output("#{bin}/botan-config-1.10 --libs")
+    # stable version doesn't have `botan` executable
+    if !File.exist? bin/"botan"
+      assert_match "lcrypto", shell_output("#{bin}/botan-config-1.10 --libs")
+    else
+      system bin/"botan", "keygen"
+      File.exist? "public.pem"
+      File.exist? "private.pem"
+    end
   end
 end
 
diff --git a/Formula/softhsm.rb b/Formula/softhsm.rb
index 1a24b57466..eafe32297e 100644
--- a/Formula/softhsm.rb
+++ b/Formula/softhsm.rb
@@ -3,6 +3,7 @@ class Softhsm < Formula
   homepage "https://www.opendnssec.org/softhsm/"
   url "https://dist.opendnssec.org/source/softhsm-1.3.7.tar.gz"
   sha256 "d12d6456a85561266d9da427565f3ee3746a35df6670d5e6be75de253c2810a4"
+  revision 1
 
   bottle do
     sha256 "2e93310b6db277071b4643e327954fe002270dbb7f9ca43080455eedb6c699c1" => :yosemite