Strictler template usage. Bump revision.

3 files changed, 109 insertions, 3 deletions

diff --git a/security/botan/Makefile b/security/botan/Makefile
index af299ac8fbd..a9342fc7aff 100644
--- a/security/botan/Makefile
+++ b/security/botan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2011/05/10 13:01:01 reed Exp $
+# $NetBSD: Makefile,v 1.24 2011/09/08 00:15:50 joerg Exp $
 
 DISTNAME=	Botan-1.8.7
 PKGNAME=	botan-1.8.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://files.randombit.net/botan/archive/v1.8/
 EXTRACT_SUFX=	.tgz
diff --git a/security/botan/distinfo b/security/botan/distinfo
index 90f98239611..2ee569e7df2 100644
--- a/security/botan/distinfo
+++ b/security/botan/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2009/10/22 10:25:02 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2011/09/08 00:15:50 joerg Exp $
 
 SHA1 (Botan-1.8.7.tgz) = 69d985f66aa024f0d53c2d5597a4f1a0b9735959
 RMD160 (Botan-1.8.7.tgz) = 73a6417f1445282e4b2fbf45557f2644b2996563
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 1229c25c86ac686ddeeaaabca3c5eea1ebccfed7
 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-src-alloc-secmem.h b/security/botan/patches/patch-src-alloc-secmem.h
new file mode 100644
index 00000000000..f32fcde86fa
--- /dev/null
+++ b/security/botan/patches/patch-src-alloc-secmem.h
@@ -0,0 +1,105 @@
+$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); }
+    };
+ 
+ }