[libcrypt-openssl-x509-perl] 06/08: Drop 0002-Fix-STACK_OF-OPENSSL_STRING-conflicts-with-OpenSSL-1.patch patch

[Salvatore Bonaccorso]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch master
in repository libcrypt-openssl-x509-perl.

commit 98981cdee9a898c0c7ac4b4bf9d46e68a7269f1c
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sat Nov 11 14:26:10 2017 +0100

    Drop 0002-Fix-STACK_OF-OPENSSL_STRING-conflicts-with-OpenSSL-1.patch patch
---
 ...F-OPENSSL_STRING-conflicts-with-OpenSSL-1.patch | 44 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 45 deletions(-)

diff --git a/debian/patches/0002-Fix-STACK_OF-OPENSSL_STRING-conflicts-with-OpenSSL-1.patch b/debian/patches/0002-Fix-STACK_OF-OPENSSL_STRING-conflicts-with-OpenSSL-1.patch
deleted file mode 100644
index 3e4f679..0000000
--- a/debian/patches/0002-Fix-STACK_OF-OPENSSL_STRING-conflicts-with-OpenSSL-1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 47a65ecd166526bbc43c86cb38c743e84b050eec Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Thu, 27 Oct 2016 12:16:29 +0200
-Subject: [PATCH] Fix STACK_OF(OPENSSL_STRING) conflicts with OpenSSL 1.1.0
-
-Since OpenSSL 1.1.0, STACK_OF(OPENSSL_STRING) defines
-sk_OPENSSL_STRING_num() and other accessors as a functions, not
-macros. Thus the #ifndef sk_OPENSSL_STRING_num incorrectly redefined
-them and caused fatal warnings about incompatible types.
-
-This patch redefines the accessors only with OpenSSL older than 1.1.0.
-
-<https://github.com/dsully/perl-crypt-openssl-x509/issues/53>
----
- X509.xs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/X509.xs b/X509.xs
-index 9d11f03..a08ed81 100644
---- a/X509.xs
-+++ b/X509.xs
-@@ -35,6 +35,9 @@ typedef X509_NAME_ENTRY* Crypt__OpenSSL__X509__Name_Entry;
- typedef X509_CRL* Crypt__OpenSSL__X509__CRL;
- 
- /* 1.0 backwards compat */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#define const_ossl11
-+
- #ifndef sk_OPENSSL_STRING_num
- #define sk_OPENSSL_STRING_num sk_num
- #endif
-@@ -43,9 +46,6 @@ typedef X509_CRL* Crypt__OpenSSL__X509__CRL;
- #define sk_OPENSSL_STRING_value sk_value
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
--#define const_ossl11
--
- static ASN1_INTEGER *X509_get0_serialNumber(const X509 *a)
- {
-   return a->cert_info->serialNumber;
--- 
-2.10.2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index debfb43..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0002-Fix-STACK_OF-OPENSSL_STRING-conflicts-with-OpenSSL-1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcrypt-openssl-x509-perl.git