* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ee8b09e77d006492f89f7a8d39c4ef3787f279c4
@ 2025-03-25 15:47 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-03-25 15:47 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 ee8b09e77d006492f89f7a8d39c4ef3787f279c4 (commit)
via 28867b07c217d0cb2a855c1e1e6ac42ac2f5f32e (commit)
via 52d025342d0b804d71e1238a5c6c88d59fd973a0 (commit)
via a9cebe70db0156b72278f33dc2dcb66bc731b1e8 (commit)
via 1526aea812a7f354daf50c9edab114f95c762058 (commit)
via f6bc9fef66adde4bdc6e3076b6db081f45764569 (commit)
from b992bcc7c7af09f02eb56b40ff0635242b25cc34 (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 ee8b09e77d006492f89f7a8d39c4ef3787f279c4
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue Mar 25 15:46:54 2025 +0000
core194: Remove libidn
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 28867b07c217d0cb2a855c1e1e6ac42ac2f5f32e
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon Mar 24 18:44:26 2025 +0100
libidn: Removal of package as no longer needed.
- A while back elinks changed from using libidn to libidn2. At that time that left
ghostscript as the only package still using libidn. With the removal of cups and
associated packages, including ghostscript, libidn is no longer used. libidn2 is
used where required now.
- This removes the lfs and rootfiles and removes the entry from the make.sh file.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 52d025342d0b804d71e1238a5c6c88d59fd973a0
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon Mar 24 18:44:25 2025 +0100
cifs-utils: Update to version 7.3
- Update from version 7.1 to 7.3
- Update of rootfile not required.
- Changelog
7.3
Fix regression in mount.cifs with guest mount option
cldap_ping: Fix socket fd leak
resolve_host.c: Initialize site_name
7.2
cifs-utils: Skip TGT check if valid service ticket is already available
docs: update actimeo description
docs: add max_cached_dirs description
docs: add esize description
cifs-utils: support and document password2 mount option
use enums to check password or password2 in set_password,
get_password_from_file and minor documentation additions
Fix compiler warnings in mount.cifs
Do not pass passwords with sec=none and sec=krb5
smbinfo: add bash completion support for filestreaminfo, keys, gettconinfo
cifs-utils: bump version to 7.2
CIFS.upcall to accomodate new namespace mount opt
cifs-utils: add documentation for upcall_target
cifs-utils: avoid using mktemp when updating mtab
getcifsacl: fix return code check for getting full ACL
cifscreds: use continue instead of break when matching commands
cifscreds: allow user to set the key's timeout
configure.ac: libtalloc is now mandatory
cldap_ping.c: add missing <sys/types.h> include
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit a9cebe70db0156b72278f33dc2dcb66bc731b1e8
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue Mar 25 15:39:08 2025 +0000
core194: Ship abseil-cpp
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 1526aea812a7f354daf50c9edab114f95c762058
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon Mar 24 18:44:24 2025 +0100
abseil-cpp: Update to version 20250127.0
- Update from version 20240722.0 to 20250127.0
- Update of rootfile
- Changelog
20250127.0
What's New:
Added support for Bazel 8.0
Added support for Bazel Platforms for better portability
Added ABSL_ATTRIBUTE_VIEW and ABSL_ATTRIBUTE_OWNER for diagnosing certain
lifetime issues
Many performance improvements
A security issue in hash container create/resize has been fixed. Note that
the latest patch releases for previous LTS versions also address this
issue.
Breaking Changes:
Bazel BUILD files now reference repositories by their canonical names from
the Bazel Central Registry. For example, Abseil is now @abseil-cpp
instead of @com_google_absl, and GoogleTest is now @googletest instead
of @com_google_googletest. Users still using the old WORKSPACE system
may need to use repo_mapping on repositories that still use the old
names. See 90a7ba6 for an example.
Other:
This will be the last release to support C++14. Future releases will
require at least C++17.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit f6bc9fef66adde4bdc6e3076b6db081f45764569
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue Mar 25 15:38:10 2025 +0000
Revert "vpnmain.cgi: Fixes bug13737 - increments the serial number to allow cert regen"
This reverts commit 7d1d7e0bec4c7f991dbbb622ce414e0b91d14d74.
Reverted as requested by Adolf due to some work being required on this.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/abseil-cpp | 10 ++++
config/rootfiles/common/libidn | 15 -----
config/rootfiles/core/194/filelists/abseil-cpp | 1 +
config/rootfiles/core/194/update.sh | 4 ++
html/cgi-bin/vpnmain.cgi | 7 ---
lfs/abseil-cpp | 6 +-
lfs/cifs-utils | 8 +--
lfs/libidn | 83 --------------------------
make.sh | 1 -
9 files changed, 22 insertions(+), 113 deletions(-)
delete mode 100644 config/rootfiles/common/libidn
create mode 120000 config/rootfiles/core/194/filelists/abseil-cpp
delete mode 100644 lfs/libidn
Difference in files:
diff --git a/config/rootfiles/common/abseil-cpp b/config/rootfiles/common/abseil-cpp
index deb43daad..be751acbd 100644
--- a/config/rootfiles/common/abseil-cpp
+++ b/config/rootfiles/common/abseil-cpp
@@ -23,6 +23,8 @@
#usr/include/absl/base/CMakeFiles/strerror.dir/internal
#usr/include/absl/base/CMakeFiles/throw_delegate.dir
#usr/include/absl/base/CMakeFiles/throw_delegate.dir/internal
+#usr/include/absl/base/CMakeFiles/tracing_internal.dir
+#usr/include/absl/base/CMakeFiles/tracing_internal.dir/internal
#usr/include/absl/base/attributes.h
#usr/include/absl/base/call_once.h
#usr/include/absl/base/casts.h
@@ -65,6 +67,7 @@
#usr/include/absl/base/internal/sysinfo.h
#usr/include/absl/base/internal/thread_identity.h
#usr/include/absl/base/internal/throw_delegate.h
+#usr/include/absl/base/internal/tracing.h
#usr/include/absl/base/internal/tsan_mutex_interface.h
#usr/include/absl/base/internal/unaligned_access.h
#usr/include/absl/base/internal/unscaledcycleclock.h
@@ -289,6 +292,8 @@
#usr/include/absl/log/CMakeFiles/log_internal_nullguard.dir/internal
#usr/include/absl/log/CMakeFiles/log_internal_proto.dir
#usr/include/absl/log/CMakeFiles/log_internal_proto.dir/internal
+#usr/include/absl/log/CMakeFiles/log_internal_structured_proto.dir
+#usr/include/absl/log/CMakeFiles/log_internal_structured_proto.dir/internal
#usr/include/absl/log/CMakeFiles/log_sink.dir
#usr/include/absl/log/CMakeFiles/vlog_config_internal.dir
#usr/include/absl/log/CMakeFiles/vlog_config_internal.dir/internal
@@ -319,6 +324,7 @@
#usr/include/absl/log/internal/proto.h
#usr/include/absl/log/internal/strip.h
#usr/include/absl/log/internal/structured.h
+#usr/include/absl/log/internal/structured_proto.h
#usr/include/absl/log/internal/test_actions.h
#usr/include/absl/log/internal/test_helpers.h
#usr/include/absl/log/internal/test_matchers.h
@@ -663,6 +669,7 @@
#usr/lib/libabsl_log_internal_message.a
#usr/lib/libabsl_log_internal_nullguard.a
#usr/lib/libabsl_log_internal_proto.a
+#usr/lib/libabsl_log_internal_structured_proto.a
#usr/lib/libabsl_log_severity.a
#usr/lib/libabsl_log_sink.a
#usr/lib/libabsl_low_level_hash.a
@@ -697,6 +704,7 @@
#usr/lib/libabsl_throw_delegate.a
#usr/lib/libabsl_time.a
#usr/lib/libabsl_time_zone.a
+#usr/lib/libabsl_tracing_internal.a
#usr/lib/libabsl_utf8_for_code_point.a
#usr/lib/libabsl_vlog_config_internal.a
#usr/lib/pkgconfig/absl_absl_check.pc
@@ -811,6 +819,7 @@
#usr/lib/pkgconfig/absl_log_internal_proto.pc
#usr/lib/pkgconfig/absl_log_internal_strip.pc
#usr/lib/pkgconfig/absl_log_internal_structured.pc
+#usr/lib/pkgconfig/absl_log_internal_structured_proto.pc
#usr/lib/pkgconfig/absl_log_internal_voidify.pc
#usr/lib/pkgconfig/absl_log_severity.pc
#usr/lib/pkgconfig/absl_log_sink.pc
@@ -883,6 +892,7 @@
#usr/lib/pkgconfig/absl_throw_delegate.pc
#usr/lib/pkgconfig/absl_time.pc
#usr/lib/pkgconfig/absl_time_zone.pc
+#usr/lib/pkgconfig/absl_tracing_internal.pc
#usr/lib/pkgconfig/absl_type_traits.pc
#usr/lib/pkgconfig/absl_utf8_for_code_point.pc
#usr/lib/pkgconfig/absl_utility.pc
diff --git a/config/rootfiles/common/libidn b/config/rootfiles/common/libidn
deleted file mode 100644
index 3d0d3a97c..000000000
--- a/config/rootfiles/common/libidn
+++ /dev/null
@@ -1,15 +0,0 @@
-usr/bin/idn
-#usr/include/idn-free.h
-#usr/include/idn-int.h
-#usr/include/idna.h
-#usr/include/pr29.h
-#usr/include/punycode.h
-#usr/include/stringprep.h
-#usr/include/tld.h
-#usr/lib/libidn.la
-#usr/lib/libidn.so
-usr/lib/libidn.so.12
-usr/lib/libidn.so.12.6.5
-#usr/lib/pkgconfig/libidn.pc
-#usr/share/emacs/site-lisp/idna.el
-#usr/share/emacs/site-lisp/punycode.el
diff --git a/config/rootfiles/core/194/filelists/abseil-cpp b/config/rootfiles/core/194/filelists/abseil-cpp
new file mode 120000
index 000000000..4fdbbb494
--- /dev/null
+++ b/config/rootfiles/core/194/filelists/abseil-cpp
@@ -0,0 +1 @@
+../../../common/abseil-cpp
\ No newline at end of file
diff --git a/config/rootfiles/core/194/update.sh b/config/rootfiles/core/194/update.sh
index 81150c7ae..2d14ec8a3 100644
--- a/config/rootfiles/core/194/update.sh
+++ b/config/rootfiles/core/194/update.sh
@@ -34,6 +34,10 @@ done
# Stop services
# Remove files
+rm -vf \
+ /usr/bin/idn \
+ /usr/lib/libidn.so.12 \
+ /usr/lib/libidn.so.12.6.5
# Extract files
extract_files
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 9107bf00a..e30506fdf 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1247,13 +1247,6 @@ END
exit(0);
ROOTCERT_SUCCESS:
-
-# Increment the serial number to 02 after root and host certificates are
-# created so that cert regeneration works.
- open(FILE, ">${General::swroot}/certs/serial");
- print FILE "02";
- close FILE;
-
if (&vpnenabled) {
&General::system('/usr/local/bin/ipsecctrl', 'S');
sleep $sleepDelay;
diff --git a/lfs/abseil-cpp b/lfs/abseil-cpp
index c6f8d18cd..65c31f5ab 100644
--- a/lfs/abseil-cpp
+++ b/lfs/abseil-cpp
@@ -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 #
@@ -24,7 +24,7 @@
include Config
-VER = 20240722.0
+VER = 20250127.0
THISAPP = abseil-cpp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6756f9a5f70656a6ef1985ba44af69a7fc3ab23b4be8a36ae39d7eedc318a4a9b0da08b31d26b3c46857913a757c916f0e31254278e080497807bed24e4978ce
+$(DL_FILE)_BLAKE2 = 70fa05a0db91b9e7ccf9f2828a7bf4b7fe6d7177b5f2d17b2f2f6f2a5e83289674d624fa7983410713a2d62b1025a5b5d957f1ba11e01cb727fc771ce76bc914
install : $(TARGET)
diff --git a/lfs/cifs-utils b/lfs/cifs-utils
index 42eab5188..a53c00bc9 100644
--- a/lfs/cifs-utils
+++ b/lfs/cifs-utils
@@ -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 = Utilities for doing and managing mounts of the Linux CIFS filesystem
-VER = 7.1
+VER = 7.3
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 = 6
+PAK_VER = 7
DEPS = libtalloc
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 19af86a9e0d1f00ca46288e126a88dda079b6217ed6e2627e79c75809dd79c5d0f4477da4a30913ed4802d9ede570a4c28e8624c9f17c1bb294dca5852e93144
+$(DL_FILE)_BLAKE2 = 59cf39ed2bf14d1fff54b6ad3b2fa410dd20b7e49ff9e87a95521d7e72cd4c5fe506f7026db2f42c53f4f79ed8f2492e3aa98b6349b000c7e2457cfea695c94d
install : $(TARGET)
diff --git a/lfs/libidn b/lfs/libidn
deleted file mode 100644
index 068fefe40..000000000
--- a/lfs/libidn
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2024 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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.42
-
-THISAPP = libidn-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 8f16d388884ad2ac9aafc46ec5eae144508ca86135184f625761c82c02ec9f99400bd4db65c9c9df54d315502cd5e2d37893d171abc6d76abe0a70f29acdb68e
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(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-nls \
- --disable-doc \
- --disable-static
-
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- sed -e 's/include_next/include/g' -i /usr/include/idn-int.h
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 22148bd2b..6e0605e14 100755
--- a/make.sh
+++ b/make.sh
@@ -1671,7 +1671,6 @@ build_system() {
lfsmake2 fireinfo
lfsmake2 libnet
lfsmake2 libnl-3
- lfsmake2 libidn
lfsmake2 libidn2
lfsmake2 nasm
lfsmake2 libexif
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-03-25 15:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-25 15:47 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ee8b09e77d006492f89f7a8d39c4ef3787f279c4 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox