commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2017-12-16 20:47:24
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is "libqca2"
Sat Dec 16 20:47:24 2017 rev:49 rq:557260 version:2.1.3
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2017-11-16
14:17:39.657441160 +0100
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2017-12-16
20:47:25.170785940 +0100
@@ -1,0 +2,5 @@
+Fri Dec 15 08:04:01 UTC 2017 - fab...@ritter-vogt.de
+
+- BuildIgnore libopenssl-1_1_0-devel to avoid conflict
+
+---
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.d7tCZK/_old 2017-12-16 20:47:25.850753115 +0100
+++ /var/tmp/diff_new_pack.d7tCZK/_new 2017-12-16 20:47:25.854752922 +0100
@@ -43,6 +43,8 @@
BuildRequires: libdrm-devel
BuildRequires: libjpeg-devel
%if 0%{?suse_version} >= 1330
+# Qt4 pulls this in, avoid the conflict
+#!BuildIgnore: libopenssl-1_1_0-devel
BuildRequires: libopenssl-1_0_0-devel
# we do not actually need it for building on Factory
#!BuildIgnore: openssl-1_0_0
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2017-11-16 14:17:38
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is "libqca2"
Thu Nov 16 14:17:38 2017 rev:48 rq:535226 version:2.1.3
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2017-10-05
11:50:46.828177197 +0200
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2017-11-16
14:17:39.657441160 +0100
@@ -1,0 +2,6 @@
+Thu Oct 19 08:48:26 UTC 2017 - meiss...@suse.com
+
+- buildignore openssl-1_0_0 to avoid conflicts during the
+ openssl 1.1 effort.
+
+---
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.37TBpp/_old 2017-11-16 14:17:40.225420596 +0100
+++ /var/tmp/diff_new_pack.37TBpp/_new 2017-11-16 14:17:40.225420596 +0100
@@ -44,6 +44,8 @@
BuildRequires: libjpeg-devel
%if 0%{?suse_version} >= 1330
BuildRequires: libopenssl-1_0_0-devel
+# we do not actually need it for building on Factory
+#!BuildIgnore: openssl-1_0_0
%else
BuildRequires: openssl-devel
%endif
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2017-10-05 11:50:26
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is "libqca2"
Thu Oct 5 11:50:26 2017 rev:47 rq:530891 version:2.1.3
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2017-09-08
20:44:01.709847735 +0200
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2017-10-05
11:50:46.828177197 +0200
@@ -1,0 +2,7 @@
+Sun Oct 1 16:38:12 UTC 2017 - wba...@tmo.at
+
+- updated to version 2.1.3
+ * no changelog provided
+- update Url
+
+---
Old:
qca-2.1.1.tar.xz
New:
qca-2.1.3.tar.xz
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.jC7eQ5/_old 2017-10-05 11:50:49.675776507 +0200
+++ /var/tmp/diff_new_pack.jC7eQ5/_new 2017-10-05 11:50:49.679775944 +0200
@@ -28,12 +28,12 @@
%endif
%bcond_without nss
Name: libqca2
-Version:2.1.1
+Version:2.1.3
Release:0
Summary:Qt Cryptographic Architecture 2
License:LGPL-2.1+
Group: Development/Libraries/C and C++
-Url:https://projects.kde.org/projects/kdesupport/qca
+Url:https://userbase.kde.org/QCA
Source:
http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz
Source5:baselibs.conf
BuildRequires: ca-certificates
++ qca-2.1.1.tar.xz -> qca-2.1.3.tar.xz ++
6131 lines of diff (skipped)
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2017-09-08 20:44:00
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is "libqca2"
Fri Sep 8 20:44:00 2017 rev:46 rq:520989 version:2.1.1
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2016-08-31
00:00:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2017-09-08
20:44:01.709847735 +0200
@@ -1,0 +2,6 @@
+Thu Aug 24 13:52:26 UTC 2017 - fv...@suse.com
+
+- Force building against openSSL 1.0 (boo#1055310)
+- Disable PKCS11 on TW to avoid openssl conflicts
+
+---
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.ot66Ot/_old 2017-09-08 20:44:02.445744268 +0200
+++ /var/tmp/diff_new_pack.ot66Ot/_new 2017-09-08 20:44:02.449743706 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqca2
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,16 @@
%bcond_with botan
-# Enable gcrypt plugin on TW
%if 0%{?suse_version} > 1320
+# Enable gcrypt plugin on TW
%bcond_without gcrypt
+# Disable PKCS11 on TW, conflicts with older openssl
+%bcond_with pkcs11
%else
%bcond_with gcrypt
+%bcond_without pkcs11
%endif
%bcond_without nss
-%bcond_without pkcs11
Name: libqca2
Version:2.1.1
Release:0
@@ -40,11 +42,14 @@
BuildRequires: gpg2
BuildRequires: libdrm-devel
BuildRequires: libjpeg-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires: libopenssl-1_0_0-devel
+%else
+BuildRequires: openssl-devel
+%endif
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(QtCore) >= 4.7
-BuildRequires: pkgconfig(libcrypto)
-BuildRequires: pkgconfig(libssl)
Requires: gpg2 >= 2.0.0
%requires_eqlibqt4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.ot66Ot/_old 2017-09-08 20:44:02.493737520 +0200
+++ /var/tmp/diff_new_pack.ot66Ot/_new 2017-09-08 20:44:02.493737520 +0200
@@ -8,9 +8,9 @@
# requires "libqca2 = "
# supplements "packageand(libqca2-plugin-botan:libqca2-)"
-libqca2-plugin-pkcs11
- requires "libqca2 = "
- supplements "packageand(libqca2-plugin-pkcs11:libqca2-)"
+#libqca2-plugin-pkcs11
+# requires "libqca2 = "
+# supplements "packageand(libqca2-plugin-pkcs11:libqca2-)"
libqca2-plugin-nss
requires "libqca2 = "
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2016-08-31 00:00:47
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is "libqca2"
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2015-12-27
01:57:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2016-08-31
00:00:48.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug 25 08:29:08 UTC 2016 - fab...@ritter-vogt.de
+
+- Add new plugin-gcrypt subpackage
+
+---
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.lRXqXl/_old 2016-08-31 00:00:49.0 +0200
+++ /var/tmp/diff_new_pack.lRXqXl/_new 2016-08-31 00:00:49.0 +0200
@@ -17,6 +17,12 @@
%bcond_with botan
+# Enable gcrypt plugin on TW
+%if 0%{?suse_version} > 1320
+%bcond_without gcrypt
+%else
+%bcond_with gcrypt
+%endif
%bcond_without nss
%bcond_without pkcs11
Name: libqca2
@@ -33,7 +39,6 @@
BuildRequires: cyrus-sasl-devel
BuildRequires: gpg2
BuildRequires: libdrm-devel
-BuildRequires: libgcrypt-devel
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
@@ -46,6 +51,9 @@
%if %{with botan}
BuildRequires: pkgconfig(botan-1.10)
%endif
+%if %{with gcrypt}
+BuildRequires: libgcrypt-devel >= 1.7
+%endif
%if %{with nss}
BuildRequires: pkgconfig(nss)
%endif
@@ -87,6 +95,22 @@
It can be extended by further plug-ins, for example, with qca-sasl for
SASL support.
+%if %{with gcrypt}
+%package plugin-gcrypt
+Summary:Qt Cryptographic Architecture 2
+Group: Development/Libraries/C and C++
+Requires: %{name} = %{version}
+
+%description plugin-gcrypt
+This package provides a generic Qt cryptographic architecture,
+including a library and a plug-in for using all supported capabilities
+of openssl, like SSL/TLS, X509, RSA, SHA1, MD5, Blowfish, 3DES, and
+AES.
+
+It can be extended by further plug-ins, for example, with qca-sasl for
+SASL support.
+%endif
+
%if %{with botan}
%package plugin-botan
Summary:Qt Cryptographic Architecture 2
@@ -146,7 +170,9 @@
-DQCA_FEATURE_INSTALL_DIR=%{_datadir}/qt4/mkspecs/features/ \
-DQT4_BUILD=ON \
-DWITH_cyrus-sasl_PLUGIN=ON \
+%if %{with gcrypt}
-DWITH_gcrypt_PLUGIN=ON \
+%endif
-DWITH_gnupg_PLUGIN=ON \
-DWITH_logger_PLUGIN=ON \
%if %{with botan}
@@ -193,6 +219,12 @@
%defattr(-,root,root)
%{_libdir}/qt4/plugins/crypto/libqca-cyrus-sasl.so
+%if %{with gcrypt}
+%files plugin-gcrypt
+%defattr(-,root,root)
+%{_libdir}/qt4/plugins/crypto/libqca-gcrypt.so
+%endif
+
%if %{with botan}
%files plugin-botan
%defattr(-,root,root)
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2015-12-27 01:57:39
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is "libqca2"
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2015-12-13
09:37:02.0 +0100
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2015-12-27
01:57:45.0 +0100
@@ -1,0 +2,11 @@
+Thu Dec 17 10:38:11 UTC 2015 - tchva...@suse.com
+
+- Pass all required switches to cmake to ensure it builds properly
+- Install manpage to correct location
+
+---
+Thu Dec 17 10:12:46 UTC 2015 - tchva...@suse.com
+
+- Switch to bcond_with/without usage instead of 0/1 defines
+
+---
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.OXokyV/_old 2015-12-27 01:57:46.0 +0100
+++ /var/tmp/diff_new_pack.OXokyV/_new 2015-12-27 01:57:46.0 +0100
@@ -16,7 +16,18 @@
#
+%bcond_with botan
+%bcond_without nss
+%bcond_without pkcs11
Name: libqca2
+Version:2.1.1
+Release:0
+Summary:Qt Cryptographic Architecture 2
+License:LGPL-2.1+
+Group: Development/Libraries/C and C++
+Url:https://projects.kde.org/projects/kdesupport/qca
+Source:
http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz
+Source5:baselibs.conf
BuildRequires: ca-certificates
BuildRequires: cmake >= 2.8.12
BuildRequires: cyrus-sasl-devel
@@ -29,29 +40,18 @@
BuildRequires: pkgconfig(QtCore) >= 4.7
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libssl)
-Summary:Qt Cryptographic Architecture 2
-License:LGPL-2.1+
-Group: Development/Libraries/C and C++
+Requires: gpg2 >= 2.0.0
+%requires_eqlibqt4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Url:https://projects.kde.org/projects/kdesupport/qca
-Version:2.1.1
-Release:0
-%define with_botan 0
-%define with_nss 1
-%define with_pkcs11 1
-%if %with_botan
+%if %{with botan}
BuildRequires: pkgconfig(botan-1.10)
%endif
-%if %with_pkcs11
+%if %{with nss}
BuildRequires: pkgconfig(nss)
%endif
-%if %with_pkcs11
+%if %{with pkcs11}
BuildRequires: pkgconfig(libpkcs11-helper-1)
%endif
-Source:
http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz
-Source5:baselibs.conf
-Requires: gpg2 >= 2.0.0
-%requires_eqlibqt4
%description
This package provides a generic Qt cryptographic architecture,
@@ -87,7 +87,7 @@
It can be extended by further plug-ins, for example, with qca-sasl for
SASL support.
-%if %with_botan
+%if %{with botan}
%package plugin-botan
Summary:Qt Cryptographic Architecture 2
Group: Development/Libraries/C and C++
@@ -104,7 +104,7 @@
SASL support.
%endif
-%if %with_nss
+%if %{with nss}
%package plugin-nss
Summary:Qt Cryptographic Architecture 2
Group: Development/Libraries/C and C++
@@ -120,7 +120,7 @@
SASL support.
%endif
-%if %with_pkcs11
+%if %{with pkcs11}
%package plugin-pkcs11
Summary:Qt Cryptographic Architecture 2 - pkcs11 support
Group: Development/Libraries/C and C++
@@ -140,22 +140,34 @@
%setup -q -n qca-%{version}
%build
-cmake .
+# TODO: When needed switch to Qt5 build
+%cmake \
+-DQCA_PLUGINS_INSTALL_DIR=%{_libdir}/qt4/plugins/ \
+-DQCA_FEATURE_INSTALL_DIR=%{_datadir}/qt4/mkspecs/features/ \
+-DQT4_BUILD=ON \
+-DWITH_cyrus-sasl_PLUGIN=ON \
+-DWITH_gcrypt_PLUGIN=ON \
+-DWITH_gnupg_PLUGIN=ON \
+-DWITH_logger_PLUGIN=ON \
+%if %{with botan}
+-DWITH_botan_PLUGIN=ON \
+%endif
+%if %{with nss}
+-DWITH_nss_PLUGIN=ON \
+%endif
+%if %{with pkcs11}
+-DWITH_pkcs11_PLUGIN=ON \
+%endif
+-DWITH_ossl_PLUGIN=ON
make %{?_smp_mflags}
%install
-make DESTDIR="%{buildroot}" install
+%cmake_install
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-# no baselibs supplements for older distros
-%if %suse_version < 1110
- sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf
-%endif
-
%files
%defattr(-,root,root)
%doc README COPYING TODO
@@ -172,9 +184,7 @@
%{_bindir}/qcatool
%{_includedir}/QtCrypto
%{_datadir}/qt4/mkspecs/features/crypto.prf
-%dir %{_datadir}/qt4/man/
-%dir %{_datadir}/qt4/man/man1/
-%{_datadir}/qt4/man/man1/qcatool.1
+%{_mandir}/man1/qcatool.1.*
%{_libdir}/libqca.so
%{_libdir}/pkgconfig/qca2.pc
%{_libdir}/cmake/Qca/
@@ -183,19 +193,19 @@
%defattr(-,root,root)
%{_libdir}/qt4/plugins/crypto/libqca-cyrus-sasl.so
-%if
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2015-12-13 09:37:00
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is "libqca2"
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2014-04-25
16:09:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2015-12-13
09:37:02.0 +0100
@@ -1,0 +2,50 @@
+Sun Dec 6 08:42:54 UTC 2015 - mailaen...@opensuse.org
+
+- update to version 2.1.1 (now part of KDE)
+- use system root certificates
+
+---
+Mon Nov 23 12:20:15 UTC 2015 - mailaen...@opensuse.org
+
+- updated to version 2.1.0 (plugins now included)
+ - Ported to Qt5 (Qt4 also supported)
+ - New building system. CMake instead of qmake
+ - Added CTR symetric cipher support to qca core
+ - Added no padding encryption algorithm to qca core
+ - qcatool2 renamed to qcatool
+ - fixed crash in qcatool when only options provided on command line without
any commands
+ - Use plugins installation path as hard-coded runtime plugins search path
+ - Added new functiion pluginPaths
+ - Added functions to get runtime QCA version
+ - Fixed 'no watch file' warnings in FileWatch
+ - Added EME_PKCS1v15_SSL Encryption Algorithm
+ - New implementation of SafeTimer to prevent crashes
+ - Updated certificates for unittests
+ - RSA Keys are permutable, can encrypt with private and decrypt with public
+ - Add unloadProvider() function for symmetry with insertProvider()
+ - Overloaded "makeKey" to derive a password depending on a time factor
+ - Remove pointer to deinit() routine from QCoreApplication at
deinitialization
+ - Fix a couple of crashes where all plugins might not be available
+ - Fix operating on keys with unrelated expired subkeys
+ - Fixed timers in Synchronizer class
+ - Dropped randomunittest
+ - Fixed many unittests
+ - qca-gnupg: internal refactoring
+ - qca-gnupg: try both gpg and gpg2 to find gnupg executable
+ - qca-gnupg: fixed some encodings problem
+ - qca-ossl: no DSA_* dl groups in FIPS specification
+ - qca-ossl: added missed signatures to CRLContext
+ - qca-ossl: fixed certs time zone
+ - qca-nss: fixed KeyLenght for Cipher
+ - qca-botan: fixed getting result size for ciphers
+- removed deprecated patches:
+ - fix-qt-check.diff
+ - r928413.diff
+ - disable-insecure-ssl.diff
+ - qca-2.0.3-gcc47.patch
+ - detect_ssl2_available.diff
+ - qca-no-ssl-internals.patch
+- enabled plugin-nss
+- spec file cleanup
+
+---
Old:
detect_ssl2_available.diff
disable-insecure-ssl.diff
fix-qt-check.diff
qca-2.0.3-gcc47.patch
qca-2.0.3.tar.bz2
qca-cyrus-sasl-2.0.0-beta3.tar.bz2
qca-gnupg-2.0.0-beta3.tar.bz2
qca-no-ssl-internals.patch
qca-ossl-2.0.0-beta3.tar.bz2
qca-pkcs11-2.0.0-beta2.tar.bz2
r928413.diff
New:
qca-2.1.1.tar.xz
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.wKg3xR/_old 2015-12-13 09:37:03.0 +0100
+++ /var/tmp/diff_new_pack.wKg3xR/_new 2015-12-13 09:37:03.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqca2
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,50 +17,39 @@
Name: libqca2
-BuildRequires: cmake
+BuildRequires: ca-certificates
+BuildRequires: cmake >= 2.8.12
BuildRequires: cyrus-sasl-devel
BuildRequires: gpg2
-BuildRequires: kde4-filesystem
BuildRequires: libdrm-devel
BuildRequires: libgcrypt-devel
BuildRequires: libjpeg-devel
-BuildRequires: libqt4-devel
-BuildRequires: openssl-devel
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(QtCore) >= 4.7
+BuildRequires: pkgconfig(libcrypto)
+BuildRequires: pkgconfig(libssl)
Summary:Qt Cryptographic Architecture 2
License:LGPL-2.1+
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Url:http://delta.affinix.com/qca/
-Version:2.0.3
+Url:https://projects.kde.org/projects/kdesupport/qca
+Version:2.1.1
Release:0
-%define tar_version %{version}
-%define my_subdirs qca-gnupg-* qca-ossl-* qca-pkcs11-* qca-cyrus-sasl-*
%define with_botan 0
-%define with_nss 0
+%define with_nss 1
%define with_pkcs11 1
%if %with_botan
-BuildRequires: libbotan-devel
+BuildRequires:
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2014-04-25 16:09:50
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is libqca2
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2014-04-17
14:11:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2014-04-25
16:09:51.0 +0200
@@ -1,0 +2,7 @@
+Sat Apr 19 04:59:22 UTC 2014 - crrodrig...@opensuse.org
+
+- qca-no-ssl-internals.patch + spec file: Never use
+ the ssl library internals directly, instead use the proper
+ API accessors.
+
+---
New:
qca-no-ssl-internals.patch
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.zhJDaC/_old 2014-04-25 16:09:52.0 +0200
+++ /var/tmp/diff_new_pack.zhJDaC/_new 2014-04-25 16:09:52.0 +0200
@@ -60,6 +60,7 @@
Patch3: qca-2.0.3-gcc47.patch
# PATCH-FIX-UPSTREAM detect_ssl2_available.diff -- fix build with no-ssl2 in
openssl lib
Patch4: detect_ssl2_available.diff
+Patch5: qca-no-ssl-internals.patch
Requires: gpg2 = 2.0.0
%requires_eqlibqt4
@@ -194,6 +195,7 @@
pushd qca-ossl-*
%patch2
%patch4 -p1
+%patch5 -p3
popd
cd ../../..
%setup -D -q -n qca-%{tar_version}
@@ -203,7 +205,7 @@
%build
# I confess this is ugly..
# but there are too many pro files to make a patch ( 180)
-find -type f -name *.pro -exec sed -i 1i QMAKE_CXXFLAGS +=$RPM_OPT_FLAGS
-DOPENSSL_LOAD_CONF -fvisibility-inlines-hidden {} +
+find -type f -name *.pro -exec sed -i 1i QMAKE_CXXFLAGS +=$RPM_OPT_FLAGS
-DOPENSSL_NO_SSL_INTERN -DOPENSSL_LOAD_CONF -fvisibility-inlines-hidden {} +
pushd plugins
rm -rf CMakeLists.txt qca-%{version}
for i in *; do
@@ -212,7 +214,7 @@
popd
export CXXFLAGS=$RPM_OPT_FLAGS
export CFLAGS=$RPM_OPT_FLAGS
-export EXTRA_FLAGS=$RPM_OPT_FLAGS -fvisibility-inlines-hidden
-DOPENSSL_LOAD_CONF
+export EXTRA_FLAGS=$RPM_OPT_FLAGS -fvisibility-inlines-hidden
-DOPENSSL_LOAD_CONF -DOPENSSL_NO_SSL_INTERN
export QMAKE_CXXFLAGS=$EXTRA_FLAGS
if [ %{_lib} = lib64 ]; then
EXTRA_FLAGS=$EXTRA_FLAGS -DLIB_SUFFIX=64
++ qca-no-ssl-internals.patch ++
--- qca-2.0.3.orig/plugins/qca-ossl-2.0.0-beta3/qca-ossl.cpp
+++ qca-2.0.3/plugins/qca-ossl-2.0.0-beta3/qca-ossl.cpp
@@ -5161,7 +5161,7 @@ public:
QStringList cipherList;
for(int i = 0; i sk_SSL_CIPHER_num(sk); ++i) {
SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i);
- cipherList += cipherIDtoString(version, thisCipher-id);
+ cipherList += cipherIDtoString(version,
SSL_CIPHER_get_id(thisCipher));
}
SSL_free(ssl);
@@ -5538,13 +5538,13 @@ public:
{
SessionInfo sessInfo;
- sessInfo.isCompressed = (0 != ssl-session-compress_meth);
+ sessInfo.isCompressed = (0 !=
SSL_SESSION_get_compress_id(SSL_get_session(ssl)));
- if (ssl-version == TLS1_VERSION)
+ if (SSL_version(ssl) == TLS1_VERSION)
sessInfo.version = TLS::TLS_v1;
- else if (ssl-version == SSL3_VERSION)
+ else if (SSL_version(ssl) == SSL3_VERSION)
sessInfo.version = TLS::SSL_v3;
- else if (ssl-version == SSL2_VERSION)
+ else if (SSL_version(ssl) == SSL2_VERSION)
sessInfo.version = TLS::SSL_v2;
else {
qDebug(unexpected version response);
@@ -5552,7 +5552,7 @@ public:
}
sessInfo.cipherSuite = cipherIDtoString( sessInfo.version,
-
SSL_get_current_cipher(ssl)-id);
+
SSL_CIPHER_get_id(SSL_get_current_cipher(ssl)));
sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl,
(sessInfo.cipherBits));
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2014-04-17 14:10:59
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is libqca2
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2013-10-14
09:29:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2014-04-17
14:11:01.0 +0200
@@ -1,0 +2,6 @@
+Wed Apr 16 16:13:46 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Added detect_ssl2_available.diff: fix build with no-ssl2 in
+ openssl lib
+
+---
New:
detect_ssl2_available.diff
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.RYieOz/_old 2014-04-17 14:11:03.0 +0200
+++ /var/tmp/diff_new_pack.RYieOz/_new 2014-04-17 14:11:03.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqca2
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -58,6 +58,8 @@
Patch1: r928413.diff
Patch2: disable-insecure-ssl.diff
Patch3: qca-2.0.3-gcc47.patch
+# PATCH-FIX-UPSTREAM detect_ssl2_available.diff -- fix build with no-ssl2 in
openssl lib
+Patch4: detect_ssl2_available.diff
Requires: gpg2 = 2.0.0
%requires_eqlibqt4
@@ -191,6 +193,7 @@
popd
pushd qca-ossl-*
%patch2
+%patch4 -p1
popd
cd ../../..
%setup -D -q -n qca-%{tar_version}
++ detect_ssl2_available.diff ++
Description: fix compile when openssl doesn't support ssl2
Origin: upstream, http://websvn.kde.org/?view=revisionrevision=1230301
--- qca-ossl/qca-ossl.cpp
+++ qca-ossl/qca-ossl.cpp
@@ -5235,9 +5235,11 @@
OpenSSL_add_ssl_algorithms();
SSL_CTX *ctx = 0;
switch (version) {
+#ifndef OPENSSL_NO_SSL2
case TLS::SSL_v2:
ctx = SSL_CTX_new(SSLv2_client_method());
break;
+#endif
case TLS::SSL_v3:
ctx = SSL_CTX_new(SSLv3_client_method());
break;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2012-03-19 09:50:48
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is libqca2, Maintainer is kde-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2012-03-12
08:53:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2012-03-19
09:52:00.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 15 09:03:35 UTC 2012 - a...@suse.de
+
+- Fix build with gcc 4.7.
+
+---
New:
qca-2.0.3-gcc47.patch
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.k1J2zD/_old 2012-03-19 09:52:03.0 +0100
+++ /var/tmp/diff_new_pack.k1J2zD/_new 2012-03-19 09:52:03.0 +0100
@@ -16,6 +16,7 @@
#
+
Name: libqca2
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
@@ -57,6 +58,7 @@
Patch0: fix-qt-check.diff
Patch1: r928413.diff
Patch2: disable-insecure-ssl.diff
+Patch3: qca-2.0.3-gcc47.patch
Requires: gpg2 = 2.0.0
%requires_eqlibqt4
@@ -194,6 +196,7 @@
cd ../../..
%setup -D -q -n qca-%{tar_version}
%patch1
+%patch3
%build
# I confess this is ugly..
++ qca-2.0.3-gcc47.patch ++
--- ./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) { MemoryRegionT::init(true, n); }
SecureVector(const T in[], u32bit n)
- { MemoryRegionT::init(true); set(in, n); }
+ { MemoryRegionT::init(true); this-set(in, n); }
SecureVector(const MemoryRegionT in)
- { MemoryRegionT::init(true); set(in); }
+ { MemoryRegionT::init(true); this-set(in); }
SecureVector(const MemoryRegionT in1, const MemoryRegionT in2)
- { MemoryRegionT::init(true); set(in1); append(in2); }
+ { MemoryRegionT::init(true); this-set(in1); append(in2); }
};
/*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libqca2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libqca2 for openSUSE:Factory checked
in at 2012-03-12 08:53:34
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
and /work/SRC/openSUSE:Factory/.libqca2.new (New)
Package is libqca2, Maintainer is kde-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2011-09-23
02:09:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2012-03-12
08:53:36.0 +0100
@@ -1,0 +2,7 @@
+Sun Mar 11 00:06:55 UTC 2012 - crrodrig...@opensuse.org
+
+- Build respecting RPM_OPT_FLAGS, ugly hack to fix all
+ *.pro files ensued.
+- Build with visibility-inlines-hidden
+
+---
Other differences:
--
++ libqca2.spec ++
--- /var/tmp/diff_new_pack.brQQzn/_old 2012-03-12 08:53:37.0 +0100
+++ /var/tmp/diff_new_pack.brQQzn/_new 2012-03-12 08:53:37.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqca2
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,25 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: libqca2
-BuildRequires: cmake libdrm-devel libjpeg-devel libqt4-devel openssl-devel
-BuildRequires: kde4-filesystem update-desktop-files
-BuildRequires: cyrus-sasl-devel gpg2 libgcrypt-devel
+BuildRequires: cmake
+BuildRequires: cyrus-sasl-devel
+BuildRequires: gpg2
+BuildRequires: kde4-filesystem
+BuildRequires: libdrm-devel
+BuildRequires: libgcrypt-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libqt4-devel
+BuildRequires: openssl-devel
+BuildRequires: update-desktop-files
+Summary:Qt Cryptographic Architecture 2
License:LGPL-2.1+
Group: Development/Libraries/C and C++
-Summary:Qt Cryptographic Architecture 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url:http://delta.affinix.com/qca/
Version:2.0.3
-Release:1
+Release:0
%define tar_version %{version}
%define my_subdirs qca-gnupg-* qca-ossl-* qca-pkcs11-* qca-cyrus-sasl-*
%define with_botan 0
@@ -71,7 +76,6 @@
Justin Karneges jus...@affinix.com
%package devel
-License:LGPL-2.1+
Summary:Qt Cryptographic Architecture 2
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -89,7 +93,6 @@
Justin Karneges jus...@affinix.com
%package plugin-cyrus-sasl
-License:LGPL-2.1+
Summary:Qt Cryptographic Architecture 2
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -112,7 +115,6 @@
%if %with_botan
%package plugin-botan
-License:LGPL-2.1+
Summary:Qt Cryptographic Architecture 2
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -137,7 +139,6 @@
%if %with_nss
%package plugin-nss
-License:LGPL-2.1+
Summary:Qt Cryptographic Architecture 2
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -161,7 +162,6 @@
%if %with_pkcs11
%package plugin-pkcs11
-License:LGPL-2.1+
Summary:Qt Cryptographic Architecture 2 - pkcs11 support
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -184,7 +184,7 @@
%endif
%prep
-%setup -c -n qca-%{tar_version}/plugins -a 1 -a 2 -a 3 -a 4
+%setup -q -c -n qca-%{tar_version}/plugins -a 1 -a 2 -a 3 -a 4
pushd qca-gnupg-*
%patch0
popd
@@ -196,6 +196,9 @@
%patch1
%build
+# I confess this is ugly..
+# but there are too many pro files to make a patch ( 180)
+find -type f -name *.pro -exec sed -i 1i QMAKE_CXXFLAGS +=$RPM_OPT_FLAGS
-fvisibility-inlines-hidden {} +
pushd plugins
rm -rf CMakeLists.txt qca-%{version}
for i in *; do
@@ -204,7 +207,8 @@
popd
export CXXFLAGS=$RPM_OPT_FLAGS
export CFLAGS=$RPM_OPT_FLAGS
-EXTRA_FLAGS=
+export EXTRA_FLAGS=$RPM_OPT_FLAGS -fvisibility-inlines-hidden
+export QMAKE_CXXFLAGS=$EXTRA_FLAGS
if [ %{_lib} = lib64 ]; then
EXTRA_FLAGS=$EXTRA_FLAGS -DLIB_SUFFIX=64
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
