cifs-utils: update to 7.5

Update from 6.11 to 7.5. Notable changes across releases:

- 7.5: fix cifscreds command-line option parsing and ambiguous command
  matching; documentation updates for echo_interval parameter
- 7.4: retry logic for -EINPROGRESS errors during mount operations;
  improved handling for multiple IP address resolution scenarios
- 7.3: fix guest mount option handling; prevent empty password
  parameters from being passed to the SMB client
- 7.2: improve return code checking in getcifsacl; better handling of
  permission-related errors across different kernel versions
- 7.1: add upcall_target mount option for namespace resolution; enable
  credential lookups in host or application namespace (e.g., Kubernetes)
- 7.0: migrate files to /usr per DEP17 M2 standard
- 6.15: fix CVE-2022-27239 (stack buffer overflow in ip= argument
  parsing) and CVE-2022-29869 (info leak in verbose logging)

Add libtalloc dependency to cifsmount

Add test.sh to verify mount.cifs and smbinfo report the correct version.

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/net/cifs-utils/Makefile b/net/cifs-utils/Makefile
index c809e940f7f9281dea7473f866abb65ad5718275..93ece9d5f49e2d5716d0f57fbf7fa049782241b1 100644 (file)
--- a/net/cifs-utils/Makefile
+++ b/net/cifs-utils/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cifs-utils
-PKG_VERSION:=6.11
+PKG_VERSION:=7.5
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://download.samba.org/pub/linux-cifs/cifs-utils/
-PKG_HASH:=b859239a3f204f8220d3e54ed43bf8109e1ef202042dd87ba87492f8878728d9
+PKG_HASH:=7face85e3d2d5eb5e7adbd181adee6759097f135b10d6fb30be8e070af7e7054
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
@@ -31,7 +31,7 @@ define Package/cifsmount
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Filesystem
-  DEPENDS:=+kmod-fs-cifs
+  DEPENDS:=+kmod-fs-cifs +libtalloc
   TITLE:=CIFS mount
   URL:=https://wiki.samba.org/index.php/LinuxCIFS_utils
 endef
@@ -39,7 +39,7 @@ endef
 define Package/smbinfo
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-fs-cifs
+  DEPENDS:=+kmod-fs-cifs +libtalloc
   TITLE:=SMB info
   URL:=https://wiki.samba.org/index.php/LinuxCIFS_utils
 endef
@@ -59,7 +59,7 @@ CONFIGURE_ARGS += \
 CONFIGURE_ARGS += \
        ac_cv_lib_cap_ng_capng_clear=no
 
-TARGET_CFLAGS += $(FPIC) -ffunction-sections
+TARGET_CFLAGS += $(FPIC) -ffunction-sections -I$(STAGING_DIR)/usr/include
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 
 define Build/InstallDev

diff --git a/net/cifs-utils/patches/010-no-libtalloc.patch b/net/cifs-utils/patches/010-no-libtalloc.patch
deleted file mode 100644 (file)
index 29de8f1..0000000
--- a/net/cifs-utils/patches/010-no-libtalloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/data_blob.h
-+++ b/data_blob.h
-@@ -23,7 +23,7 @@
- #ifndef _SAMBA_DATABLOB_H_
- #define _SAMBA_DATABLOB_H_
- 
--#include <talloc.h>
-+//#include <talloc.h>
- #include <stdint.h>
- 
- /* used to hold an arbitrary blob of data */

diff --git a/net/cifs-utils/patches/020-no-smb3.patch b/net/cifs-utils/patches/020-no-smb3.patch
index bb20af422abc23574c3515e3de774740233f0f4a..04c9cdd716f8f554167b4366e27d38148e0f8919 100644 (file)
--- a/net/cifs-utils/patches/020-no-smb3.patch
+++ b/net/cifs-utils/patches/020-no-smb3.patch
@@ -1,13 +1,14 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -119,10 +119,8 @@ endif
+@@ -121,11 +121,9 @@ endif
  SUBDIRS = contrib
  
- install-exec-hook:
--      (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
+ install-exec-hook: install-sbinPROGRAMS
+-      (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
  
  install-data-hook:
--      (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
+ if CONFIG_MAN
+-      ( cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
+ endif
  
  uninstall-hook:
-       (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)

diff --git a/net/cifs-utils/test.sh b/net/cifs-utils/test.sh
new file mode 100644 (file)
index 0000000..681edde
--- /dev/null
+++ b/net/cifs-utils/test.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case "$1" in
+cifsmount)
+       mount.cifs --version 2>&1 | grep -F "$2"
+       ;;
+smbinfo)
+       smbinfo --version 2>&1 | grep -F "$2"
+       ;;
+esac