projects / openwrt / svn-archive / archive.git / blob
? search:


d15724f90752105305e7bc02f98c2a59003d5e20
[openwrt/svn-archive/archive.git] / obsolete-buildroot / sources / openwrt / patches / tcpdump / 00_debian_tcpdump_3.8.3-3.diff
1 --- tcpdump-3.8.3.orig/debian/copyright
2 +++ tcpdump-3.8.3/debian/copyright
3 @@ -0,0 +1,116 @@
4 +This package was debianized by Anand Kumria <wildfire@progsoc.org> on
5 +Wed, 22 Nov 2000 13:19:33 +1100.
6 +It is now maintained by:
7 + + Torsten Landschoff <torsten@debian.org>
8 + + Romain Francoise <rfrancoise@debian.org>
9 +
10 +It was downloaded from http://tcpdump.org/release/tcpdump-3.8.3.tar.gz
11 +
12 +Upstream Authors: tcpdump-workers@tcpdump.org
13 +
14 +Licensed under the 3-clause BSD license:
15 +
16 + Redistribution and use in source and binary forms, with or without
17 + modification, are permitted provided that the following conditions
18 + are met:
19 +
20 + 1. Redistributions of source code must retain the above copyright
21 + notice, this list of conditions and the following disclaimer.
22 + 2. Redistributions in binary form must reproduce the above copyright
23 + notice, this list of conditions and the following disclaimer in
24 + the documentation and/or other materials provided with the
25 + distribution.
26 + 3. The names of the authors may not be used to endorse or promote
27 + products derived from this software without specific prior
28 + written permission.
29 +
30 + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
31 + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
32 + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
33 +
34 +Current upstream maintainers:
35 + Bill Fenner <fenner@research.att.com>
36 + Fulvio Risso <risso@polito.it>
37 + Guy Harris <guy@alum.mit.edu>
38 + Hannes Gredler <hannes@juniper.net>
39 + Jun-ichiro itojun Hagino <itojun@iijlab.net>
40 + Michael Richardson <mcr@sandelman.ottawa.on.ca>
41 +
42 +Additional people who have contributed patches:
43 +
44 + Alan Bawden <Alan@LCS.MIT.EDU>
45 + Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
46 + Albert Chin <china@thewrittenword.com>
47 + Andrew Brown <atatat@atatdot.net>
48 + Antti Kantee <pooka@netbsd.org>
49 + Arkadiusz Miskiewicz <misiek@pld.org.pl>
50 + Armando L. Caro Jr. <acaro@mail.eecis.udel.edu>
51 + Assar Westerlund <assar@sics.se>
52 + Brian Ginsbach <ginsbach@cray.com>
53 + Charles M. Hannum <mycroft@netbsd.org>
54 + Chris G. Demetriou <cgd@netbsd.org>
55 + Chris Pepper <pepper@mail.reppep.com>
56 + Darren Reed <darrenr@reed.wattle.id.au>
57 + David Kaelbling <drk@sgi.com>
58 + David Young <dyoung@ojctech.com>
59 + Don Ebright <Don.Ebright@compuware.com>
60 + Eric Anderson <anderse@hpl.hp.com>
61 + Franz Schaefer <schaefer@mond.at>
62 + Gianluca Varenni <varenni@netgroup-serv.polito.it>
63 + Gisle Vanem <giva@bgnett.no>
64 + Graeme Hewson <ghewson@cix.compulink.co.uk>
65 + Greg Stark <gsstark@mit.edu>
66 + Greg Troxel <gdt@ir.bbn.com>
67 + Guillaume Pelat <endymion_@users.sourceforge.net>
68 + Hyung Sik Yoon <hsyn@kr.ibm.com>
69 + Igor Khristophorov <igor@atdot.org>
70 + Jan-Philip Velders <jpv@veldersjes.net>
71 + Jason R. Thorpe <thorpej@netbsd.org>
72 + Javier Achirica <achirica@ttd.net>
73 + Jean Tourrilhes <jt@hpl.hp.com>
74 + Jefferson Ogata <jogata@nodc.noaa.gov>
75 + Jesper Peterson <jesper@endace.com>
76 + John Bankier <jbankier@rainfinity.com>
77 + Jon Lindgren <jonl@yubyub.net>
78 + Juergen Schoenwaelder <schoenw@ibr.cs.tu-bs.de>
79 + Kazushi Sugyo <sugyo@pb.jp.nec.com>
80 + Klaus Klein <kleink@netbsd.org>
81 + Koryn Grant <koryn@endace.com>
82 + Krzysztof Halasa <khc@pm.waw.pl>
83 + Lorenzo Cavallaro <sullivan@sikurezza.org>
84 + Loris Degioanni <loris@netgroup-serv.polito.it>
85 + Love Hörnquist-Åstrand <lha@stacken.kth.se>
86 + Maciej W. Rozycki <macro@ds2.pg.gda.pl>
87 + Marcus Felipe Pereira <marcus@task.com.br>
88 + Martin Husemann <martin@netbsd.org>
89 + Mike Wiacek <mike@iroot.net>
90 + Monroe Williams <monroe@pobox.com>
91 + Octavian Cerna <tavy@ylabs.com>
92 + Olaf Kirch <okir@caldera.de>
93 + Onno van der Linden <onno@simplex.nl>
94 + Paul Mundt <lethal@linux-sh.org>
95 + Pavel Kankovsky <kan@dcit.cz>
96 + Peter Fales <peter@fales-lorenz.net>
97 + Peter Jeremy <peter.jeremy@alcatel.com.au>
98 + Phil Wood <cpw@lanl.gov>
99 + Rafal Maszkowski <rzm@icm.edu.pl>
100 + Rick Jones <raj@cup.hp.com>
101 + Scott Barron <sb125499@ohiou.edu>
102 + Scott Gifford <sgifford@tir.com>
103 + Sebastian Krahmer <krahmer@cs.uni-potsdam.de>
104 + Shaun Clowes <delius@progsoc.uts.edu.au>
105 + Solomon Peachy <pizza@shaftnet.org>
106 + Stefan Hudson <hudson@mbay.net>
107 + Takashi Yamamoto <yamt@mwd.biglobe.ne.jp>
108 + Tony Li <tli@procket.com>
109 + Torsten Landschoff <torsten@debian.org>
110 + Uns Lider <unslider@miranda.org>
111 + Uwe Girlich <Uwe.Girlich@philosys.de>
112 + Xianjie Zhang <xzhang@cup.hp.com>
113 + Yen Yen Lim
114 + Yoann Vandoorselaere <yoann@prelude-ids.org>
115 +
116 +The original LBL crew:
117 + Steve McCanne
118 + Craig Leres
119 + Van Jacobson
120 --- tcpdump-3.8.3.orig/debian/tcpdump.docs
121 +++ tcpdump-3.8.3/debian/tcpdump.docs
122 @@ -0,0 +1 @@
123 +README
124 --- tcpdump-3.8.3.orig/debian/changelog
125 +++ tcpdump-3.8.3/debian/changelog
126 @@ -0,0 +1,272 @@
127 +tcpdump (3.8.3-3) unstable; urgency=low
128 +
129 + * debian/patches/40_ipv6cp.dpatch: New patch, do not try to print IPV6CP
130 + ppp packets, the dissector doesn't support it (closes: #255179).
131 + * debian/patches/00list: Add 40_ipv6cp.
132 +
133 + -- Romain Francoise <rfrancoise@debian.org> Sat, 19 Jun 2004 15:01:27 +0200
134 +
135 +tcpdump (3.8.3-2) unstable; urgency=low
136 +
137 + * debian/rules: Enable crypto support (closes: #82581, #93428).
138 + * debian/control:
139 + + Build-Depend on libssl-dev.
140 + + Put back URL markers in description.
141 + + Switch Maintainer and Uploaders fields to match reality.
142 + * debian/patches/30_openssl_des.dpatch: Patch to make upstream's
143 + configure script check for DES_cbc_encrypt instead of des_cbc_encrypt,
144 + (the function got renamed in OpenSSL 0.9.7), which saves us the hassle
145 + of re-running autoconf. Temporary hack since upstream has fixed this
146 + in CVS already.
147 + * debian/patches/00list: Add 30_openssl_des.
148 +
149 + -- Romain Francoise <rfrancoise@debian.org> Fri, 14 May 2004 22:14:08 +0200
150 +
151 +tcpdump (3.8.3-1) unstable; urgency=low
152 +
153 + * New upstream release.
154 + * debian/rules:
155 + + Add -D_FILE_OFFSET_BITS=64 to default CFLAGS to match libpcap
156 + (closes: #154762).
157 + + Use dpatch for patch management.
158 + + Clean up CFLAGS handling.
159 + + Support DEB_BUILD_OPTIONS.
160 + * debian/control:
161 + + Build-Depend on libpcap0.8-dev, dpatch.
162 + + Add versioned Build-Depends on debhelper.
163 + + Remove Emacs-style URL markers from description.
164 + * debian/compat: New file.
165 + * debian/copyright: Update.
166 + * debian/tcpdump.docs: Do not install upstream INSTALL file.
167 + * debian/patches: New directory.
168 + * debian/patches/10_man_install.dpatch: Patch split off the Debian diff
169 + to change man install paths in upstream Makefile.in.
170 + * debian/patches/20_man_fixes.dpatch: Patch split off the Debian diff to
171 + fix some inconsistencies in the upstream man page.
172 + * debian/patches/00list: New file (patch list).
173 +
174 + -- Romain Francoise <rfrancoise@debian.org> Tue, 11 May 2004 14:02:09 +0200
175 +
176 +tcpdump (3.7.2-4) unstable; urgency=high
177 +
178 + * Urgency high due to security fixes.
179 + * Backport changes from upstream CVS to fix ISAKMP payload handling
180 + denial-of-service vulnerabilities (CAN-2004-0183, CAN-2004-0184).
181 + Detailed changes (with corresponding upstream revisions):
182 + + Add length checks in isakmp_id_print() (print-isakmp.c, rev. 1.47)
183 + + Add data checks all over the place, change rawprint() prototype and
184 + add corresponding return value checks (print-isakmp.c, rev. 1.46)
185 + + Add missing ntohs() and change length initialization in
186 + isakmp_id_print(), not porting prototype changes (print-isakmp.c,
187 + rev. 1.45)
188 +
189 + -- Romain Francoise <rfrancoise@debian.org> Tue, 6 Apr 2004 19:39:24 +0200
190 +
191 +tcpdump (3.7.2-3) unstable; urgency=low
192 +
193 + * Backport changes from upstream CVS to fix several vulnerabilities in
194 + ISAKMP, L2TP and Radius parsing (closes: #227844, #227845, #227846).
195 +
196 + -- Romain Francoise <rfrancoise@debian.org> Sat, 17 Jan 2004 14:12:30 +0100
197 +
198 +tcpdump (3.7.2-2) unstable; urgency=low
199 +
200 + * Acknowledge NMU by Romain (closes: #208543).
201 + * Apply man page fixes by Romain:
202 + + networks(4) changed to networks(5) (closes: #194180).
203 + + ethers(3N) changed to ethers(5) (closes: #197888).
204 + * debian/control: Added Romain Francoise as co maintainer. Thanks for
205 + your help, Romain!
206 +
207 + -- Torsten Landschoff <torsten@debian.org> Sun, 19 Oct 2003 04:12:31 +0200
208 +
209 +tcpdump (3.7.2-1.1) unstable; urgency=low
210 +
211 + * NMU
212 + * Reverse order of #include directives in print-sctp.c so that
213 + IPPROTO_SCTP is defined (closes: #208543).
214 +
215 + -- Romain Francoise <rfrancoise@debian.org> Sun, 12 Oct 2003 17:06:01 +0200
216 +
217 +tcpdump (3.7.2-1) unstable; urgency=low
218 +
219 + * New upstream release (closes: #195816).
220 +
221 + -- Torsten Landschoff <torsten@debian.org> Sun, 8 Jun 2003 00:14:44 +0200
222 +
223 +tcpdump (3.7.1-1.2) unstable; urgency=high
224 +
225 + * Non-maintainer upload
226 + * Apply security fixes from 3.7.2
227 + - Fixed infinite loop when parsing malformed isakmp packets.
228 + (CAN-2003-0108)
229 + - Fixed infinite loop when parsing malformed BGP packets.
230 + - Fixed buffer overflow with certain malformed NFS packets.
231 +
232 + -- Matt Zimmerman <mdz@debian.org> Thu, 27 Feb 2003 11:00:32 -0500
233 +
234 +tcpdump (3.7.1-1.1) unstable; urgency=low
235 +
236 + * NMU
237 + * Simple rebuild to deal with libpcap0->libpcap0.7 transition.
238 + Sourceful NMU so that every arch rebuilds it.
239 +
240 + -- LaMont Jones <lamont@debian.org> Wed, 14 Aug 2002 21:25:45 -0600
241 +
242 +tcpdump (3.7.1-1) unstable; urgency=low
243 +
244 + * New upstream release (closes: #138052).
245 +
246 + -- Torsten Landschoff <torsten@debian.org> Sat, 3 Aug 2002 23:54:04 +0200
247 +
248 +tcpdump (3.6.2-2) unstable; urgency=HIGH
249 +
250 + * print-rx.c: Take the version from current CVS fixing the remote
251 + buffer overflow reported in FreeBSD Security Advisory SA-01:48
252 + yesterday. Thanks to Matt Zimmerman for forwarding the report,
253 + I might have missed it.
254 + * debian/control: Clean the Build-Depends from build-essential
255 + packages.
256 +
257 + -- Torsten Landschoff <torsten@debian.org> Thu, 19 Jul 2001 15:03:48 +0200
258 +
259 +tcpdump (3.6.2-1) unstable; urgency=low
260 +
261 + * New upstream release.
262 +
263 + -- Torsten Landschoff <torsten@debian.org> Tue, 6 Mar 2001 04:18:16 +0100
264 +
265 +tcpdump (3.6.1-2) unstable; urgency=low
266 +
267 + * debian/rules: Force support for IPv6 (closes: #82665).
268 + * print-icmp6.c: Removed duplicate definition also in icmp6.h to
269 + get the package to compile with IPv6.
270 + * Rebuild should fix the missing libpcap0-dependency (closes: #82666).
271 + Additional info: The missing dependency was because the configure
272 + script found my libpcap sources in the parent directory. Black magic
273 + always works against you :(
274 +
275 + -- Torsten Landschoff <torsten@debian.org> Thu, 18 Jan 2001 00:44:01 +0100
276 +
277 +tcpdump (3.6.1-1) unstable; urgency=high
278 +
279 + * Taking back the package. Kudos to Anand for his help.
280 + * New upstream release. This release fixes a security hole in print-rx.c.
281 + * debian/rules: Disable crypto support (closes: #81969).
282 + * Removed empty README.Debian (closes: #81966).
283 +
284 + -- Torsten Landschoff <torsten@debian.org> Tue, 16 Jan 2001 16:04:03 +0100
285 +
286 +tcpdump (3.5.2-3) unstable; urgency=low
287 +
288 + * Fixup dependancy stuff. Sheesh. (Closes: #78063, #78081, #78082)
289 +
290 + -- Anand Kumria <wildfire@progsoc.org> Tue, 28 Nov 2000 02:16:01 +1100
291 +
292 +tcpdump (3.5.2-2) unstable; urgency=low
293 +
294 + * Update both config.guess and config.sub (Closes: #36692, #53145)
295 + * Opps, make the .diff available.
296 + * We require a particular libpcap version to work (Closes: #77877)
297 +
298 + -- Anand Kumria <wildfire@progsoc.org> Mon, 27 Nov 2000 01:13:55 +1100
299 +
300 +tcpdump (3.5.2-1) unstable; urgency=low
301 +
302 + * New Maintainer
303 + * New upstream release (Closes: #75889)
304 + * Upstream added hex dump (-x) and ascii dump (-X) Closes: #23514, #29418)
305 + * Acknowledge and incorporate security fixes (Closes: #63708, #77489)
306 + * Appletalk / Ethertalk patches are in (Closes: #67642)
307 +
308 + -- Anand Kumria <wildfire@progsoc.org> Wed, 22 Nov 2000 13:19:33 +1100
309 +
310 +tcpdump (3.4a6-4.1) frozen unstable; urgency=high
311 +
312 + * Non-maintainer upload by security team
313 + * Apply patch from tcpdump-workers mailinglist to fix DNS DoS attack
314 + against tcpdump. Based on patch from Guy Harris <gharris@flashcom.net> as
315 + found on http://www.tcpdump.org/lists/workers/1999/msg00607.html
316 + * Fix Build-Depends entry in debian/control
317 +
318 + -- Wichert Akkerman <wakkerma@debian.org> Sun, 7 May 2000 15:17:33 +0200
319 +
320 +tcpdump (3.4a6-4) unstable; urgency=low
321 +
322 + * New maintainer.
323 + * tcpdump.c (main): Reestablish priviliges before closing the device
324 + (closes: #19959).
325 + * It seems the problem with ppp came from the kernel - I can dump
326 + packages on ppp0 just fine... (closes: #25757)
327 + * print-tcp.c (tcp_print): Applied patch from David S. Miller submitted
328 + by Andrea Arcangeli to fix tcpdump sack TCP option interpretation
329 + (closes: #28530).
330 + * print-bootp.c (rfc1048_print): Interpret timezone offset as signed
331 + (closes: #40376). Fixed byte order problem in printing internet
332 + addresses (closes: #40375). Thanks to Roderick Schertler for the patch.
333 + * Several files: Applied SMB patch from samba.org (closes: #27653).
334 + * print-ip.c (ip_print): Check for ip headers with less than 5 longs.
335 + Patch taken from RedHat's source package.
336 + * Redid debian/rules using debhelper.
337 + * Makefile.in: Install the manpage into man8 instead of man1.
338 + * tcpdump.1: Moved to section 8 (admin commands).
339 + * print-smb.c (print_smb): Disabled anything but printing the command
340 + info by default. Otherwise we would get flooded with smb information.
341 + You can get all info using -vvv. Two -v's will give you the SMB headers.
342 + * tcpdump.1: Documented the behaviour described above.
343 +
344 + -- Torsten Landschoff <torsten@debian.org> Mon, 22 Nov 1999 01:31:44 +0100
345 +
346 +tcpdump (3.4a6-3) frozen unstable; urgency=low
347 +
348 + * fixed permissions
349 +
350 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Mon, 30 Mar 1998 02:28:39 +0200
351 +
352 +
353 +tcpdump (3.4a6-2) frozen unstable; urgency=low
354 +
355 + * rebuild with latest debmake, fixes #19415
356 + (should also fix the lintian warnings)
357 + * updated standards-version
358 +
359 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Mon, 30 Mar 1998 00:28:39 +0200
360 +
361 +
362 +tcpdump (3.4a6-1) unstable; urgency=low
363 +
364 + * updated to latest upstream version, fixes: Bug#17163
365 + * install changelog.Debian compressed, fixes: Bug#15417
366 +
367 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Sun, 1 Feb 1998 00:08:31 +0100
368 +
369 +
370 +tcpdump (3.4a4-1) unstable; urgency=low
371 +
372 + * updated to latest upstream version
373 + * libc6 version
374 +
375 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Wed, 17 Sep 1997 23:22:54 +0200
376 +
377 +
378 +tcpdump (3.3.1a2-1) frozen stable unstable; urgency=medium
379 +
380 + * updated to latest upstream version (works with new libpcap now)
381 +
382 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Sat, 24 May 1997 00:49:17 +0200
383 +
384 +
385 +tcpdump (3.3-2) unstable; urgency=low
386 +
387 + * fixed SLIP support
388 +
389 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Sun, 16 Feb 1997 21:06:51 +0100
390 +
391 +
392 +tcpdump (3.3-1) unstable; urgency=low
393 +
394 + * updated to latest upstream version
395 +
396 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Thu, 16 Jan 1997 01:34:00 +0100
397 +
398 +
399 --- tcpdump-3.8.3.orig/debian/control
400 +++ tcpdump-3.8.3/debian/control
401 @@ -0,0 +1,23 @@
402 +Source: tcpdump
403 +Section: net
404 +Priority: optional
405 +Maintainer: Romain Francoise <rfrancoise@debian.org>
406 +Uploaders: Torsten Landschoff <torsten@debian.org>
407 +Build-Depends: debhelper (>= 4), libpcap0.8-dev, dpatch, libssl-dev
408 +Standards-Version: 3.6.1.0
409 +
410 +Package: tcpdump
411 +Architecture: any
412 +Depends: ${shlibs:Depends}
413 +Description: A powerful tool for network monitoring and data acquisition
414 + This program allows you to dump the traffic on a network. tcpdump
415 + is able to examine IPv4, ICMPv4, IPv6, ICMPv6, UDP, TCP, SNMP, AFS
416 + BGP, RIP, PIM, DVMRP, IGMP, SMB, OSPF, NFS and many other packet
417 + types.
418 + .
419 + It can be used to print out the headers of packets on a network
420 + interface, filter packets that match a certain expression. You can
421 + use this tool to track down network problems, to detect "ping attacks"
422 + or to monitor network activities.
423 + .
424 + Further information is available at <URL: http://www.tcpdump.org/>
425 --- tcpdump-3.8.3.orig/debian/tcpdump.dirs
426 +++ tcpdump-3.8.3/debian/tcpdump.dirs
427 @@ -0,0 +1 @@
428 +usr/sbin
429 --- tcpdump-3.8.3.orig/debian/tcpdump.examples
430 +++ tcpdump-3.8.3/debian/tcpdump.examples
431 @@ -0,0 +1,4 @@
432 +atime.awk
433 +packetdat.awk
434 +send-ack.awk
435 +stime.awk
436 --- tcpdump-3.8.3.orig/debian/rules
437 +++ tcpdump-3.8.3/debian/rules
438 @@ -0,0 +1,70 @@
439 +#!/usr/bin/make -f
440 +
441 +include /usr/share/dpatch/dpatch.make
442 +
443 +export DH_VERBOSE=1
444 +
445 +dstdir := $(shell pwd)/debian/tcpdump
446 +
447 +export CFLAGS=-D_FILE_OFFSET_BITS=64
448 +
449 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
450 + CFLAGS += -O0
451 +endif
452 +
453 +build: patch build-stamp
454 +build-stamp:
455 + dh_testdir
456 +
457 + ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
458 + --infodir=\$${prefix}/share/info --enable-ipv6
459 + $(MAKE)
460 +
461 + touch build-stamp
462 +
463 +clean: clean-patched unpatch
464 +clean-patched:
465 + dh_testdir
466 + dh_testroot
467 + rm -f build-stamp
468 +
469 + -$(MAKE) distclean
470 +
471 + dh_clean
472 +
473 +install: build
474 + dh_testdir
475 + dh_testroot
476 + dh_clean -k
477 + dh_installdirs
478 +
479 + $(MAKE) install prefix=$(dstdir)/usr
480 +
481 +
482 +# Build architecture-independent files here.
483 +binary-indep: build install
484 +# We have nothing to do by default.
485 +
486 +# Build architecture-dependent files here.
487 +binary-arch: build install
488 +# dh_testversion
489 + dh_testdir
490 + dh_testroot
491 + dh_installdocs
492 + dh_installexamples
493 + dh_installinfo
494 + dh_installchangelogs CHANGES
495 + dh_link
496 + dh_strip
497 + dh_compress
498 + dh_fixperms
499 +# dh_makeshlibs
500 + dh_installdeb
501 +# dh_perl
502 + dh_shlibdeps
503 + dh_gencontrol
504 + dh_md5sums
505 + dh_builddeb
506 +
507 +binary: binary-indep binary-arch
508 +.PHONY: build clean binary-indep binary-arch binary install
509 --- tcpdump-3.8.3.orig/debian/patches/10_man_install.dpatch
510 +++ tcpdump-3.8.3/debian/patches/10_man_install.dpatch
511 @@ -0,0 +1,46 @@
512 +#! /bin/sh -e
513 +## 10_man_install.dpatch by Romain Francoise <rfrancoise@debian.org>
514 +##
515 +## All lines beginning with `## DP:' are a description of the patch.
516 +## DP: Change man page install paths for Debian.
517 +
518 +if [ $# -lt 1 ]; then
519 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
520 + exit 1
521 +fi
522 +
523 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
524 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
525 +
526 +case "$1" in
527 + -patch) patch -p1 ${patch_opts} < $0;;
528 + -unpatch) patch -R -p1 ${patch_opts} < $0;;
529 + *)
530 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
531 + exit 1;;
532 +esac
533 +
534 +exit 0
535 +
536 +@DPATCH@
537 +diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/Makefile.in tcpdump-3.8.3/Makefile.in
538 +--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/Makefile.in 2004-05-08 09:12:28.000000000 +0200
539 ++++ tcpdump-3.8.3/Makefile.in 2004-05-08 09:13:23.000000000 +0200
540 +@@ -157,13 +157,13 @@
541 + [ -d $(DESTDIR)$(sbindir) ] || \
542 + (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
543 + $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
544 +- [ -d $(DESTDIR)$(mandir)/man1 ] || \
545 +- (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
546 +- $(INSTALL_DATA) $(srcdir)/$(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
547 ++ [ -d $(DESTDIR)$(mandir)/man8 ] || \
548 ++ (mkdir -p $(DESTDIR)$(mandir)/man8; chmod 755 $(DESTDIR)$(mandir)/man8)
549 ++ $(INSTALL_DATA) $(srcdir)/$(PROG).1 $(DESTDIR)$(mandir)/man8/$(PROG).8
550 +
551 + uninstall:
552 + rm -f $(DESTDIR)$(sbindir)/$(PROG)
553 +- rm -f $(DESTDIR)$(mandir)/man1/$(PROG).1
554 ++ rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
555 +
556 + lint: $(GENSRC)
557 + lint -hbxn $(SRC) | \
558 --- tcpdump-3.8.3.orig/debian/patches/00list
559 +++ tcpdump-3.8.3/debian/patches/00list
560 @@ -0,0 +1,4 @@
561 +10_man_install
562 +20_man_fixes
563 +30_openssl_des
564 +40_ipv6cp
565 --- tcpdump-3.8.3.orig/debian/patches/20_man_fixes.dpatch
566 +++ tcpdump-3.8.3/debian/patches/20_man_fixes.dpatch
567 @@ -0,0 +1,67 @@
568 +#! /bin/sh -e
569 +## 20_man_fixes.dpatch by Romain Francoise <rfrancoise@debian.org>
570 +##
571 +## All lines beginning with `## DP:' are a description of the patch.
572 +## DP: Misc. fixes to the upstream man page.
573 +
574 +if [ $# -lt 1 ]; then
575 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
576 + exit 1
577 +fi
578 +
579 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
580 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
581 +
582 +case "$1" in
583 + -patch) patch -p1 ${patch_opts} < $0;;
584 + -unpatch) patch -R -p1 ${patch_opts} < $0;;
585 + *)
586 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
587 + exit 1;;
588 +esac
589 +
590 +exit 0
591 +
592 +@DPATCH@
593 +diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/tcpdump.1 tcpdump-3.8.3/tcpdump.1
594 +--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/tcpdump.1 2004-05-08 09:12:32.000000000 +0200
595 ++++ tcpdump-3.8.3/tcpdump.1 2004-05-08 09:18:27.000000000 +0200
596 +@@ -22,7 +22,7 @@
597 + .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
598 + .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
599 + .\"
600 +-.TH TCPDUMP 1 "7 January 2004"
601 ++.TH TCPDUMP 8 "8 May 2004"
602 + .SH NAME
603 + tcpdump \- dump traffic on a network
604 + .SH SYNOPSIS
605 +@@ -672,7 +672,7 @@
606 + True if the ethernet destination address is \fIehost\fP.
607 + \fIEhost\fP
608 + may be either a name from /etc/ethers or a number (see
609 +-.IR ethers (3N)
610 ++.IR ethers (5)
611 + for numeric format).
612 + .IP "\fBether src \fIehost\fP
613 + True if the ethernet source address is \fIehost\fP.
614 +@@ -699,7 +699,7 @@
615 + True if the IPv4/v6 destination address of the packet has a network
616 + number of \fInet\fP.
617 + \fINet\fP may be either a name from /etc/networks
618 +-or a network number (see \fInetworks(4)\fP for details).
619 ++or a network number (see \fInetworks(5)\fP for details).
620 + .IP "\fBsrc net \fInet\fR"
621 + True if the IPv4/v6 source address of the packet has a network
622 + number of \fInet\fP.
623 +@@ -718,9 +718,9 @@
624 + True if the packet is ip/tcp, ip/udp, ip6/tcp or ip6/udp and has a
625 + destination port value of \fIport\fP.
626 + The \fIport\fP can be a number or a name used in /etc/services (see
627 +-.IR tcp (4P)
628 ++.IR tcp (7)
629 + and
630 +-.IR udp (4P)).
631 ++.IR udp (7)).
632 + If a name is used, both the port
633 + number and protocol are checked.
634 + If a number or ambiguous name is used,
635 --- tcpdump-3.8.3.orig/debian/patches/30_openssl_des.dpatch
636 +++ tcpdump-3.8.3/debian/patches/30_openssl_des.dpatch
637 @@ -0,0 +1,57 @@
638 +#! /bin/sh -e
639 +## 30_openssl_des.dpatch by Romain Francoise <rfrancoise@debian.org>
640 +##
641 +## All lines beginning with `## DP:' are a description of the patch.
642 +## DP: Change "des_cbc_encrypt" check to "DES_cbc_encrypt" since it
643 +## DP: got renamed in OpenSSL 0.9.7. Super-ugly change to configure,
644 +## DP: but it's simpler this way (changing configure.in too while we're
645 +## DP: at it).
646 +
647 +if [ $# -lt 1 ]; then
648 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
649 + exit 1
650 +fi
651 +
652 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
653 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
654 +
655 +case "$1" in
656 + -patch) patch -p1 ${patch_opts} < $0;;
657 + -unpatch) patch -R -p1 ${patch_opts} < $0;;
658 + *)
659 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
660 + exit 1;;
661 +esac
662 +
663 +exit 0
664 +
665 +@DPATCH@
666 +diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/configure tcpdump-3.8.3/configure
667 +--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/configure 2004-03-28 23:06:09.000000000 +0200
668 ++++ tcpdump-3.8.3/configure 2004-05-14 21:58:56.000000000 +0200
669 +@@ -9760,11 +9760,11 @@
670 + #endif
671 + /* We use char because int might match the return type of a gcc2
672 + builtin and then its argument prototype would still apply. */
673 +-char des_cbc_encrypt ();
674 ++char DES_cbc_encrypt ();
675 + int
676 + main ()
677 + {
678 +-des_cbc_encrypt ();
679 ++DES_cbc_encrypt ();
680 + ;
681 + return 0;
682 + }
683 +diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/configure.in tcpdump-3.8.3/configure.in
684 +--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/configure.in 2004-03-28 23:04:48.000000000 +0200
685 ++++ tcpdump-3.8.3/configure.in 2004-05-14 21:58:11.000000000 +0200
686 +@@ -732,7 +732,7 @@
687 + if test -f $ac_cv_ssleay_path/lib/librsaref.a; then
688 + LIBS="$LIBS -lrsaref"
689 + fi
690 +- AC_CHECK_LIB(crypto, des_cbc_encrypt)
691 ++ AC_CHECK_LIB(crypto, DES_cbc_encrypt)
692 +
693 + CPPFLAGS="$CPPFLAGS $V_INCLS"
694 + AC_CHECK_HEADERS(openssl/evp.h)
695 --- tcpdump-3.8.3.orig/debian/patches/40_ipv6cp.dpatch
696 +++ tcpdump-3.8.3/debian/patches/40_ipv6cp.dpatch
697 @@ -0,0 +1,45 @@
698 +#! /bin/sh -e
699 +## 40_ipv6cp.dpatch by Romain Francoise <rfrancoise@debian.org>
700 +##
701 +## All lines beginning with `## DP:' are a description of the patch.
702 +## DP: Do not try to grok IPV6CP packets, the dissector doesn't
703 +## DP: support it.
704 +
705 +if [ $# -lt 1 ]; then
706 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
707 + exit 1
708 +fi
709 +
710 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
711 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
712 +
713 +case "$1" in
714 + -patch) patch -p1 ${patch_opts} < $0;;
715 + -unpatch) patch -R -p1 ${patch_opts} < $0;;
716 + *)
717 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
718 + exit 1;;
719 +esac
720 +
721 +exit 0
722 +
723 +@DPATCH@
724 +diff -urNad /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/print-ppp.c tcpdump-3.8.3/print-ppp.c
725 +--- /home/romain/Work/Debian/tcpdump/tcpdump-3.8.3/print-ppp.c 2004-04-17 00:25:32.000000000 +0200
726 ++++ tcpdump-3.8.3/print-ppp.c 2004-06-19 14:54:40.000000000 +0200
727 +@@ -1056,7 +1056,6 @@
728 + case PPP_IPCP:
729 + case PPP_OSICP:
730 + case PPP_MPLSCP:
731 +- case PPP_IPV6CP:
732 + case PPP_CCP:
733 + case PPP_BACP:
734 + handle_ctrl_proto(proto, p, length);
735 +@@ -1077,6 +1076,7 @@
736 + #ifdef INET6
737 + case ETHERTYPE_IPV6: /*XXX*/
738 + case PPP_IPV6:
739 ++ case PPP_IPV6CP:
740 + ip6_print(p, length);
741 + break;
742 + #endif
743 --- tcpdump-3.8.3.orig/debian/compat
744 +++ tcpdump-3.8.3/debian/compat
745 @@ -0,0 +1 @@
746 +4
OpenWrt SVN history