[arch-commits] Commit in qca/repos (8 files)

Antonio Rojas arojas at archlinux.org
Fri Jan 6 12:07:32 UTC 2017


    Date: Friday, January 6, 2017 @ 12:07:31
  Author: arojas
Revision: 285485

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qca/repos/extra-i686/PKGBUILD
    (from rev 285484, qca/trunk/PKGBUILD)
  qca/repos/extra-i686/no-ssl3.patch
    (from rev 285484, qca/trunk/no-ssl3.patch)
  qca/repos/extra-x86_64/PKGBUILD
    (from rev 285484, qca/trunk/PKGBUILD)
  qca/repos/extra-x86_64/no-ssl3.patch
    (from rev 285484, qca/trunk/no-ssl3.patch)
Deleted:
  qca/repos/extra-i686/PKGBUILD
  qca/repos/extra-i686/no-ssl3.patch
  qca/repos/extra-x86_64/PKGBUILD
  qca/repos/extra-x86_64/no-ssl3.patch

----------------------------+
 /PKGBUILD                  |  132 +++++++++++++++++++++++++++++++++++++++++++
 /no-ssl3.patch             |   58 ++++++++++++++++++
 extra-i686/PKGBUILD        |   66 ---------------------
 extra-i686/no-ssl3.patch   |   29 ---------
 extra-x86_64/PKGBUILD      |   66 ---------------------
 extra-x86_64/no-ssl3.patch |   29 ---------
 6 files changed, 190 insertions(+), 190 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-01-06 12:06:54 UTC (rev 285484)
+++ extra-i686/PKGBUILD	2017-01-06 12:07:31 UTC (rev 285485)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=qca
-pkgname=(qca-qt4 qca-qt5)
-pkgver=2.1.1
-pkgrel=6
-pkgdesc="Qt Cryptographic Architecture"
-arch=(i686 x86_64)
-url="http://delta.affinix.com/qca/"
-license=(LGPL)
-makedepends=(qt4 qt5-base cmake doxygen nss pkcs11-helper)
-source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz"
-        no-ssl3.patch)
-md5sums=('657cc701316600199199a6b6cb2c73c9'
-         '209f9187209d255fc3468ffeb26302e0')
-
-prepare() {
-  mkdir -p build{4,5}
-  cd $pkgbase-$pkgver
-  patch -Np1 < "${srcdir}/no-ssl3.patch"
-}
-
-build() {
-  cd build4
-  cmake ../$pkgbase-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTS=OFF \
-    -DQCA_LIBRARY_INSTALL_DIR=/usr/lib \
-    -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features/ \
-    -DQT4_BUILD=ON
-  make
-
-  cd ../build5
-  cmake ../$pkgbase-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTS=OFF \
-    -DQCA_INSTALL_IN_QT_PREFIX=ON \
-    -DQCA_MAN_INSTALL_DIR=/usr/share/man
-  make
-}
-
-package_qca-qt4() {
-  depends=(qt4 nss)
-  optdepends=('pkcs11-helper: PKCS-11 plugin')
-  conflicts=(qca qca-gnupg qca-ossl)
-  provides=(qca qca-gnupg qca-ossl)
-  replaces=(qca qca-gnupg qca-ossl)
-
-  cd build4
-  make DESTDIR="$pkgdir" install
-}
-
-package_qca-qt5() {
-  depends=(qt5-base nss ca-certificates)
-  optdepends=('pkcs11-helper: PKCS-11 plugin')
-
-  cd build5
-  make DESTDIR="$pkgdir" install
-}
-
-

Copied: qca/repos/extra-i686/PKGBUILD (from rev 285484, qca/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-01-06 12:07:31 UTC (rev 285485)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=qca
+pkgname=(qca-qt4 qca-qt5)
+pkgver=2.1.1
+pkgrel=7
+pkgdesc="Qt Cryptographic Architecture"
+arch=(i686 x86_64)
+url="http://delta.affinix.com/qca/"
+license=(LGPL)
+makedepends=(qt4 qt5-base cmake doxygen nss pkcs11-helper botan1.10)
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz"
+        no-ssl3.patch)
+md5sums=('657cc701316600199199a6b6cb2c73c9'
+         '209f9187209d255fc3468ffeb26302e0')
+
+prepare() {
+  mkdir -p build{4,5}
+  cd $pkgbase-$pkgver
+  patch -Np1 < "${srcdir}/no-ssl3.patch"
+}
+
+build() {
+  cd build4
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTS=OFF \
+    -DQCA_LIBRARY_INSTALL_DIR=/usr/lib \
+    -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features/ \
+    -DQT4_BUILD=ON
+  make
+
+  cd ../build5
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTS=OFF \
+    -DQCA_INSTALL_IN_QT_PREFIX=ON \
+    -DQCA_MAN_INSTALL_DIR=/usr/share/man
+  make
+}
+
+package_qca-qt4() {
+  depends=(qt4 nss)
+  optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan1.10: botan plugin')
+  conflicts=(qca qca-gnupg qca-ossl)
+  provides=(qca qca-gnupg qca-ossl)
+  replaces=(qca qca-gnupg qca-ossl)
+
+  cd build4
+  make DESTDIR="$pkgdir" install
+}
+
+package_qca-qt5() {
+  depends=(qt5-base nss ca-certificates)
+  optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan1.10: botan plugin')
+
+  cd build5
+  make DESTDIR="$pkgdir" install
+}
+
+

