projects / openwrt.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
add nocatsplash depend on glib
[openwrt.git] / obsolete-buildroot / sources / openwrt / patches / libpcap / 00_debian_libpcap0.8_0.8.3-4.diff
1 --- libpcap0.8-0.8.3.orig/debian/compat
2 +++ libpcap0.8-0.8.3/debian/compat
3 @@ -0,0 +1,2 @@
4 +4
5 +
6 --- libpcap0.8-0.8.3.orig/debian/copyright
7 +++ libpcap0.8-0.8.3/debian/copyright
8 @@ -0,0 +1,115 @@
9 +This package was debianized by Romain Francoise <rfrancoise@debian.org>
10 +on Fri, 16 Apr 2004 18:41:39 +0200, based on work by:
11 + + Anand Kumria <wildfire@progsoc.org>
12 + + Torsten Landschoff <torsten@debian.org>
13 +
14 +It was downloaded from http://tcpdump.org/release/libpcap-0.8.3.tar.gz
15 +
16 +Upstream Authors: tcpdump-workers@tcpdump.org
17 +
18 +Licensed under the 3-clause BSD license:
19 +
20 + Redistribution and use in source and binary forms, with or without
21 + modification, are permitted provided that the following conditions
22 + are met:
23 +
24 + 1. Redistributions of source code must retain the above copyright
25 + notice, this list of conditions and the following disclaimer.
26 + 2. Redistributions in binary form must reproduce the above copyright
27 + notice, this list of conditions and the following disclaimer in
28 + the documentation and/or other materials provided with the
29 + distribution.
30 + 3. The names of the authors may not be used to endorse or promote
31 + products derived from this software without specific prior
32 + written permission.
33 +
34 + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
35 + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
36 + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
37 +
38 +Current upstream maintainers:
39 + Bill Fenner <fenner@research.att.com>
40 + Fulvio Risso <risso@polito.it>
41 + Guy Harris <guy@alum.mit.edu>
42 + Hannes Gredler <hannes@juniper.net>
43 + Jun-ichiro itojun Hagino <itojun@iijlab.net>
44 + Michael Richardson <mcr@sandelman.ottawa.on.ca>
45 +
46 +Additional people who have contributed patches:
47 +
48 + Alan Bawden <Alan@LCS.MIT.EDU>
49 + Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
50 + Albert Chin <china@thewrittenword.com>
51 + Andrew Brown <atatat@atatdot.net>
52 + Antti Kantee <pooka@netbsd.org>
53 + Arkadiusz Miskiewicz <misiek@pld.org.pl>
54 + Armando L. Caro Jr. <acaro@mail.eecis.udel.edu>
55 + Assar Westerlund <assar@sics.se>
56 + Brian Ginsbach <ginsbach@cray.com>
57 + Charles M. Hannum <mycroft@netbsd.org>
58 + Chris G. Demetriou <cgd@netbsd.org>
59 + Chris Pepper <pepper@mail.reppep.com>
60 + Darren Reed <darrenr@reed.wattle.id.au>
61 + David Kaelbling <drk@sgi.com>
62 + David Young <dyoung@ojctech.com>
63 + Don Ebright <Don.Ebright@compuware.com>
64 + Eric Anderson <anderse@hpl.hp.com>
65 + Franz Schaefer <schaefer@mond.at>
66 + Gianluca Varenni <varenni@netgroup-serv.polito.it>
67 + Gisle Vanem <giva@bgnett.no>
68 + Graeme Hewson <ghewson@cix.compulink.co.uk>
69 + Greg Stark <gsstark@mit.edu>
70 + Greg Troxel <gdt@ir.bbn.com>
71 + Guillaume Pelat <endymion_@users.sourceforge.net>
72 + Hyung Sik Yoon <hsyn@kr.ibm.com>
73 + Igor Khristophorov <igor@atdot.org>
74 + Jan-Philip Velders <jpv@veldersjes.net>
75 + Jason R. Thorpe <thorpej@netbsd.org>
76 + Javier Achirica <achirica@ttd.net>
77 + Jean Tourrilhes <jt@hpl.hp.com>
78 + Jefferson Ogata <jogata@nodc.noaa.gov>
79 + Jesper Peterson <jesper@endace.com>
80 + John Bankier <jbankier@rainfinity.com>
81 + Jon Lindgren <jonl@yubyub.net>
82 + Juergen Schoenwaelder <schoenw@ibr.cs.tu-bs.de>
83 + Kazushi Sugyo <sugyo@pb.jp.nec.com>
84 + Klaus Klein <kleink@netbsd.org>
85 + Koryn Grant <koryn@endace.com>
86 + Krzysztof Halasa <khc@pm.waw.pl>
87 + Lorenzo Cavallaro <sullivan@sikurezza.org>
88 + Loris Degioanni <loris@netgroup-serv.polito.it>
89 + Love Hörnquist-Åstrand <lha@stacken.kth.se>
90 + Maciej W. Rozycki <macro@ds2.pg.gda.pl>
91 + Marcus Felipe Pereira <marcus@task.com.br>
92 + Martin Husemann <martin@netbsd.org>
93 + Mike Wiacek <mike@iroot.net>
94 + Monroe Williams <monroe@pobox.com>
95 + Octavian Cerna <tavy@ylabs.com>
96 + Olaf Kirch <okir@caldera.de>
97 + Onno van der Linden <onno@simplex.nl>
98 + Paul Mundt <lethal@linux-sh.org>
99 + Pavel Kankovsky <kan@dcit.cz>
100 + Peter Fales <peter@fales-lorenz.net>
101 + Peter Jeremy <peter.jeremy@alcatel.com.au>
102 + Phil Wood <cpw@lanl.gov>
103 + Rafal Maszkowski <rzm@icm.edu.pl>
104 + Rick Jones <raj@cup.hp.com>
105 + Scott Barron <sb125499@ohiou.edu>
106 + Scott Gifford <sgifford@tir.com>
107 + Sebastian Krahmer <krahmer@cs.uni-potsdam.de>
108 + Shaun Clowes <delius@progsoc.uts.edu.au>
109 + Solomon Peachy <pizza@shaftnet.org>
110 + Stefan Hudson <hudson@mbay.net>
111 + Takashi Yamamoto <yamt@mwd.biglobe.ne.jp>
112 + Tony Li <tli@procket.com>
113 + Torsten Landschoff <torsten@debian.org>
114 + Uns Lider <unslider@miranda.org>
115 + Uwe Girlich <Uwe.Girlich@philosys.de>
116 + Xianjie Zhang <xzhang@cup.hp.com>
117 + Yen Yen Lim
118 + Yoann Vandoorselaere <yoann@prelude-ids.org>
119 +
120 +The original LBL crew:
121 + Steve McCanne
122 + Craig Leres
123 + Van Jacobson
124 --- libpcap0.8-0.8.3.orig/debian/control
125 +++ libpcap0.8-0.8.3/debian/control
126 @@ -0,0 +1,44 @@
127 +Source: libpcap0.8
128 +Section: devel
129 +Priority: optional
130 +Maintainer: Romain Francoise <rfrancoise@debian.org>
131 +Uploaders: Torsten Landschoff <torsten@debian.org>
132 +Build-Depends: debhelper (>= 4), flex, bison, dpatch, perl
133 +Standards-Version: 3.6.1.0
134 +
135 +Package: libpcap0.8-dev
136 +Section: libdevel
137 +Architecture: any
138 +Depends: libpcap0.8 (= ${Source-Version}), libc6-dev
139 +Conflicts: libpcap-dev, libpcap0.7-dev
140 +Description: Development library and header files for libpcap 0.8
141 + Headers, static libraries, and documentation for the libpcap library.
142 + .
143 + libpcap (Packet CAPture) provides a portable framework for low-level
144 + network monitoring. Applications include network statistics
145 + collection, security monitoring, network debugging, etc.
146 + .
147 + Since almost every system vendor provides a different interface for
148 + packet capture, and since there are several tools that require this
149 + functionality, we've created this system-independent API to ease in
150 + porting and to alleviate the need for several system-dependent packet
151 + capture modules in each application.
152 + .
153 + Further information is available at <URL: http://www.tcpdump.org/>
154 +
155 +Package: libpcap0.8
156 +Section: libs
157 +Architecture: any
158 +Depends: ${shlibs:Depends}
159 +Description: System interface for user-level packet capture
160 + libpcap (Packet CAPture) provides a portable framework for low-level
161 + network monitoring. Applications include network statistics collection,
162 + security monitoring, network debugging, etc.
163 + .
164 + Since almost every system vendor provides a different interface for
165 + packet capture, and since there are several tools that require this
166 + functionality, we've created this system-independent API to ease in
167 + porting and to alleviate the need for several system-dependent packet
168 + capture modules in each application.
169 + .
170 + Further information is available at <URL: http://www.tcpdump.org/>
171 --- libpcap0.8-0.8.3.orig/debian/changelog
172 +++ libpcap0.8-0.8.3/debian/changelog
173 @@ -0,0 +1,236 @@
174 +libpcap0.8 (0.8.3-4) unstable; urgency=low
175 +
176 + * debian/patches/30_man_fixes.dpatch: Explicitly mention `pcap_handler'
177 + as routine type for pcap_loop() and pcap_dispatch() callbacks,
178 + suggested by Florian Weimer <fw@deneb.enyo.de> (closes: #255267).
179 +
180 + -- Romain Francoise <rfrancoise@debian.org> Wed, 21 Jul 2004 19:46:07 +0200
181 +
182 +libpcap0.8 (0.8.3-3) unstable; urgency=low
183 +
184 + * debian/control: libpcap0.8-dev conflicts with libpcap0.7-dev.
185 +
186 + -- Romain Francoise <rfrancoise@debian.org> Wed, 9 Jun 2004 11:44:50 +0200
187 +
188 +libpcap0.8 (0.8.3-2) unstable; urgency=low
189 +
190 + * debian/control:
191 + + Put back URL markers in description.
192 + + Switch Maintainer and Uploaders fields to match reality.
193 + * debian/patches/30_man_fixes.dpatch: Patch to fix some inconsistencies
194 + in the upstream man page (tcpdump is in section 8, not 1).
195 + * debian/patches/00list: Add 30_man_fixes.
196 +
197 + -- Romain Francoise <rfrancoise@debian.org> Fri, 14 May 2004 23:43:02 +0200
198 +
199 +libpcap0.8 (0.8.3-1) unstable; urgency=low
200 +
201 + * New upstream release (closes: #235155).
202 + + bpf_filter.c now has config.h (closes: #171210).
203 + + Does not ship CVS directories anymore (closes: #119750).
204 + + Has improved "truncated file" messages (closes: #207535).
205 + * New source package to ease the 0.7 -> 0.8 transition, each source
206 + package builds corresponding libpcap0.x{,-dev} binary packages. The
207 + libpcap-dev package is provided by libpcap0.7 for now.
208 + * debian/copyright: Rewrite. Licensing information is now complete in
209 + the upstream tarball.
210 + * debian/control:
211 + + Update source and binary package names.
212 + + Build-Depend on dpatch, perl.
213 + + Bump Standards-Version to 3.6.1.0.
214 + * debian/rules:
215 + + Clean up CFLAGS handling.
216 + + Support DEB_BUILD_OPTIONS.
217 + + Use dpatch for patch management.
218 + + Compute major/minor versions from the changelog instead of
219 + hardcoding them.
220 + * debian/patches: New directory.
221 + * debian/patches/10_shared_lib.dpatch: Patch split off the Debian diff
222 + to build a shared library (upstream does not support it).
223 + * debian/patches/20_mac_syntax.dpatch: Patch split off the Debian diff
224 + to support more MAC address syntaxes (by Torsten Landschoff).
225 + * debian/patches/00list: New file (patch list).
226 +
227 + -- Romain Francoise <rfrancoise@debian.org> Fri, 30 Apr 2004 16:14:10 +0200
228 +
229 +libpcap (0.7.2-5) unstable; urgency=low
230 +
231 + * debian/rules: Update version variables, this is version 0.7.2.
232 + * Makefile.in: Fix version.
233 +
234 + -- Romain Francoise <rfrancoise@debian.org> Tue, 11 Nov 2003 12:14:28 +0100
235 +
236 +libpcap (0.7.2-4) unstable; urgency=low
237 +
238 + * debian/libpcap-dev.preinst: New file. Remove old symlink from
239 + /usr/share/doc/libpcap-dev to libpcap0 since we now have a real
240 + libpcap-dev directory. Closes: #175742.
241 + * debian/rules: Add -A flag to dh_installdocs so that it acts on all
242 + binary packages.
243 +
244 + -- Romain Francoise <rfrancoise@debian.org> Mon, 20 Oct 2003 18:49:22 +0200
245 +
246 +libpcap (0.7.2-3) unstable; urgency=low
247 +
248 + * debian/control: libpcap-dev is in section libdevel, not in section
249 + devel.
250 +
251 + -- Romain Francoise <rfrancoise@debian.org> Sun, 19 Oct 2003 19:22:12 +0200
252 +
253 +libpcap (0.7.2-2) unstable; urgency=low
254 +
255 + * debian/control:
256 + + Adding myself as co-maintainer, with Torsten's blessing.
257 + + Repeat extended description in libpcap-dev description
258 + (closes: #209728)
259 + + Remove Emacs-style <URL: ...> markers from the descriptions.
260 + (closes: #196727).
261 + + Remove full stops from synopsis as per Policy.
262 + + Add versioned build-dependency on debhelper (>= 4).
263 + * debian/copyright: Remove dh-make boilerplates.
264 + * debian/compat: New file.
265 + * debian/rules: Remove obsolete DH_COMPAT variable.
266 +
267 + -- Romain Francoise <rfrancoise@debian.org> Sun, 19 Oct 2003 18:17:41 +0200
268 +
269 +libpcap (0.7.2-1) unstable; urgency=low
270 +
271 + * New upstream release.
272 +
273 + -- Torsten Landschoff <torsten@debian.org> Sat, 7 Jun 2003 22:57:55 +0200
274 +
275 +libpcap (0.7.1-1) unstable; urgency=low
276 +
277 + * New upstream release (closes: #145538).
278 + * debian/rules: Build the library with _FILE_OFFSET_BITS set to 64
279 + to allow for files bigger than 2GB (closes: #129213).
280 + * Rename the library package to libpcap0.7 and change the SONAME so that we
281 + can account for interface changes (closes: #132359).
282 + * Run ldconfig as appropriate (lintian).
283 + * Remove watch.ex template and the silly symlink from libpcap-dev's
284 + documentation to libpcap0 (lintian).
285 +
286 + -- Torsten Landschoff <torsten@debian.org> Sat, 3 Aug 2002 23:33:56 +0200
287 +
288 +libpcap (0.6.2-2) unstable; urgency=low
289 +
290 + * debian/control: Change section of libpcap0 from net to libs
291 + (Debian installer message).
292 + * aclocal.m4: Treat the ia64 as a cpu which can't handle unaligned
293 + memory access (closes: #112152). Thanks for the report go to
294 + John R. Daily.
295 +
296 + -- Torsten Landschoff <torsten@debian.org> Fri, 14 Sep 2001 10:15:52 +0200
297 +
298 +libpcap (0.6.2-1) unstable; urgency=medium
299 +
300 + * New upstream release.
301 + * debian/control: Removed Build-Depends already satisfied by the
302 + build-essential package.
303 + * gencode.c (gen_scode): Add the missing default branch of the protocol
304 + family switch (closes: 88688).
305 + * debian/libpcap.post{rm,inst}: Run ldconfig (lintian).
306 + * debian/copyright: Fix the "similiar" typo (lintian).
307 +
308 + -- Torsten Landschoff <torsten@debian.org> Tue, 6 Mar 2001 04:27:27 +0100
309 +
310 +libpcap (0.6.1-2) unstable; urgency=low
311 +
312 + * debian/rules: Changed the shlibs info so that only pcap 0.6
313 + is okay for packages linked against this version.
314 +
315 + -- Torsten Landschoff <torsten@debian.org> Thu, 18 Jan 2001 01:13:20 +0100
316 +
317 +libpcap (0.6.1-1) unstable; urgency=low
318 +
319 + * Taking back the package. Kudos to Anand for helping out.
320 + * debian/rules: Pass --enable-ipv6 to configure (closes: #80223).
321 +
322 + -- Torsten Landschoff <torsten@debian.org> Tue, 16 Jan 2001 15:40:37 +0100
323 +
324 +libpcap (0.5.2-2) unstable; urgency=low
325 +
326 + * Update config.guess and config.sub (Closes #26031)
327 + * Source builds would not always work. Fix that.
328 + * Kernel interface problem is really a module not loaded problem.
329 + Note this in README.Debian. (Closes #21356)
330 +
331 + -- Anand Kumria <wildfire@progsoc.org> Tue, 28 Nov 2000 02:03:25 +1100
332 +
333 +libpcap (0.5.2-1) unstable; urgency=low
334 +
335 + * New upstream release
336 + * New maintainer
337 + * Migrate to Debhelper and insert Build-Depends
338 +
339 + -- Anand Kumria <wildfire@progsoc.org> Sun, 12 Nov 2000 03:19:44 +1100
340 +
341 +libpcap (0.4a6-3) unstable; urgency=low
342 +
343 + * New maintainer.
344 + * scanner.l: Allow a 12 digit hex number as ether address as well as
345 + BB.BB.BB.BB.BB.BB (closes: #48735)
346 + * nametoaddr.c (pcap_ether_aton): Adjust for change in scanner.l
347 +
348 + -- Torsten Landschoff <torsten@debian.org> Mon, 22 Nov 1999 02:39:45 +0100
349 +
350 +libpcap (0.4a6-2.1) unstable; urgency=low
351 +
352 + * Non maintainer upload.
353 + config.{guess,sub} changed to recognize a Arm architecture.
354 +
355 + -- Turbo Fredriksson <turbo@debian.org> Thu, 20 Aug 1998 23:12:36 -0400
356 +
357 +libpcap (0.4a6-2) frozen unstable; urgency=low
358 +
359 + * renamed /usr/doc/libpcap to /usr/doc/libpcap0 (should fix several
360 + lintian warnings)
361 + * updated standards-version
362 + * rebuild with latest debmake
363 +
364 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Mon, 30 Mar 1998 00:46:44 +0200
365 +
366 +
367 +libpcap (0.4a6-1) unstable; urgency=low
368 +
369 + * upgraded to latest upstream version, fixes: Bug#17164
370 + * added patch from Michael Alan Dorman <mdorman@mdorman.law.miami.edu>
371 + for building libpcap on alpha systems, fixes: Bug#15556
372 + * fixed aclocal.m4 script
373 +
374 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Sat, 31 Jan 1998 23:19:42 +0100
375 +
376 +
377 +libpcap (0.4a2-2) unstable; urgency=low
378 +
379 + * fixed detection of IFF_LOOPBACK for linux systems
380 + * link shared library with -l
381 +
382 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Wed, 19 Nov 1997 23:44:34 +0100
383 +
384 +
385 +libpcap (0.4a2-1) unstable; urgency=low
386 +
387 + * new maintainer
388 + * latest upstream release
389 + * libc6 version
390 + * compiled with _REENTRANT
391 +
392 + -- Peter Tobias <tobias@et-inf.fho-emden.de> Wed, 17 Sep 1997 20:40:01 +0200
393 +
394 +
395 +libpcap (0.3.1a3-1) unstable; urgency=low
396 +
397 + * Latest upstream release. Fixes bug #6670.
398 +
399 + -- Karl Sackett <krs@debian.org> Wed, 2 Apr 1997 10:19:28 -0600
400 +
401 +
402 +libpcap (0.3-1) unstable; urgency=low
403 +
404 + * First Debian release.
405 + * Makefile.in: supports libpcap.so target.
406 +
407 + -- Karl Sackett <krs@debian.org> Wed, 8 Jan 1997 09:38:31 -0600
408 +
409 +
410 --- libpcap0.8-0.8.3.orig/debian/rules
411 +++ libpcap0.8-0.8.3/debian/rules
412 @@ -0,0 +1,81 @@
413 +#!/usr/bin/make -f
414 +
415 +include /usr/share/dpatch/dpatch.make
416 +
417 +version := $(shell head -1 debian/changelog | \
418 + perl -nle 'm/\S+\s+\((\S+)-\S+\)/ and print $$1')
419 +major := $(shell head -1 debian/changelog | perl -nle \
420 + 'm/\S+\s+\((\d\.\d)\.\d+-\S+\)/ and print $$1')
421 +
422 +export CFLAGS=-D_FILE_OFFSET_BITS=64
423 +
424 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
425 + CFLAGS += -O0
426 +endif
427 +
428 +build: patch build-stamp
429 +build-stamp:
430 + dh_testdir
431 +
432 + ./configure --prefix=/usr \
433 + --mandir=\$${prefix}/share/man \
434 + --enable-ipv6 --infodir=\$${prefix}/share/info
435 + $(MAKE)
436 +
437 + touch build-stamp
438 +
439 +clean: clean-patched unpatch
440 +clean-patched:
441 + dh_testdir
442 + dh_testroot
443 + rm -f build-stamp
444 +
445 + -$(MAKE) distclean
446 +
447 + rm -f net
448 +
449 + dh_clean
450 +
451 +install: build
452 + dh_testdir
453 + dh_testroot
454 + dh_clean -k
455 + dh_installdirs
456 +
457 + $(MAKE) install prefix=`pwd`/debian/libpcap0.8-dev/usr
458 +
459 +binary-indep: build install
460 +# We have nothing to do by default.
461 +
462 +binary-arch: build install
463 +# dh_testversion
464 + dh_testdir
465 + dh_testroot
466 + #
467 + # build libpcap${major} package by moving files from libpcap0.8-dev
468 + #
469 + dh_movefiles -plibpcap$(major) --sourcedir=debian/libpcap0.8-dev \
470 + usr/lib/libpcap.so.$(major) \
471 + usr/lib/libpcap.so.$(version)
472 +
473 +# dh_installdebconf
474 + dh_installdocs -A debian/README.Debian
475 + dh_installexamples
476 + dh_installmenu
477 + dh_installmanpages -plibpcap0.8-dev
478 + dh_installinfo
479 +# dh_undocumented
480 + dh_installchangelogs CHANGES
481 + dh_link -plibpcap0.8-dev
482 + dh_strip
483 + dh_compress
484 + dh_fixperms
485 + dh_makeshlibs
486 + dh_installdeb
487 + dh_shlibdeps
488 + dh_gencontrol
489 + dh_md5sums
490 + dh_builddeb
491 +
492 +binary: binary-indep binary-arch
493 +.PHONY: build clean binary-indep binary-arch binary install
494 --- libpcap0.8-0.8.3.orig/debian/patches/10_shared_lib.dpatch
495 +++ libpcap0.8-0.8.3/debian/patches/10_shared_lib.dpatch
496 @@ -0,0 +1,144 @@
497 +#! /bin/sh -e
498 +## 10_shared_lib.dpatch by Romain Francoise <rfrancoise@debian.org>
499 +##
500 +## All lines beginning with `## DP:' are a description of the patch.
501 +## DP: Debian-specific modifications to the upstream Makefile.in to
502 +## DP: build a shared library.
503 +
504 +if [ $# -lt 1 ]; then
505 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
506 + exit 1
507 +fi
508 +
509 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
510 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
511 +
512 +case "$1" in
513 + -patch) patch -p1 ${patch_opts} < $0;;
514 + -unpatch) patch -R -p1 ${patch_opts} < $0;;
515 + *)
516 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
517 + exit 1;;
518 +esac
519 +
520 +exit 0
521 +
522 +@DPATCH@
523 +diff -urNad /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/Makefile.in libpcap0.8-0.8.3/Makefile.in
524 +--- /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/Makefile.in 2004-04-30 16:40:33.000000000 +0200
525 ++++ libpcap0.8-0.8.3/Makefile.in 2004-04-30 16:41:43.000000000 +0200
526 +@@ -37,6 +37,15 @@
527 + srcdir = @srcdir@
528 + VPATH = @srcdir@
529 +
530 ++# some defines for shared library compilation
531 ++MAJ=$(shell head -1 debian/changelog | perl -nle 'm/\S+\s+\((\d\.\d)\.\d+-\S+\)/ and print $$1')
532 ++MIN=$(shell head -1 debian/changelog | perl -nle 'm/\S+\s+\(\d\.\d\.(\d+)-\S+\)/ and print $$1')
533 ++VERSION=$(MAJ).$(MIN)
534 ++LIBNAME=pcap
535 ++LIBRARY=lib$(LIBNAME).a
536 ++SOLIBRARY=lib$(LIBNAME).so
537 ++SHAREDLIB=$(SOLIBRARY).$(VERSION)
538 ++
539 + #
540 + # You shouldn't need to edit anything below.
541 + #
542 +@@ -49,6 +58,7 @@
543 +
544 + # Standard CFLAGS
545 + CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
546 ++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
547 +
548 + INSTALL = @INSTALL@
549 + INSTALL_PROGRAM = @INSTALL_PROGRAM@
550 +@@ -68,7 +78,11 @@
551 + # problem if you don't own the file but can write to the directory.
552 + .c.o:
553 + @rm -f $@
554 +- $(CC) $(CFLAGS) -c $(srcdir)/$*.c
555 ++ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c
556 ++
557 ++%_pic.o: %.c
558 ++ @rm -f $@
559 ++ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
560 +
561 + PSRC = pcap-@V_PCAP@.c
562 + FSRC = fad-@V_FINDALLDEVS@.c
563 +@@ -83,6 +97,7 @@
564 + # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
565 + # hack the extra indirection
566 + OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
567 ++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
568 + HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
569 + ethertype.h gencode.h gnuc.h
570 + GENHDR = \
571 +@@ -94,15 +109,22 @@
572 + TAGFILES = \
573 + $(SRC) $(HDR) $(TAGHDR)
574 +
575 +-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
576 ++CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so*
577 +
578 +-all: libpcap.a
579 ++all: libpcap.a $(SHAREDLIB)
580 +
581 + libpcap.a: $(OBJ)
582 + @rm -f $@
583 + ar rc $@ $(OBJ) $(LIBS)
584 + $(RANLIB) $@
585 +
586 ++$(SHAREDLIB): $(OBJ_PIC)
587 ++ -@rm -f $@
588 ++ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
589 ++ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
590 ++ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
591 ++ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
592 ++
593 + scanner.c: $(srcdir)/scanner.l
594 + @rm -f $@
595 + $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
596 +@@ -110,6 +132,9 @@
597 + scanner.o: scanner.c tokdefs.h
598 + $(CC) $(CFLAGS) -c scanner.c
599 +
600 ++scanner_pic.o: scanner.c tokdefs.h
601 ++ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
602 ++
603 + pcap.o: version.h
604 +
605 + tokdefs.h: grammar.c
606 +@@ -123,9 +148,17 @@
607 + @rm -f $@
608 + $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
609 +
610 ++grammar_pic.o: grammar.c
611 ++ @rm -f $@
612 ++ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
613 ++
614 + version.o: version.c
615 + $(CC) $(CFLAGS) -c version.c
616 +
617 ++version_pic.o: version.c
618 ++ $(CC) -fPIC $(CFLAGS) -c version.c -o $@
619 ++
620 ++
621 + snprintf.o: $(srcdir)/missing/snprintf.c
622 + $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
623 +
624 +@@ -151,10 +184,16 @@
625 + bpf_filter.o: bpf_filter.c
626 + $(CC) $(CFLAGS) -c bpf_filter.c
627 +
628 ++bpf_filter_pic.o: bpf_filter.c
629 ++ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
630 ++
631 + install:
632 + [ -d $(DESTDIR)$(libdir) ] || \
633 + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
634 + $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
635 ++ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
636 ++ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
637 ++ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
638 + $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
639 + [ -d $(DESTDIR)$(includedir) ] || \
640 + (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
641 --- libpcap0.8-0.8.3.orig/debian/patches/20_mac_syntax.dpatch
642 +++ libpcap0.8-0.8.3/debian/patches/20_mac_syntax.dpatch
643 @@ -0,0 +1,68 @@
644 +#! /bin/sh -e
645 +## 20_mac_syntax.dpatch by Torsten Landschoff <torsten@debian.org>
646 +##
647 +## All lines beginning with `## DP:' are a description of the patch.
648 +## DP: Adds more possible syntaxes to input MAC addresses:
649 +## DP: - the nn.nn.nn.nn.nn.nn syntax
650 +## DP: - the hexadecimal syntax
651 +
652 +if [ $# -lt 1 ]; then
653 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
654 + exit 1
655 +fi
656 +
657 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
658 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
659 +
660 +case "$1" in
661 + -patch) patch -p1 ${patch_opts} < $0;;
662 + -unpatch) patch -R -p1 ${patch_opts} < $0;;
663 + *)
664 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
665 + exit 1;;
666 +esac
667 +
668 +exit 0
669 +
670 +@DPATCH@
671 +diff -urNad /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/nametoaddr.c libpcap0.8-0.8.3/nametoaddr.c
672 +--- /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/nametoaddr.c 2004-04-30 15:45:14.000000000 +0200
673 ++++ libpcap0.8-0.8.3/nametoaddr.c 2004-04-30 15:57:54.000000000 +0200
674 +@@ -333,7 +333,7 @@
675 + e = ep = (u_char *)malloc(6);
676 +
677 + while (*s) {
678 +- if (*s == ':')
679 ++ if (*s == ':' || *s == '.')
680 + s += 1;
681 + d = xdtoi(*s++);
682 + if (isxdigit((unsigned char)*s)) {
683 +diff -urNad /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/scanner.l libpcap0.8-0.8.3/scanner.l
684 +--- /home/romain/Work/Debian/libpcap/libpcap0.8/libpcap0.8-0.8.3/scanner.l 2004-04-30 15:45:14.000000000 +0200
685 ++++ libpcap0.8-0.8.3/scanner.l 2004-04-30 15:57:54.000000000 +0200
686 +@@ -80,6 +80,7 @@
687 + N ([0-9]+|(0X|0x)[0-9A-Fa-f]+)
688 + B ([0-9A-Fa-f][0-9A-Fa-f]?)
689 + W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?)
690 ++X [0-9A-Fa-f]
691 +
692 + %a 16000
693 + %o 19000
694 +@@ -296,7 +297,7 @@
695 + {N} { yylval.i = stoi((char *)yytext); return NUM; }
696 + ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N}) {
697 + yylval.s = sdup((char *)yytext); return HID; }
698 +-{B}:{B}:{B}:{B}:{B}:{B} { yylval.e = pcap_ether_aton((char *)yytext);
699 ++({B}:{B}:{B}:{B}:{B}:{B})|({B}\.{B}\.{B}\.{B}\.{B}\.{B}) { yylval.e = pcap_ether_aton((char *)yytext);
700 + return EID; }
701 + {V6} {
702 + #ifdef INET6
703 +@@ -314,6 +315,8 @@
704 + #endif /*INET6*/
705 + }
706 + {B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); }
707 ++{X}{12} { yylval.e = pcap_ether_aton((char *)yytext); return EID;}
708 ++
709 + icmptype { yylval.i = 0; return NUM; }
710 + icmpcode { yylval.i = 1; return NUM; }
711 + icmp-echoreply { yylval.i = 0; return NUM; }
712 --- libpcap0.8-0.8.3.orig/debian/patches/00list
713 +++ libpcap0.8-0.8.3/debian/patches/00list
714 @@ -0,0 +1,3 @@
715 +10_shared_lib
716 +20_mac_syntax
717 +30_man_fixes
718 --- libpcap0.8-0.8.3.orig/debian/patches/30_man_fixes.dpatch
719 +++ libpcap0.8-0.8.3/debian/patches/30_man_fixes.dpatch
720 @@ -0,0 +1,57 @@
721 +#! /bin/sh -e
722 +## 30_man_fixes.dpatch by Romain Francoise <rfrancoise@debian.org>
723 +##
724 +## All lines beginning with `## DP:' are a description of the patch.
725 +## DP: Misc. fixes to the upstream man page.
726 +
727 +if [ $# -lt 1 ]; then
728 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
729 + exit 1
730 +fi
731 +
732 +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
733 +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
734 +
735 +case "$1" in
736 + -patch) patch -p1 ${patch_opts} < $0;;
737 + -unpatch) patch -R -p1 ${patch_opts} < $0;;
738 + *)
739 + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
740 + exit 1;;
741 +esac
742 +
743 +exit 0
744 +
745 +@DPATCH@
746 +diff -urNad /home/romain/Work/Debian/libpcap0.8/libpcap0.8-0.8.3/pcap.3 libpcap0.8-0.8.3/pcap.3
747 +--- /home/romain/Work/Debian/libpcap0.8/libpcap0.8-0.8.3/pcap.3 2004-07-21 19:41:53.000000000 +0200
748 ++++ libpcap0.8-0.8.3/pcap.3 2004-07-21 19:42:28.000000000 +0200
749 +@@ -201,7 +201,7 @@
750 + .I fname
751 + specifies the name of the file to open. The file has
752 + the same format as those used by
753 +-.B tcpdump(1)
754 ++.B tcpdump(8)
755 + and
756 + .BR tcpslice(1) .
757 + The name "-" in a synonym for
758 +@@ -404,7 +404,9 @@
759 + live capture, or all the packets in the file when reading a
760 + ``savefile''.
761 + .I callback
762 +-specifies a routine to be called with three arguments:
763 ++specifies a
764 ++.I pcap_handler
765 ++routine to be called with three arguments:
766 + a
767 + .I u_char
768 + pointer which is passed in from
769 +@@ -1168,7 +1170,7 @@
770 + closes the ``savefile.''
771 + .PP
772 + .SH SEE ALSO
773 +-tcpdump(1), tcpslice(1)
774 ++tcpdump(8), tcpslice(1)
775 + .SH AUTHORS
776 + The original authors are:
777 + .LP
778 --- libpcap0.8-0.8.3.orig/debian/README.Debian
779 +++ libpcap0.8-0.8.3/debian/README.Debian
780 @@ -0,0 +1,13 @@
781 +libpcap for Debian
782 +------------------
783 +
784 + If you receive messages telling you the packet type is not supported
785 + or is deprecated check that CONFIG_PACKET is set to either `Y' or `M'.
786 +
787 + You should also check that /etc/modules.conf has the line
788 +
789 + alias net-pf-17 af_packet
790 +
791 + Feel free to report bugs.
792 +
793 + -- Anand Kumria <wildfire@progsoc.org>, Tue, 28 Nov 2000 02:04:28 EST
794 --- libpcap0.8-0.8.3.orig/debian/libpcap0.8-dev.preinst
795 +++ libpcap0.8-0.8.3/debian/libpcap0.8-dev.preinst
796 @@ -0,0 +1,9 @@
797 +#!/bin/sh
798 +set -e
799 +
800 +# Remove old symlink, if it exists
801 +if [ -L /usr/share/doc/libpcap-dev ]; then
802 + rm -f /usr/share/doc/libpcap-dev ;
803 +fi
804 +
805 +#DEBHELPER#
806 --- libpcap0.8-0.8.3.orig/debian/libpcap0.8.postinst
807 +++ libpcap0.8-0.8.3/debian/libpcap0.8.postinst
808 @@ -0,0 +1,8 @@
809 +#! /bin/sh
810 +
811 +if [ "$1" = "configure" ]; then
812 + ldconfig
813 +fi
814 +
815 +#DEBHELPER#
816 +
817 --- libpcap0.8-0.8.3.orig/debian/libpcap0.8-dev.dirs
818 +++ libpcap0.8-0.8.3/debian/libpcap0.8-dev.dirs
819 @@ -0,0 +1,3 @@
820 +usr/lib
821 +usr/include
822 +usr/share/man/man3
823 --- libpcap0.8-0.8.3.orig/debian/libpcap0.8.docs
824 +++ libpcap0.8-0.8.3/debian/libpcap0.8.docs
825 @@ -0,0 +1,2 @@
826 +README
827 +CREDITS
828 --- libpcap0.8-0.8.3.orig/debian/libpcap0.8.postrm
829 +++ libpcap0.8-0.8.3/debian/libpcap0.8.postrm
830 @@ -0,0 +1,8 @@
831 +#! /bin/sh
832 +
833 +if [ "$1" = "remove" ]; then
834 + ldconfig
835 +fi
836 +
837 +#DEBHELPER#
838 +
Personal OpenWRT clone
This page took 0.087636 seconds and 5 git commands to generate.