From 68ee23dce79cc9bd02b5db643818606e49e40d8c Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 06:24:00 +0000
Subject: [PATCH] auto-import changelog data from iputils-20020927-15.src.rpm
 Wed May 12 2004 Phil Knirsch <pknirsch@redhat.com> 20020927-15 - Updated rh
 patch to enable PIE build of binaries. Thu Apr 22 2004 Phil Knirsch
 <pknirsch@redhat.com> 20020927-14 - Fixed bug with wrong return code check of
 inet_pton() in traceroute6     (#100684)

---
 iputils-20020927-rh.patch | 31 +++++++++++++++++++++++++++++++
 iputils.spec              | 22 ++++++++++++++++++----
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 iputils-20020927-rh.patch

diff --git a/iputils-20020927-rh.patch b/iputils-20020927-rh.patch
new file mode 100644
index 0000000..23d6fd8
--- /dev/null
+++ b/iputils-20020927-rh.patch
@@ -0,0 +1,31 @@
+--- iputils/doc/Makefile.rh7	2002-02-23 01:17:57.000000000 +0100
++++ iputils/doc/Makefile	2004-05-12 14:55:16.724448173 +0200
+@@ -2,7 +2,7 @@
+ HTMLFILES=$(subst .sgml,.html,$(SGMLFILES)) index.html
+ MANFILES=$(subst .sgml,.8,$(SGMLFILES))
+ 
+-all: html
++all:
+ 
+ html: $(HTMLFILES) iputils.html
+ 
+--- iputils/Makefile.rh7	2002-09-20 20:23:55.000000000 +0200
++++ iputils/Makefile	2004-05-12 15:08:25.638310270 +0200
+@@ -24,14 +24,14 @@
+ CC=gcc
+ # 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=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
+-CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) 
++#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
++#CFLAGS=$(CCOPT) $(DEFINES) 
+ 
+ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
+ IPV6_TARGETS=tracepath6 traceroute6 ping6
+ TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
+ 
+-all: check-kernel $(TARGETS)
++all: $(TARGETS)
+ 
+ 
+ tftpd: tftpd.o tftpsubs.o
diff --git a/iputils.spec b/iputils.spec
index ddb1076..cc91787 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,13 +1,13 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 13
+Release: 15
 License: BSD
 Group: System Environment/Daemons
 Source0: http://ftp.sunet.se/pub/os/Linux/ip-routing/iputils-ss020927.tar.gz
 Source1: ifenslave.c
 Source2: README.bonding
-Patch0: iputils-20001007-rh7.patch
+Patch0: iputils-20020927-rh.patch
 Patch1: iputils-20020124-ping_sparcfix.patch
 Patch2: iputils-20020124-rdisc-server.patch
 Patch3: iputils-20020124-countermeasures.patch
@@ -17,6 +17,7 @@ Patch6: iputils-20020927-icmp_seq.patch
 Patch7: iputils-glibckernheaders.patch
 Patch8: iputils-20020927-headers.patch
 Patch9: iputils-20020927-unaligned.patch
+Patch10: iputils-20020927-inet_pton.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: docbook-utils perl-SGMLSpm
@@ -33,7 +34,7 @@ the target machine is alive and receiving network traffic.
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
-%patch0 -p1 -b .rh7
+%patch0 -p1 -b .rh
 %patch1 -p1 -b .ping_sparcfix
 %patch2 -p1 -b .rdisc-server
 %patch3 -p1 -b .countermeasures
@@ -43,10 +44,17 @@ cp %{SOURCE2} .
 %patch7 -p1 -b .glibckernheaders
 %patch8 -p1 -b .headers
 %patch9 -p1 -b .unaligned
+%patch10 -p1 -b .inet_pton
 
 %build
+%ifarch s390 s390x
+export CFLAGS="$RPM_OPT_FLAGS -fPIE"
+%else
+export CFLAGS="$RPM_OPT_FLAGS -fpie"
+%endif
+export LDFLAGS="-pie"
 make
-gcc -Wall -Wstrict-prototypes -O3 ifenslave.c -o ifenslave
+gcc -Wall -Wstrict-prototypes -O2 ifenslave.c -o ifenslave
 make -C doc man
 
 %install
@@ -113,6 +121,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Wed May 12 2004 Phil Knirsch <pknirsch@redhat.com> 20020927-15
+- Updated rh patch to enable PIE build of binaries.
+
+* Thu Apr 22 2004 Phil Knirsch <pknirsch@redhat.com> 20020927-14
+- Fixed bug with wrong return code check of inet_pton() in traceroute6 (#100684)
+
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt