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 4ch0Sm0Ddrz2yrL for ; Tue, 07 Oct 2025 15:30:16 +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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ch0Sl75cnz2xJy for ; Tue, 07 Oct 2025 15:30:15 +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) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ch0Sf2j70z3Np for ; Tue, 07 Oct 2025 15:30:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1759851010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=bkoCDXfgQQh+3Vsjr3oH9r5o0nfu5aloJwzhwAX+bfc=; b=6jRWG+L9QOesN3XOFpTZj0K6pq+R6d3l31unq8g33zt7xdlFfjdCstn0nUwIs+eMgeBnA5 fx8fesMGKMdoI/Bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1759851010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=bkoCDXfgQQh+3Vsjr3oH9r5o0nfu5aloJwzhwAX+bfc=; b=GVyevY0yM8b+uTbWFbhER9XcPrg5HnZxX1fMrYfHDMofYNnFRWV9lAyHVi1YuXn7AxPzqn KEDR7BF/PysyLCtmtQ4w6dR5TWR5c/Q2Yh51YNouLqefQaGBT+F36UFU0PxWP61PNzkIJu 1Y5i8dLsKmsl+Bql0cLwuz9Do0o7DHIP1Htsd1MmA9KujbxMPDhwfQ7qfngERx5OR/PMX1 02uTU21Fb/SMlXEsmN/2aemkRn9KFP1cXV1H0M0ZZF6cG5U13US4E/qZNCU/FceliNY3XH piKZnD+/PG8gs5w+8DZH35SJhNJHxljef1HHng5HCudAlsA+4bOPCpiwropoKg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4ch0Sf1hM2z2xNX; Tue, 07 Oct 2025 15:30:10 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c1618483dec4b1421106b8f42cdeaa3d779175b8 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1081a699c68ba4d2aa39aee21607767208565382 X-Git-Newrev: c1618483dec4b1421106b8f42cdeaa3d779175b8 Message-Id: <4ch0Sf1hM2z2xNX@people01.haj.ipfire.org> Date: Tue, 07 Oct 2025 15:30:10 +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, master has been updated via c1618483dec4b1421106b8f42cdeaa3d779175b8 (commit) via 68063bc7e7878c60dfc5c736a5b07b0e8f31ad43 (commit) via c3b8ba152daf7ba6faa99d307d87b2f8eb85cfcb (commit) from 1081a699c68ba4d2aa39aee21607767208565382 (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 c1618483dec4b1421106b8f42cdeaa3d779175b8 Author: Michael Tremer Date: Tue Oct 7 15:27:43 2025 +0000 core198: Update permissions of auth.conf Signed-off-by: Michael Tremer commit 68063bc7e7878c60dfc5c736a5b07b0e8f31ad43 Author: Michael Tremer Date: Tue Oct 7 15:24:25 2025 +0000 Add the suricata user to the mail group Signed-off-by: Michael Tremer commit c3b8ba152daf7ba6faa99d307d87b2f8eb85cfcb Author: Michael Tremer Date: Tue Oct 7 15:22:57 2025 +0000 dma: Change ownership of auth.conf This file only needs to be written to by nobody (i.e. the web UI), but there are other users which need to read it in order to send emails. Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 11 +++++++++++ config/etc/group | 2 +- config/rootfiles/core/198/update.sh | 7 +++++++ lfs/dma | 3 ++- 4 files changed, 21 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 8988427eae..9a54b50d3c 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -358,6 +358,17 @@ restore_backup() { /etc/init.d/openvpn-n2n restart /etc/init.d/openvpn-rw restart + # + # Core Update 198 + # + + # Add the suricata user to the mail group + usermod -a -G mail suricata + + # Change ownership & permissions of auth.conf + chmod 640 /var/ipfire/dma/auth.conf + chown nobody:mail /var/ipfire/dma/auth.conf + return 0 } diff --git a/config/etc/group b/config/etc/group index f1767b30cd..1264c43c6c 100644 --- a/config/etc/group +++ b/config/etc/group @@ -8,7 +8,7 @@ lp:x:7:daemon mem:x:8: kmem:x:9: wheel:x:10:root -mail:x:12:mail +mail:x:12:mail,suricata uucp:x:14: dialout:x:16:nobody floppy:x:19: diff --git a/config/rootfiles/core/198/update.sh b/config/rootfiles/core/198/update.sh index e258f65d7f..bb08f493eb 100644 --- a/config/rootfiles/core/198/update.sh +++ b/config/rootfiles/core/198/update.sh @@ -46,6 +46,13 @@ if ! [ -d "/var/run/suricata" ]; then chown suricata:suricata /var/run/suricata fi +# Add the suricata user to the mail group +usermod -a -G mail suricata + +# Change ownership & permissions of auth.conf +chmod 640 /var/ipfire/dma/auth.conf +chown nobody:mail /var/ipfire/dma/auth.conf + # update linker config ldconfig diff --git a/lfs/dma b/lfs/dma index 39507ff6aa..9200de2902 100644 --- a/lfs/dma +++ b/lfs/dma @@ -81,7 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install mailq-link install-spool-dirs install-etc install -v -m 755 $(DIR_SRC)/config/dma/dma-cleanup-spool /usr/sbin chown -R nobody.nobody /var/ipfire/dma - chown nobody.root /var/ipfire/dma/auth.conf + chown nobody.mail /var/ipfire/dma/auth.conf + chmod 640 /var/ipfire/dma/auth.conf ln -svf dma /usr/sbin/sendmail.dma /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20 @rm -rf $(DIR_APP) hooks/post-receive -- IPFire 2.x development tree