rpms/iputils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- fixed things necessery for revision

Browse Source
This commit is contained in:
Martin Bacovsky 2007-03-15 17:40:40 +00:00
parent 154cc82ce8
commit 96bd63d1e2
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
iputils-20020927-rh.patch
View File

@ -11,21 +11,14 @@
--- iputils/Makefile.rh7 2002-09-20 20:23:55.000000000 +0200 --- iputils/Makefile.rh7 2002-09-20 20:23:55.000000000 +0200
+++ iputils/Makefile 2004-05-12 15:08:25.638310270 +0200 +++ iputils/Makefile 2004-05-12 15:08:25.638310270 +0200
@@ -24,14 +24,14 @@ @@ -24,8 +24,8 @@
CC=gcc 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=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
-CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) -CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
+#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g +#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
+#CFLAGS=$(CCOPT) $(DEFINES) +#CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
IPV6_TARGETS=tracepath6 traceroute6 ping6 IPV6_TARGETS=tracepath6 traceroute6 ping6
TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
-all: check-kernel $(TARGETS)
+all: $(TARGETS)
tftpd: tftpd.o tftpsubs.o

17
iputils.spec
View File

@ -8,7 +8,7 @@ Group: System Environment/Daemons
Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2 Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2
Source1: ifenslave.tar.gz Source1: ifenslave.tar.gz
Source3: rdisc.initd Source3: rdisc.initd
#Patch0: iputils-20020927-rh.patch Patch0: iputils-20020927-rh.patch
Patch3: iputils-20020124-countermeasures.patch Patch3: iputils-20020124-countermeasures.patch
Patch4: iputils-20020927-addrcache.patch Patch4: iputils-20020927-addrcache.patch
Patch5: iputils-20020927-ping-subint.patch Patch5: iputils-20020927-ping-subint.patch
@ -19,12 +19,12 @@ Patch21: iputils-ping_cleanup.patch
Patch22: iputils-ifenslave.patch Patch22: iputils-ifenslave.patch
Patch25: iputils-20020927-arping-infiniband.patch Patch25: iputils-20020927-arping-infiniband.patch
Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRoot: %{_tmppath}/%{name}-root BuildRequires: docbook-utils perl-SGMLSpm
BuildPreReq: docbook-utils perl-SGMLSpm BuildRequires: glibc-kernheaders >= 2.4-8.19
BuildPreReq: glibc-kernheaders >= 2.4-8.19
PreReq: chkconfig
BuildRequires: libsysfs-devel BuildRequires: libsysfs-devel
Requires(post): chkconfig
Requires(preun): chkconfig
%description %description
The iputils package contains basic utilities for monitoring a network, The iputils package contains basic utilities for monitoring a network,
@ -35,7 +35,7 @@ the target machine is alive and receiving network traffic.
%prep %prep
%setup -q -a 1 -n %{name}-s%{version} %setup -q -a 1 -n %{name}-s%{version}
#%patch0 -p1 -b .rh %patch0 -p1 -b .rh
%patch3 -p1 -b .countermeasures %patch3 -p1 -b .countermeasures
%patch4 -p1 -b .addrcache %patch4 -p1 -b .addrcache
%patch5 -p1 -b .ping-subint %patch5 -p1 -b .ping-subint
@ -142,6 +142,7 @@ rm -rf ${RPM_BUILD_ROOT}
* Thu Mar 15 2007 Martin Bacovsky <mbacovsk@redhat.com> - 20070202-1 * Thu Mar 15 2007 Martin Bacovsky <mbacovsk@redhat.com> - 20070202-1
- upgarde to new upstream iputils-s20070202 - upgarde to new upstream iputils-s20070202
- Resolves: #229995 - Resolves: #229995
- Resolves: #225909 - Merge Review: iputils
- patches revision - patches revision
* Thu Feb 22 2007 Martin Bacovsky <mbacovsk@redhat.com>- 20020927-42 * Thu Feb 22 2007 Martin Bacovsky <mbacovsk@redhat.com>- 20020927-42
@ -379,7 +380,7 @@ rm -rf ${RPM_BUILD_ROOT}
- add ifenslave. - add ifenslave.
* Thu Feb 3 2000 Elliot Lee <sopwith@redhat.com> * Thu Feb 3 2000 Elliot Lee <sopwith@redhat.com>
- List /usr/sbin/rdisc in %files list. - List /usr/sbin/rdisc in %%files list.
* Thu Jan 27 2000 Jeff Johnson <jbj@redhat.com> * Thu Jan 27 2000 Jeff Johnson <jbj@redhat.com>
- add remaining binaries. - add remaining binaries.