From 1205e07a3e4f03571fb9d38a2e90af1032089945 Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 28 Jul 2021 09:57:22 +0200 Subject: [PATCH] bump version neon-0.31.2 & davfs-1.6.0 --- ...patch => davfs2-1.5.5-main-code-fix.patch} | 0 ...t.patch => davfs2-1.5.5-musl-compat.patch} | 0 ...fs2-1.5.5-no-forced-stack-protector.patch} | 0 ...eplace-have-iconv-h-with-have-iconv.patch} | 0 .../davfs2-1.6.0-main-code-fix.patch | 11 + .../davfs2-1.6.0-musl-compat.patch | 194 ++++++++++++++++++ ...vfs2-1.6.0-no-forced-stack-protector.patch | 13 ++ ...replace-have-iconv-h-with-have-iconv.patch | 11 + make/extras.mk | 9 +- make/versions.mk | 4 +- 10 files changed, 235 insertions(+), 7 deletions(-) rename archive-patches/{davfs2-main-code-fix.patch => davfs2-1.5.5-main-code-fix.patch} (100%) rename archive-patches/{davfs2-musl-compat.patch => davfs2-1.5.5-musl-compat.patch} (100%) rename archive-patches/{davfs2-1.5.4-no-forced-stack-protector.patch => davfs2-1.5.5-no-forced-stack-protector.patch} (100%) rename archive-patches/{davfs2-replace-have-iconv-h-with-have-iconv.patch => davfs2-1.5.5-replace-have-iconv-h-with-have-iconv.patch} (100%) create mode 100644 archive-patches/davfs2-1.6.0-main-code-fix.patch create mode 100644 archive-patches/davfs2-1.6.0-musl-compat.patch create mode 100644 archive-patches/davfs2-1.6.0-no-forced-stack-protector.patch create mode 100644 archive-patches/davfs2-1.6.0-replace-have-iconv-h-with-have-iconv.patch diff --git a/archive-patches/davfs2-main-code-fix.patch b/archive-patches/davfs2-1.5.5-main-code-fix.patch similarity index 100% rename from archive-patches/davfs2-main-code-fix.patch rename to archive-patches/davfs2-1.5.5-main-code-fix.patch diff --git a/archive-patches/davfs2-musl-compat.patch b/archive-patches/davfs2-1.5.5-musl-compat.patch similarity index 100% rename from archive-patches/davfs2-musl-compat.patch rename to archive-patches/davfs2-1.5.5-musl-compat.patch diff --git a/archive-patches/davfs2-1.5.4-no-forced-stack-protector.patch b/archive-patches/davfs2-1.5.5-no-forced-stack-protector.patch similarity index 100% rename from archive-patches/davfs2-1.5.4-no-forced-stack-protector.patch rename to archive-patches/davfs2-1.5.5-no-forced-stack-protector.patch diff --git a/archive-patches/davfs2-replace-have-iconv-h-with-have-iconv.patch b/archive-patches/davfs2-1.5.5-replace-have-iconv-h-with-have-iconv.patch similarity index 100% rename from archive-patches/davfs2-replace-have-iconv-h-with-have-iconv.patch rename to archive-patches/davfs2-1.5.5-replace-have-iconv-h-with-have-iconv.patch diff --git a/archive-patches/davfs2-1.6.0-main-code-fix.patch b/archive-patches/davfs2-1.6.0-main-code-fix.patch new file mode 100644 index 0000000..a20430f --- /dev/null +++ b/archive-patches/davfs2-1.6.0-main-code-fix.patch @@ -0,0 +1,11 @@ +--- a/src/webdav.c ++++ b/src/webdav.c +@@ -2045,7 +2045,7 @@ ssl_verify(void *userdata, int failures, + len = getline(&s, &n, stdin); + if (len < 0) + abort(); +- if (rpmatch(s) > 0) ++ if ((s[0]=='y' || s[0]=='Y') > 0) + ret = 0; + free(s); + } diff --git a/archive-patches/davfs2-1.6.0-musl-compat.patch b/archive-patches/davfs2-1.6.0-musl-compat.patch new file mode 100644 index 0000000..b781c43 --- /dev/null +++ b/archive-patches/davfs2-1.6.0-musl-compat.patch @@ -0,0 +1,194 @@ +--- a/configure.ac 2020-08-04 16:50:36.000000000 +0200 ++++ b/configure.ac 2021-07-28 09:11:09.157980505 +0200 +@@ -42,7 +42,7 @@ DAV_CHECK_NEON + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +-AC_CHECK_HEADERS([fcntl.h iconv.h libintl.h langinfo.h limits.h locale.h mntent.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/mount.h sys/time.h syslog.h termios.h unistd.h utime.h]) ++AC_CHECK_HEADERS([fcntl.h iconv.h libintl.h langinfo.h limits.h locale.h mntent.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/mount.h sys/time.h syslog.h termios.h unistd.h utime.h error.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +@@ -78,7 +78,7 @@ AC_FUNC_SELECT_ARGTYPES + AC_FUNC_STRFTIME + AC_FUNC_STAT + AC_FUNC_UTIME_NULL +-AC_CHECK_FUNCS([endpwent ftruncate getmntent iconv memset mkdir nl_langinfo rpmatch select setlocale strcasecmp strchr strdup strerror strpbrk strrchr strstr strtol strtoull utime]) ++AC_CHECK_FUNCS([endpwent ftruncate getmntent iconv memset mkdir nl_langinfo rpmatch select setlocale strcasecmp strchr strdup strerror strpbrk strrchr strstr strtol strtoull utime canonicalize_file_name fopencookie]) + + # Misc. + DAV_DEFAULTS +--- a/src/cache.c 2020-08-03 11:31:52.000000000 +0200 ++++ b/src/cache.c 2021-07-28 09:09:13.434003720 +0200 +@@ -19,12 +19,12 @@ + + + #include "config.h" ++#include "compat.h" + + #ifdef HAVE_DIRENT_H + #include + #endif + #include +-#include + #ifdef HAVE_FCNTL_H + #include + #endif +--- a/src/dav_fuse.c 2020-08-03 11:33:19.000000000 +0200 ++++ b/src/dav_fuse.c 2021-07-28 09:09:13.434003720 +0200 +@@ -47,6 +47,9 @@ + #ifdef HAVE_SYS_STAT_H + #include + #endif ++#ifdef HAVE_SYS_SELECT_H ++#include ++#endif + + #include "defaults.h" + #include "mount_davfs.h" +--- a/src/kernel_interface.c 2020-08-03 11:11:17.000000000 +0200 ++++ b/src/kernel_interface.c 2021-07-28 09:13:29.665994020 +0200 +@@ -21,7 +21,8 @@ + #include "config.h" + + #include +-#include ++#include "compat.h" ++//#include + #ifdef HAVE_FCNTL_H + #include + #endif +@@ -52,6 +53,9 @@ + #ifdef HAVE_SYS_STAT_H + #include + #endif ++#ifdef HAVE_SYS_TYPES_H ++#include ++#endif + #include + + #include "defaults.h" +--- a/src/mount_davfs.c 2020-08-03 11:13:20.000000000 +0200 ++++ b/src/mount_davfs.c 2021-07-28 09:09:13.434003720 +0200 +@@ -19,10 +19,10 @@ + + + #include "config.h" ++#include "compat.h" + + #include + #include +-#include + #ifdef HAVE_FCNTL_H + #include + #endif +--- a/src/umount_davfs.c 2019-11-26 12:05:09.000000000 +0100 ++++ b/src/umount_davfs.c 2021-07-28 09:09:13.434003720 +0200 +@@ -19,8 +19,8 @@ + + + #include "config.h" ++#include "compat.h" + +-#include + #include + #include + #ifdef HAVE_LIBINTL_H +--- a/src/webdav.c 2020-06-07 18:13:03.000000000 +0200 ++++ b/src/webdav.c 2021-07-28 09:09:13.434003720 +0200 +@@ -19,9 +19,9 @@ + + + #include "config.h" ++#include "compat.h" + + #include +-#include + #ifdef HAVE_FCNTL_H + #include + #endif +@@ -368,6 +368,7 @@ dav_init_webdav(const dav_args *args) + error(EXIT_FAILURE, errno, _("socket library initialization failed")); + + if (args->neon_debug & ~NE_DBG_HTTPPLAIN) { ++#ifdef HAVE_FOPENCOOKIE + char *buf = malloc(log_bufsize); + cookie_io_functions_t *log_func = malloc(sizeof(cookie_io_functions_t)); + if (!log_func) abort(); +@@ -380,6 +381,9 @@ dav_init_webdav(const dav_args *args) + error(EXIT_FAILURE, errno, + _("can't open stream to log neon-messages")); + ne_debug_init(log_stream, args->neon_debug); ++#else ++ error(EXIT_FAILURE, 0, "neon debugging unsupported"); ++#endif + } + + session = ne_session_create(args->scheme, args->host, args->port); +--- /dev/null ++++ b/src/compat.h +@@ -0,0 +1,64 @@ ++#ifndef _COMPAT_H ++#define _COMPAT_H ++ ++#ifndef _PATH_MOUNTED ++# define _PATH_MOUNTED "/proc/mounts" ++#endif ++ ++#ifndef _PATH_MNTTAB ++# define _PATH_MNTTAB "/etc/fstab" ++#endif ++ ++#ifdef HAVE_ERROR_H ++# include ++#else ++# include ++# include ++# include ++# include ++static void error_at_line(int status, int errnum, const char *filename, ++ unsigned int linenum, const char *format, ...) ++{ ++ va_list ap; ++ ++ fflush(stdout); ++ ++ if (filename != NULL) ++ fprintf(stderr, "%s:%u: ", filename, linenum); ++ ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ ++ if (errnum != 0) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ ++ fprintf(stderr, "\n"); ++ ++ if (status != 0) ++ exit(status); ++} ++ ++#define error(status, errnum, format...) \ ++ error_at_line(status, errnum, NULL, 0, format) ++ ++#endif /* HAVE_ERROR_H */ ++ ++#ifndef HAVE_CANONICALIZE_FILE_NAME ++#include ++#include ++#include ++static char * canonicalize_file_name(const char *path) ++{ ++ char buf[PATH_MAX] = { }; ++ ++ snprintf(buf, sizeof(buf) - 1, "%s", path); ++ ++ if (!realpath(path, buf)) ++ return NULL; ++ ++ return strdup(buf); ++} ++#endif ++ ++#endif /* _COMPAT_H */ diff --git a/archive-patches/davfs2-1.6.0-no-forced-stack-protector.patch b/archive-patches/davfs2-1.6.0-no-forced-stack-protector.patch new file mode 100644 index 0000000..e033163 --- /dev/null +++ b/archive-patches/davfs2-1.6.0-no-forced-stack-protector.patch @@ -0,0 +1,13 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -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-strong --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/archive-patches/davfs2-1.6.0-replace-have-iconv-h-with-have-iconv.patch b/archive-patches/davfs2-1.6.0-replace-have-iconv-h-with-have-iconv.patch new file mode 100644 index 0000000..f2abd59 --- /dev/null +++ b/archive-patches/davfs2-1.6.0-replace-have-iconv-h-with-have-iconv.patch @@ -0,0 +1,11 @@ +--- a/src/webdav.c 2020-06-07 18:13:03.000000000 +0200 ++++ b/src/webdav.c 2021-07-28 09:25:10.802089137 +0200 +@@ -25,7 +25,7 @@ + #ifdef HAVE_FCNTL_H + #include + #endif +-#ifdef HAVE_ICONV_H ++#ifdef HAVE_ICONV + #include + #endif + #ifdef HAVE_LANGINFO_H diff --git a/make/extras.mk b/make/extras.mk index 159a495..7437a3a 100644 --- a/make/extras.mk +++ b/make/extras.mk @@ -69,7 +69,6 @@ $(D)/libneon: $(D)/expat $(D)/openssl $(ARCHIVE)/neon-$(NEON_VER).tar.gz | $(TAR $(START_BUILD) $(UNTAR)/neon-$(NEON_VER).tar.gz pushd $(BUILD_TMP)/neon-$(NEON_VER); \ - $(PATCH)/libneon-openssl-deprecated.patch; \ export CFLAGS="-I$(TARGETPREFIX)/include" \ export LIBS="-L$(TARGETPREFIX)/lib" && \ ./configure \ @@ -92,10 +91,10 @@ $(D)/davfs2: $(D)/libneon $(ARCHIVE)/davfs2-$(DAVFS2_VER).tar.gz | $(TARGETPREFI $(START_BUILD) $(UNTAR)/davfs2-$(DAVFS2_VER).tar.gz pushd $(BUILD_TMP)/davfs2-$(DAVFS2_VER); \ - $(PATCH)/davfs2-main-code-fix.patch; \ - $(PATCH)/davfs2-musl-compat.patch; \ - $(PATCH)/davfs2-1.5.4-no-forced-stack-protector.patch; \ - $(PATCH)/davfs2-replace-have-iconv-h-with-have-iconv.patch; \ + $(PATCH)/davfs2-$(DAVFS2_VER)-main-code-fix.patch; \ + $(PATCH)/davfs2-$(DAVFS2_VER)-musl-compat.patch; \ + $(PATCH)/davfs2-$(DAVFS2_VER)-no-forced-stack-protector.patch; \ + $(PATCH)/davfs2-$(DAVFS2_VER)-replace-have-iconv-h-with-have-iconv.patch; \ export ac_cv_func_malloc_0_nonnull=yes; \ ./configure \ --prefix= \ diff --git a/make/versions.mk b/make/versions.mk index 5b2635f..0534288 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -52,7 +52,7 @@ E2FSPROGS_VER = 1.42.13 endif -DAVFS2_VER = 1.5.5 +DAVFS2_VER = 1.6.0 # dosfstools consists of the programs mkfs.fat, fsck.fat and fatlabel to create, check and label file systems of the FAT family. DOSFSTOOLS_VER = 4.1 @@ -184,7 +184,7 @@ MTD_UTILS_VER = 2.0.2 NCURSES_VER=6.1 # NEON s an HTTP and WebDAV client library, with a C interface. -NEON_VER = 0.30.2 +NEON_VER = 0.31.2 # The NFS Utilities package contains the userspace server and client tools necessary to use the kernel's NFS abilities. NFS_UTILS_VER = 2.2.1 -- 2.39.5