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>

diff --git a/net/davfs2/Makefile b/net/davfs2/Makefile
index 9ff566635c030ee10d372d4b5d64099706adb193..12e0fd9d6cca36fbe6cd3fd60707d323b2a45dda 100644 (file)
--- a/net/davfs2/Makefile
+++ b/net/davfs2/Makefile
@@ -8,19 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=davfs2
-PKG_VERSION:=1.5.6
+PKG_VERSION:=1.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SAVANNAH/davfs2
-PKG_HASH:=417476cdcfd53966b2dcfaf12455b54f315959b488a89255ab4b44586153d801
+PKG_HASH:=2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50
 
 PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
-PKG_LICENSE:=GPL-3
+PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:davfs2:davfs2
 
-PKG_FIXUP:=gettext-version autoreconf
+PKG_FIXUP:=gettext-version
+PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -57,8 +58,6 @@ endef
 
 CONFIGURE_ARGS += \
        --with-neon="$(STAGING_DIR)/usr" \
-       --without-libiconv-prefix \
-       --without-libintl-prefix \
        --disable-rpath
 
 define Package/davfs2/install

diff --git a/net/davfs2/patches/020-neon.patch b/net/davfs2/patches/020-neon.patch
deleted file mode 100644 (file)
index e46be6a..0000000
--- 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 (file)
index 9478b8b..0000000
--- 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 (file)
index 0000000..9478b8b
--- /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 fb3966b1f77f21483cacbf81f636909789676702..a6140d5dd4f3f6ac4c9edc89c43f7a945e720572 100644 (file)
--- 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 (file)
index 046c67e..0000000
--- 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 */