Update to Botan 1.8.13:

* 1.8.13, 2011-07-02
 - A race in Algorithm_Factory that could cause crashes in multithreaded
   code has been fixed.

* 1.8.12, 2011-06-20
 - If EMSA3(Raw) was used for more than one signature, it would produce
   incorrect output.
 - Fix the --enable-debug option to configure.py
 - Improve OS detection on Cygwin
 - Fix compilation under Sun Studio 12 on Solaris
 - Fix a memory leak in the constructors of DataSource_Stream and
   DataSink_Stream which would occur if opening the file failed. PR 144

* 1.8.11, 2010-11-02
 - Fix a number of CRL encoding and decoding bugs
 - When building a debug library under VC++, use the debug runtime
 - Fix compilation under Sun Studio on Linux and Solaris
 - Add several functions for compatability with 1.9
 - In the examples, read most input files as binary
 - The Perl build script has been removed in this release

* 1.8.10, 2010-08-31
 - Switch default PKCS #8 encryption algorithm from 3DES to AES-256
 - Increase default hash iterations from 2048 to 10000 in PBES1 and
PBES2
 - Use small tables in the first round of AES
 - Add PBKDF typedef and get_pbkdf for better compatability with 1.9
 - Add version of S2K::derive_key taking salt and iteration count
 - Enable the /proc-walking entropy source on NetBSD
 - Fix the doxygen makefile target

* 1.8.9, 2010-06-16
 - Use constant time multiplication in IDEA
 - Avoid possible timing attack against OAEP decoding
 - Add new X509::BER_encode and PKCS8::BER_encode
 - Enable DLL builds under Windows
 - Add Win32 installer support
 - Add support for the Clang compiler
 - Fix problem in semcem.h preventing build under Clang or GCC 3.4
 - Fix bug that prevented creation of DSA groups under 1024 bits
 - Fix crash in GMP_Engine if library is shutdown and reinitialized
 - Work around problem with recent binutils in x86-64 SHA-1
 - The Perl build script is no longer supported and refuses to run by
   default

* 1.8.8, 2009-11-03
 - Alter Skein-512 to match the tweaked 1.2 specification
 - Fix use of inline asm for access to x86 bswap function
 - Allow building the library without AES enabled
 - Add 'powerpc64' alias to ppc64 arch for Gentoo ebuild

7 files changed, 13 insertions, 133 deletions

diff --git a/security/botan/Makefile b/security/botan/Makefile
index a9342fc7aff..7123e4adfa8 100644
--- a/security/botan/Makefile
+++ b/security/botan/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2011/09/08 00:15:50 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2011/11/25 21:25:26 joerg Exp $
 
-DISTNAME=	Botan-1.8.7
-PKGNAME=	botan-1.8.7
-PKGREVISION=	4
+DISTNAME=	Botan-1.8.13
+PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	security
 MASTER_SITES=	http://files.randombit.net/botan/archive/v1.8/
 EXTRACT_SUFX=	.tgz
diff --git a/security/botan/PLIST.NetBSD b/security/botan/PLIST.NetBSD
index 1df921236eb..c0262322cb1 100644
--- a/security/botan/PLIST.NetBSD
+++ b/security/botan/PLIST.NetBSD
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.3 2010/10/12 19:36:43 joerg Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.4 2011/11/25 21:25:26 joerg Exp $
 ${PLIST.x86}include/botan/asm_macr.h
 ${PLIST.x86_64}include/botan/eng_sse2.h
+include/botan/es_ftw.h
 ${PLIST.x86_64}include/botan/sha1_sse2.h
 ${PLIST.i386}include/botan/md4_ia32.h
 ${PLIST.i386}include/botan/md5_ia32.h
diff --git a/security/botan/PLIST.common b/security/botan/PLIST.common
index 4a6988d16d4..b7750c54e09 100644
--- a/security/botan/PLIST.common
+++ b/security/botan/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2009/10/06 18:34:14 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2011/11/25 21:25:26 joerg Exp $
 bin/botan-config
 include/botan/adler32.h
 include/botan/aes.h
@@ -246,7 +246,7 @@ include/botan/x931_rng.h
 include/botan/xor_buf.h
 include/botan/xtea.h
 include/botan/xts.h
-lib/libbotan-1.8.2.so
+lib/libbotan-1.8.13.so
 lib/libbotan.a
 lib/libbotan.so
 lib/pkgconfig/botan-1.8.pc
diff --git a/security/botan/buildlink3.mk b/security/botan/buildlink3.mk
index efce47d59f6..581d5f5676e 100644
--- a/security/botan/buildlink3.mk
+++ b/security/botan/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/09/23 16:03:25 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2011/11/25 21:25:26 joerg Exp $
 
 BUILDLINK_TREE+=	botan
 
 .if !defined(BOTAN_BUILDLINK3_MK)
 BOTAN_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.botan+=	botan>=1.8.7
+BUILDLINK_API_DEPENDS.botan+=	botan>=1.8.13
 BUILDLINK_PKGSRCDIR.botan?=	../../security/botan
 .endif # BOTAN_BUILDLINK3_MK
 
diff --git a/security/botan/distinfo b/security/botan/distinfo
index 2ee569e7df2..08369b30f36 100644
--- a/security/botan/distinfo
+++ b/security/botan/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.9 2011/09/08 00:15:50 joerg Exp $
+$NetBSD: distinfo,v 1.10 2011/11/25 21:25:26 joerg Exp $
 
