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 0a8cfdac43dd8d782ae99020e442d39eefaf3896 (commit) via e28cb28628239a93a36ed044e0a6d31ac0f7a945 (commit) via 01782a41f8feea008b92ea3e349c15dc7994588b (commit) via 7eec7e2c8b99bfe577d5b9cbd0bc0559f52f8020 (commit) from 71cea32cd8ab84d174f1913a04b4751c8eacd69e (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 0a8cfdac43dd8d782ae99020e442d39eefaf3896 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 7 10:24:09 2024 +0000
core190: Ship ncat again (just to be sure)
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e28cb28628239a93a36ed044e0a6d31ac0f7a945 Merge: 71cea32cd8 01782a41f8 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 7 10:23:22 2024 +0000
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/{packages => common}/ncat | 0 config/rootfiles/core/190/filelists/ncat | 1 + config/rootfiles/core/190/update.sh | 5 +++++ config/rootfiles/oldcore/189/filelists/ncat | 1 + config/rootfiles/oldcore/189/update.sh | 5 +++++ lfs/libvirt | 4 ++-- lfs/ncat | 6 ------ 7 files changed, 14 insertions(+), 8 deletions(-) rename config/rootfiles/{packages => common}/ncat (100%) create mode 120000 config/rootfiles/core/190/filelists/ncat create mode 120000 config/rootfiles/oldcore/189/filelists/ncat
Difference in files: diff --git a/config/rootfiles/packages/ncat b/config/rootfiles/common/ncat similarity index 100% rename from config/rootfiles/packages/ncat rename to config/rootfiles/common/ncat diff --git a/config/rootfiles/core/190/filelists/ncat b/config/rootfiles/core/190/filelists/ncat new file mode 120000 index 0000000000..38dcdb2245 --- /dev/null +++ b/config/rootfiles/core/190/filelists/ncat @@ -0,0 +1 @@ +../../../common/ncat \ No newline at end of file diff --git a/config/rootfiles/core/190/update.sh b/config/rootfiles/core/190/update.sh index ba24bc41e7..d301b0c9e9 100644 --- a/config/rootfiles/core/190/update.sh +++ b/config/rootfiles/core/190/update.sh @@ -34,6 +34,11 @@ done # Stop services /etc/init.d/suricata stop
+# Remove the metadata for ncat (if installed) as this is now part of the core system +rm -f "/opt/pakfire/db/installed/meta-ncat" +rm -f "/opt/pakfire/db/meta/meta-ncat" +rm -f "/opt/pakfire/db/rootfiles/ncat" + # Extract files extract_files
diff --git a/config/rootfiles/oldcore/189/filelists/ncat b/config/rootfiles/oldcore/189/filelists/ncat new file mode 120000 index 0000000000..38dcdb2245 --- /dev/null +++ b/config/rootfiles/oldcore/189/filelists/ncat @@ -0,0 +1 @@ +../../../common/ncat \ No newline at end of file diff --git a/config/rootfiles/oldcore/189/update.sh b/config/rootfiles/oldcore/189/update.sh index cae569b80b..e0436ebf40 100644 --- a/config/rootfiles/oldcore/189/update.sh +++ b/config/rootfiles/oldcore/189/update.sh @@ -324,6 +324,11 @@ rm -vrf \ /lib/firmware/qcom/vpu-1.0/venus.mdt \ /lib/firmware/RTL8192E
+# Remove the metadata for ncat (if installed) as this is now part of the core system +rm -f "/opt/pakfire/db/installed/meta-ncat" +rm -f "/opt/pakfire/db/meta/meta-ncat" +rm -f "/opt/pakfire/db/rootfiles/ncat" + # Stop services /usr/local/bin/openvpnctrl -k /usr/local/bin/openvpnctrl -kn2n diff --git a/lfs/libvirt b/lfs/libvirt index 4ac7dbf907..a497ed8680 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -35,9 +35,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 aarch64 PROG = libvirt -PAK_VER = 35 +PAK_VER = 36
-DEPS = ebtables libpciaccess libyajl ncat qemu +DEPS = ebtables libpciaccess libyajl qemu
SERVICES = libvirtd virtlogd
diff --git a/lfs/ncat b/lfs/ncat index e135b16ca0..8596471792 100644 --- a/lfs/ncat +++ b/lfs/ncat @@ -33,12 +33,6 @@ DL_FILE = nmap-$(VER).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/nmap-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = ncat -PAK_VER = 12 - -DEPS = - -SERVICES =
############################################################################### # Top-level Rules
hooks/post-receive -- IPFire 2.x development tree