--- libpcap-ruby-0.6.orig/debian/compat +++ libpcap-ruby-0.6/debian/compat @@ -0,0 +1 @@ +5 --- libpcap-ruby-0.6.orig/debian/README.source +++ libpcap-ruby-0.6/debian/README.source @@ -0,0 +1,7 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/dpatch/README.source.gz for a detailed explanation. + + -- Paul van Tilburg , Sun, 14 Deb 2010 19:03:14 +0100 --- libpcap-ruby-0.6.orig/debian/rules +++ libpcap-ruby-0.6/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# -*- mode: makefile; -*- + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk + +#DEB_RUBY_INSTALL_ARGS = sitelibdir=$(CURDIR)/debian/libpcap-ruby1.8$(shell ruby1.8 -rrbconfig -e 'print Config::CONFIG["rubylibdir"]') --- libpcap-ruby-0.6.orig/debian/control +++ libpcap-ruby-0.6/debian/control @@ -0,0 +1,31 @@ +Source: libpcap-ruby +Section: ruby +Priority: optional +Maintainer: Paul van Tilburg +Uploaders: Debian Ruby Extras Maintainers +Build-Depends: debhelper (>> 5), cdbs, ruby-pkg-tools (>= 0.8), libpcap-dev, dpatch, ruby1.8, ruby1.8-dev +Standards-Version: 3.8.4 +Homepage: http://www.goto.info.waseda.ac.jp/~fukusima/ruby/pcap-e.html +Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/trunk/libpcap-ruby/ +Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/trunk/libpcap-ruby/ + +Package: libpcap-ruby +Architecture: all +Depends: libpcap-ruby1.8, ${misc:Depends} +Description: Ruby interface for the libpcap packet capture library + libpcap (Packet CAPture) provides a portable framework for low-level + network monitoring. This package provides bindings for the Ruby programming + language. + . + This is a dummy package to install the libpcap library bindings for + the default version of Ruby. It also contains documentation for the + package. + +Package: libpcap-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: libpcap-ruby +Description: Ruby 1.8 interface for the libpcap packet capture library + libpcap (Packet CAPture) provides a portable framework for low-level + network monitoring. This package provides bindings for the Ruby programming + language, version 1.8. --- libpcap-ruby-0.6.orig/debian/watch +++ libpcap-ruby-0.6/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://www.goto.info.waseda.ac.jp/~fukusima/ruby/pcap-e.html ruby-pcap-(.*)\.tar\.gz --- libpcap-ruby-0.6.orig/debian/examples +++ libpcap-ruby-0.6/debian/examples @@ -0,0 +1 @@ +examples/* --- libpcap-ruby-0.6.orig/debian/docs +++ libpcap-ruby-0.6/debian/docs @@ -0,0 +1,4 @@ +README +README.ja +doc/ +doc-ja/ --- libpcap-ruby-0.6.orig/debian/changelog +++ libpcap-ruby-0.6/debian/changelog @@ -0,0 +1,153 @@ +libpcap-ruby (0.6-10) unstable; urgency=low + + * debian/control: + - Bumped standards version to 3.8.4. + - Changed section to "ruby" per ftp-masters' request. + - Fixed the Vcs-* URLs to comply with the new layout. + - Added ${misc:Depends} to the depends of libpcap-ruby and libpcap-ruby1.8. + * debian/copyright: fixed the common license symlink to point to GPL-2. + * debian/patches: + - Added 06_linux_cooked_support.dpatch, courtesy of Guillaume Teissier + (closes: #510487). + - Added 07_filter_regexp_init.dpatch, courtesy of Clinton Gower + (closes: #557043) + * README.source: added to explain that dpatch is used in this package. + + -- Paul van Tilburg Sun, 14 Feb 2010 19:04:33 +0100 + +libpcap-ruby (0.6-9.1) unstable; urgency=low + + * NMU + * debian/patches/05_pcap_dispatch.dpatch: New patch, use pcap_dispatch() + instead of pcap_read() (closes: #548019). + + -- Romain Francoise Fri, 09 Oct 2009 20:57:11 +0200 + +libpcap-ruby (0.6-9) unstable; urgency=low + + [ Paul van Tilburg ] + * debian/control: moved the team to the Uploaders field, set myself as + maintainer (closes: #472431). + * debian/copyright: added copyright notice. + + -- Paul van Tilburg Wed, 02 Apr 2008 19:51:58 +0200 + +libpcap-ruby (0.6-8) unstable; urgency=low + + [ Barry deFreese ] + * Move to cdbs and extconf class (Closes: #454956) + * Bump debhelper build-dep and compat to 5 + * Add watch file + * Update FSF address in copyright file + * Bump Standards Version to 3.7.3 + + [ Lucas Nussbaum ] + * Fixed Vcs-* + * Added a libpcap-ruby binary package that depends on libpcap-ruby1.8, to + match the team's policy. + + -- Lucas Nussbaum Mon, 24 Dec 2007 17:37:40 +0100 + +libpcap-ruby (0.6-7) unstable; urgency=low + + * New maintainer. + * Added Vcs-*, changed Homepage field. + + -- Lucas Nussbaum Sat, 08 Dec 2007 13:31:17 +0100 + +libpcap-ruby (0.6-6) unstable; urgency=low + + * dropped ruby1.6 support. (Closes: #367916) + * debian/control: updated description. (Closes: #210090) + Thanks: Lucas Nussbaum. + * applied findalldevs-support-patch from Barry deFreese. (Closes: #360637) + * lib/pcaplet.rb: uses optparse instead of getopts. (Closes: #312214) + + -- akira yamada Mon, 5 Jun 2006 10:46:06 +0900 + +libpcap-ruby (0.6-5) unstable; urgency=low + + * rebuild with ruby1.6 and ruby1.8, closes: #212265. + - renamed to libpcap-ruby1.6 from libpcap-ruby. it conflicts/replaces with + libpcap-ruby. + - new-subpackage libpcap-ruby1.8. + + -- akira yamada Sat, 4 Oct 2003 16:20:21 +0900 + +libpcap-ruby (0.6-4) unstable; urgency=low + + * rebuild with libpcap-dev_0.7.1-1, closes: #156210. + + -- akira yamada Thu, 15 Aug 2002 10:36:59 +0900 + +libpcap-ruby (0.6-3.1) unstable; urgency=low + + * Non maintainer upload + * Rebuilt with new libpcap to remove dependency on libpcap0, which I + got removed from unstable by accident. Sorry about this... + + -- Torsten Landschoff Sat, 10 Aug 2002 11:37:13 +0200 + +libpcap-ruby (0.6-3) unstable; urgency=low + + * Rebuild with ruby_1.6.2-5. + + -- akira yamada Thu, 25 Jan 2001 22:56:47 +0900 + +libpcap-ruby (0.6-2) unstable; urgency=low + + * Rebuild with ruby_1.6.0. + * Updated Standards-Version to 3.2.1. + * Added Build-Depends field into control file. + + -- akira yamada Fri, 1 Sep 2000 17:58:46 +0900 + +libpcap-ruby (0.6-1) unstable; urgency=low + + * Upgraded to new upstream version. + + -- akira yamada Sun, 20 Aug 2000 01:03:47 +0900 + +libpcap-ruby (0.5-2) unstable; urgency=low + + * Rebuild with ruby_1.4.4. + + -- akira yamada Tue, 4 Apr 2000 21:02:01 +0900 + +libpcap-ruby (0.5-1) unstable; urgency=low + + * Upgraded to new upstream version. + + -- akira yamada Wed, 22 Dec 1999 14:27:34 +0900 + +libpcap-ruby (0.4-1) unstable; urgency=low + + * Upgraded to new upstream version. + * FHS complience. + + -- akira yamada Thu, 21 Oct 1999 23:38:38 +0900 + +libpcap-ruby (0.3.1-1) unstable; urgency=low + + * Upgraded to new upstream version. + + -- akira yamada Fri, 27 Aug 1999 11:28:32 +0900 + +ruby-pcap-module (0.1.1-2) unstable-jp; urgency=low + + * Build with ruby1.2_1.2.2. + + -- akira yamada Mon, 1 Feb 1999 14:39:24 +0900 + +ruby-pcap-module (0.1.1-1) unstable-jp; urgency=low + + * Upgraded to new upstream version. + * Build with ruby_1.2.2. + + -- akira yamada Fri, 22 Jan 1999 17:47:56 +0900 + +ruby-pcap-module (0.1-1) unstable-jp; urgency=low + + * Initial Release. + + -- akira yamada Tue, 1 Dec 1998 23:22:12 +0900 --- libpcap-ruby-0.6.orig/debian/copyright +++ libpcap-ruby-0.6/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by akira yamada akira@debian.org on +Tue, 1 Dec 1998 23:22:12 +0900. + +It was downloaded from +http://www.goto.info.waseda.ac.jp/~fukusima/ruby/pcap-e.html + +Upstream Author: Masaki Fukushima + +Copyright: + + ruby-pcap is Copyright(C) 1998-2000 by Masaki Fukushima. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02111-1301, USA. + +On Debian systems, the complete text of the GNU General Public License +version 2 can be found in `/usr/share/common-licenses/GPL-2'. --- libpcap-ruby-0.6.orig/debian/patches/02_optparse.dpatch +++ libpcap-ruby-0.6/debian/patches/02_optparse.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_optparse.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use optparse instead of getopts + +@DPATCH@ +diff -urNad pcap~/lib/pcaplet.rb pcap/lib/pcaplet.rb +--- pcap~/lib/pcaplet.rb 2000-08-13 01:22:14.000000000 -0400 ++++ pcap/lib/pcaplet.rb 2007-12-20 09:24:15.000000000 -0500 +@@ -1,5 +1,5 @@ + require 'pcap' +-require 'getopts' ++require 'optparse' + + def pcaplet_usage() + $stderr.print < +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Loop through stderr on DEBUG_PRINT + +@DPATCH@ +diff -urNad pcap~/ruby_pcap.h pcap/ruby_pcap.h +--- pcap~/ruby_pcap.h 2000-08-13 02:56:15.000000000 -0400 ++++ pcap/ruby_pcap.h 2007-12-20 09:30:38.000000000 -0500 +@@ -29,11 +29,12 @@ + #include + + #ifdef DEBUG +-# define DEBUG_PRINT(x) \ ++# define DEBUG_PRINT(x) do {\ + ((RTEST(ruby_debug) && RTEST(ruby_verbose))?\ +- (fprintf(stderr, "%s\n", x),fflush(stderr)) : 0) ++ (fprintf(stderr, "%s\n", x),fflush(stderr)) : 0)\ ++} while (0) + #else +-# define DEBUG_PRINT(x) (0) ++# define DEBUG_PRINT(x) do {} while (0) + #endif + + #define UINT32_2_NUM(i) rb_uint2inum(i) --- libpcap-ruby-0.6.orig/debian/patches/04_findalldevs.dpatch +++ libpcap-ruby-0.6/debian/patches/04_findalldevs.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_findalldevs.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add support for the findalldevs function of libpcap. + +@DPATCH@ +diff -urNad pcap~/Pcap.c pcap/Pcap.c +--- pcap~/Pcap.c 2000-08-13 01:56:31.000000000 -0400 ++++ pcap/Pcap.c 2007-12-20 09:53:39.000000000 -0500 +@@ -54,6 +54,29 @@ + } + + static VALUE ++pcap_s_findalldevs(self) ++ VALUE self; ++{ ++ pcap_if_t *alldevsp; ++ VALUE return_ary; ++ char pcap_errbuf[PCAP_ERRBUF_SIZE]; ++ ++ return_ary = rb_ary_new(); ++ ++ pcap_findalldevs(&alldevsp, pcap_errbuf); ++ ++ if (alldevsp == NULL) // List is empty, probably an error ++ rb_raise(ePcapError, "%s", pcap_errbuf); ++ ++ for (; alldevsp->next != NULL; alldevsp = alldevsp->next) ++ rb_ary_push(return_ary, rb_str_new2(alldevsp->name)); ++ ++ pcap_freealldevs(alldevsp); ++ ++ return return_ary; ++} ++ ++static VALUE + pcap_s_lookupnet(self, dev) + VALUE self; + VALUE dev; +@@ -723,6 +746,7 @@ + /* define module Pcap */ + mPcap = rb_define_module("Pcap"); + rb_define_module_function(mPcap, "lookupdev", pcap_s_lookupdev, 0); ++ rb_define_module_function(mPcap, "findalldevs", pcap_s_findalldevs, 0); + rb_define_module_function(mPcap, "lookupnet", pcap_s_lookupnet, 1); + rb_global_variable(&rbpcap_convert); + rb_define_singleton_method(mPcap, "convert?", pcap_s_convert, 0); +@@ -780,11 +804,7 @@ + /*rb_define_method(cFilter, "&", filter_and, 1);*/ + + /* define class PcapStat */ +- cPcapStat = rb_funcall(rb_cStruct, rb_intern("new"), 4, +- Qnil, +- INT2NUM(rb_intern("recv")), +- INT2NUM(rb_intern("drop")), +- INT2NUM(rb_intern("ifdrop"))); ++ cPcapStat = rb_struct_define(NULL, "recv", "drop", "ifdrop", NULL); + rb_define_const(mPcap, "Stat", cPcapStat); + + /* define exception classes */ --- libpcap-ruby-0.6.orig/debian/patches/01_examples_ruby_path.dpatch +++ libpcap-ruby-0.6/debian/patches/01_examples_ruby_path.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_examples_ruby_path.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use /usr/bin/ruby, not /usr/local/bin/ruby + +@DPATCH@ +diff -urNad pcap~/examples/httpdump.rb pcap/examples/httpdump.rb +--- pcap~/examples/httpdump.rb 2000-08-13 01:41:14.000000000 -0400 ++++ pcap/examples/httpdump.rb 2007-12-20 09:15:27.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/ruby + require 'pcaplet' + httpdump = Pcaplet.new('-s 1500') + +diff -urNad pcap~/examples/tcpdump.rb pcap/examples/tcpdump.rb +--- pcap~/examples/tcpdump.rb 1999-10-27 05:54:39.000000000 -0400 ++++ pcap/examples/tcpdump.rb 2007-12-20 09:15:39.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/ruby + require 'pcaplet' + include Pcap + +diff -urNad pcap~/examples/test.rb pcap/examples/test.rb +--- pcap~/examples/test.rb 1999-11-01 03:22:54.000000000 -0500 ++++ pcap/examples/test.rb 2007-12-20 09:15:14.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/ruby + require 'pcap' + + dev = Pcap.lookupdev --- libpcap-ruby-0.6.orig/debian/patches/07_filter_regexp_init.dpatch +++ libpcap-ruby-0.6/debian/patches/07_filter_regexp_init.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_filter_regexp_init.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libpcap-ruby-0.6~/lib/pcaplet.rb libpcap-ruby-0.6/lib/pcaplet.rb +--- libpcap-ruby-0.6~/lib/pcaplet.rb 2000-08-13 07:22:14.000000000 +0200 ++++ libpcap-ruby-0.6/lib/pcaplet.rb 2010-02-14 18:53:06.000000000 +0100 +@@ -64,10 +64,10 @@ + attr('capture') + + def add_filter(f) ++ f = f.source if f.is_a? Filter + if @filter == nil || @filter =~ /^\s*$/ # if empty + @filter = f + else +- f = f.source if f.is_a? Filter + @filter = "( #{@filter} ) and ( #{f} )" + end + @capture.setfilter(@filter) --- libpcap-ruby-0.6.orig/debian/patches/05_pcap_dispatch.dpatch +++ libpcap-ruby-0.6/debian/patches/05_pcap_dispatch.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_pcap_dispatch.dpatch by Romain Francoise +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libpcap-ruby-0.6~/Pcap.c libpcap-ruby-0.6/Pcap.c +--- libpcap-ruby-0.6~/Pcap.c 2009-10-09 20:54:11.000000000 +0200 ++++ libpcap-ruby-0.6/Pcap.c 2009-10-09 20:54:37.000000000 +0200 +@@ -271,8 +271,6 @@ + return INT2FIX(ret); + } + +-int pcap_read(pcap_t *, int cnt, pcap_handler, u_char *); /* pcap-int.h */ +- + static VALUE + capture_loop(argc, argv, self) + int argc; +@@ -319,7 +317,7 @@ + rb_thread_wait_fd(fd); + } + TRAP_BEG; +- ret = pcap_read(cap->pcap, 1, handler, (u_char *)cap); ++ ret = pcap_dispatch(cap->pcap, 1, handler, (u_char *)cap); + TRAP_END; + } while (ret == 0); + if (ret <= 0) --- libpcap-ruby-0.6.orig/debian/patches/06_linux_cooked_support.dpatch +++ libpcap-ruby-0.6/debian/patches/06_linux_cooked_support.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_linux_cooked_support.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add support for datalink type Linux cooked + +@DPATCH@ +diff -Nurb libpcap-ruby-0.6/packet.c pcap/packet.c +--- libpcap-ruby-0.6/packet.c 2000-08-13 08:56:15.000000000 +0200 ++++ pcap/packet.c 2009-01-02 14:08:57.000000000 +0100 +@@ -67,8 +67,9 @@ + { 6, 8 }, /* 11: DLT_ATM_RFC1483 */ + { -1, 0 }, /* 12: DLT_RAW */ + { -1, 24 }, /* 13: DLT_SLIP_BSDOS */ +- { 5, 24 } /* 14: DLT_PPP_BSDOS */ +-#define DATALINK_MAX 14 ++ { 5, 24 }, /* 14: DLT_PPP_BSDOS */ ++ [113] = { 14, 16 } /* 113: DLT_LINUX_SLL */ ++#define DATALINK_MAX 113 + }; + + VALUE +diff -Nurb libpcap-ruby-0.6/Pcap.c pcap/Pcap.c +--- libpcap-ruby-0.6/Pcap.c 2000-08-13 07:56:31.000000000 +0200 ++++ pcap/Pcap.c 2009-01-02 13:32:44.000000000 +0100 +@@ -744,6 +744,9 @@ + rb_define_const(mPcap, "DLT_SLIP_BSDOS", INT2NUM(DLT_SLIP_BSDOS)); + rb_define_const(mPcap, "DLT_PPP_BSDOS", INT2NUM(DLT_PPP_BSDOS)); + #endif ++#ifdef DLT_LINUX_SLL ++ rb_define_const(mPcap, "DLT_LINUX_SLL", INT2NUM(DLT_LINUX_SLL)); ++#endif + + /* define class Capture */ + cCapture = rb_define_class_under(mPcap, "Capture", rb_cObject); --- libpcap-ruby-0.6.orig/debian/patches/00list +++ libpcap-ruby-0.6/debian/patches/00list @@ -0,0 +1,7 @@ +01_examples_ruby_path.dpatch +02_optparse.dpatch +03_debug_print.dpatch +04_findalldevs.dpatch +05_pcap_dispatch.dpatch +06_linux_cooked_support.dpatch +07_filter_regexp_init.dpatch