From c03f25a00a36861a23ea500c0fcb2d6bd3f827b9 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 11 Aug 2020 21:24:43 -0700
Subject: davfs2: update to 1.6.0

Removed now unnecessary gcc10 patch.

Removed neon patch. It's now upstream.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 net/davfs2/patches/020-neon.patch      | 11 -----------
 net/davfs2/patches/050-sys-types.h     | 11 -----------
 net/davfs2/patches/050-sys-types.patch | 11 +++++++++++
 net/davfs2/patches/070-no-error.patch  |  3 ++-
 net/davfs2/patches/400-gcc10.patch     | 11 -----------
 5 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 net/davfs2/patches/020-neon.patch
 delete mode 100644 net/davfs2/patches/050-sys-types.h
 create mode 100644 net/davfs2/patches/050-sys-types.patch
 delete mode 100644 net/davfs2/patches/400-gcc10.patch

(limited to 'net/davfs2/patches')

diff --git a/net/davfs2/patches/020-neon.patch b/net/davfs2/patches/020-neon.patch
deleted file mode 100644
index e46be6a95..000000000
--- a/net/davfs2/patches/020-neon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,7 +36,7 @@ AC_PROG_LN_S
- # Checks for libraries.
- AM_GNU_GETTEXT_VERSION(0.18.1)
- AM_GNU_GETTEXT([external])
--NE_REQUIRE_VERSIONS([0], [27 28 29 30])
-+NE_REQUIRE_VERSIONS([0], [27 28 29 30 31])
- DAV_CHECK_NEON
- 
- # Checks for header files.
diff --git a/net/davfs2/patches/050-sys-types.h b/net/davfs2/patches/050-sys-types.h
deleted file mode 100644
index 9478b8b78..000000000
--- a/net/davfs2/patches/050-sys-types.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/kernel_interface.c
-+++ b/src/kernel_interface.c
-@@ -45,6 +45,8 @@
- #include <unistd.h>
- #endif
- 
-+#include <sys/types.h>
-+
- #ifdef HAVE_SYS_MOUNT_H
- #include <sys/mount.h>
- #endif
diff --git a/net/davfs2/patches/050-sys-types.patch b/net/davfs2/patches/050-sys-types.patch
new file mode 100644
index 000000000..9478b8b78
--- /dev/null
+++ b/net/davfs2/patches/050-sys-types.patch
@@ -0,0 +1,11 @@
+--- a/src/kernel_interface.c
++++ b/src/kernel_interface.c
+@@ -45,6 +45,8 @@
+ #include <unistd.h>
+ #endif
+ 
++#include <sys/types.h>
++
+ #ifdef HAVE_SYS_MOUNT_H
+ #include <sys/mount.h>
+ #endif
diff --git a/net/davfs2/patches/070-no-error.patch b/net/davfs2/patches/070-no-error.patch
index fb3966b1f..a6140d5dd 100644
--- a/net/davfs2/patches/070-no-error.patch
+++ b/net/davfs2/patches/070-no-error.patch
@@ -69,12 +69,13 @@
 +#endif /* _COMPAT_H */
 --- a/src/kernel_interface.c
 +++ b/src/kernel_interface.c
-@@ -19,8 +19,8 @@
+@@ -19,9 +19,9 @@
  
  
  #include "config.h"
 +#include "compat.h"
  
+ #include <errno.h>
 -#include <error.h>
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
diff --git a/net/davfs2/patches/400-gcc10.patch b/net/davfs2/patches/400-gcc10.patch
deleted file mode 100644
index 046c67e58..000000000
--- a/net/davfs2/patches/400-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/dav_coda.c
-+++ b/src/dav_coda.c
-@@ -97,7 +97,7 @@ static unsigned int blocksize;
- static size_t alignment;
- 
- /* Send debug messages to syslog if != 0. */
--int debug;
-+extern int debug;
- 
- 
- /* Private function prototypes */
-- 
cgit v1.2.3