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

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

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 5664 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  c153f735529a7a9b766e523b26bb578c520e2862 (commit)
       via  415afe55b2e16f06e72adce457f747b04cf63932 (commit)
       via  c309bdcf3d0c983d2c4a169ea65ce7ef749eba80 (commit)
      from  18f9c27601d1777e862913428c7a7fc5289b3035 (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 c153f735529a7a9b766e523b26bb578c520e2862
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Oct 2 10:20:38 2022 +0000

    Core Update 171: Do not ship /sbin/tipc
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 415afe55b2e16f06e72adce457f747b04cf63932
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Oct 2 09:46:47 2022 +0000

    Core Update 171: Fix Suricata stop/start
    
    My fault, again. :-/
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit c309bdcf3d0c983d2c4a169ea65ce7ef749eba80
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Oct 2 09:43:47 2022 +0000

    Avoid manpages from being shipped and delete them on existing installations
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/iproute2            | 2 +-
 config/rootfiles/common/iptables            | 4 ++--
 config/rootfiles/common/perl                | 2 +-
 config/rootfiles/common/perl-Sort-Naturally | 2 +-
 config/rootfiles/core/171/update.sh         | 6 ++++--
 5 files changed, 9 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2
index 11174bd4e..d4df24e09 100644
--- a/config/rootfiles/common/iproute2
+++ b/config/rootfiles/common/iproute2
@@ -24,7 +24,7 @@ sbin/rtmon
 sbin/rtstat
 sbin/ss
 sbin/tc
-sbin/tipc
+#sbin/tipc
 sbin/vdpa
 #usr/include/iproute2
 #usr/include/iproute2/bpf_elf.h
diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index ba1621324..d7d87bee7 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -166,11 +166,11 @@ sbin/xtables-legacy-multi
 #usr/share/man/man3/ipq_set_mode.3
 #usr/share/man/man3/ipq_set_verdict.3
 #usr/share/man/man3/libipq.3
-usr/share/man/man8/ip6tables-apply.8
+#usr/share/man/man8/ip6tables-apply.8
 #usr/share/man/man8/ip6tables-restore.8
 #usr/share/man/man8/ip6tables-save.8
 #usr/share/man/man8/ip6tables.8
-usr/share/man/man8/iptables-apply.8
+#usr/share/man/man8/iptables-apply.8
 #usr/share/man/man8/iptables-extensions.8
 #usr/share/man/man8/iptables-restore.8
 #usr/share/man/man8/iptables-save.8
diff --git a/config/rootfiles/common/perl b/config/rootfiles/common/perl
index 0ba876a6a..fb360c874 100644
--- a/config/rootfiles/common/perl
+++ b/config/rootfiles/common/perl
@@ -2549,7 +2549,7 @@ usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/threads/shared.pm
 #usr/share/man/man3/Pod::Simple::DumpAsXML.3
 #usr/share/man/man3/Pod::Simple::HTML.3
 #usr/share/man/man3/Pod::Simple::HTMLBatch.3
-usr/share/man/man3/Pod::Simple::JustPod.3
+#usr/share/man/man3/Pod::Simple::JustPod.3
 #usr/share/man/man3/Pod::Simple::LinkSection.3
 #usr/share/man/man3/Pod::Simple::Methody.3
 #usr/share/man/man3/Pod::Simple::PullParser.3
diff --git a/config/rootfiles/common/perl-Sort-Naturally b/config/rootfiles/common/perl-Sort-Naturally
index 64feb6b33..faac8b544 100644
--- a/config/rootfiles/common/perl-Sort-Naturally
+++ b/config/rootfiles/common/perl-Sort-Naturally
@@ -3,4 +3,4 @@ usr/lib/perl5/site_perl/5.36.0/Sort/Naturally.pm
 #usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Sort
 #usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Sort/Naturally
 #usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Sort/Naturally/.packlist
-usr/share/man/man3/Sort::Naturally.3
+#usr/share/man/man3/Sort::Naturally.3
diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh
index a8172a929..6c04955bb 100644
--- a/config/rootfiles/core/171/update.sh
+++ b/config/rootfiles/core/171/update.sh
@@ -50,7 +50,7 @@ done
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
 /etc/rc.d/init.d/ipsec stop
-/etc/init.d/rc.d/suricata stop
+/etc/rc.d/init.d/suricata stop
 /etc/rc.d/init.d/collectd stop
 
 KVER="xxxKVERxxx"
@@ -201,10 +201,12 @@ rm -rvf \
 	/usr/lib/libunbound.so.8.1.18 \
 	/usr/lib/perl5/5.32* \
 	/usr/lib/perl5/site_perl/5.32* \
+	/usr/share/man/* \
 	/usr/share/usb_modeswitch/1004:61aa \
 	/usr/share/usb_modeswitch/12d1:\#android \
 	/usr/share/usb_modeswitch/12d1:\#linux \
 	/usr/share/usb_modeswitch/19d2:\#linux \
+	/sbin/tipc \
 	/srv/web/ipfire/html/themes/ipfire/include/css/style-rounded.css
 
 # Extract files
@@ -227,7 +229,7 @@ chown -v root:root /var/ipfire/backup/{in,ex}clude*
 
 # Start services
 /etc/rc.d/init.d/collectd start
-if grep -q "ENABLED=on" /var/ipfire/suricata/settings; then
+if grep -q "ENABLE_IDS=on" /var/ipfire/suricata/settings; then
 	/etc/rc.d/init.d/suricata start
 fi
 /etc/rc.d/init.d/unbound start


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