Update to iputils-s20121106 (#873571) and update patches
This commit is contained in:
Jan Synacek
parent
b039f70aee
commit
45cb4ec5b8
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ ifenslave.tar.gz
|
|||||||
/iputils-s20101006.tar.bz2
|
/iputils-s20101006.tar.bz2
|
||||||
/ifenslave.tar.gz
|
/ifenslave.tar.gz
|
||||||
/iputils-s20121011.tar.bz2
|
/iputils-s20121011.tar.bz2
|
||||||
|
/iputils-s20121106.tar.bz2
|
||||||
|
|||||||
@ -1,15 +1,21 @@
|
|||||||
--- a/Makefile 2012-10-11 08:36:40.000000000 +0200
|
--- iputils-s20121106/Makefile.orig 2012-11-05 19:13:50.000000000 +0100
|
||||||
+++ b/Makefile 2012-10-15 11:53:14.663426710 +0200
|
+++ iputils-s20121106/Makefile 2012-11-06 14:03:03.214464415 +0100
|
||||||
@@ -26,9 +26,9 @@ endif
|
@@ -21,8 +21,7 @@
|
||||||
|
# -------------------------------------
|
||||||
CC=gcc
|
|
||||||
# What a pity, all new gccs are buggy and -Werror does not work. Sigh.
|
# What a pity, all new gccs are buggy and -Werror does not work. Sigh.
|
||||||
-#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
|
#CCOPT=-Wstrict-prototypes -Wall -g -Werror
|
||||||
-CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
|
-CCOPT=-Wstrict-prototypes -Wall -g
|
||||||
-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
|
-CCOPTOPT=-O2
|
||||||
+CCOPT=-Wstrict-prototypes -fno-strict-aliasing -Werror
|
+CCOPT=-Wstrict-prototypes -fno-strict-aliasing -Werror
|
||||||
+DEFINES += -D_GNU_SOURCE
|
GLIBCFIX=-D_GNU_SOURCE
|
||||||
+CFLAGS += $(RPM_OPT_FLAGS) $(CCOPT) $(GLIBCFIX) $(DEFINES)
|
DEFINES=
|
||||||
|
LDLIB=
|
||||||
IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
|
@@ -42,7 +41,7 @@
|
||||||
IPV6_TARGETS=tracepath6 traceroute6 ping6
|
IPV6_TARGETS=tracepath6 traceroute6 ping6
|
||||||
|
TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
|
||||||
|
|
||||||
|
-CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
|
||||||
|
+CFLAGS+=$(RPM_OPT_FLAGS) $(CCOPT) $(GLIBCFIX) $(DEFINES)
|
||||||
|
LDLIBS=$(LDLIB) $(ADDLIB)
|
||||||
|
|
||||||
|
LASTTAG:=`git describe HEAD | sed -e 's/-.*//'`
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
--- iputils-s20121011/Makefile.orig 2012-10-15 12:30:47.000000000 +0200
|
--- iputils-s20121106/Makefile.orig 2012-11-06 14:05:19.000000000 +0100
|
||||||
+++ iputils-s20121011/Makefile 2012-10-15 12:31:53.057830727 +0200
|
+++ iputils-s20121106/Makefile 2012-11-06 14:06:42.608585629 +0100
|
||||||
@@ -48,7 +48,7 @@
|
@@ -62,7 +62,7 @@
|
||||||
arping: arping.o
|
|
||||||
$(LINK.o) -o $@ $^ $(LIB_SYSFS) $(LIB_CAP)
|
|
||||||
ping: ping.o ping_common.o
|
|
||||||
- $(LINK.o) -o $@ $^ $(LIB_CAP)
|
|
||||||
+ $(LINK.o) -o $@ $^ -lidn $(LIB_CAP)
|
|
||||||
ping6: ping6.o ping_common.o
|
|
||||||
$(LINK.o) -o $@ $^ -lresolv -lcrypto $(LIB_CAP)
|
|
||||||
|
|
||||||
|
# ping / ping6
|
||||||
|
ping: ping.o ping_common.o
|
||||||
|
- $(LINK.o) $^ $(LIB_CAP) $(LDLIBS) -o $@
|
||||||
|
+ $(LINK.o) $^ -lidn $(LIB_CAP) $(LDLIBS) -o $@
|
||||||
|
ping6: ping6.o ping_common.o
|
||||||
|
$(LINK.o) $^ -lresolv -lcrypto $(LIB_CAP) $(LDLIBS) -o $@
|
||||||
|
ping.o ping6.o ping_common.o: ping_common.h
|
||||||
diff -up iputils-s20100418/ping.c.idn iputils-s20100418/ping.c
|
diff -up iputils-s20100418/ping.c.idn iputils-s20100418/ping.c
|
||||||
--- iputils-s20100418/ping.c.idn 2010-04-20 16:07:59.038484302 +0200
|
--- iputils-s20100418/ping.c.idn 2010-04-20 16:07:59.038484302 +0200
|
||||||
+++ iputils-s20100418/ping.c 2010-04-20 16:07:59.077485007 +0200
|
+++ iputils-s20100418/ping.c 2010-04-20 16:07:59.077485007 +0200
|
||||||
|
|||||||
@ -264,9 +264,9 @@
|
|||||||
|
|
||||||
if (!quiet) {
|
if (!quiet) {
|
||||||
printf("ARPING %s ", inet_ntoa(dst));
|
printf("ARPING %s ", inet_ntoa(dst));
|
||||||
--- iputils-s20121011/Makefile~ 2012-10-16 11:32:11.548574050 +0200
|
--- iputils-s20121106/Makefile.orig 2012-11-06 14:07:24.000000000 +0100
|
||||||
+++ iputils-s20121011/Makefile 2012-10-16 11:33:19.326548839 +0200
|
+++ iputils-s20121106/Makefile 2012-11-06 14:07:51.394624700 +0100
|
||||||
@@ -19,11 +19,6 @@ ifneq ($(USE_CAP),no)
|
@@ -31,11 +31,6 @@
|
||||||
LIB_CAP = -lcap
|
LIB_CAP = -lcap
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -275,6 +275,6 @@
|
|||||||
- LIB_SYSFS = -lsysfs
|
- LIB_SYSFS = -lsysfs
|
||||||
-endif
|
-endif
|
||||||
-
|
-
|
||||||
CC=gcc
|
# -------------------------------------
|
||||||
# What a pity, all new gccs are buggy and -Werror does not work. Sigh.
|
IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
|
||||||
CCOPT=-Wstrict-prototypes -fno-strict-aliasing -Werror
|
IPV6_TARGETS=tracepath6 traceroute6 ping6
|
||||||
|
|||||||
@ -42,17 +42,17 @@ diff -up iputils-s20100418/in6_flowlabel.h.flowlabel iputils-s20100418/in6_flowl
|
|||||||
+#define IPV6_FLOWLABEL_MGR 32
|
+#define IPV6_FLOWLABEL_MGR 32
|
||||||
+#define IPV6_FLOWINFO_SEND 33
|
+#define IPV6_FLOWINFO_SEND 33
|
||||||
+
|
+
|
||||||
--- iputils-s20121011/Makefile.flowlabel 2012-10-16 10:31:41.000000000 +0200
|
--- iputils-s20121106/Makefile.orig 2012-11-06 14:09:00.000000000 +0100
|
||||||
+++ iputils-s20121011/Makefile 2012-10-16 10:33:05.687870860 +0200
|
+++ iputils-s20121106/Makefile 2012-11-06 14:09:30.983678824 +0100
|
||||||
@@ -52,7 +52,7 @@
|
@@ -60,7 +60,7 @@
|
||||||
|
$(LINK.o) $^ -lidn $(LIB_CAP) $(LDLIBS) -o $@
|
||||||
ping6: ping6.o ping_common.o
|
ping6: ping6.o ping_common.o
|
||||||
$(LINK.o) -o $@ $^ -lresolv -lcrypto $(LIB_CAP)
|
$(LINK.o) $^ -lresolv -lcrypto $(LIB_CAP) $(LDLIBS) -o $@
|
||||||
|
|
||||||
-ping.o ping6.o ping_common.o: ping_common.h
|
-ping.o ping6.o ping_common.o: ping_common.h
|
||||||
+ping.o ping6.o ping_common.o: ping_common.h in6_flowlabel.h
|
+ping.o ping6.o ping_common.o: ping_common.h in6_flowlabel.h
|
||||||
tftpd.o tftpsubs.o: tftp.h
|
|
||||||
|
|
||||||
rdisc_srv: rdisc_srv.o
|
# rarpd
|
||||||
|
|
||||||
diff -up iputils-s20100418/ping6.c.flowlabel iputils-s20100418/ping6.c
|
diff -up iputils-s20100418/ping6.c.flowlabel iputils-s20100418/ping6.c
|
||||||
--- iputils-s20100418/ping6.c.flowlabel 2010-05-17 13:55:34.012839691 +0200
|
--- iputils-s20100418/ping6.c.flowlabel 2010-05-17 13:55:34.012839691 +0200
|
||||||
+++ iputils-s20100418/ping6.c 2010-05-17 13:55:36.411557280 +0200
|
+++ iputils-s20100418/ping6.c 2010-05-17 13:55:36.411557280 +0200
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Summary: Network monitoring tools including ping
|
Summary: Network monitoring tools including ping
|
||||||
Name: iputils
|
Name: iputils
|
||||||
Version: 20121011
|
Version: 20121106
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.skbuff.net/iputils
|
URL: http://www.skbuff.net/iputils
|
||||||
@ -167,6 +167,9 @@ mv -f RELNOTES.tmp RELNOTES
|
|||||||
%{_sysconfdir}/rc.d/init.d/rdisc
|
%{_sysconfdir}/rc.d/init.d/rdisc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 06 2012 Jan Synáček <jsynacek@redhat.com> - 20121106-1
|
||||||
|
- Update to iputils-s20121106 (#873571) and update patches
|
||||||
|
|
||||||
* Mon Oct 15 2012 Jan Synáček <jsynacek@redhat.com> - 20121011-1
|
* Mon Oct 15 2012 Jan Synáček <jsynacek@redhat.com> - 20121011-1
|
||||||
- Update to iputils-s20121011
|
- Update to iputils-s20121011
|
||||||
+ drop unnecessary patches
|
+ drop unnecessary patches
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user