diff options
| author | adam <adam@pkgsrc.org> | 2012-01-16 20:36:08 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2012-01-16 20:36:08 +0000 |
| commit | c7ac0921f85cea3a06f2872e290165a78426493e (patch) | |
| tree | 6fcdf47b16115ea6423f4a92f356ce3f4c1dde9f /security | |
| parent | 13310fd0406e9c6a30c305ff6734f8806028178b (diff) | |
| download | pkgsrc-c7ac0921f85cea3a06f2872e290165a78426493e.tar.gz | |
Fix building with Clang; Fix installing on Mac OS X
Diffstat (limited to 'security')
| -rw-r--r-- | security/qca2/Makefile | 3 | ||||
| -rw-r--r-- | security/qca2/distinfo | 4 | ||||
| -rw-r--r-- | security/qca2/patches/patch-configure | 13 | ||||
| -rw-r--r-- | security/qca2/patches/patch-src_botantools_botan_botan_secmem.h | 13 |
4 files changed, 31 insertions, 2 deletions
diff --git a/security/qca2/Makefile b/security/qca2/Makefile index 1d7615bc3ee..7c356f9e220 100644 --- a/security/qca2/Makefile +++ b/security/qca2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/01/13 10:55:31 obache Exp $ +# $NetBSD: Makefile,v 1.20 2012/01/16 20:36:08 adam Exp $ DISTNAME= qca-2.0.3 PKGNAME= qca2-${DISTNAME:C/.*-//} @@ -27,6 +27,7 @@ CONFIGURE_ARGS+= --prefix=${QTDIR} CONFIGURE_ARGS+= --qtdir=${QTDIR} CONFIGURE_ARGS+= --disable-tests CONFIGURE_ARGS+= --certstore-internal +CONFIGURE_ARGS+= --no-framework post-install: ${INSTALL_DATA} ${DESTDIR}${QTDIR}/lib/pkgconfig/qca2.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/qca2.pc diff --git a/security/qca2/distinfo b/security/qca2/distinfo index 17df61cf620..ddeb8c0bddc 100644 --- a/security/qca2/distinfo +++ b/security/qca2/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.5 2010/12/02 15:03:56 wiz Exp $ +$NetBSD: distinfo,v 1.6 2012/01/16 20:36:08 adam Exp $ SHA1 (qca-2.0.3.tar.bz2) = 9c868b05b81dce172c41b813de4de68554154c60 RMD160 (qca-2.0.3.tar.bz2) = 333cfdce91fedfaec09c205528de52d7b569c521 Size (qca-2.0.3.tar.bz2) = 4530731 bytes SHA1 (patch-aa) = e9c7791aac4b8764100a95a596e109e6ebb6abf0 +SHA1 (patch-configure) = c114e4f6c2982f8293d37b332a44781fd884412b +SHA1 (patch-src_botantools_botan_botan_secmem.h) = 4cb74801291dadb4d2c15c741bbb3b836135fcd9 diff --git a/security/qca2/patches/patch-configure b/security/qca2/patches/patch-configure new file mode 100644 index 00000000000..a08089afc50 --- /dev/null +++ b/security/qca2/patches/patch-configure @@ -0,0 +1,13 @@ +$NetBSD: patch-configure,v 1.1 2012/01/16 20:36:08 adam Exp $ + +--- configure.orig 2012-01-16 20:32:17.000000000 +0000 ++++ configure +@@ -977,7 +977,7 @@ public: + { + bundled = false; + +-#if defined(Q_OS_WIN) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN) + // use built-in + return true; + #else diff --git a/security/qca2/patches/patch-src_botantools_botan_botan_secmem.h b/security/qca2/patches/patch-src_botantools_botan_botan_secmem.h new file mode 100644 index 00000000000..664abc1d61a --- /dev/null +++ b/security/qca2/patches/patch-src_botantools_botan_botan_secmem.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_botantools_botan_botan_secmem.h,v 1.1 2012/01/16 20:36:08 adam Exp $ + +--- src/botantools/botan/botan/secmem.h.orig 2012-01-16 18:21:07.000000000 +0000 ++++ src/botantools/botan/botan/secmem.h +@@ -214,7 +214,7 @@ class SecureVector : public MemoryRegion + + SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); } + SecureVector(const T in[], u32bit n) +- { MemoryRegion<T>::init(true); set(in, n); } ++ { MemoryRegion<T>::init(true); this->set(in, n); } + SecureVector(const MemoryRegion<T>& in) + { MemoryRegion<T>::init(true); set(in); } + SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2) |