diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-16 12:28:33 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-16 12:28:33 +0100 |
| commit | 708526fe67ec9cd87f7a5965d515971d6faf8884 (patch) | |
| tree | 80158cf8e6b69852e974777db3e3d6822690542c /extra/qca | |
| parent | 80ba9b9d983a8bfa0ea3be8a5841eb88d919d603 (diff) | |
| parent | 4a4f6be8604aa35bdc81ae29d86b07dc8aea0c5c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jhead/PKGBUILD
extra/qca-gnupg/PKGBUILD
extra/qca-ossl/PKGBUILD
extra/qca/PKGBUILD
Diffstat (limited to 'extra/qca')
| -rw-r--r-- | extra/qca/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/qca/gcc47.patch | 17 |
2 files changed, 24 insertions, 4 deletions
diff --git a/extra/qca/PKGBUILD b/extra/qca/PKGBUILD index f2e914566..0b24efb85 100644 --- a/extra/qca/PKGBUILD +++ b/extra/qca/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 149477 2012-02-08 09:57:45Z pierre $ +# $Id: PKGBUILD 178073 2013-02-15 11:56:00Z pierre $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qca pkgver=2.0.3 -pkgrel=2.1 +pkgrel=3 pkgdesc="Qt Cryptographic Architecture" arch=('i686' 'x86_64' 'mips64el') url="http://delta.affinix.com/qca/" license=('LGPL') depends=('qt' 'ca-certificates') -source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2") -md5sums=('fc15bd4da22b8096c51fcfe52d2fa309') +source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2" + 'gcc47.patch') +md5sums=('fc15bd4da22b8096c51fcfe52d2fa309' + 'dffc7367152d8888c1447253a0387a2a') build() { cd $srcdir/${pkgname}-${pkgver} + patch -p0 -i ${srcdir}/gcc47.patch ./configure \ --prefix=/usr \ --disable-tests \ diff --git a/extra/qca/gcc47.patch b/extra/qca/gcc47.patch new file mode 100644 index 000000000..5297ecb9b --- /dev/null +++ b/extra/qca/gcc47.patch @@ -0,0 +1,17 @@ +--- ./src/botantools/botan/botan/secmem.h.orig 2012-01-07 20:09:35.427999593 +0100 ++++ ./src/botantools/botan/botan/secmem.h 2012-01-07 20:09:52.540001422 +0100 +@@ -214,11 +214,11 @@ + + 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); } ++ { MemoryRegion<T>::init(true); this->set(in); } + SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2) +- { MemoryRegion<T>::init(true); set(in1); append(in2); } ++ { MemoryRegion<T>::init(true); this->set(in1); append(in2); } + }; + + /************************************************* |