Changeset 8d00c46 for patches/iputils-s20071127-fixes-2.patch
- Timestamp:
- Feb 18, 2009, 11:27:54 PM (15 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 56c7abf
- Parents:
- ffe68ed
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/iputils-s20071127-fixes-2.patch
rffe68ed r8d00c46 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 0 1-15-20092 Date: 02-18-2009 3 3 Initial Package Version: s20071127 4 Origin: Debian 4 Origin: Debian and Fedora 5 5 Upstream Status: Unknown 6 6 Description: Fixes Various Issues 7 7 8 diff -Naur iputils-s20071127.orig/Makefile iputils-s20071127/Makefile9 --- iputils-s20071127.orig/Makefile 2007-11-26 16:57:27.000000000 -080010 +++ iputils-s20071127/Makefile 2009-01-15 22:02:32.000000000 -080011 @@ -16,7 +16,7 @@12 CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g13 CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)14 15 -IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd16 +IPV4_TARGETS=tracepath ping arping17 IPV6_TARGETS=tracepath6 traceroute6 ping618 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)19 20 @@ -25,7 +25,6 @@21 22 all: $(TARGETS)23 24 -25 tftpd: tftpd.o tftpsubs.o26 ping: ping.o ping_common.o27 ping6: ping6.o ping_common.o28 @@ -37,7 +36,6 @@29 rdisc_srv.o: rdisc.c30 $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c31 32 -33 check-kernel:34 ifeq ($(KERNEL_INCLUDE),)35 @echo "Please, set correct KERNEL_INCLUDE"; false36 8 diff -Naur iputils-s20071127.orig/arping.c iputils-s20071127/arping.c 37 9 --- iputils-s20071127.orig/arping.c 2007-11-26 16:57:27.000000000 -0800 38 +++ iputils-s20071127/arping.c 2009-0 1-15 22:02:51.000000000-080010 +++ iputils-s20071127/arping.c 2009-02-18 23:18:09.239954184 -0800 39 11 @@ -168,12 +168,17 @@ 40 12 if (start.tv_sec==0) … … 59 31 } 60 32 alarm(1); 33 diff -Naur iputils-s20071127.orig/doc/docbook2man-spec.pl iputils-s20071127/doc/docbook2man-spec.pl 34 --- iputils-s20071127.orig/doc/docbook2man-spec.pl 2007-11-26 16:57:27.000000000 -0800 35 +++ iputils-s20071127/doc/docbook2man-spec.pl 2009-02-18 23:18:09.239954184 -0800 36 @@ -428,7 +428,7 @@ 37 output ' '; 38 39 if($_[0]->attribute('CHOICE')->value =~ /opt/i) { 40 - output '[ '; 41 + output '['; 42 } 43 bold_on(); 44 } 45 @@ -441,7 +441,7 @@ 46 font_off(); 47 } 48 if($_[0]->attribute('CHOICE')->value =~ /opt/i) { 49 - output '] '; 50 + output ']'; 51 } 52 } 53 61 54 diff -Naur iputils-s20071127.orig/doc/Makefile iputils-s20071127/doc/Makefile 62 55 --- iputils-s20071127.orig/doc/Makefile 2007-11-26 16:57:27.000000000 -0800 63 +++ iputils-s20071127/doc/Makefile 2009-0 1-15 22:02:41.000000000-080056 +++ iputils-s20071127/doc/Makefile 2009-02-18 23:18:09.239954184 -0800 64 57 @@ -6,7 +6,7 @@ 65 58 … … 81 74 @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man 82 75 83 diff -Naur iputils-s20071127.orig/doc/docbook2man-spec.pl iputils-s20071127/doc/docbook2man-spec.pl 84 --- iputils-s20071127.orig/doc/docbook2man-spec.pl 2007-11-26 16:57:27.000000000 -0800 85 +++ iputils-s20071127/doc/docbook2man-spec.pl 2009-01-15 22:02:19.000000000 -0800 86 @@ -428,7 +428,7 @@ 87 output ' '; 88 89 if($_[0]->attribute('CHOICE')->value =~ /opt/i) { 90 - output '[ '; 91 + output '['; 92 } 93 bold_on(); 94 } 95 @@ -441,7 +441,7 @@ 96 font_off(); 97 } 98 if($_[0]->attribute('CHOICE')->value =~ /opt/i) { 99 - output '] '; 100 + output ']'; 101 } 102 } 103 76 diff -Naur iputils-s20071127.orig/Makefile iputils-s20071127/Makefile 77 --- iputils-s20071127.orig/Makefile 2007-11-26 16:57:27.000000000 -0800 78 +++ iputils-s20071127/Makefile 2009-02-18 23:18:09.239954184 -0800 79 @@ -16,7 +16,7 @@ 80 CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g 81 CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 82 83 -IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd 84 +IPV4_TARGETS=tracepath ping arping 85 IPV6_TARGETS=tracepath6 traceroute6 ping6 86 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) 87 88 @@ -25,7 +25,6 @@ 89 90 all: $(TARGETS) 91 92 - 93 tftpd: tftpd.o tftpsubs.o 94 ping: ping.o ping_common.o 95 ping6: ping6.o ping_common.o 96 @@ -37,7 +36,6 @@ 97 rdisc_srv.o: rdisc.c 98 $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c 99 100 - 101 check-kernel: 102 ifeq ($(KERNEL_INCLUDE),) 103 @echo "Please, set correct KERNEL_INCLUDE"; false 104 diff -Naur iputils-s20071127.orig/ping6.c iputils-s20071127/ping6.c 105 --- iputils-s20071127.orig/ping6.c 2007-11-26 16:57:27.000000000 -0800 106 +++ iputils-s20071127/ping6.c 2009-02-18 23:18:09.239954184 -0800 107 @@ -414,7 +414,7 @@ 108 fprintf(stderr, "ping: unknown iface %s\n", device); 109 exit(2); 110 } 111 - cmsg = (struct cmsghdr*)cmsgbuf; 112 + cmsg = (struct cmsghdr*)(cmsgbuf+cmsglen); 113 cmsglen += CMSG_SPACE(sizeof(*ipi)); 114 cmsg->cmsg_len = CMSG_LEN(sizeof(*ipi)); 115 cmsg->cmsg_level = SOL_IPV6; 116 @@ -486,7 +486,6 @@ 117 /* 118 * select icmp echo reply as icmp type to receive 119 */ 120 - 121 ICMP6_FILTER_SETBLOCKALL(&filter); 122 123 if (!working_recverr) { 104 124 diff -Naur iputils-s20071127.orig/ping.c iputils-s20071127/ping.c 105 125 --- iputils-s20071127.orig/ping.c 2007-11-26 16:57:27.000000000 -0800 106 +++ iputils-s20071127/ping.c 2009-0 1-15 22:01:59.000000000-0800126 +++ iputils-s20071127/ping.c 2009-02-18 23:18:09.239954184 -0800 107 127 @@ -249,7 +249,7 @@ 108 128 if (argc == 1) … … 151 171 printf("Dest Unreachable, Bad Code: %d\n", code); 152 172 break; 153 diff -Naur iputils-s20071127.orig/ping6.c iputils-s20071127/ping6.c154 --- iputils-s20071127.orig/ping6.c 2007-11-26 16:57:27.000000000 -0800155 +++ iputils-s20071127/ping6.c 2009-01-15 22:02:11.000000000 -0800156 @@ -414,7 +414,7 @@157 fprintf(stderr, "ping: unknown iface %s\n", device);158 exit(2);159 }160 - cmsg = (struct cmsghdr*)cmsgbuf;161 + cmsg = (struct cmsghdr*)(cmsgbuf+cmsglen);162 cmsglen += CMSG_SPACE(sizeof(*ipi));163 cmsg->cmsg_len = CMSG_LEN(sizeof(*ipi));164 cmsg->cmsg_level = SOL_IPV6;165 @@ -486,7 +486,6 @@166 /*167 * select icmp echo reply as icmp type to receive168 */169 -170 ICMP6_FILTER_SETBLOCKALL(&filter);171 172 if (!working_recverr) {173 173 diff -Naur iputils-s20071127.orig/ping_common.c iputils-s20071127/ping_common.c 174 174 --- iputils-s20071127.orig/ping_common.c 2007-11-26 16:57:27.000000000 -0800 175 +++ iputils-s20071127/ping_common.c 2009-0 1-15 22:01:42.000000000-0800175 +++ iputils-s20071127/ping_common.c 2009-02-18 23:18:09.239954184 -0800 176 176 @@ -818,7 +818,8 @@ 177 177 } … … 189 189 } 190 190 - 191 diff -Naur iputils-s20071127.orig/rdisc.c iputils-s20071127/rdisc.c 192 --- iputils-s20071127.orig/rdisc.c 2007-11-26 16:57:27.000000000 -0800 193 +++ iputils-s20071127/rdisc.c 2009-02-18 23:18:31.745396284 -0800 194 @@ -240,14 +240,25 @@ 195 { 196 int t; 197 pid_t pid; 198 + long open_max; 199 200 if (trace) 201 return; 202 + if ((open_max = sysconf(_SC_OPEN_MAX)) == -1) { 203 + if (errno == 0) { 204 + (void) fprintf(stderr, "OPEN_MAX is not supported\n"); 205 + } 206 + else { 207 + (void) fprintf(stderr, "sysconf() error\n"); 208 + } 209 + exit(1); 210 + } 211 + 212 213 if ((pid=fork()) != 0) 214 exit(0); 215 216 - for (t = 0; t < OPEN_MAX; t++) 217 + for (t = 0; t < open_max; t++) 218 if (t != s) 219 close(t); 220 191 221 diff -Naur iputils-s20071127.orig/tracepath.c iputils-s20071127/tracepath.c 192 222 --- iputils-s20071127.orig/tracepath.c 2007-11-26 16:57:27.000000000 -0800 193 +++ iputils-s20071127/tracepath.c 2009-0 1-15 22:01:59.000000000-0800223 +++ iputils-s20071127/tracepath.c 2009-02-18 23:18:09.239954184 -0800 194 224 @@ -318,9 +318,9 @@ 195 225 base_port = atoi(p+1); … … 204 234 } 205 235 memcpy(&target.sin_addr, he->h_addr, 4); 206 207
Note: See TracChangeset
for help on using the changeset viewer.