From 7720939c7536512be82434a2a2cb09190e79cb33 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 22 Feb 2024 14:11:45 +0100 Subject: davfs2: update to 1.7.0, disable uClibc-ng (no fstab.h) --- package/davfs2/Makefile | 8 ++++---- package/davfs2/patches/patch-configure_ac | 11 +++++++++++ package/davfs2/patches/patch-src_Makefile_am | 12 ------------ package/davfs2/patches/patch-src_Makefile_in | 12 ------------ 4 files changed, 15 insertions(+), 28 deletions(-) create mode 100644 package/davfs2/patches/patch-configure_ac delete mode 100644 package/davfs2/patches/patch-src_Makefile_am delete mode 100644 package/davfs2/patches/patch-src_Makefile_in (limited to 'package') diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 79cb2f960..556ccb9f1 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= davfs2 -PKG_VERSION:= 1.5.2 +PKG_VERSION:= 1.7.0 PKG_RELEASE:= 1 -PKG_HASH:= be34a19ab57a6ea77ecb82083e9e4c1882e12b2de64257de567ad5ee7a17b358 +PKG_HASH:= 251db75a27380cca1330b1b971700c5e5dcc0c90e5a47622285f0140edfe3a2f PKG_DESCR:= webdav filesystem PKG_SECTION:= net/fs PKG_DEPENDS:= fuse-utils neon @@ -14,7 +14,7 @@ PKG_BUILDDEP:= neon fuse PKG_URL:= http://savannah.nongnu.org/projects/davfs2/ PKG_SITES:= http://download.savannah.gnu.org/releases/davfs2/ -PKG_LIBC_DEPENDS:= uclibc-ng glibc +PKG_LIBC_DEPENDS:= glibc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -22,7 +22,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOLS_STYLE:= autoreconf +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --with-neon CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes diff --git a/package/davfs2/patches/patch-configure_ac b/package/davfs2/patches/patch-configure_ac new file mode 100644 index 000000000..c07fcf365 --- /dev/null +++ b/package/davfs2/patches/patch-configure_ac @@ -0,0 +1,11 @@ +--- davfs2-1.7.0.orig/configure.ac 2022-09-08 22:17:15.000000000 +0200 ++++ davfs2-1.7.0/configure.ac 2024-02-22 09:55:30.529042778 +0100 +@@ -36,7 +36,7 @@ AC_PROG_LN_S + # Checks for libraries. + AM_GNU_GETTEXT_VERSION(0.19.8) + AM_GNU_GETTEXT([external]) +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + DAV_CHECK_NEON + + # Checks for header files. diff --git a/package/davfs2/patches/patch-src_Makefile_am b/package/davfs2/patches/patch-src_Makefile_am deleted file mode 100644 index 318ebd27b..000000000 --- a/package/davfs2/patches/patch-src_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ ---- davfs2-1.5.2.orig/src/Makefile.am 2014-04-22 21:19:02.000000000 +0200 -+++ davfs2-1.5.2/src/Makefile.am 2015-10-20 07:52:29.000000000 +0200 -@@ -32,8 +32,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c - kernel_interface.h mount_davfs.h webdav.h - umount_davfs_SOURCES = umount_davfs.c defaults.h - --AM_CFLAGS = -Wall -Werror=format-security \ -- -fstack-protector --param=ssp-buffer-size=4 -+AM_CFLAGS = -Wall -Werror=format-security - DEFS = -DPROGRAM_NAME=\"mount.davfs\" \ - -DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \ - -DDAV_LOCALSTATE_DIR=\"$(dav_localstatedir)\" \ diff --git a/package/davfs2/patches/patch-src_Makefile_in b/package/davfs2/patches/patch-src_Makefile_in deleted file mode 100644 index c99e6071d..000000000 --- a/package/davfs2/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ ---- davfs2-1.5.2.orig/src/Makefile.in 2014-08-23 20:13:17.000000000 +0200 -+++ davfs2-1.5.2/src/Makefile.in 2016-09-24 10:24:45.225043359 +0200 -@@ -248,8 +248,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c - kernel_interface.h mount_davfs.h webdav.h - - umount_davfs_SOURCES = umount_davfs.c defaults.h --AM_CFLAGS = -Wall -Werror=format-security \ -- -fstack-protector --param=ssp-buffer-size=4 -+AM_CFLAGS = - - all: all-am - -- cgit v1.2.3