commit c900312572dce59b30d98ba1895b76477600bf95
Author: Jan Rękorajski <[email protected]>
Date: Sun Oct 17 11:19:50 2021 +0200
- up to 3.10.5
libdigidoc-cmake.patch | 11 -----------
libdigidoc.spec | 6 +++---
openssl3.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 14 deletions(-)
---
diff --git a/libdigidoc.spec b/libdigidoc.spec
index 13540d8..bd72000 100644
--- a/libdigidoc.spec
+++ b/libdigidoc.spec
@@ -1,14 +1,14 @@
Summary: XAdES digital signature standard library
Summary(pl.UTF-8): Biblioteka obsługująca standard podpisów cyfrowych XAdES
Name: libdigidoc
-Version: 3.10.4
+Version: 3.10.5
Release: 1
License: LGPL v2.1+
Group: Libraries
#Source0Download: https://github.com/open-eid/libdigidoc/releases
Source0:
https://github.com/open-eid/libdigidoc/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 050c73fe991dae0ffe3afec616e20851
-Patch0: %{name}-cmake.patch
+# Source0-md5: 41194d61e8922aff76336d59d5ca22ac
+Patch0: openssl3.patch
URL: https://github.com/open-eid/libdigidoc
BuildRequires: cmake >= 2.8
BuildRequires: libxml2-devel >= 2
diff --git a/libdigidoc-cmake.patch b/libdigidoc-cmake.patch
deleted file mode 100644
index 8c95a05..0000000
--- a/libdigidoc-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdigidoc-3.10.4/cmake/modules/VersionInfo.cmake~ 2018-06-12
12:22:01.000000000 +0200
-+++ libdigidoc-3.10.4/cmake/modules/VersionInfo.cmake 2018-09-14
20:59:46.952522826 +0200
-@@ -81,7 +81,7 @@ if(NOT DEFINED ENABLE_VISIBILITY)
- endif()
- endif()
-
--if(NOT DISABLE_CXX11)
-+if(FALSE)
- if(CMAKE_VERSION VERSION_GREATER 3.1.0)
- set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_CXX_STANDARD_REQUIRED YES)
diff --git a/openssl3.patch b/openssl3.patch
new file mode 100644
index 0000000..d0c2847
--- /dev/null
+++ b/openssl3.patch
@@ -0,0 +1,43 @@
+--- libdigidoc-3.10.5/libdigidoc/DigiDocOCSP.c~ 2019-11-05
14:17:13.000000000 +0100
++++ libdigidoc-3.10.5/libdigidoc/DigiDocOCSP.c 2021-10-17 11:17:05.318057531
+0200
+@@ -980,7 +980,7 @@
+ BIO_write(mem, tmpbuf, len);
+ } while(len > 0);
+ if(BIO_gets(mem, tmpbuf, 512) <= 0) {
+- OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
++ OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_NO_RESPONSE_DATA);
+ goto err;
+ }
+ /* Parse the HTTP response. This will look like this:
+@@ -991,19 +991,19 @@
+ /* Skip to first white space (passed protocol info) */
+ for(p = tmpbuf; *p && !isspace((unsigned char)*p); p++) continue;
+ if(!*p) {
+- OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
++ OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_NO_RESPONSE_DATA);
+ goto err;
+ }
+ /* Skip past white space to start of response code */
+ while(*p && isspace((unsigned char)*p)) p++;
+ if(!*p) {
+- OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
++ OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_NO_RESPONSE_DATA);
+ goto err;
+ }
+ /* Find end of response code: first whitespace after start of code */
+ for(q = p; *q && !isspace((unsigned char)*q); q++) continue;
+ if(!*q) {
+- OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
++ OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_NO_RESPONSE_DATA);
+ goto err;
+ }
+ /* Set end of response code and start of message */
+@@ -1019,7 +1019,7 @@
+ for(r = q + strlen(q) - 1; isspace((unsigned char)*r); r--) *r = 0;
+ }
+ if(retcode != 200) {
+- OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_ERROR);
++ OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_NO_RESPONSE_DATA);
+ if(!*q) {
+ ERR_add_error_data(2, "Code=", p);
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdigidoc.git/commitdiff/c900312572dce59b30d98ba1895b76477600bf95
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
