Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2021-01-29 14:57:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arpwatch" Fri Jan 29 14:57:29 2021 rev:32 rq:867653 version:2.1a15 Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes 2021-01-28 21:28:45.220224338 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new.28504/arpwatch.changes 2021-01-29 14:57:44.217565878 +0100 @@ -1,0 +2,11 @@ +Thu Jan 28 17:17:17 UTC 2021 - o...@aepfle.de + +- report MAC as HH:HH:HH:HH:HH:HH with arpwatch-MAC.patch +- remove unused ARPWATCH_INTERFACE= from sysconfig template +- schedule arpwatch.service after exim/postfix/sendmail +- remove arpwatch@.service from postinstall scriptlets to avoid warning + in case no instance is configured +- move service_add_post to end of script because the macro exit + the script early + +------------------------------------------------------------------- New: ---- arpwatch-MAC.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch.spec ++++++ --- /var/tmp/diff_new_pack.CJRNH0/_old 2021-01-29 14:57:45.681568032 +0100 +++ /var/tmp/diff_new_pack.CJRNH0/_new 2021-01-29 14:57:45.685568038 +0100 @@ -43,6 +43,7 @@ # PATCH-Fix-Upstream -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625796#20 -- seife+...@b1-systems.com Patch10: 0001-Ignore-802.1Q-frames.patch Patch11: report-iface.patch +Patch12: arpwatch-MAC.patch BuildRequires: libpcap-devel BuildRequires: postfix BuildRequires: systemd-rpm-macros @@ -76,6 +77,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build %configure @@ -110,18 +112,18 @@ install -m 0755 arp2ethers %{buildroot}%{_bindir} %pre -%service_add_pre arpwatch.service arpwatch@.service +%service_add_pre arpwatch.service %preun -%service_del_preun arpwatch.service arpwatch@.service +%service_del_preun arpwatch.service %post -%service_add_post arpwatch.service arpwatch@.service %fillup_only %tmpfiles_create %{_tmpfilesdir}/arpwatch.conf +%service_add_post arpwatch.service %postun -%service_del_postun arpwatch.service arpwatch@.service +%service_del_postun arpwatch.service %files %{_unitdir}/arpwatch.service ++++++ arpwatch-MAC.patch ++++++ Accept any input in str2e. But make sure a MAC written in output can be copy&pasted into other searches, verbatim. A MAC is expected to be in format HH:HH:HH:HH:HH:HH. --- a/ec.c +++ b/ec.c @@ -218,7 +218,7 @@ e2str(register u_char *e) { static char str[32]; - (void)sprintf(str, "%x:%x:%x:%x:%x:%x", + (void)sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x", e[0], e[1], e[2], e[3], e[4], e[5]); return (str); } ++++++ arpwatch.service ++++++ --- /var/tmp/diff_new_pack.CJRNH0/_old 2021-01-29 14:57:45.753568138 +0100 +++ /var/tmp/diff_new_pack.CJRNH0/_new 2021-01-29 14:57:45.753568138 +0100 @@ -1,6 +1,9 @@ [Unit] Description=Arpwatch daemon which keeps track of ethernet/ip address pairings After=network.target +After=exim.service +After=postfix.service +After=sendmail.service Conflicts=arpwatch.target [Service] ++++++ arpwatch@.service ++++++ --- /var/tmp/diff_new_pack.CJRNH0/_old 2021-01-29 14:57:45.773568167 +0100 +++ /var/tmp/diff_new_pack.CJRNH0/_new 2021-01-29 14:57:45.773568167 +0100 @@ -1,6 +1,9 @@ [Unit] Description=Arpwatch daemon which keeps track of ethernet/ip address pairings After=network.target +After=exim.service +After=postfix.service +After=sendmail.service PartOf=arpwatch.target [Service] ++++++ sysconfig.arpwatch ++++++ --- /var/tmp/diff_new_pack.CJRNH0/_old 2021-01-29 14:57:45.797568202 +0100 +++ /var/tmp/diff_new_pack.CJRNH0/_new 2021-01-29 14:57:45.801568209 +0100 @@ -1,13 +1,3 @@ -## Path: Network/Arpwatch -## Description: Arpwatch settings -## Type: string -## Default: "" -## ServiceRestart: arpwatch -# -# Space seperated list of interfaces for arpwatch to listen on. -# -ARPWATCH_INTERFACE="" - ## Type: string ## Default: "" ## ServiceRestart: arpwatch