Deleted: extra-i686/no-ssl3.patch
===================================================================
--- extra-i686/no-ssl3.patch	2017-01-06 12:06:54 UTC (rev 285484)
+++ extra-i686/no-ssl3.patch	2017-01-06 12:07:31 UTC (rev 285485)
@@ -1,29 +0,0 @@
-From: Heiko Becker <heirecka at exherbo.org>
-Date: Thu, 24 Sep 2015 20:54:41 +0000
-Subject: qca-ossl: Fix build without SSLv3
-X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=20a587d77636186edb044cd2b71d6d90fe98d232
----
-qca-ossl: Fix build without SSLv3
-
-This fixes building with LibreSSL >= 2.3.0 which has removed support
-for SSLv3 completely. As far as I know OpenSSL can be configured to
-build without it, so it might be helpful there as well.
-
-REVIEW: 125386
----
-
-
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -5403,9 +5403,11 @@
- 			ctx = SSL_CTX_new(SSLv2_client_method());
- 			break;
- #endif
-+#ifndef OPENSSL_NO_SSL3_METHOD
- 		case TLS::SSL_v3:
- 			ctx = SSL_CTX_new(SSLv3_client_method());
- 			break;
-+#endif
- 		case TLS::TLS_v1:
- 			ctx = SSL_CTX_new(TLSv1_client_method());
- 			break;

Copied: qca/repos/extra-i686/no-ssl3.patch (from rev 285484, qca/trunk/no-ssl3.patch)
===================================================================
--- extra-i686/no-ssl3.patch	                        (rev 0)
+++ extra-i686/no-ssl3.patch	2017-01-06 12:07:31 UTC (rev 285485)
@@ -0,0 +1,29 @@
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Thu, 24 Sep 2015 20:54:41 +0000
+Subject: qca-ossl: Fix build without SSLv3
+X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=20a587d77636186edb044cd2b71d6d90fe98d232
+---
+qca-ossl: Fix build without SSLv3
+
+This fixes building with LibreSSL >= 2.3.0 which has removed support
+for SSLv3 completely. As far as I know OpenSSL can be configured to
+build without it, so it might be helpful there as well.
+
+REVIEW: 125386
+---
+
+
+--- a/plugins/qca-ossl/qca-ossl.cpp
++++ b/plugins/qca-ossl/qca-ossl.cpp
+@@ -5403,9 +5403,11 @@
+ 			ctx = SSL_CTX_new(SSLv2_client_method());
+ 			break;
+ #endif
++#ifndef OPENSSL_NO_SSL3_METHOD
+ 		case TLS::SSL_v3:
+ 			ctx = SSL_CTX_new(SSLv3_client_method());
+ 			break;
++#endif
+ 		case TLS::TLS_v1:
+ 			ctx = SSL_CTX_new(TLSv1_client_method());
+ 			break;

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-01-06 12:06:54 UTC (rev 285484)
+++ extra-x86_64/PKGBUILD	2017-01-06 12:07:31 UTC (rev 285485)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=qca
-pkgname=(qca-qt4 qca-qt5)
-pkgver=2.1.1
-pkgrel=6
-pkgdesc="Qt Cryptographic Architecture"
-arch=(i686 x86_64)
-url="http://delta.affinix.com/qca/"
-license=(LGPL)
-makedepends=(qt4 qt5-base cmake doxygen nss pkcs11-helper)
-source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz"
-        no-ssl3.patch)
-md5sums=('657cc701316600199199a6b6cb2c73c9'
-         '209f9187209d255fc3468ffeb26302e0')
-
-prepare() {
-  mkdir -p build{4,5}
-  cd $pkgbase-$pkgver
-  patch -Np1 < "${srcdir}/no-ssl3.patch"
-}
-
-build() {
-  cd build4
-  cmake ../$pkgbase-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTS=OFF \
-    -DQCA_LIBRARY_INSTALL_DIR=/usr/lib \
-    -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features/ \
-    -DQT4_BUILD=ON
-  make
-
-  cd ../build5
-  cmake ../$pkgbase-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTS=OFF \
-    -DQCA_INSTALL_IN_QT_PREFIX=ON \
-    -DQCA_MAN_INSTALL_DIR=/usr/share/man
-  make
-}
-
-package_qca-qt4() {
-  depends=(qt4 nss)
-  optdepends=('pkcs11-helper: PKCS-11 plugin')
-  conflicts=(qca qca-gnupg qca-ossl)
-  provides=(qca qca-gnupg qca-ossl)
-  replaces=(qca qca-gnupg qca-ossl)
-
-  cd build4
-  make DESTDIR="$pkgdir" install
-}
-
-package_qca-qt5() {
-  depends=(qt5-base nss ca-certificates)
-  optdepends=('pkcs11-helper: PKCS-11 plugin')
-
-  cd build5
-  make DESTDIR="$pkgdir" install
-}
-
-

