[tqsllib] Add patch by Christopher Meng to make it build again (#992800)
Till Maas
till at fedoraproject.org
Sat Aug 31 06:52:24 UTC 2013
commit 4c156846e1fb666ea27f218496a5abc49ae11359
Author: Till Maas <opensource at till.name>
Date: Sat Aug 31 08:52:09 2013 +0200
Add patch by Christopher Meng to make it build again (#992800)
tqsllib-openssl-asn-header.patch | 17 +++++++++++++++++
tqsllib.spec | 7 ++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/tqsllib-openssl-asn-header.patch b/tqsllib-openssl-asn-header.patch
new file mode 100644
index 0000000..87efe8a
--- /dev/null
+++ b/tqsllib-openssl-asn-header.patch
@@ -0,0 +1,17 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=992800
+--- tqsllib-2.2/openssl_cert.cpp
++++ tqsllib-2.2/openssl_cert.cpp
+@@ -136,7 +136,12 @@
+ /* Ugly workaround for Openssl 1.0 bug per:
+ * http://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=2123
+ */
+-#if (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x10000000L
++
++/* As Fedora ships newer version of OpenSSL, we need to change the limited
++ * version.
++ */
++
++#if (OPENSSL_VERSION_NUMBER & 0xfffff000) >= 0x10000000L
+ #define i2d_ASN1_SET i2d_ASN1_SET_buggy
+ #define d2i_ASN1_SET d2i_ASN1_SET_buggy
+ #define ASN1_seq_unpack ASN1_seq_unpack_buggy
diff --git a/tqsllib.spec b/tqsllib.spec
index 72a9ca8..49028d4 100644
--- a/tqsllib.spec
+++ b/tqsllib.spec
@@ -1,11 +1,12 @@
Name: tqsllib
Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: The TrustedQSL library
Group: Development/Libraries
License: BSD
URL: http://sourceforge.net/projects/trustedqsl/
Source: http://downloads.sourceforge.net/sourceforge/trustedqsl/%{name}-%{version}.tar.gz
+Patch0: tqsllib-openssl-asn-header.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel
BuildRequires: expat-devel
@@ -30,6 +31,7 @@ as well as a static tqsllib library and API documentation.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .openssl-asn-header
%build
#openssl, expat, zlib detection is broken on other archs
@@ -77,6 +79,9 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
%changelog
+* Sat Aug 31 2013 Till Maas <opensource at till.name> - 2.2-7
+- Add patch by Christopher Meng to make it build again (#992800)
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list