webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 10:35:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

arpwatch: Fix the evelope sender

Browse Source 
commit c2eba600d753df95a81707f7da0ab172ed864ab0
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Sat Sep 20 14:02:01 2025 +0000

    arpwatch: Fix the envelope sender

    arpwatch invokes sendmail without passing the envelope sender
    explicitely. This causes that mails can get rejected if the From: header
    does not match the envelope sender.

    This patch passes the correct address as the envelope sender.

    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
This commit is contained in:
Vincent Li
2025-09-26 01:05:29 +00:00
parent a81b1f8f2b
commit 578eb58ea0
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/arpwatch
View File

@@ -37,7 +37,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = arpwatch
PAK_VER = 1
PAK_VER = 2
DEPS =
@@ -97,6 +97,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Don't install the initscript
cd $(DIR_APP) && sed -i '/@HAVE_FREEBSD_TRUE@/d' Makefile.in
# Fix the envelope sender
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arpwatch/fix-envelope-sender.patch
# Build!
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)

11
src/patches/arpwatch/fix-envelope-sender.patch Normal file
View File

@@ -0,0 +1,11 @@
--- arpwatch-3.8/report.c~ 2025-09-20 13:57:16.351246657 +0000
+++ arpwatch-3.8/report.c 2025-09-20 13:43:47.777995101 +0000
@@ -390,7 +390,7 @@
close(fd);
/* Always Deliver interactively (pause when child depth gets large) */
- execl(sendmail, "sendmail", "-odi", watcher, NULL);
+ execl(sendmail, "sendmail", "-odi", watcher, "-f", watchee, NULL);
lg(LOG_ERR, "execl: %s: %s", sendmail, strerror(errno));
exit(1);
}