[DRE-commits] [SCM] ruby-pcap.git branch, master, updated. upstream/0.7.0-3-g8af8fd0

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 8af8fd0033b3508cf6fca8781a1e2f0590fa9360
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Dec 28 18:49:51 2011 +0100

    Reviewed patches from the old libpcap-ruby package, dropped and refreshed them
    
    * debian/patches/01_examples_ruby_path.dpatch: dropped, done by gem2deb.
    * debian/patches/02_optparse.dpatch,
      debian/patches/03_debug_print.dpatch,
      debian/patches/04_findalldevs.dpatch,
      debian/patches/05_pcap_dispatch.dpatch,
      debian/patches/07_filter_regexp_init.dpatch: dropped, included upstream.
    * debian/patches/series: renamed from debian/patches/00list to move from
      dpatch to quilt.

diff --git a/debian/changelog b/debian/changelog
index cb2d77a..9e71e56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,16 @@ ruby-pcap (0.7.0-1) UNRELEASED; urgency=low
       convention the team is the default maintainer.
     - Added libdbus-ruby and libdbus-ruby1.8 as transitional packages.
   * debian/copyright: reworked to fit the DEP5 format.
-
- -- Paul van Tilburg <paulvt at debian.org>  Wed, 28 Dec 2011 16:50:53 +0100
+  * debian/patches/01_examples_ruby_path.dpatch: dropped, done by gem2deb.
+  * debian/patches/02_optparse.dpatch,
+    debian/patches/03_debug_print.dpatch,
+    debian/patches/04_findalldevs.dpatch,
+    debian/patches/05_pcap_dispatch.dpatch,
+    debian/patches/07_filter_regexp_init.dpatch: dropped, included upstream. 
+  * debian/patches/series: renamed from debian/patches/00list to move from
+    dpatch to quilt. 
+
+ -- Paul van Tilburg <paulvt at debian.org>  Wed, 28 Dec 2011 17:45:43 +0100
 
 libpcap-ruby (0.6-10) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5c30d2e..7b77171 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: ruby-pcap
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders:  <paulvt at debian.org>
+Uploaders: Paul van Tilburg <paulvt at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), libpcap-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-pcap.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-pcap.git;a=summary
diff --git a/debian/patches/06_linux_cooked_support.dpatch b/debian/patches/06_linux_cooked_support.dpatch
new file mode 100644
index 0000000..1ed9cde
--- /dev/null
+++ b/debian/patches/06_linux_cooked_support.dpatch
@@ -0,0 +1,30 @@
+Index: ruby-pcap/ext/packet.c
+===================================================================
+--- ruby-pcap.orig/ext/packet.c	2011-12-28 16:51:50.000000000 +0100
++++ ruby-pcap/ext/packet.c	2011-12-28 18:43:35.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
+Index: ruby-pcap/ext/Pcap.c
+===================================================================
+--- ruby-pcap.orig/ext/Pcap.c	2011-12-28 16:51:50.000000000 +0100
++++ ruby-pcap/ext/Pcap.c	2011-12-28 18:42:13.000000000 +0100
+@@ -864,6 +864,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);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e97ebe6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+06_linux_cooked_support.dpatch

-- 
ruby-pcap.git