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.changes 2014-12-10 23:45:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2015-06-23 11:58:52.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 19 14:32:19 UTC 2015 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.ke1SUH/_new 2015-06-23 11:58:53.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.ke1SUH/_new 2015-06-23 11:58:53.000000000 +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.000000000 +0100 +++ ./arpwatch.c 2008-11-12 14:26:23.000000000 +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 <[email protected]> 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 | \
