diff --git a/srcpkgs/davfs2/patches/010-main_code_fix.patch b/srcpkgs/davfs2/patches/010-main_code_fix.patch index d91336d2734..ba64a7fad05 100644 --- a/srcpkgs/davfs2/patches/010-main_code_fix.patch +++ b/srcpkgs/davfs2/patches/010-main_code_fix.patch @@ -1,5 +1,5 @@ ---- a/src/cache.c -+++ b/src/cache.c +--- src/cache.c ++++ src/cache.c @@ -58,7 +58,7 @@ #ifdef HAVE_SYS_TYPES_H #include @@ -9,8 +9,8 @@ #include #include ---- a/src/webdav.c -+++ b/src/webdav.c +--- src/webdav.c ++++ src/webdav.c @@ -2033,7 +2033,7 @@ ssl_verify(void *userdata, int failures, len = getline(&s, &n, stdin); if (len < 0) diff --git a/srcpkgs/davfs2/patches/100-musl-compat.patch b/srcpkgs/davfs2/patches/100-musl-compat.patch index 96638225812..9af0e9b45d5 100644 --- a/srcpkgs/davfs2/patches/100-musl-compat.patch +++ b/srcpkgs/davfs2/patches/100-musl-compat.patch @@ -1,5 +1,5 @@ ---- a/configure.ac -+++ b/configure.ac +--- configure.ac ++++ configure.ac @@ -42,7 +42,7 @@ DAV_CHECK_NEON # Checks for header files. AC_HEADER_DIRENT @@ -18,8 +18,8 @@ # Misc. DAV_DEFAULTS ---- a/src/cache.c -+++ b/src/cache.c +--- src/cache.c ++++ src/cache.c @@ -19,12 +19,12 @@ @@ -34,8 +34,8 @@ #ifdef HAVE_FCNTL_H #include #endif ---- a/src/dav_fuse.c -+++ b/src/dav_fuse.c +--- src/dav_fuse.c ++++ src/dav_fuse.c @@ -47,6 +47,9 @@ #ifdef HAVE_SYS_STAT_H #include @@ -46,8 +46,8 @@ #include "defaults.h" #include "mount_davfs.h" ---- a/src/kernel_interface.c -+++ b/src/kernel_interface.c +--- src/kernel_interface.c ++++ src/kernel_interface.c @@ -19,8 +19,8 @@ @@ -68,8 +68,8 @@ #include #include "defaults.h" ---- a/src/mount_davfs.c -+++ b/src/mount_davfs.c +--- src/mount_davfs.c ++++ src/mount_davfs.c @@ -19,10 +19,10 @@ @@ -82,8 +82,8 @@ #ifdef HAVE_FCNTL_H #include #endif ---- a/src/umount_davfs.c -+++ b/src/umount_davfs.c +--- src/umount_davfs.c ++++ src/umount_davfs.c @@ -19,8 +19,8 @@ @@ -94,8 +94,8 @@ #include #include #ifdef HAVE_LIBINTL_H ---- a/src/webdav.c -+++ b/src/webdav.c +--- src/webdav.c ++++ src/webdav.c @@ -19,9 +19,9 @@ @@ -126,7 +126,7 @@ session = ne_session_create(args->scheme, args->host, args->port); --- /dev/null -+++ b/src/compat.h ++++ src/compat.h @@ -0,0 +1,64 @@ +#ifndef _COMPAT_H +#define _COMPAT_H diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template index 70f3c71087a..0ec869e8db4 100644 --- a/srcpkgs/davfs2/template +++ b/srcpkgs/davfs2/template @@ -1,19 +1,18 @@ # Template file for 'davfs2' pkgname=davfs2 -version=1.5.4 +version=1.5.5 revision=1 build_style=gnu-configure configure_args="dav_user=nobody dav_group=network --enable-largefile" -hostmakedepends="autoconf automake gettext-devel neon-devel" +hostmakedepends="automake gettext-devel neon-devel" makedepends="neon-devel" conf_files="/etc/davfs2/davfs2.conf /etc/davfs2/secrets" short_desc="File system driver that allows you to mount a WebDAV folder" maintainer="Alexander Mamay " -license="GPL-3" -homepage="http://savannah.nongnu.org/projects/davfs2" +license="GPL-3.0-or-later" +homepage="https://savannah.nongnu.org/projects/davfs2" distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=c9c4e0f0912a782386216b2147eb9c36c47f193b8fcf3d637719e0b9fe7c96e0 -patch_args="-p1" +checksum=587c6a25ad78109995a7ccb8e60aa1c491b149f2c99d47033f3d5e648430ad2f pre_configure() { autoreconf -fi