Copied: qca/repos/extra-x86_64/PKGBUILD (from rev 285484, qca/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-01-06 12:07:31 UTC (rev 285485)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=qca
+pkgname=(qca-qt4 qca-qt5)
+pkgver=2.1.1
+pkgrel=7
+pkgdesc="Qt Cryptographic Architecture"
+arch=(i686 x86_64)
+url="http://delta.affinix.com/qca/"
+license=(LGPL)
+makedepends=(qt4 qt5-base cmake doxygen nss pkcs11-helper botan1.10)
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz"
+        no-ssl3.patch)
+md5sums=('657cc701316600199199a6b6cb2c73c9'
+         '209f9187209d255fc3468ffeb26302e0')
+
+prepare() {
+  mkdir -p build{4,5}
+  cd $pkgbase-$pkgver
+  patch -Np1 < "${srcdir}/no-ssl3.patch"
+}
+
+build() {
+  cd build4
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTS=OFF \
+    -DQCA_LIBRARY_INSTALL_DIR=/usr/lib \
+    -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features/ \
+    -DQT4_BUILD=ON
+  make
+
+  cd ../build5
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTS=OFF \
+    -DQCA_INSTALL_IN_QT_PREFIX=ON \
+    -DQCA_MAN_INSTALL_DIR=/usr/share/man
+  make
+}
+
+package_qca-qt4() {
+  depends=(qt4 nss)
+  optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan1.10: botan plugin')
+  conflicts=(qca qca-gnupg qca-ossl)
+  provides=(qca qca-gnupg qca-ossl)
+  replaces=(qca qca-gnupg qca-ossl)
+
+  cd build4
+  make DESTDIR="$pkgdir" install
+}
+
+package_qca-qt5() {
+  depends=(qt5-base nss ca-certificates)
+  optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan1.10: botan plugin')
+
+  cd build5
+  make DESTDIR="$pkgdir" install
+}
+
+

Deleted: extra-x86_64/no-ssl3.patch
===================================================================
--- extra-x86_64/no-ssl3.patch	2017-01-06 12:06:54 UTC (rev 285484)
+++ extra-x86_64/no-ssl3.patch	2017-01-06 12:07:31 UTC (rev 285485)
@@ -1,29 +0,0 @@
-From: Heiko Becker <heirecka at exherbo.org>
-Date: Thu, 24 Sep 2015 20:54:41 +0000
-Subject: qca-ossl: Fix build without SSLv3
-X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=20a587d77636186edb044cd2b71d6d90fe98d232
----
-qca-ossl: Fix build without SSLv3
-
-This fixes building with LibreSSL >= 2.3.0 which has removed support
-for SSLv3 completely. As far as I know OpenSSL can be configured to
-build without it, so it might be helpful there as well.
-
-REVIEW: 125386
----
-
-
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -5403,9 +5403,11 @@
- 			ctx = SSL_CTX_new(SSLv2_client_method());
- 			break;
- #endif
-+#ifndef OPENSSL_NO_SSL3_METHOD
- 		case TLS::SSL_v3:
- 			ctx = SSL_CTX_new(SSLv3_client_method());
- 			break;
-+#endif
- 		case TLS::TLS_v1:
- 			ctx = SSL_CTX_new(TLSv1_client_method());
- 			break;

Copied: qca/repos/extra-x86_64/no-ssl3.patch (from rev 285484, qca/trunk/no-ssl3.patch)
===================================================================
--- extra-x86_64/no-ssl3.patch	                        (rev 0)
+++ extra-x86_64/no-ssl3.patch	2017-01-06 12:07:31 UTC (rev 285485)
@@ -0,0 +1,29 @@
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Thu, 24 Sep 2015 20:54:41 +0000
+Subject: qca-ossl: Fix build without SSLv3
+X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=20a587d77636186edb044cd2b71d6d90fe98d232
+---
+qca-ossl: Fix build without SSLv3
+
+This fixes building with LibreSSL >= 2.3.0 which has removed support
+for SSLv3 completely. As far as I know OpenSSL can be configured to
+build without it, so it might be helpful there as well.
+
+REVIEW: 125386
+---
+
+
+--- a/plugins/qca-ossl/qca-ossl.cpp
++++ b/plugins/qca-ossl/qca-ossl.cpp
+@@ -5403,9 +5403,11 @@
+ 			ctx = SSL_CTX_new(SSLv2_client_method());
+ 			break;
+ #endif
++#ifndef OPENSSL_NO_SSL3_METHOD
+ 		case TLS::SSL_v3:
+ 			ctx = SSL_CTX_new(SSLv3_client_method());
+ 			break;
++#endif
+ 		case TLS::TLS_v1:
+ 			ctx = SSL_CTX_new(TLSv1_client_method());
+ 			break;



More information about the arch-commits mailing list