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 4gTTT117wvz2xPP for ; Mon, 01 Jun 2026 09:39:49 +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 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gTTT10nyVz2xNp for ; Mon, 01 Jun 2026 09:39:49 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bit raw public key) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gTTSy5ps2z2SW for ; Mon, 01 Jun 2026 09:39:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1780306786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=qt4llR9Xc87b+dbMOwZMFMEUxL3RLsPnK+9bcQ58k5g=; b=JO5w7uEL5uZ6Dsg0kCbQBqWJCoqsVnxGYS5nBHw/ji6hG5qJ9QUGgbBmgW9SGQ/a5x8lAI /bTL2I9s1P+Z1feroV1XZJbe77jMqcCfusap5Omr/WAVxCJ7byBrF/8SCVyQiZcZTHqlbS s1pwuMDGVkPpW1aj+ivITbgnVsywNuPoXSVBWOvx+DEoDvY3sV7qu0iUtoUyEaFdSuVr5B AfHR55unbwztIHrlyIX2twa7yHWofvilTjgAq1q8BquVtsWC7VkgmspOaRTeMoxV2qkaQy ogTudUxN0O3BQXoUSUnG0+1cD4e3lMc2m2mASKbVAgJ//ccOSoVVqR0Qslyw3Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1780306786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=qt4llR9Xc87b+dbMOwZMFMEUxL3RLsPnK+9bcQ58k5g=; b=enO1tbarb0w9wXCun5tGCf1u4WXUF3SBUm0v+7kU5pDqKYyXsh2UG/Edn3rd0E3sa9UH6Q LGaOxXqyBu+dyCCg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4gTTSy4DRYz2xK2; Mon, 01 Jun 2026 09:39:46 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ab11cbb2954f17f9fd9c02aef7b31a04450598a X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 091050ab1610a60a7bd0c00bc35dd09faf925e4c X-Git-Newrev: 0ab11cbb2954f17f9fd9c02aef7b31a04450598a Message-Id: <4gTTSy4DRYz2xK2@people01.haj.ipfire.org> Date: Mon, 01 Jun 2026 09:39:46 +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 0ab11cbb2954f17f9fd9c02aef7b31a04450598a (commit) via d030f69a35377cc0655ed3b87fd8957688ace225 (commit) from 091050ab1610a60a7bd0c00bc35dd09faf925e4c (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 0ab11cbb2954f17f9fd9c02aef7b31a04450598a Author: Michael Tremer Date: Mon Jun 1 09:28:05 2026 +0000 core203: Create /var/run/knot-resolver in updater Signed-off-by: Michael Tremer commit d030f69a35377cc0655ed3b87fd8957688ace225 Author: Michael Tremer Date: Mon Jun 1 09:10:41 2026 +0000 knot resolver: Mover user to UID/GID 120 Fixes: #14002 - User id 119 has been used for tor user in the past Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 4 ++-- config/etc/group | 2 +- config/etc/passwd | 2 +- config/rootfiles/core/203/update.sh | 10 ++++++++-- 4 files changed, 12 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index e899d7139..7454ae762 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -118,7 +118,7 @@ restore_backup() { # Create Knot Resolver group if ! getent group knot-resolver &>/dev/null; then - groupadd -g 119 knot-resolver + groupadd -g 120 knot-resolver fi # Create Knot Resolver user @@ -128,7 +128,7 @@ restore_backup() { -d /var/empty \ -g knot-resolver \ -s /bin/false \ - -u 119 \ + -u 120 \ knot-resolver fi diff --git a/config/etc/group b/config/etc/group index 5087e0a0d..8ba642e5e 100644 --- a/config/etc/group +++ b/config/etc/group @@ -44,5 +44,5 @@ nut:x:115: cdrom:x:116: usb:x:117: zabbix:x:118: -knot-resolver:x:119: +knot-resolver:x:120: samba:x:1000: diff --git a/config/etc/passwd b/config/etc/passwd index 759568810..a25c79890 100644 --- a/config/etc/passwd +++ b/config/etc/passwd @@ -23,5 +23,5 @@ cyrus:x:111:12:Cyrus user:/usr/cyrus: filter:x:112:12:Spam user:/home/filter:/bin/false asterisk:x:114:114:Asterisk user:/var/empty:/bin/false zabbix:x:118:118:Zabbix Monitoring:/var/empty:/bin/false -knot-resolver:x:119:119:Knot Resolver User:/var/empty:/bin/false +knot-resolver:x:120:120:Knot Resolver User:/var/empty:/bin/false samba:x:1000:1000:Samba User:/var/empty:/bin/false diff --git a/config/rootfiles/core/203/update.sh b/config/rootfiles/core/203/update.sh index d920c12a1..e8d9b2a37 100644 --- a/config/rootfiles/core/203/update.sh +++ b/config/rootfiles/core/203/update.sh @@ -51,7 +51,7 @@ done # Create Knot Resolver group if ! getent group knot-resolver &>/dev/null; then - groupadd -g 119 knot-resolver + groupadd -g 120 knot-resolver fi # Create Knot Resolver user @@ -61,10 +61,16 @@ if ! getent passwd knot-resolver &>/dev/null; then -d /var/empty \ -g knot-resolver \ -s /bin/false \ - -u 119 \ + -u 120 \ knot-resolver fi +# Create /var/run/knot-resolver +if [ -d "/var/run/knot-resolver" ]; then + mkdir /var/run/knot-resolver + chown knot-resolver:knot-resolver /var/run/knot-resolver +fi + # Extract files extract_files hooks/post-receive -- IPFire 2.x development tree