-SHA1 (Botan-1.8.7.tgz) = 69d985f66aa024f0d53c2d5597a4f1a0b9735959
-RMD160 (Botan-1.8.7.tgz) = 73a6417f1445282e4b2fbf45557f2644b2996563
-Size (Botan-1.8.7.tgz) = 3464535 bytes
-SHA1 (patch-aa) = 1229c25c86ac686ddeeaaabca3c5eea1ebccfed7
+SHA1 (Botan-1.8.13.tgz) = 7453abcff8539059b813acfb3f87ab8b74f8b03c
+RMD160 (Botan-1.8.13.tgz) = 0e0972493e693e72df1c1a66838948fcede5eec1
+Size (Botan-1.8.13.tgz) = 3043024 bytes
 SHA1 (patch-ab) = a53a3e23722d8f478c5a6c5ecf1df08d74fd21c0
 SHA1 (patch-ac) = 4f98ff086983b27ed17d048486a8afced47e7970
 SHA1 (patch-ak) = 7bf66c1faa84971b490be96efefac0ef44f97b70
-SHA1 (patch-src-alloc-secmem.h) = 532423f824e63acd8cafa0a74dc860990d40c41b
diff --git a/security/botan/patches/patch-aa b/security/botan/patches/patch-aa
deleted file mode 100644
index 0a63a867b36..00000000000
--- a/security/botan/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/10/22 10:25:02 jmmv Exp $
-
---- src/build-data/cc/gcc.orig	2009-09-10 01:29:34.000000000 +0100
-+++ src/build-data/cc/gcc
-@@ -31,7 +31,7 @@ default -> "$(CXX) -shared -fPIC -Wl,-so
- # AIX doesn't seem to have soname support (weird...)
- aix     -> "$(CXX) -shared -fPIC"
- 
--darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(SONAME)"
-+darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
- hpux    -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)"
- solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
- # Gotta use ld directly on BeOS, their GCC is busted
diff --git a/security/botan/patches/patch-src-alloc-secmem.h b/security/botan/patches/patch-src-alloc-secmem.h
deleted file mode 100644
index f32fcde86fa..00000000000
--- a/security/botan/patches/patch-src-alloc-secmem.h
+++ /dev/null
@@ -1,105 +0,0 @@
-$NetBSD: patch-src-alloc-secmem.h,v 1.1 2011/09/08 00:15:50 joerg Exp $
-
---- src/alloc/secmem.h.orig	2009-09-10 00:29:33.000000000 +0000
-+++ src/alloc/secmem.h
-@@ -107,7 +107,7 @@ class MemoryRegion
-       * @return a reference to *this
-       */
-       MemoryRegion<T>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       /**
-       * The use of this function is discouraged because of the risk of memory
-@@ -307,7 +307,7 @@ class MemoryVector : public MemoryRegion
-       * @return a reference to *this
-       */
-       MemoryVector<T>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       /**
-       * Create a buffer of the specified length.
-@@ -323,13 +323,13 @@ class MemoryVector : public MemoryRegion
-       * @param n the size of the arry in
-       */
-       MemoryVector(const T in[], u32bit n)
--         { MemoryRegion<T>::init(false); set(in, n); }
-+         { MemoryRegion<T>::init(false); this->set(in, n); }
- 
-       /**
-       * Copy constructor.
-       */
-       MemoryVector(const MemoryRegion<T>& in)
--         { MemoryRegion<T>::init(false); set(in); }
-+         { MemoryRegion<T>::init(false); this->set(in); }
- 
-       /**
-       * Create a buffer whose content is the concatenation of two other
-@@ -338,7 +338,7 @@ class MemoryVector : public MemoryRegion
-       * @param in2 the contents to be appended to in1
-       */
-       MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
--         { MemoryRegion<T>::init(false); set(in1); append(in2); }
-+         { MemoryRegion<T>::init(false); this->set(in1); this->append(in2); }
-    };
- 
- /**
-@@ -359,7 +359,7 @@ class SecureVector : public MemoryRegion
-       * @return a reference to *this
-       */
-       SecureVector<T>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       /**
-       * Create a buffer of the specified length.
-@@ -375,7 +375,7 @@ class SecureVector : public MemoryRegion
-       * @param n the size of the array in
-       */
-       SecureVector(const T in[], u32bit n)
--         { MemoryRegion<T>::init(true); set(in, n); }
-+         { MemoryRegion<T>::init(true); this->set(in, n); }
- 
-       /**
-       * Create a buffer with contents specified contents.
-@@ -383,7 +383,7 @@ class SecureVector : public MemoryRegion
-       * copied into the newly created buffer.
-       */
-       SecureVector(const MemoryRegion<T>& in)
--         { MemoryRegion<T>::init(true); set(in); }
-+         { MemoryRegion<T>::init(true); this->set(in); }
- 
-       /**
-       * Create a buffer whose content is the concatenation of two other
-@@ -392,7 +392,7 @@ class SecureVector : public MemoryRegion
-       * @param in2 the contents to be appended to in1
-       */
-       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
--         { MemoryRegion<T>::init(true); set(in1); append(in2); }
-+         { MemoryRegion<T>::init(true); this->set(in1); this->append(in2); }
-    };
- 
- /**
-@@ -413,7 +413,7 @@ class SecureBuffer : public MemoryRegion
-       * @return a reference to *this
-       */
-       SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       /**
-       * Create a buffer of the length L.
-@@ -427,10 +427,10 @@ class SecureBuffer : public MemoryRegion
-       * @param n the size of the array in
-       */
-       SecureBuffer(const T in[], u32bit n)
--         { MemoryRegion<T>::init(true, L); copy(in, n); }
-+         { MemoryRegion<T>::init(true, L); this->copy(in, n); }
-    private:
-       SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
-    };
- 
- }