* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81b94e19858e16fb7e04779001e4725daf0d453d
@ 2025-07-10 9:26 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-07-10 9:26 UTC (permalink / raw)
To: ipfire-scm
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 81b94e19858e16fb7e04779001e4725daf0d453d (commit)
via 58d2076b68d95bbec8ec2f7f337f2ba062b92400 (commit)
via ee16e42d1d4ad1fe8c0396dcc8ef2cae025056d1 (commit)
via 7fd9da42208f853cb4871744fe36ef61f7849c28 (commit)
via 943d0ef815d6ba3233664f6aa47a9036deedaee0 (commit)
via ae84010cb7e23b6d3b5708e10821459dba619f00 (commit)
from 883130628e083097f475678de1d3295e99c82ef7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 81b94e19858e16fb7e04779001e4725daf0d453d
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Jul 10 09:44:28 2025 +0200
cifs-utils: Update to version 7.4
- Update fropm version 7.3 to 7.4
- Update of rootfile
- According to Linux From Scratch cifs-utils-7.4 requires the autoreconf to work with
gcc-15. Certainly without it the build failed.
- Changelog
7.4
mount.cifs: retry mount on -EINPROGRESS
cifs.upcall: correctly treat UPTARGET_UNSPECIFIED as UPTARGET_APP
cifs.upcall: fix memory leaks in check_service_ticket_exits()
getcifsacl, setcifsacl: use <libgen.h> for basename
cifscreds: use <libgen.h> for basename
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 58d2076b68d95bbec8ec2f7f337f2ba062b92400
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Jul 10 09:44:29 2025 +0200
libtalloc: Update to version 2.4.3
- Update from version 2.4.2 to 2.4.3
- Update of rootfile
- The last changelog is recorded in the sourcde tarball is from 2007. The only place I
have found anything is by filtering the samba gitlab mirror to show the commits
related to talloc.
https://gitlab.com/samba-team/samba/-/commits/talloc-2.4.3?ref_type=tags
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit ee16e42d1d4ad1fe8c0396dcc8ef2cae025056d1
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Wed Jul 9 14:09:52 2025 +0200
swtpm: Add dist to lfs file
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 7fd9da42208f853cb4871744fe36ef61f7849c28
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Wed Jul 9 14:09:51 2025 +0200
libtpms: Add dist to lfs file
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 943d0ef815d6ba3233664f6aa47a9036deedaee0
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Wed Jul 9 14:09:50 2025 +0200
core197: Ship json-glib
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit ae84010cb7e23b6d3b5708e10821459dba619f00
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Wed Jul 9 14:09:49 2025 +0200
json-glib: Move to be built after glib has been built
- Shifted to build after glib is built and removed the dist entry that is used for
addons.
- Checked the glib library and the libgio entries are uncommented so that should be okay
- Checked build and this package then built with no problems but in the addon package
build section libtpms failed to build as it was missing the dist entry. Also the same
with swtpm so this is a patch set with the changes to those two packages as well.
- Full build tested out and confirmed working on x86_64 with this patch set applied.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/197/filelists/json-glib | 1 +
config/rootfiles/packages/cifs-utils | 14 +++++++-------
config/rootfiles/packages/libtalloc | 2 +-
lfs/cifs-utils | 12 ++++++++----
lfs/json-glib | 3 ---
lfs/libtalloc | 8 ++++----
lfs/libtpms | 5 ++++-
lfs/swtpm | 5 ++++-
make.sh | 2 +-
9 files changed, 30 insertions(+), 22 deletions(-)
create mode 120000 config/rootfiles/core/197/filelists/json-glib
Difference in files:
diff --git a/config/rootfiles/core/197/filelists/json-glib b/config/rootfiles/core/197/filelists/json-glib
new file mode 120000
index 000000000..04e13bd16
--- /dev/null
+++ b/config/rootfiles/core/197/filelists/json-glib
@@ -0,0 +1 @@
+../../../common/json-glib
\ No newline at end of file
diff --git a/config/rootfiles/packages/cifs-utils b/config/rootfiles/packages/cifs-utils
index fe8109a62..9fbafa410 100644
--- a/config/rootfiles/packages/cifs-utils
+++ b/config/rootfiles/packages/cifs-utils
@@ -1,9 +1,9 @@
sbin/mount.cifs
sbin/mount.smb3
-#usr/local/bin/smb2-quota
-#usr/local/bin/smbinfo
-#usr/local/include/cifsidmap.h
-#usr/local/share/man/man1/smb2-quota.1
-#usr/local/share/man/man1/smbinfo.1
-#usr/local/share/man/man8/mount.cifs.8
-#usr/local/share/man/man8/mount.smb3.8
+#usr/bin/smb2-quota
+#usr/bin/smbinfo
+#usr/include/cifsidmap.h
+#usr/share/man/man1/smb2-quota.1
+#usr/share/man/man1/smbinfo.1
+#usr/share/man/man8/mount.cifs.8
+#usr/share/man/man8/mount.smb3.8
diff --git a/config/rootfiles/packages/libtalloc b/config/rootfiles/packages/libtalloc
index 448ad0fc0..7cd52ba49 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.2
+usr/lib/libtalloc.so.2.4.3
#usr/lib/pkgconfig/talloc.pc
diff --git a/lfs/cifs-utils b/lfs/cifs-utils
index 068abee04..22330de9e 100644
--- a/lfs/cifs-utils
+++ b/lfs/cifs-utils
@@ -26,7 +26,7 @@ include Config
SUMMARY = Utilities for doing and managing mounts of the Linux CIFS filesystem
-VER = 7.3
+VER = 7.4
THISAPP = cifs-utils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cifs-utils
-PAK_VER = 7
+PAK_VER = 8
DEPS = libtalloc
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 59cf39ed2bf14d1fff54b6ad3b2fa410dd20b7e49ff9e87a95521d7e72cd4c5fe506f7026db2f42c53f4f79ed8f2492e3aa98b6349b000c7e2457cfea695c94d
+$(DL_FILE)_BLAKE2 = 57e03bb050b2345229dd4e0de22ac7baae7dcf080fba54c1dc339d8ecc6e60254e30feaa160568f8465698769ee513447c77de3bf8b0cd9c234ec4590e8e4270
install : $(TARGET)
@@ -85,7 +85,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure
+ cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --disable-pam \
+ --disable-systemd
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/json-glib b/lfs/json-glib
index 00617cd93..f0ac3b942 100644
--- a/lfs/json-glib
+++ b/lfs/json-glib
@@ -50,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
b2 : $(subst %,%_BLAKE2,$(objects))
-dist:
- @$(PAK)
-
###############################################################################
# Downloading, checking, b2sum
###############################################################################
diff --git a/lfs/libtalloc b/lfs/libtalloc
index 27c509a27..85d9492c4 100644
--- a/lfs/libtalloc
+++ b/lfs/libtalloc
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2025 IPFire Team <info@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 = Samba talloc Library
-VER = 2.4.2
+VER = 2.4.3
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 = 4
+PAK_VER = 5
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1f836d6b11e096e399ad7b99ad4abd3c140e75ee307695659c35b89eca600de247e5432bce523a299334f20ca2dad4c726b783a94c546b67fe25b2b7199b2915
+$(DL_FILE)_BLAKE2 = 5299ea4f19afd6b623f0c98514bdf4ae80121af3f4b38963cf2d39a8a9fdac3bd4a3119a606bc04f2a48a991bb98e7a66643e26e4f68427c64d3675b838ccc2d
install : $(TARGET)
diff --git a/lfs/libtpms b/lfs/libtpms
index 1f87a236c..6116e9412 100644
--- a/lfs/libtpms
+++ b/lfs/libtpms
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libtpms
-PAK_VER = 1
+PAK_VER = 2
DEPS =
@@ -58,6 +58,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
b2 : $(subst %,%_BLAKE2,$(objects))
+dist:
+ @$(PAK)
+
###############################################################################
# Downloading, checking, b2sum
###############################################################################
diff --git a/lfs/swtpm b/lfs/swtpm
index ccd09517e..1547610a2 100644
--- a/lfs/swtpm
+++ b/lfs/swtpm
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = swtpm
-PAK_VER = 1
+PAK_VER = 2
DEPS = libtpms
@@ -58,6 +58,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
b2 : $(subst %,%_BLAKE2,$(objects))
+dist:
+ @$(PAK)
+
###############################################################################
# Downloading, checking, b2sum
###############################################################################
diff --git a/make.sh b/make.sh
index 789d01540..dc1feb37a 100755
--- a/make.sh
+++ b/make.sh
@@ -1514,7 +1514,6 @@ build_system() {
lfsmake2 libarchive
lfsmake2 cmake
lfsmake2 json-c
- lfsmake2 json-glib
lfsmake2 tcl
lfsmake2 python3-MarkupSafe
lfsmake2 python3-Jinja2
@@ -1526,6 +1525,7 @@ build_system() {
lfsmake2 lvm2
lfsmake2 multipath-tools
lfsmake2 glib
+ lfsmake2 json-glib
lfsmake2 libgudev
lfsmake2 libgpg-error
lfsmake2 libgcrypt
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-07-10 9:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-10 9:26 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81b94e19858e16fb7e04779001e4725daf0d453d Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox