Hello community,
here is the log from the commit of package icmpinfo for openSUSE:Factory
checked in at 2017-01-19 10:36:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icmpinfo (Old)
and /work/SRC/openSUSE:Factory/.icmpinfo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icmpinfo"
Changes:
--------
--- /work/SRC/openSUSE:Factory/icmpinfo/icmpinfo.changes 2014-10-11
22:41:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.icmpinfo.new/icmpinfo.changes 2017-01-19
10:36:23.428215368 +0100
@@ -1,0 +2,7 @@
+Thu Jan 12 14:51:59 UTC 2017 - crrodrig...@opensuse.org
+
+- net-tools is not required.
+- fix various missing includes and a broken offsetof() definition.
+ (icmpinfo-1.11.dif)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icmpinfo.spec ++++++
--- /var/tmp/diff_new_pack.MNaWus/_old 2017-01-19 10:36:23.752169675 +0100
+++ /var/tmp/diff_new_pack.MNaWus/_new 2017-01-19 10:36:23.756169111 +0100
@@ -1,7 +1,7 @@
#
# spec file for package icmpinfo
#
-# Copyright (c) 2014 SUSE LINUX Products 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
@@ -27,7 +27,6 @@
Source1: COPYRIGHT
Patch: icmpinfo-%{version}.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: net-tools
Requires: netcfg
%description
@@ -44,7 +43,7 @@
%patch
%build
-make CFLAGS="-D_BSD_SOURCE $RPM_OPT_FLAGS" %{?_smp_mflags}
+make CFLAGS="-D_GNU_SOURCE -fvisibility=hidden $RPM_OPT_FLAGS" %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} install
++++++ icmpinfo-1.11.dif ++++++
--- /var/tmp/diff_new_pack.MNaWus/_old 2017-01-19 10:36:23.784165162 +0100
+++ /var/tmp/diff_new_pack.MNaWus/_new 2017-01-19 10:36:23.788164598 +0100
@@ -1,6 +1,8 @@
---- Makefile
+Index: Makefile
+===================================================================
+--- Makefile.orig
+++ Makefile
-@@ -13,21 +13,32 @@
+@@ -13,21 +13,32 @@ VERS = 1.11
#LDLIBS= -lsocket -lnsl
# To override default compiler flags :
@@ -36,12 +38,14 @@
tgz: clean
rm -f CHECKSUMS.asc
md5sum * > ../CHECKSUMS
-@@ -38,4 +49,3 @@
+@@ -38,4 +49,3 @@ tgz: clean
clean:
$(RM) $(OBJECTS) $(TARGET) core *~
-
---- defs.h
+Index: defs.h
+===================================================================
+--- defs.h.orig
+++ defs.h
@@ -4,24 +4,17 @@
@@ -69,11 +73,15 @@
#include <netinet/tcp.h>
#include <netdb.h>
---- icmpinfo.c
+Index: icmpinfo.c
+===================================================================
+--- icmpinfo.c.orig
+++ icmpinfo.c
-@@ -27,19 +27,25 @@
+@@ -26,20 +26,27 @@
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
++#include <stdlib.h>
#ifndef lint
-char copyright[] =
+char const copyright[] =
@@ -99,7 +107,7 @@
/*
* P I N G . C
*
-@@ -60,7 +66,7 @@
+@@ -60,7 +67,7 @@ static char sccsid[] = "@(#)ping.c 4.10
* This program has to run SUID to ROOT to access the ICMP socket.
*/
@@ -108,7 +116,7 @@
char *pname;
int main(argc, argv)
-@@ -99,6 +105,10 @@
+@@ -99,6 +106,10 @@ char **argv;
case 's':
showsrcip++;
break;
@@ -119,7 +127,7 @@
case 'h':
default :
err_quit(usage);
-@@ -128,6 +138,7 @@
+@@ -128,6 +139,7 @@ char **argv;
openlog("icmpinfo",0,LOG_DAEMON);
syslog(LOG_NOTICE,"started, PID=%d.",getpid());
setsid();
@@ -127,9 +135,11 @@
close(0);
close(1);
close(2);
---- icmpinfo.man
+Index: icmpinfo.man
+===================================================================
+--- icmpinfo.man.orig
+++ icmpinfo.man
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,7 @@ icmpinfo \- interpret ICMP messages
.SH SYNOPSIS
.B icmpinfo
@@ -138,7 +148,7 @@
.SH DESCRIPTION
.BR Icmpinfo
-@@ -60,6 +60,13 @@
+@@ -60,6 +60,13 @@ host has several network interfaces. In
.I "\-l"
Forks and use the syslog(3) facility to record events (recomended use).
(root only option).
@@ -152,12 +162,15 @@
.SH WARNINGS
The packet decoding is planned for ICMP Unreachable outputs and might
not be significant for all other Icmp types. Output can be shorter
---- pid.c
+Index: pid.c
+===================================================================
+--- /dev/null
+++ pid.c
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,54 @@
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
++#include <stdlib.h>
+
+#define PIDFILE "/var/run/icmpinfo.pid"
+
@@ -208,17 +221,26 @@
+ }
+}
+
---- print.c
+Index: print.c
+===================================================================
+--- print.c.orig
+++ print.c
-@@ -15,6 +15,7 @@
+@@ -15,12 +15,8 @@
*/
#include "defs.h"
+-
+-#ifndef ANSI_OFFSETOF
+-#ifndef offsetof
+-# define offsetof(t,m) (int)((&((t *)0L)->m))
+-#endif
+-#endif
+#include <time.h>
++#include <stddef.h>
- #ifndef ANSI_OFFSETOF
- #ifndef offsetof
-@@ -42,7 +43,7 @@
+ char to_hex(a)
+ int a;
+@@ -42,7 +38,7 @@ struct sockaddr_in *from; /* address of
struct hostent *hostent=NULL;
struct servent *servent=NULL;
static char prbuf[1024]; /* provide enough room for even the longest
hosts*/
@@ -227,7 +249,7 @@
/*
* We have to look at the IP header, to get its length.
* We also verify that what follows the IP header contains at
-@@ -64,14 +65,14 @@
+@@ -64,14 +60,14 @@ struct sockaddr_in *from; /* address of
cc -= iphdrlen;
icp = (struct icmp *)(buf + iphdrlen);
@@ -244,7 +266,7 @@
case ICMP_REDIRECT :
if (!verbose) break;
default :
-@@ -92,10 +93,10 @@
+@@ -92,10 +88,10 @@ struct sockaddr_in *from; /* address of
inet_ntoa(from->sin_addr),
hostent?hostent->h_name:NULL
);
@@ -257,7 +279,7 @@
{ /* icp->icmp_ip.ip_src.s_addr == local host, show it
only if requested (might be usefull for host with several
interfaces */
-@@ -126,12 +127,12 @@
+@@ -126,12 +122,12 @@ struct sockaddr_in *from; /* address of
ntohs(tp->th_sport),ntohs(tp->th_dport),
ntohl(tp->th_seq));
} else {
@@ -272,7 +294,7 @@
sprintf(prbuf+strlen(prbuf)," dp=%d [%s] seq=0x%8.8x",
ntohs(tp->th_dport),servent->s_name,
ntohl(tp->th_seq));
-@@ -154,7 +155,7 @@
+@@ -154,7 +150,7 @@ struct sockaddr_in *from; /* address of
static char a[] = " ";
int i,j,b,n, flagNEof;
unsigned char *pbuf=(unsigned char *)buf;
@@ -281,7 +303,7 @@
n = 0;
flagNEof = 1;
while (flagNEof) {
-@@ -249,7 +250,7 @@
+@@ -249,7 +245,7 @@ register int t;
"PrecdCut"
};
static char buf[80];
@@ -290,12 +312,14 @@
if (t < 0 || t > 15) {
sprintf(buf,"[OUT_OF_RANGE(%d)]",t);
} else {
-@@ -257,4 +258,3 @@
+@@ -257,4 +253,3 @@ register int t;
}
return(buf);
}
-
---- recvping.c
+Index: recvping.c
+===================================================================
+--- recvping.c.orig
+++ recvping.c
@@ -6,6 +6,9 @@
@@ -307,3 +331,13 @@
int recv_ping()
{
register int n;
+Index: err.c
+===================================================================
+--- err.c.orig
++++ err.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+
+ extern char *pname;
+
