Thu Sep 8 00:15:50 2011 UTC ()
Strictler template usage. Bump revision.


(joerg)
diff -r1.23 -r1.24 pkgsrc/security/botan/Makefile
diff -r1.8 -r1.9 pkgsrc/security/botan/distinfo
diff -r0 -r1.1 pkgsrc/security/botan/patches/patch-src-alloc-secmem.h
cvs diff -r1.23 -r1.24 pkgsrc/security/botan/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/Makefile 2011/05/10 13:01:01 1.23
+++ pkgsrc/security/botan/Attic/Makefile 2011/09/08 00:15:50 1.24
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.23 2011/05/10 13:01:01 reed Exp $ 1# $NetBSD: Makefile,v 1.24 2011/09/08 00:15:50 joerg Exp $
2 2
3DISTNAME= Botan-1.8.7 3DISTNAME= Botan-1.8.7
4PKGNAME= botan-1.8.7 4PKGNAME= botan-1.8.7
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= http://files.randombit.net/botan/archive/v1.8/ 7MASTER_SITES= http://files.randombit.net/botan/archive/v1.8/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://botan.randombit.net/ 11HOMEPAGE= http://botan.randombit.net/
12COMMENT= Portable, easy to use, and efficient C++ crypto library 12COMMENT= Portable, easy to use, and efficient C++ crypto library
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
18USE_LANGUAGES= c++ 18USE_LANGUAGES= c++
cvs diff -r1.8 -r1.9 pkgsrc/security/botan/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/distinfo 2009/10/22 10:25:02 1.8
+++ pkgsrc/security/botan/Attic/distinfo 2011/09/08 00:15:50 1.9
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.8 2009/10/22 10:25:02 jmmv Exp $ 1$NetBSD: distinfo,v 1.9 2011/09/08 00:15:50 joerg Exp $
2 2
3SHA1 (Botan-1.8.7.tgz) = 69d985f66aa024f0d53c2d5597a4f1a0b9735959 3SHA1 (Botan-1.8.7.tgz) = 69d985f66aa024f0d53c2d5597a4f1a0b9735959
4RMD160 (Botan-1.8.7.tgz) = 73a6417f1445282e4b2fbf45557f2644b2996563 4RMD160 (Botan-1.8.7.tgz) = 73a6417f1445282e4b2fbf45557f2644b2996563
5Size (Botan-1.8.7.tgz) = 3464535 bytes 5Size (Botan-1.8.7.tgz) = 3464535 bytes
6SHA1 (patch-aa) = 1229c25c86ac686ddeeaaabca3c5eea1ebccfed7 6SHA1 (patch-aa) = 1229c25c86ac686ddeeaaabca3c5eea1ebccfed7
7SHA1 (patch-ab) = a53a3e23722d8f478c5a6c5ecf1df08d74fd21c0 7SHA1 (patch-ab) = a53a3e23722d8f478c5a6c5ecf1df08d74fd21c0
8SHA1 (patch-ac) = 4f98ff086983b27ed17d048486a8afced47e7970 8SHA1 (patch-ac) = 4f98ff086983b27ed17d048486a8afced47e7970
9SHA1 (patch-ak) = 7bf66c1faa84971b490be96efefac0ef44f97b70 9SHA1 (patch-ak) = 7bf66c1faa84971b490be96efefac0ef44f97b70
 10SHA1 (patch-src-alloc-secmem.h) = 532423f824e63acd8cafa0a74dc860990d40c41b
File Added: pkgsrc/security/botan/patches/Attic/patch-src-alloc-secmem.h
$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); }
    };
 
 }