[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6460dbbfc5be1774daec47c47451b4d5a746577e

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6460dbbfc5be1774daec47c47451b4d5a746577e

[Arne Fitzenreiter]

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

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  6460dbbfc5be1774daec47c47451b4d5a746577e (commit)
       via  f08f55e6b4bc423270621dba2bb5804b13a28304 (commit)
       via  55f2a39cea3bd03095c7c35c65d407c52acacabe (commit)
      from  e347899c165db3160884be7d0b617f0b94c32fb3 (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 6460dbbfc5be1774daec47c47451b4d5a746577e
Merge: e347899c16 f08f55e6b4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jul 23 21:59:26 2024 +0200

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/aarch64/util-linux   | 2 +-
 config/rootfiles/common/riscv64/util-linux   | 2 +-
 config/rootfiles/common/x86_64/util-linux    | 2 +-
 config/rootfiles/oldcore/187/filelists/files | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/aarch64/util-linux b/config/rootfiles/common/aarch64/util-linux
index 70ab97534..d991bbda3 100644
--- a/config/rootfiles/common/aarch64/util-linux
+++ b/config/rootfiles/common/aarch64/util-linux
@@ -105,7 +105,7 @@ usr/bin/setsid
 usr/bin/uclampset
 #usr/bin/ul
 #usr/bin/uname26
-#usr/bin/unshare
+usr/bin/unshare
 usr/bin/uuidgen
 usr/bin/uuidparse
 #usr/bin/waitpid
diff --git a/config/rootfiles/common/riscv64/util-linux b/config/rootfiles/common/riscv64/util-linux
index 81dbad021..acb1ae8e4 100644
--- a/config/rootfiles/common/riscv64/util-linux
+++ b/config/rootfiles/common/riscv64/util-linux
@@ -105,7 +105,7 @@ usr/bin/setsid
 usr/bin/uclampset
 #usr/bin/ul
 #usr/bin/uname26
-#usr/bin/unshare
+usr/bin/unshare
 usr/bin/uuidgen
 usr/bin/uuidparse
 usr/bin/waitpid
diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
index 8b6884ad5..92f391d17 100644
--- a/config/rootfiles/common/x86_64/util-linux
+++ b/config/rootfiles/common/x86_64/util-linux
@@ -106,7 +106,7 @@ usr/bin/setsid
 usr/bin/uclampset
 #usr/bin/ul
 #usr/bin/uname26
-#usr/bin/unshare
+usr/bin/unshare
 usr/bin/uuidgen
 usr/bin/uuidparse
 #usr/bin/waitpid
diff --git a/config/rootfiles/oldcore/187/filelists/files b/config/rootfiles/oldcore/187/filelists/files
index d234de053..24e4d1e0c 100644
--- a/config/rootfiles/oldcore/187/filelists/files
+++ b/config/rootfiles/oldcore/187/filelists/files
@@ -5,4 +5,5 @@ srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/lib/firewall/rules.pl
+usr/bin/unshare
 var/ipfire/header.pl


hooks/post-receive
--
IPFire 2.x development tree