From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4gwzJ04W0Pz2xXQ for ; Thu, 09 Jul 2026 15:23:28 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "YR2" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gwzJ04Hg3z2xLm for ; Thu, 09 Jul 2026 15:23:28 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [IPv6:2001:678:b28::161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "people01.haj.ipfire.org", Issuer "YE2" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gwzJ01t7yzG9 for ; Thu, 09 Jul 2026 15:23:28 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1783610608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=ZaOOAsfn6sufgzGAZ4mYR3XjbD4pvI3GuFHakGxoxMM=; b=JmdVTU8jXiHUPVla0PbnwiP0ArfJOnZtRG0CHwu8LCxghvZfnPjpqfQCvOcfNU6Y4RCy7M gNWTSY36hL1Q36Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1783610608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=ZaOOAsfn6sufgzGAZ4mYR3XjbD4pvI3GuFHakGxoxMM=; b=V07FiSvnTYEAt2RdRBBW3y1Nbo5mocuxApjD4MrGx05rWEQWiA0ZnnaX8LjND7zR9Q168S 3SzZCngxHEWz7B33qBNdMECz1tuYQo9MgBXFpLtFVhMlQFBEwqk81uUF0XstD8AkY/6u5M W7iAw095tHCVyMtWyOvRHKVK6TY3Z8G4HUaGuF3G0jTEAkO3c/zLHAxccjaSiyjE/86MU1 dkqCMWGbQWM4aDGxbIAvRRoQmtXJqcQnWfjetHjbvXQTXYNUghIIqJ3yUCP5ewF+M4YxU7 DGTQAONO6s7H34TG6buIfv2Vwy1+xc3YJ6cfIeodR5dlgt1I7/eGefgdhzGalA== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4gwzJ01Rprz2xQd; Thu, 09 Jul 2026 15:23:28 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fe9156be1b55c8a1c001ccbaa6dc813d436ecb97 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 9c148496a169b1650137c0c3a5c500d625d305a9 X-Git-Newrev: fe9156be1b55c8a1c001ccbaa6dc813d436ecb97 Message-Id: <4gwzJ01Rprz2xQd@people01.haj.ipfire.org> Date: Thu, 09 Jul 2026 15:23:28 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 fe9156be1b55c8a1c001ccbaa6dc813d436ecb97 (commit) via 4b639c7ee458cdcc019d316c49f89e0d8e625a4e (commit) via 3294144f5a6af41ba103340684f29ef32b92b265 (commit) via 451afb04fad2964dbea01ce57ff385ff3893d4e9 (commit) via 4357c574e1654de3872b941bd09de1f881bd1105 (commit) via 69bb0f25a758028ab2fe71afaffc23fc59f7a80e (commit) via 684e0ee8d6b3e0bbe4933a9d503026a9bf22a0e4 (commit) via 61b9c9ad2d0cdd264c4886e3f86e3152ec3a08bd (commit) via 5eda68d8bf5335ff5fa6cb9d6ee96ae10881587d (commit) via 1da0e55c9a1545a662ce9e719e3ce13e10a223d4 (commit) via 9f7dee67a933239c60ebda28b8129063f2bb32b8 (commit) via 55843db3366fd55cfc760fbe14eaf84bc8163442 (commit) via 9b7ed567ddf73cd131ff54d0d34a0d54400bcd0d (commit) via 68123f1375024c0665eaad726ef920298cabd06c (commit) via e9a5fbb3505de68a357a90bfce1f9965f88b3622 (commit) via 0eafebef1fb1b40234771fa424557c933de8ff0e (commit) from 9c148496a169b1650137c0c3a5c500d625d305a9 (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 fe9156be1b55c8a1c001ccbaa6dc813d436ecb97 Merge: 9c148496a 4b639c7ee Author: Michael Tremer Date: Thu Jul 9 15:23:18 2026 +0000 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{core/204 => oldcore/203}/filelists/openssl | 0 config/rootfiles/oldcore/203/update.sh | 12 ++++++++++++ 2 files changed, 12 insertions(+) copy config/rootfiles/{core/204 => oldcore/203}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/oldcore/203/filelists/openssl b/config/rootfiles/oldcore/203/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/oldcore/203/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/203/update.sh b/config/rootfiles/oldcore/203/update.sh index 7242f1445..5b314664f 100644 --- a/config/rootfiles/oldcore/203/update.sh +++ b/config/rootfiles/oldcore/203/update.sh @@ -119,7 +119,10 @@ ldconfig /usr/local/bin/sshctrl # Start services +/etc/init.d/firewall restart +/etc/init.d/sysklogd restart /etc/init.d/fcron restart +/etc/init.d/suricata restart # Restart IPsec if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then @@ -130,6 +133,15 @@ fi /etc/init.d/openvpn-rw restart /etc/init.d/openvpn-n2n restart +# Migrate DHCP configuration +if [ -e "/var/ipfire/dhcp/dhcpd.conf" ]; then + sed -e "s/unbound-dhcp-leases-client/dhcp-lease/g" \ + -i /var/ipfire/dhcp/dhcpd.conf + + # Restart DHCP + /etc/init.d/dhcp restart +fi + # Re-fetch any RPZs in background /usr/local/bin/update-rpzs & hooks/post-receive -- IPFire 2.x development tree