commit e099df1592fd8b336b9d7b58b4fadbc0c25057d7
Author: Jakub Bogusz <[email protected]>
Date: Thu Nov 1 17:31:45 2012 +0100
- updated to s20121011
- updated bindnow,pingsock patches
- removed obsolete build patch
iputils-bindnow.patch | 30 ++++++++++++++++++------------
iputils-build.patch | 13 -------------
iputils-pingsock.patch | 29 ++++++++++++++---------------
iputils.spec | 15 ++++++---------
4 files changed, 38 insertions(+), 49 deletions(-)
---
diff --git a/iputils.spec b/iputils.spec
index cf14121..a26f1e9 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -7,25 +7,25 @@ Summary(pl.UTF-8): Użytki przeznaczone dla pracy z siecią
IPv4/IPv6
Summary(ru.UTF-8): Набор базовых сетевых утилит (ping, tracepath etc.)
Summary(uk.UTF-8): Набір базових мережевих утиліт (ping, tracepath etc.)
Name: iputils
-Version: s20101006
-Release: 3
+Version: s20121011
+Release: 1
Epoch: 2
License: BSD
Group: Networking/Admin
Source0: http://www.skbuff.net/iputils/%{name}-%{version}.tar.bz2
-# Source0-md5: a36c25e9ec17e48be514dc0485e7376c
+# Source0-md5: 67056dae90c1ec02e753e0e17d3774ac
Patch0: %{name}-pmake.patch
Patch1: %{name}-pf.patch
Patch2: %{name}-bindnow.patch
-Patch3: %{name}-build.patch
#
http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/iputils/iputils-s20101006-owl-pingsock.diff?rev=1.1;content-type=text%2Fplain
-Patch4: %{name}-pingsock.patch
+Patch3: %{name}-pingsock.patch
URL:
http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils
%if %{with doc}
BuildRequires: docbook-dtd31-sgml
BuildRequires: docbook-utils >= 0.6.10
BuildRequires: gnome-doc-tools
%endif
+BuildRequires: libcap-devel
BuildRequires: linux-libc-headers
BuildRequires: openssl-devel
BuildRequires: sysfsutils-devel
@@ -95,14 +95,11 @@ pakiety ARP z użyciem podanego adresu źródłowego.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
-# empty LDLIBS - don't link with -lresolv, it's not necessary
%{__make} all \
CC="%{__cc}" \
- CCOPT="%{rpmcflags} %{rpmcppflags} -D_GNU_SOURCE -DHAVE_SIN6_SCOPEID=1"
\
- LDLIBS=
+ CCOPT="%{rpmcflags} %{rpmcppflags} -D_GNU_SOURCE -DHAVE_SIN6_SCOPEID=1"
%if %{with doc}
%{__make} html
diff --git a/iputils-bindnow.patch b/iputils-bindnow.patch
index 4200c66..58447fa 100644
--- a/iputils-bindnow.patch
+++ b/iputils-bindnow.patch
@@ -4,19 +4,25 @@ information leakage.
http://bugs.gentoo.org/77526
---- iputils-s20100418/Makefile.orig 2010-04-18 06:45:45.000000000 +0200
-+++ iputils-s20100418/Makefile 2010-08-15 10:09:35.402816591 +0200
-@@ -28,8 +28,13 @@
-
+--- iputils-s20121011/Makefile.orig 2012-11-01 17:12:14.226219387 +0100
++++ iputils-s20121011/Makefile 2012-11-01 17:15:12.589545237 +0100
+@@ -42,15 +42,15 @@
+ clockdiff: clockdiff.o
+ $(LINK.o) -o $@ $^ $(LIB_CAP)
+ traceroute6: traceroute6.o
+- $(LINK.o) -o $@ $^ $(LIB_CAP)
++ $(LINK.o) -o $@ $^ $(LIB_CAP) -Wl,-z,now -Wl,-z,relro
tftpd: tftpd.o tftpsubs.o
- arping: arping.o -lsysfs
-+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
+ $(LINK.o) -o $@ $^ $(LIB_CAP)
+ arping: arping.o
+- $(LINK.o) -o $@ $^ $(LIB_SYSFS) $(LIB_CAP)
++ $(LINK.o) -o $@ $^ $(LIB_SYSFS) $(LIB_CAP) -Wl,-z,now -Wl,-z,relro
ping: ping.o ping_common.o
-+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
- ping6: ping6.o ping_common.o -lresolv -lcrypto
-+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
-+traceroute6: traceroute6.o
-+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
+- $(LINK.o) -o $@ $^ $(LIB_CAP)
++ $(LINK.o) -o $@ $^ $(LIB_CAP) -Wl,-z,now -Wl,-z,relro
+ ping6: ping6.o ping_common.o
+- $(LINK.o) -o $@ $^ -lresolv -lcrypto $(LIB_CAP)
++ $(LINK.o) -o $@ $^ -lresolv -lcrypto $(LIB_CAP) -Wl,-z,now -Wl,-z,relro
+
ping.o ping6.o ping_common.o: ping_common.h
tftpd.o tftpsubs.o: tftp.h
-
diff --git a/iputils-build.patch b/iputils-build.patch
deleted file mode 100644
index eb9c2f9..0000000
--- a/iputils-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- iputils-s20100418/Makefile~ 2010-08-15 21:40:16.369143350 +0200
-+++ iputils-s20100418/Makefile 2010-08-15 21:40:55.575806109 +0200
-@@ -31,8 +31,8 @@
- $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
- ping: ping.o ping_common.o
- $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
--ping6: ping6.o ping_common.o -lresolv -lcrypto
-- $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
-+ping6: ping6.o ping_common.o
-+ $(LINK.o) $^ $(LDLIBS) -o $@ -lresolv -lcrypto -Wl,-z,now -Wl,-z,relro
- traceroute6: traceroute6.o
- $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
- ping.o ping6.o ping_common.o: ping_common.h
diff --git a/iputils-pingsock.patch b/iputils-pingsock.patch
index d7cc34e..8212c0b 100644
--- a/iputils-pingsock.patch
+++ b/iputils-pingsock.patch
@@ -1,6 +1,5 @@
-diff -uNp -r iputils-s20101006.orig/ping.c iputils-s20101006/ping.c
---- iputils-s20101006.orig/ping.c 2010-10-06 11:59:20 +0000
-+++ iputils-s20101006/ping.c 2011-03-24 12:21:30 +0000
+--- iputils-s20121011/ping.c.orig 2012-11-01 17:17:27.509539573 +0100
++++ iputils-s20121011/ping.c 2012-11-01 17:23:39.319523969 +0100
@@ -88,6 +88,7 @@ struct sockaddr_in whereto; /* who to pi
int optlen = 0;
int settos = 0; /* Set TOS, Precendence or other QOS
options */
@@ -22,7 +21,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
socket_errno = errno;
uid = getuid();
-@@ -377,13 +382,35 @@ main(int argc, char **argv)
+@@ -399,13 +404,35 @@ main(int argc, char **argv)
}
}
@@ -63,7 +62,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
struct icmp_filter filt;
filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
(1<<ICMP_DEST_UNREACH)|
-@@ -398,6 +425,12 @@ main(int argc, char **argv)
+@@ -420,6 +447,12 @@ main(int argc, char **argv)
hold = 1;
if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold,
sizeof(hold)))
fprintf(stderr, "WARNING: your kernel is veeery old. No
problems.\n");
@@ -76,7 +75,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
/* record route option */
if (options & F_RROUTE) {
-@@ -566,6 +599,7 @@ int receive_error_msg()
+@@ -588,6 +621,7 @@ int receive_error_msg()
nerrors++;
} else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
@@ -84,7 +83,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
if (res < sizeof(icmph) ||
target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
-@@ -576,9 +610,18 @@ int receive_error_msg()
+@@ -598,9 +632,18 @@ int receive_error_msg()
goto out;
}
@@ -105,7 +104,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
struct icmp_filter filt;
working_recverr = 1;
/* OK, it works. Add stronger filter. */
-@@ -589,15 +632,14 @@ int receive_error_msg()
+@@ -611,15 +654,14 @@ int receive_error_msg()
perror("\rWARNING: setsockopt(ICMP_FILTER)");
}
@@ -114,9 +113,9 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
if (options & F_QUIET)
goto out;
if (options & F_FLOOD) {
-- write(STDOUT_FILENO, "\bE", 2);
+- write_stdout("\bE", 2);
+ if (error_pkt)
-+ write(STDOUT_FILENO, "\bE", 2);
++ write_stdout("\bE", 2);
} else {
print_timestamp();
- printf("From %s icmp_seq=%u ",
pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
@@ -124,7 +123,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
fflush(stdout);
}
-@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc,
+@@ -717,15 +759,41 @@ parse_reply(struct msghdr *msg, int cc,
struct iphdr *ip;
int hlen;
int csfailed;
@@ -172,7 +171,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
}
/* Now the ICMP part */
-@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc,
+@@ -738,7 +806,7 @@ parse_reply(struct msghdr *msg, int cc,
return 1; /* 'Twas not our ECHO */
if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
ntohs(icp->un.echo.sequence),
@@ -181,7 +180,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
pr_echo_reply))
return 0;
} else {
-@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc,
+@@ -829,7 +897,7 @@ parse_reply(struct msghdr *msg, int cc,
}
if (!(options & F_FLOOD)) {
@@ -190,7 +189,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
if (options & F_AUDIBLE)
putchar('\a');
-@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
+@@ -965,8 +1033,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
printf("Redirect, Bad Code: %d", code);
break;
}
@@ -200,7 +199,7 @@ diff -uNp -r iputils-s20101006.orig/ping.c
iputils-s20101006/ping.c
if (icp && (options & F_VERBOSE))
pr_iph((struct iphdr*)(icp + 1));
break;
-@@ -1217,7 +1284,7 @@ void install_filter(void)
+@@ -1266,7 +1333,7 @@ void install_filter(void)
insns
};
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iputils.git/commitdiff/e099df1592fd8b336b9d7b58b4fadbc0c25057d7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
