From f731798b914206f4003a3ba90b3b64cc06b3598b Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sun, 21 Jul 2019 19:01:43 +0200
Subject: [PATCH] add davfs and neon patches

---
 ...replace-have-iconv-h-with-have-iconv.patch | 40 +++++++++++++++++++
 .../libneon-openssl-deprecated.patch          | 38 ++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 archive-patches/davfs2-replace-have-iconv-h-with-have-iconv.patch
 create mode 100644 archive-patches/libneon-openssl-deprecated.patch

diff --git a/archive-patches/davfs2-replace-have-iconv-h-with-have-iconv.patch b/archive-patches/davfs2-replace-have-iconv-h-with-have-iconv.patch
new file mode 100644
index 0000000..c126b5a
--- /dev/null
+++ b/archive-patches/davfs2-replace-have-iconv-h-with-have-iconv.patch
@@ -0,0 +1,40 @@
+diff --git a/src/webdav.c b/src/webdav.c
+index 1ff7c7f..74cd957 100644
+--- a/src/webdav.c
++++ b/src/webdav.c
+@@ -25,7 +25,7 @@
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+-#ifdef HAVE_ICONV_H
++#ifdef HAVE_ICONV
+ #include <iconv.h>
+ #endif
+ #ifdef HAVE_LANGINFO_H
+@@ -231,7 +231,7 @@ static int initialized;
+    Needed by  ssl_verify() which may be called at any time. */
+ static int have_terminal;
+ 
+-#ifdef HAVE_ICONV_H
++#ifdef HAVE_ICONV
+ /* Handle to convert character encoding from utf-8 to LC_CTYPE.
+    If NULL no conversion is done. */
+ static iconv_t from_utf_8;
+@@ -264,7 +264,7 @@ static char **cookie_list;
+ /* Private function prototypes and inline functions */
+ /*==================================================*/
+ 
+-#ifdef HAVE_ICONV_H
++#ifdef HAVE_ICONV
+ static void
+ convert(char **s, iconv_t conv);
+ #endif
+@@ -337,7 +337,7 @@ dav_init_webdav(const dav_args *args)
+     if (args->neon_debug & ~NE_DBG_HTTPPLAIN)
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Initializing webdav");
+ 
+-#ifdef HAVE_ICONV_H
++#ifdef HAVE_ICONV
+     char *lc_charset = nl_langinfo(CODESET);
+     if (lc_charset && strcasecmp(lc_charset, "UTF-8") != 0) {
+         from_utf_8 = iconv_open(lc_charset, "UTF-8");
diff --git a/archive-patches/libneon-openssl-deprecated.patch b/archive-patches/libneon-openssl-deprecated.patch
new file mode 100644
index 0000000..1538647
--- /dev/null
+++ b/archive-patches/libneon-openssl-deprecated.patch
@@ -0,0 +1,38 @@
+--- a/src/ne_openssl.c
++++ b/src/ne_openssl.c
+@@ -35,6 +35,10 @@
+ #include <openssl/x509v3.h>
+ #include <openssl/rand.h>
+ #include <openssl/opensslv.h>
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#define X509_get0_notBefore X509_get_notBefore
++#define X509_get0_notAfter X509_get_notAfter
++#endif
+ 
+ #ifdef NE_HAVE_TS_SSL
+ #include <stdlib.h> /* for abort() */
+@@ -226,10 +230,10 @@ void ne_ssl_cert_validity_time(const ne_ssl_certificate *cert,
+                                time_t *from, time_t *until)
+ {
+     if (from) {
+-        *from = asn1time_to_timet(X509_get_notBefore(cert->subject));
++        *from = asn1time_to_timet(X509_get0_notBefore(cert->subject));
+     }
+     if (until) {
+-        *until = asn1time_to_timet(X509_get_notAfter(cert->subject));
++        *until = asn1time_to_timet(X509_get0_notAfter(cert->subject));
+     }
+ }
+ 
+--- a/src/ne_socket.c
++++ b/src/ne_socket.c
+@@ -27,7 +27,7 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
+-#ifdef HAVE_SYS_UIO_h
++#ifdef HAVE_SYS_UIO_H
+ #include <sys/uio.h> /* writev(2) */
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+
-- 
2.39.5