commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2020-10-20 16:19:26 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new.3486 (New) Package is "arpwatch" Tue Oct 20 16:19:26 2020 rev:30 rq:842812 version:2.1a15 Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2019-05-07 23:20:18.977100176 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch.new.3486/arpwatch.changes 2020-10-20 16:30:52.862591410 +0200 @@ -1,0 +2,5 @@ +Sat Oct 17 10:52:57 UTC 2020 - Hans-Peter Jansen + +- add report-iface.patch to see, where the offending change happened + +--- New: report-iface.patch Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.CCSWQx/_old 2020-10-20 16:30:53.550591736 +0200 +++ /var/tmp/diff_new_pack.CCSWQx/_new 2020-10-20 16:30:53.554591738 +0200 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Summary:Tool to keep track of Ethernet<->IP address pairings License:BSD-3-Clause Group: Productivity/Networking/Diagnostic -Url:http://www-nrg.ee.lbl.gov/nrg.html +URL:http://www-nrg.ee.lbl.gov/nrg.html Source: %{name}-%{version}.tar.bz2 Source10: arpwatch@.service Source11: sysconfig.arpwatch @@ -43,6 +43,7 @@ Patch9: getnameinfo.patch # 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 BuildRequires: libpcap-devel BuildRequires: postfix BuildRequires: systemd-rpm-macros @@ -75,6 +76,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build %configure ++ report-iface.patch ++ Index: b/report.c === --- a/report.c +++ b/report.c @@ -73,6 +73,8 @@ struct rtentry; char *watcher = WATCHER; char *watchee = WATCHEE; +extern char *interface; + static int cdepth; /* number of outstanding children */ static char *fmtdate(time_t); @@ -339,6 +341,8 @@ report(register char *title, register u_ (void)fprintf(f, fmt, "previous timestamp", fmtdate(*t2p)); if (t1p && t2p && *t1p && *t2p) (void)fprintf(f, fmt, "delta", fmtdelta(*t1p - *t2p)); + if (interface) + (void)fprintf(f, fmt, "interface", interface); if (debug) { fflush(f); Index: b/arpwatch.c === --- a/arpwatch.c +++ b/arpwatch.c @@ -118,6 +118,7 @@ struct rtentry; #endif char *prog; +char *interface; int can_checkpoint; int swapped; @@ -214,7 +215,7 @@ main(int argc, char **argv) register int fd; #endif register pcap_t *pd; - register char *interface, *rfilename; + register char *rfilename; struct bpf_program code; char errbuf[PCAP_ERRBUF_SIZE]; char* serveruser = NULL; Index: b/arpsnmp.c === --- a/arpsnmp.c +++ b/arpsnmp.c @@ -68,6 +68,7 @@ int snmp_add(u_int32_t, u_char *, time_t __dead void usage(void) __attribute__((volatile)); char *prog; +char *interface; extern int optind; extern int opterr;
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2019-05-07 23:20:15 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new.5148 (New) Package is "arpwatch" Tue May 7 23:20:15 2019 rev:29 rq:701315 version:2.1a15 Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2019-04-01 12:37:40.149894611 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch.new.5148/arpwatch.changes 2019-05-07 23:20:18.977100176 +0200 @@ -1,0 +2,6 @@ +Tue May 7 08:51:31 UTC 2019 - Stefan Seyfried + +- add 0001-Ignore-802.1Q-frames.patch to fix log spam on networks + with configured VLANs. (deb#625796) + +--- New: 0001-Ignore-802.1Q-frames.patch Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.qmOcEN/_old 2019-05-07 23:20:20.061102650 +0200 +++ /var/tmp/diff_new_pack.qmOcEN/_new 2019-05-07 23:20:20.065102659 +0200 @@ -41,6 +41,8 @@ Patch7: arpwatch-2.1a11-emailaddr.dif Patch8: arpwatch-2.1a15-massagevendor.patch Patch9: getnameinfo.patch +# 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 BuildRequires: libpcap-devel BuildRequires: postfix BuildRequires: systemd-rpm-macros @@ -72,6 +74,7 @@ %patch7 -p1 -E %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build %configure ++ 0001-Ignore-802.1Q-frames.patch ++ >From 5d852d6f81d4022d500ccfea3e9b84a1d3b07dd0 Mon Sep 17 00:00:00 2001 From: Rob Leslie Date: Sun, 10 Jun 2012 12:35:02 -0700 Subject: [PATCH] Ignore 802.1Q frames Due to the way Linux packet filtering works, the pcap library will return ARP/RARP packets belonging to other VLANs when listening on the corresponding physical interface. This confuses arpwatch as it is not expecting such packets; the symptom is many "... sent bad hardware format ..." syslog messages. Since VLAN packets can be accessed via another interface and a separate arpwatch instance could be run there (if desired), we simply ignore all 802.1Q frames. --- arpwatch.c | 12 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arpwatch.c b/arpwatch.c index 9892894..30d9972 100644 --- a/arpwatch.c +++ b/arpwatch.c @@ -98,6 +98,10 @@ struct rtentry; #define ETHERTYPE_APOLLO 0x8019 #endif +#ifndef ETHERTYPE_VLAN +#defineETHERTYPE_VLAN 0x8100 +#endif + #ifndef IN_CLASSD_NET #define IN_CLASSD_NET 0xf000 #endif @@ -573,6 +577,14 @@ sanity_ether(register struct ether_header *eh, register struct ether_arp *ea, return(0); } + /* ignore 802.1Q (VLAN) frames */ + if (eh->ether_type == ETHERTYPE_VLAN) { + if (debug) + syslog(LOG_INFO, "ignoring 802.1Q frame from %s\n", + e2str(shost)); + return(0); + } + /* XXX sysv r4 seems to use hardware format 6 */ if (ea->arp_hrd != ARPHRD_ETHER && ea->arp_hrd != 6) { syslog(LOG_ERR, "%s sent bad hardware format 0x%x\n", -- 1.7.2.5
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2019-04-01 12:37:39 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new.25356 (New) Package is "arpwatch" Mon Apr 1 12:37:39 2019 rev:28 rq:689773 version:2.1a15 Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2019-02-08 12:14:56.777434598 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new.25356/arpwatch.changes 2019-04-01 12:37:40.149894611 +0200 @@ -1,0 +2,5 @@ +Sat Mar 16 08:57:03 UTC 2019 - Jan Engelhardt + +- Use noun phrase in summary. + +--- Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.iKDMU9/_old 2019-04-01 12:37:41.121895079 +0200 +++ /var/tmp/diff_new_pack.iKDMU9/_new 2019-04-01 12:37:41.125895081 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ Name: arpwatch Version:2.1a15 Release:0 -Summary:Keeps Track of Ethernet and IP Address Pairings +Summary:Tool to keep track of Ethernet<->IP address pairings License:BSD-3-Clause Group: Productivity/Networking/Diagnostic Url:http://www-nrg.ee.lbl.gov/nrg.html
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2019-02-08 12:14:50 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new.28833 (New) Package is "arpwatch" Fri Feb 8 12:14:50 2019 rev:27 rq:672504 version:2.1a15 Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2017-11-24 10:54:16.708705966 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new.28833/arpwatch.changes 2019-02-08 12:14:56.777434598 +0100 @@ -1,0 +2,12 @@ +Thu Feb 7 12:21:45 UTC 2019 - jseg...@suse.com + +- One %service_* call for all service files + +--- +Tue Feb 5 12:25:15 UTC 2019 - jseg...@suse.com + +- added getnameinfo.patch to prevent memory leak in gethname + (bsc#1119851) +- %service_* invocations for arpwatch@.service + +--- New: getnameinfo.patch Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.PBjpHT/_old 2019-02-08 12:14:57.965434152 +0100 +++ /var/tmp/diff_new_pack.PBjpHT/_new 2019-02-08 12:14:57.973434150 +0100 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,7 @@ Patch6: arpwatch-2.1a11-drop-privs.dif Patch7: arpwatch-2.1a11-emailaddr.dif Patch8: arpwatch-2.1a15-massagevendor.patch +Patch9: getnameinfo.patch BuildRequires: libpcap-devel BuildRequires: postfix BuildRequires: systemd-rpm-macros @@ -70,6 +71,7 @@ %patch6 -p1 -E %patch7 -p1 -E %patch8 -p1 +%patch9 -p1 %build %configure @@ -102,18 +104,18 @@ EOF %pre -%service_add_pre arpwatch.service +%service_add_pre arpwatch.service arpwatch@.service %preun -%service_del_preun arpwatch.service +%service_del_preun arpwatch.service arpwatch@.service %post -%service_add_post arpwatch.service +%service_add_post arpwatch.service arpwatch@.service %fillup_only %tmpfiles_create %{_tmpfilesdir}/arpwatch.conf %postun -%service_del_postun arpwatch.service +%service_del_postun arpwatch.service arpwatch@.service %files %{_unitdir}/arpwatch.service ++ getnameinfo.patch ++ Index: arpwatch-2.1a15/db.c === --- arpwatch-2.1a15.orig/db.c 2019-01-22 13:34:02.942536296 +0100 +++ arpwatch-2.1a15/db.c2019-01-22 13:38:54.099329959 +0100 @@ -269,6 +269,7 @@ elist_alloc(register u_int32_t a, regist register u_int size; static struct einfo *elist = NULL; static int eleft = 0; + char free_hostname = 0; if (eleft <= 0) { /* Allocate some more */ @@ -285,12 +286,16 @@ elist_alloc(register u_int32_t a, regist ep = elist++; --eleft; BCOPY(e, ep->e, 6); - if (h == NULL && !initializing) + if (h == NULL && !initializing) { h = getsname(a); + free_hostname = 1; + } if (h != NULL && !isdigit((int)*h)) { memset(ep->h, 0, sizeof(ep->h)); strncpy(ep->h, h, sizeof(ep->h)-1); } + if (free_hostname) + free(h); ep->t = t; return (ep); } @@ -313,6 +318,7 @@ check_hname(register struct ainfo *ap) memset(ep->h, 0, sizeof(ep->h)); strncpy(ep->h, h, sizeof(ep->h)-1); } + free(h); } int Index: arpwatch-2.1a15/dns.c === --- arpwatch-2.1a15.orig/dns.c 2000-10-14 03:50:52.0 +0200 +++ arpwatch-2.1a15/dns.c 2019-01-22 13:39:31.043941461 +0100 @@ -137,24 +137,30 @@ gethinfo(register char *hostname, regist return (0); } -/* Return the cannonical name of the host */ +/* Return the cannonical name of the host + Returned value needs to be free'd +*/ char * gethname(u_int32_t a) { - register int32_t options; - register struct hostent *hp; + struct sockaddr_in sa; + char node[NI_MAXHOST]; + struct in_addr addr; - options = _res.options; - _res.options |= RES_AAONLY; - _res.options &= ~(RES_DEFNAMES | RES_DNSRCH); - hp = gethostbyaddr((char *)&a, sizeof(a), AF_INET); - _res.options = options; - if (hp == NULL) - return (intoa(a)); - return (hp->h_name); + addr.s_addr = a; + sa.sin_family = AF_INET; + sa.sin_addr
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2017-11-24 10:54:14 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch" Fri Nov 24 10:54:14 2017 rev:26 rq:544779 version:2.1a15 Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2017-08-28 15:10:25.097638966 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2017-11-24 10:54:16.708705966 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:44:03 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +--- Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.wuysea/_old 2017-11-24 10:54:17.604673240 +0100 +++ /var/tmp/diff_new_pack.wuysea/_new 2017-11-24 10:54:17.608673094 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: arpwatch Version:2.1a15 Release:0 @@ -76,7 +81,7 @@ %{buildroot}/%{_sbindir} \ %{buildroot}/%{_datadir}/arpwatch \ %{buildroot}/%{_mandir}/man8 \ -%{buildroot}%{_localstatedir}/adm/fillup-templates +%{buildroot}%{_fillupdir} %make_install # ethercodes.dat is in the arpwatch-ethercodes package rm -f %{buildroot}/%{_datadir}/arpwatch/ethercodes.dat @@ -88,7 +93,7 @@ install -Dm 0644 %{SOURCE12} %{buildroot}/%{_unitdir}/arpwatch.service ln -s service %{buildroot}%{_sbindir}/rcarpwatch install -Dm 0644 %{SOURCE11} \ -%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.arpwatch +%{buildroot}%{_fillupdir}/sysconfig.arpwatch # own the database files cat > %{buildroot}%{_tmpfilesdir}/arpwatch.conf <
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2017-08-28 15:10:15 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch" Mon Aug 28 15:10:15 2017 rev:25 rq:516799 version:2.1a15 Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2015-06-23 11:58:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2017-08-28 15:10:25.097638966 +0200 @@ -1,0 +2,11 @@ +Sat Aug 12 16:09:14 UTC 2017 - tchva...@suse.com + +- Remove initscript support. Fix the service initialization to\ + either allow single full client or user has to symlink the instance + and make sure he can run only one of them. bsc#737527 +- Make sure rcarpwatch is working +- Use install commands for installation of files +- Format with spec-cleaner +- Generate temp files using systemd + +--- Old: arpwatch.init New: arpwatch.service Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.UqpogP/_old 2017-08-28 15:10:27.669277203 +0200 +++ /var/tmp/diff_new_pack.UqpogP/_new 2017-08-28 15:10:27.673276641 +0200 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,36 +16,17 @@ # -%if 0%{?suse_version} > 1140 -%define has_systemd 1 -%endif - Name: arpwatch -BuildRequires: libpcap-devel -BuildRequires: postfix -%if 0%{?has_systemd} -BuildRequires: systemd -%{?systemd_requires} -%endif -Url:http://www-nrg.ee.lbl.gov/nrg.html -Requires: arpwatch-ethercodes -%if 0%{?suse_version} <= 1140 -PreReq: /usr/bin/touch %insserv_prereq %fillup_prereq -%else -PreReq: /usr/bin/touch %fillup_prereq -%endif -Summary:Arpwatch Keeps Track of Ethernet and IP Address Pairings -License:BSD-3-Clause -Group: Productivity/Networking/Diagnostic Version:2.1a15 Release:0 +Summary:Keeps Track of Ethernet and IP Address Pairings +License:BSD-3-Clause +Group: Productivity/Networking/Diagnostic +Url:http://www-nrg.ee.lbl.gov/nrg.html Source: %{name}-%{version}.tar.bz2 -%if 0%{?has_systemd} Source10: arpwatch@.service -%else -Source10: arpwatch.init -%endif Source11: sysconfig.arpwatch +Source12: arpwatch.service Patch0: arpwatch-2.1a11-chrootbuild.diff Patch1: arpwatch-no-source-zero.dif Patch3: arpwatch-2.1a11-tokenring.diff @@ -54,7 +35,12 @@ Patch6: arpwatch-2.1a11-drop-privs.dif Patch7: arpwatch-2.1a11-emailaddr.dif Patch8: arpwatch-2.1a15-massagevendor.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: libpcap-devel +BuildRequires: postfix +BuildRequires: systemd-rpm-macros +Requires: arpwatch-ethercodes +Requires(post): %fillup_prereq +Requires(post): coreutils %description Arpwatch keeps track of Ethernet and IP address pairings. It logs @@ -71,7 +57,7 @@ %prep %setup -q -%patch -P 0 -E +%patch0 -E %patch1 -p1 -E %patch3 -p1 -E %patch4 -p1 -E @@ -82,88 +68,63 @@ %build %configure -%{__make} ARPDIR=/var/lib/arpwatch %{?_smp_mflags} +make ARPDIR=%{_localstatedir}/lib/arpwatch %{?_smp_mflags} %install mkdir -p \ -%if 0%{?has_systemd} -$RPM_BUILD_ROOT/%{_unitdir} \ -%else -$RPM_BUILD_ROOT/etc/init.d \ -%endif -$RPM_BUILD_ROOT/%{_sbindir} \ - $RPM_BUILD_ROOT/%{_datadir}/arpwatch \ - $RPM_BUILD_ROOT/%{_mandir}/man8 \ - $RPM_BUILD_ROOT/var/adm/fillup-templates -%makeinstall +%{buildroot}/%{_tmpfilesdir} \ +%{buildroot}/%{_sbindir} \ +%{buildroot}/%{_datadir}/arpwatch \ +%{buildroot}/%{_mandir}/man8 \ +%{buildroot}%{_localstatedir}/adm/fillup-templates +%make_install # ethercodes.dat is in the arpwatch-ethercodes package -rm -f $RPM_BUILD_ROOT/%{_datadir}/arpwatch/ethercodes.dat +rm -f %{buildroot}/%{_datadir}/arpwatch/ethercodes.dat for file in massagevendor euppertolower.awk duplicates.awk p.awk; do - cp -p ${file} $RPM_BUILD_ROOT/%{_datadir}/arpwatch + cp -p ${file} %{buildroot}/%{_datadir}/arpwatch done -make DESTDIR=$RPM_BUILD_ROOT install-man -%if 0%{?has_systemd} -install -m 0644 $RPM_SOURCE_DIR/arpwatch@.service $RPM_BUILD_ROOT/%{_unitdir} -%else -install -m 0754 $RPM_SOURCE_DIR/arpwatch.init $RPM_BUILD_ROOT/etc/init.d/arpwatch -ln -sf ../../
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2015-06-23 11:58:51 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch" Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2014-12-10 23:45:02.0 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2015-06-23 11:58:52.0 +0200 @@ -1,0 +2,6 @@ +Fri Jun 19 14:32:19 UTC 2015 - lmue...@suse.com + +- Deal with added two whitespaces in more recent oui.txt versions. + + arpwatch-2.1a15-massagevendor.patch + +--- New: arpwatch-2.1a15-massagevendor.patch Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.ke1SUH/_old 2015-06-23 11:58:53.0 +0200 +++ /var/tmp/diff_new_pack.ke1SUH/_new 2015-06-23 11:58:53.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,6 +53,7 @@ Patch5: arpwatch-2.1a11-drop-privs-manpage.dif Patch6: arpwatch-2.1a11-drop-privs.dif Patch7: arpwatch-2.1a11-emailaddr.dif +Patch8: arpwatch-2.1a15-massagevendor.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,6 +78,7 @@ %patch5 -p1 -E %patch6 -p1 -E %patch7 -p1 -E +%patch8 -p1 %build %configure ++ arpwatch-2.1a11-emailaddr.dif ++ --- /var/tmp/diff_new_pack.ke1SUH/_old 2015-06-23 11:58:53.0 +0200 +++ /var/tmp/diff_new_pack.ke1SUH/_new 2015-06-23 11:58:53.0 +0200 @@ -151,7 +151,7 @@ diff -ruN ../arpwatch-2.1a15.orig/arpwatch.c ./arpwatch.c --- ../arpwatch-2.1a15.orig/arpwatch.c 2008-11-12 14:21:27.0 +0100 +++ ./arpwatch.c 2008-11-12 14:26:23.0 +0100 -@@ -83,6 +83,7 @@ +@@ -85,6 +85,7 @@ #include "machdep.h" #include "setsignal.h" #include "util.h" @@ -159,7 +159,7 @@ /* Some systems don't define these */ #ifndef ETHERTYPE_REVARP -@@ -224,7 +225,7 @@ +@@ -230,7 +231,7 @@ interface = NULL; rfilename = NULL; pd = NULL; @@ -168,7 +168,7 @@ switch (op) { case 'd': -@@ -266,6 +267,26 @@ +@@ -272,6 +273,26 @@ } break; @@ -195,7 +195,7 @@ default: usage(); } -@@ -898,6 +919,7 @@ +@@ -904,6 +925,7 @@ (void)fprintf(stderr, "Version %s\n", version); (void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]" ++ arpwatch-2.1a15-massagevendor.patch ++ Author: Lars Mueller Subject: Deal with added two whitespaces in more recent oui.txt versions Index: arpwatch-2.1a15/massagevendor === --- arpwatch-2.1a15.orig/massagevendor +++ arpwatch-2.1a15/massagevendor @@ -10,12 +10,12 @@ # - Deal with duplicates in oui.txt (concatenate company names) # (sed -n \ --e 's/^\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\) *(hex)[ ]*\(..*\)/\1\2\3\4/p' \ +-e 's/\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\) *(hex)[ ]*\(..*\)/\1\2\3\4/p' \ $* | \ awk -f euppertolower.awk | \ sed -n \ --e 's/^\([0-9A-Za-z][0-9A-Za-z]\)\([0-9A-Za-z][0-9A-Za-z]\)\([0-9A-Za-z][0-9A-Za-z]\)[ ]\(.*\)$/\1:\2:\3 \4/' \ --e 's/^0//' -e 's/:0\([0-9A-Za-z]\)/:\1/g' -e p | \ +-e 's/\([0-9A-Za-z][0-9A-Za-z]\)\([0-9A-Za-z][0-9A-Za-z]\)\([0-9A-Za-z][0-9A-Za-z]\)[ ]\(.*\)$/\1:\2:\3 \4/' \ +-e 's/0//' -e 's/:0\([0-9A-Za-z]\)/:\1/g' -e p | \ sort | \ awk -f duplicates.awk ) | \ awk -f p.awk | \
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2014-12-10 23:45:10 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch" Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2014-05-15 19:10:11.0 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2014-12-10 23:45:02.0 +0100 @@ -1,0 +2,5 @@ +Fri Dec 5 13:26:33 UTC 2014 - lmue...@suse.com + +- Removed executable permission bits from arpwatch@.service file. + +--- Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.TLL19o/_old 2014-12-10 23:45:05.0 +0100 +++ /var/tmp/diff_new_pack.TLL19o/_new 2014-12-10 23:45:05.0 +0100 @@ -101,7 +101,7 @@ done make DESTDIR=$RPM_BUILD_ROOT install-man %if 0%{?has_systemd} -install -m 0754 $RPM_SOURCE_DIR/arpwatch@.service $RPM_BUILD_ROOT/%{_unitdir} +install -m 0644 $RPM_SOURCE_DIR/arpwatch@.service $RPM_BUILD_ROOT/%{_unitdir} %else install -m 0754 $RPM_SOURCE_DIR/arpwatch.init $RPM_BUILD_ROOT/etc/init.d/arpwatch ln -sf ../../etc/init.d/arpwatch $RPM_BUILD_ROOT/%{_sbindir}/rcarpwatch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2014-05-15 19:10:10 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch" Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2014-01-07 13:52:19.0 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2014-05-15 19:10:11.0 +0200 @@ -1,0 +2,5 @@ +Wed May 14 14:36:51 UTC 2014 - meiss...@suse.com + +- added missing %pre/%service_add_pre section + +--- Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.QjxJ0K/_old 2014-05-15 19:10:12.0 +0200 +++ /var/tmp/diff_new_pack.QjxJ0K/_new 2014-05-15 19:10:12.0 +0200 @@ -111,6 +111,11 @@ touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat- +%pre +%if 0%{?has_systemd} +%service_add_pre arpwatch@.service +%endif + %preun %if 0%{?has_systemd} %service_del_preun arpwatch@.service @@ -120,7 +125,7 @@ %post %if 0%{?has_systemd} -%service_add_post arpwatch\@.service +%service_add_post arpwatch@.service %fillup_only %else %fillup_and_insserv -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2014-01-07 13:52:18 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch" Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2013-03-28 13:09:54.0 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2014-01-07 13:52:19.0 +0100 @@ -1,0 +2,6 @@ +Tue Jan 7 10:06:22 UTC 2014 - rmila...@suse.com + +- Rework arpwatch.service file to properly support multiple network + interfaces and arpwatch sysconfig file. (bnc#853384). + +--- Old: arpwatch.service New: arpwatch@.service Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.UpEgt7/_old 2014-01-07 13:52:19.0 +0100 +++ /var/tmp/diff_new_pack.UpEgt7/_new 2014-01-07 13:52:19.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,7 @@ Release:0 Source: %{name}-%{version}.tar.bz2 %if 0%{?has_systemd} -Source10: arpwatch.service +Source10: arpwatch@.service %else Source10: arpwatch.init %endif @@ -101,7 +101,7 @@ done make DESTDIR=$RPM_BUILD_ROOT install-man %if 0%{?has_systemd} -install -m 0754 $RPM_SOURCE_DIR/arpwatch.service $RPM_BUILD_ROOT/%{_unitdir} +install -m 0754 $RPM_SOURCE_DIR/arpwatch@.service $RPM_BUILD_ROOT/%{_unitdir} %else install -m 0754 $RPM_SOURCE_DIR/arpwatch.init $RPM_BUILD_ROOT/etc/init.d/arpwatch ln -sf ../../etc/init.d/arpwatch $RPM_BUILD_ROOT/%{_sbindir}/rcarpwatch @@ -113,14 +113,14 @@ %preun %if 0%{?has_systemd} -%service_del_preun arpwatch.service +%service_del_preun arpwatch@.service %else %stop_on_removal arpwatch %endif %post %if 0%{?has_systemd} -%service_add_post arpwatch.service +%service_add_post arpwatch\@.service %fillup_only %else %fillup_and_insserv @@ -131,7 +131,7 @@ %postun %if 0%{?has_systemd} -%service_del_postun arpwatch.service +%service_del_postun arpwatch@.service %else %restart_on_update arpwatch %insserv_cleanup @@ -140,7 +140,7 @@ %files %defattr(-,root,root) %if 0%{?has_systemd} -%{_unitdir}/arpwatch.service +%{_unitdir}/arpwatch@.service %else %config /etc/init.d/arpwatch %{_sbindir}/rcarpwatch ++ arpwatch@.service ++ [Unit] Description=Arpwatch daemon which keeps track of ethernet/ip address pairings After=syslog.target network.target [Service] Type=forking Environment=ARPWATCH_ARGS= EnvironmentFile=-/etc/sysconfig/arpwatch PrivateTmp=yes ExecStartPre=/usr/bin/touch /var/lib/arpwatch/arp.dat.%i ExecStart=/usr/sbin/arpwatch $ARPWATCH_ARGS -i %i -f /var/lib/arpwatch/arp.dat.%i [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2013-03-28 13:09:53 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch", Maintainer is "dr...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2012-07-18 11:45:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2013-03-28 13:09:54.0 +0100 @@ -1,0 +2,5 @@ +Thu Mar 14 11:33:23 UTC 2013 - p.drou...@gmail.com + +- Drop sysvinit support and add systemd support for opensuse > 11.4 + +--- New: arpwatch.service Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.H21oTp/_old 2013-03-28 13:09:59.0 +0100 +++ /var/tmp/diff_new_pack.H21oTp/_new 2013-03-28 13:09:59.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,35 @@ # +%if 0%{?suse_version} > 1140 +%define has_systemd 1 +%endif + Name: arpwatch BuildRequires: libpcap-devel BuildRequires: postfix +%if 0%{?has_systemd} +BuildRequires: systemd +%{?systemd_requires} +%endif Url:http://www-nrg.ee.lbl.gov/nrg.html Requires: arpwatch-ethercodes +%if 0%{?suse_version} <= 1140 PreReq: /usr/bin/touch %insserv_prereq %fillup_prereq +%else +PreReq: /usr/bin/touch %fillup_prereq +%endif Summary:Arpwatch Keeps Track of Ethernet and IP Address Pairings License:BSD-3-Clause Group: Productivity/Networking/Diagnostic Version:2.1a15 Release:0 Source: %{name}-%{version}.tar.bz2 +%if 0%{?has_systemd} +Source10: arpwatch.service +%else Source10: arpwatch.init +%endif Source11: sysconfig.arpwatch Patch0: arpwatch-2.1a11-chrootbuild.diff Patch1: arpwatch-no-source-zero.dif @@ -68,7 +84,11 @@ %install mkdir -p \ +%if 0%{?has_systemd} +$RPM_BUILD_ROOT/%{_unitdir} \ +%else $RPM_BUILD_ROOT/etc/init.d \ +%endif $RPM_BUILD_ROOT/%{_sbindir} \ $RPM_BUILD_ROOT/%{_datadir}/arpwatch \ $RPM_BUILD_ROOT/%{_mandir}/man8 \ @@ -80,39 +100,60 @@ cp -p ${file} $RPM_BUILD_ROOT/%{_datadir}/arpwatch done make DESTDIR=$RPM_BUILD_ROOT install-man +%if 0%{?has_systemd} +install -m 0754 $RPM_SOURCE_DIR/arpwatch.service $RPM_BUILD_ROOT/%{_unitdir} +%else install -m 0754 $RPM_SOURCE_DIR/arpwatch.init $RPM_BUILD_ROOT/etc/init.d/arpwatch ln -sf ../../etc/init.d/arpwatch $RPM_BUILD_ROOT/%{_sbindir}/rcarpwatch +%endif cp -p ${RPM_SOURCE_DIR}/sysconfig.arpwatch $RPM_BUILD_ROOT/var/adm/fillup-templates # own the database files touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat- %preun +%if 0%{?has_systemd} +%service_del_preun arpwatch.service +%else %stop_on_removal arpwatch +%endif %post +%if 0%{?has_systemd} +%service_add_post arpwatch.service +%fillup_only +%else %fillup_and_insserv +%endif if [ ! -f var/lib/arpwatch/arp.dat ]; then touch var/lib/arpwatch/arp.dat fi %postun +%if 0%{?has_systemd} +%service_del_postun arpwatch.service +%else %restart_on_update arpwatch %insserv_cleanup +%endif %files %defattr(-,root,root) +%if 0%{?has_systemd} +%{_unitdir}/arpwatch.service +%else %config /etc/init.d/arpwatch +%{_sbindir}/rcarpwatch +%endif %{_sbindir}/arpsnmp %{_sbindir}/arpwatch -%{_sbindir}/rcarpwatch %dir /var/lib/arpwatch %ghost %config(noreplace) /var/lib/arpwatch/arp.dat %ghost %config(noreplace) /var/lib/arpwatch/arp.dat- /var/adm/fillup-templates/sysconfig.arpwatch %doc %{_mandir}/man8/arpsnmp.8.gz %doc %{_mandir}/man8/arpwatch.8.gz -%doc CHANGES FILES INSTALL README +%doc CHANGES FILES README %files ethercodes-build %defattr(-,root,root) ++ arpwatch.service ++ [Unit] Description=Arpwatch daemon which keeps track of ethernet/ip address pairings After=syslog.target network.target [Service] Type=forking EnvironmentFile=-/etc/sysconfig/arpwatch/sysconfig.arpwatch PrivateTmp=yes ExecStart=/usr/sbin/arpwatch $OPTIONS [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2012-07-18 11:45:42 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch", Maintainer is "dr...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes2011-09-23 01:52:00.0 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2012-07-18 11:45:44.0 +0200 @@ -1,0 +2,6 @@ +Wed Jul 18 05:56:13 CEST 2012 - dr...@suse.de + +- arpwatch-2.1a11-drop-privs.dif: call initgroups() with pw->pw_gid, + not NULL, to not have groupid 0 initialized. [bnc#764521] + +--- Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.Ozekh0/_old 2012-07-18 11:45:46.0 +0200 +++ /var/tmp/diff_new_pack.Ozekh0/_new 2012-07-18 11:45:46.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,17 @@ # - Name: arpwatch -BuildRequires: libpcap-devel postfix +BuildRequires: libpcap-devel +BuildRequires: postfix Url:http://www-nrg.ee.lbl.gov/nrg.html -License:BSD-3-Clause -Group: Productivity/Networking/Diagnostic Requires: arpwatch-ethercodes PreReq: /usr/bin/touch %insserv_prereq %fillup_prereq Summary:Arpwatch Keeps Track of Ethernet and IP Address Pairings +License:BSD-3-Clause +Group: Productivity/Networking/Diagnostic Version:2.1a15 -Release:132 +Release:0 Source: %{name}-%{version}.tar.bz2 Source10: arpwatch.init Source11: sysconfig.arpwatch @@ -44,9 +44,8 @@ activity to syslog and reports certain changes via e-mail. %package ethercodes-build -License:BSD-3-Clause -Group: Productivity/Networking/Diagnostic Summary:Tool to create ethercodes.dat from IEEE.org meta data +Group: Productivity/Networking/Diagnostic %description ethercodes-build Tool and required files to create the ethercodes.dat file from the OUI ++ arpwatch-2.1a11-drop-privs.dif ++ --- /var/tmp/diff_new_pack.Ozekh0/_old 2012-07-18 11:45:46.0 +0200 +++ /var/tmp/diff_new_pack.Ozekh0/_new 2012-07-18 11:45:46.0 +0200 @@ -46,7 +46,7 @@ + exit(1); + } + free(arpfiledir); -+ if ( initgroups(pw->pw_name, NULL) != 0 || setgid(pw->pw_gid) != 0 || ++ if ( initgroups(pw->pw_name, pw->pw_gid) != 0 || setgid(pw->pw_gid) != 0 || + setuid(pw->pw_uid) != 0 ) { + syslog(LOG_ERR, "Fatal: Couldn't change to user/group '%.32s' uid=%d gid=%d", user, + pw->pw_uid, pw->pw_gid); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2011-12-06 17:59:06 Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) Package is "arpwatch", Maintainer is "dr...@suse.com" Changes: Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.QITv4e/_old 2011-12-06 17:59:53.0 +0100 +++ /var/tmp/diff_new_pack.QITv4e/_new 2011-12-06 17:59:53.0 +0100 @@ -20,7 +20,7 @@ Name: arpwatch BuildRequires: libpcap-devel postfix Url:http://www-nrg.ee.lbl.gov/nrg.html -License:BSD3c +License:BSD-3-Clause Group: Productivity/Networking/Diagnostic Requires: arpwatch-ethercodes PreReq: /usr/bin/touch %insserv_prereq %fillup_prereq @@ -44,7 +44,7 @@ activity to syslog and reports certain changes via e-mail. %package ethercodes-build -License:BSD3c +License:BSD-3-Clause Group: Productivity/Networking/Diagnostic Summary:Tool to create ethercodes.dat from IEEE.org meta data -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit arpwatch for openSUSE:Factory
Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at Mon Sep 19 15:38:27 CEST 2011. --- arpwatch/arpwatch.changes 2009-11-27 14:07:45.0 +0100 +++ /mounts/work_src_done/STABLE/arpwatch/arpwatch.changes 2011-09-17 14:17:48.0 +0200 @@ -1,0 +2,5 @@ +Sat Sep 17 12:17:44 UTC 2011 - jeng...@medozas.de + +- Remove redundant tags/sections from specfile + +--- calling whatdependson for head-i586 Other differences: -- ++ arpwatch.spec ++ --- /var/tmp/diff_new_pack.QeFyTk/_old 2011-09-19 15:38:22.0 +0200 +++ /var/tmp/diff_new_pack.QeFyTk/_new 2011-09-19 15:38:22.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package arpwatch (Version 2.1a15) +# spec file for package arpwatch # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: arpwatch @@ -23,7 +22,6 @@ Url:http://www-nrg.ee.lbl.gov/nrg.html License:BSD3c Group: Productivity/Networking/Diagnostic -AutoReqProv:on Requires: arpwatch-ethercodes PreReq: /usr/bin/touch %insserv_prereq %fillup_prereq Summary:Arpwatch Keeps Track of Ethernet and IP Address Pairings @@ -45,12 +43,6 @@ Arpwatch keeps track of Ethernet and IP address pairings. It logs activity to syslog and reports certain changes via e-mail. - - -Authors: - -Craig Leres - %package ethercodes-build License:BSD3c Group: Productivity/Networking/Diagnostic @@ -61,12 +53,6 @@ and company ID data as provided by IEEE.org. This package is only needed if you want to build the arpwatch-ethercodes package. - - -Authors: - -Craig Leres - %prep %setup -q %patch -P 0 -E Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org