[PATCH 1/2] cifs-utils: Update to version 7.1

[PATCH 1/2] cifs-utils: Update to version 7.1

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 3297 bytes --]

- Update from version 7.0 to 7.1
- Update of rootfile not required
- libtalloc now required as a build and run-time dependency for cifs-utils
- Changelog
    7.1
	LDAP Ping capability
	smbinfo adds gettconinfo command
	Various improvements to man pages
	Detailed list of changes since 7.0 was released:
		0fae4c7 cifs-utils: bump version to 7.1
		2cd7b1f cifs: update documentation for sloppy mount option
		9918019 docs: add closetimeo description
		c4c30b5 docs: add compress description
		454870a checkopts: update it to work with latest kernel version
		465f213 cifs-utils: add documentation for multichannel and max_channels
		b3fe25c cifs-utils: smbinfo: add gettconinfo command
		c6bf4d9 Implement CLDAP Ping to find the closest site
		4718e09 (for-next) mount.cifs.rst: update section about xattr/acl support
		e7ec003 mount.cifs.rst: add missing reference for sssd
		3870f5b getcifsacl, setcifsacl: add missing <endian.h> include for le32toh
		c8ec7d1 getcifsacl, setcifsacl: add missing <linux/limits.h> include
		for XATTR_SIZE_MAX
		25d6552 cifs-utils: Make automake treat /sbin as exec, not data
		dac3301 pam_cifscreds: fix warning on NULL arg passed to %s in
			pam_syslog()
		7314638 cifs.upcall: fix UAF in get_cachename_from_process_env()
		ef0d95e cifs-utils: add documentation for acregmax and acdirmax
		2260c0d setcifsacl: Fix uninitialized value.
		1eee8e8 Use explicit "#!/usr/bin/python3"

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/cifs-utils | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lfs/cifs-utils b/lfs/cifs-utils
index 9301caef6..42eab5188 100644
--- a/lfs/cifs-utils
+++ b/lfs/cifs-utils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Utilities for doing and managing mounts of the Linux CIFS filesystem
 
-VER        = 7.0
+VER        = 7.1
 
 THISAPP    = cifs-utils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,9 +34,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cifs-utils
-PAK_VER    = 5
+PAK_VER    = 6
 
-DEPS       =
+DEPS       = libtalloc
 
 SERVICES   =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 514d35f243d0ef7b866068a9a53a4b1704d2856d491d56aa469e8e3919b4030cb920a7f60d08851b0a23d28a020d1ddf7daa8b9ac412f1567a0a60d2f6ee6774
+$(DL_FILE)_BLAKE2 = 19af86a9e0d1f00ca46288e126a88dda079b6217ed6e2627e79c75809dd79c5d0f4477da4a30913ed4802d9ede570a4c28e8624c9f17c1bb294dca5852e93144
 
 install : $(TARGET)
 
-- 
2.47.1

[PATCH 2/2] libtalloc: Update to version 2.4.2 plus moved before cifs-utils

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 2901 bytes --]

- Update from version 2.4.1 to 2.4.2
- Update of rootfile
- Moved to before cifs-utils in make.sh as now a required dependency for cifs-utils
- The last changelog is recorded in the sourcde tarball is from 2007 and I have been
   unable to find anywhere where the changes can be identified. So updated on the
   principle of having the latest version and both samba and cifs-utils now require it.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/packages/libtalloc |  2 +-
 lfs/libtalloc                       | 10 ++++++----
 make.sh                             |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/config/rootfiles/packages/libtalloc b/config/rootfiles/packages/libtalloc
index 6e131085f..448ad0fc0 100644
--- a/config/rootfiles/packages/libtalloc
+++ b/config/rootfiles/packages/libtalloc
@@ -1,5 +1,5 @@
 #usr/include/talloc.h
 #usr/lib/libtalloc.so
 usr/lib/libtalloc.so.2
-usr/lib/libtalloc.so.2.4.1
+usr/lib/libtalloc.so.2.4.2
 #usr/lib/pkgconfig/talloc.pc
diff --git a/lfs/libtalloc b/lfs/libtalloc
index 9bb3f05c0..27c509a27 100644
--- a/lfs/libtalloc
+++ b/lfs/libtalloc
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Samba talloc Library
 
-VER        = 2.4.1
+VER        = 2.4.2
 
 THISAPP    = talloc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libtalloc
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = a7913b25930c77da53c17c2e0d71386402b1059f93c751084037c5068a035bd543c2d7e24a2d8dc989bb4eea13fa1a3c7a362e4d6c14af0b2030fbfb2f513801
+$(DL_FILE)_BLAKE2 = 1f836d6b11e096e399ad7b99ad4abd3c140e75ee307695659c35b89eca600de247e5432bce523a299334f20ca2dad4c726b783a94c546b67fe25b2b7199b2915
 
 install : $(TARGET)
 
@@ -81,7 +81,9 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-python
+	cd $(DIR_APP) && ./configure \
+				--prefix=/usr \
+				--disable-python
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/make.sh b/make.sh
index 35a602f62..4ddb5be53 100755
--- a/make.sh
+++ b/make.sh
@@ -1801,6 +1801,7 @@ build_system() {
 	lfsmake2 cups-pdf
 	lfsmake2 foomatic
 	lfsmake2 hplip
+	lfsmake2 libtalloc
 	lfsmake2 cifs-utils
 	lfsmake2 krb5
 	lfsmake2 rpcsvc-proto
@@ -2033,7 +2034,6 @@ build_system() {
 	lfsmake2 libpciaccess
 	lfsmake2 libyajl
 	lfsmake2 libvirt
-	lfsmake2 libtalloc
 	lfsmake2 freeradius
 	lfsmake2 perl-common-sense
 	lfsmake2 perl-inotify2
-- 
2.47.1