[DRE-maint] Bug#548019: NMU diff

Romain Francoise rfrancoise at debian.org
Fri Oct 9 19:26:19 UTC 2009


I uploaded a NMU for this bug, here's the diff:

diffstat for libpcap-ruby_0.6-9 libpcap-ruby_0.6-9.1

 debian/patches/05_pcap_dispatch.dpatch |   28 ++++++++++++++++++++++++++++
 libpcap-ruby-0.6/debian/changelog      |    8 ++++++++
 libpcap-ruby-0.6/debian/patches/00list |    1 +
 3 files changed, 37 insertions(+)

diff -u libpcap-ruby-0.6/debian/changelog libpcap-ruby-0.6/debian/changelog
--- libpcap-ruby-0.6/debian/changelog
+++ libpcap-ruby-0.6/debian/changelog
@@ -1,3 +1,11 @@
+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 <rfrancoise at debian.org>  Fri, 09 Oct 2009 20:57:11 +0200
+
 libpcap-ruby (0.6-9) unstable; urgency=low
 
   [ Paul van Tilburg ]
diff -u libpcap-ruby-0.6/debian/patches/00list libpcap-ruby-0.6/debian/patches/00list
--- libpcap-ruby-0.6/debian/patches/00list
+++ libpcap-ruby-0.6/debian/patches/00list
@@ -4,0 +5 @@
+05_pcap_dispatch.dpatch
only in patch2:
unchanged:
--- 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 <rfrancoise at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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)

-- 
Romain Francoise <rfrancoise at debian.org>
http://people.debian.org/~rfrancoise/






More information about the Pkg-ruby-extras-maintainers mailing list