perl-NetPcap:moved from contrib

2020-06-10 00:52:48 +03:00
parent eadbe6812b
commit 19186b5654
5 changed files with 170 additions and 0 deletions
@@ -0,0 +1,36 @@
+From 52607780c02ee90a93bd40e91c5263e55e7a351c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 5 Oct 2016 15:54:02 +0200
+Subject: [PATCH] Adapt a test to libpcap-1.8.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libpcap-1.8.0 changed error message on invalid filter expression from
+"syntax error" to "syntax error in filter expression: syntax error".
+
+This patch adjust the t/09-error.t for that.
+
+CPAN RT#117831
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ t/09-error.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/09-error.t b/t/09-error.t
+index bcd2a13..ef8f0b2 100644
+--- a/t/09-error.t
+++ b/t/09-error.t
+@@ -22,7 +22,7 @@ is(   $@,   '', "compile() with an invalid filter string" );
+ is(   $res, -1, " - result must not be null: $res" );
+ eval { $err = Net::Pcap::geterr($pcap) };
+ is(   $@,   '', "geterr()" );
+-like( $err, '/^(?:parse|syntax) error$/', " - \$err must not be null: $err" );
+like( $err, '/(?:parse|syntax) error$/', " - \$err must not be null: $err" );
+ 
+ # Testing compile() with a valid filter
+ eval { $res = Net::Pcap::compile($pcap, \$filter, "tcp", 0, $mask) };
+-- 
+2.7.4
+
@@ -0,0 +1,44 @@
+diff -up ./Makefile.PL.tv ./Makefile.PL
+--- ./Makefile.PL.tv	2018-09-21 10:32:09.165570705 +0200
+++ ./Makefile.PL	2018-09-21 10:45:39.096591301 +0200
+@@ -106,7 +106,7 @@ REASON
+ # We also store the list of available functions in a file for skipping the 
+ # corresponding tests. 
+ my @funcs = have_functions(find_functions());
+-$options{DEFINE} .= cpp_defines(@funcs);
+$options{DEFINE} .= cpp_defines(@funcs). "-DHAVE_PCAP_SETSAMPLING";
+ open(FUNCS, '>funcs.txt') or warn "warning: can't write 'funcs.txt': $!\n";
+ print FUNCS join("\n", @funcs), "\n";
+ close(FUNCS);
+diff -up ./Pcap.xs.tv ./Pcap.xs
+diff -up ./stubs.inc.tv ./stubs.inc
+--- ./stubs.inc.tv	2018-09-21 10:30:08.653034412 +0200
+++ ./stubs.inc	2018-09-21 10:46:41.339897943 +0200
+@@ -354,11 +354,6 @@ int pcap_parsesrcstr(const char *source,
+ #ifdef _MSC_VER
+ #pragma message( "Warning: the function pcap_open() is not available" )
+ #endif
+-struct pcap_rmtauth {
+-    int type;
+-    char *username;
+-    char *password;
+-};
+ 
+ pcap_t * pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *err);
+ pcap_t * pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *err) {
+@@ -511,6 +511,7 @@ HANDLE pcap_getevent(pcap_t *p) {
+ #ifdef _MSC_VER
+ #pragma message( "Warning: the function pcap_setsampling() is not available" )
+ #endif
+#if 0
+ struct pcap_samp {
+     int method;
+     int value;
+@@ -522,6 +523,7 @@ struct pcap_samp *pcap_setsampling(pcap_
+     return NULL;
+ }
+ #endif
+#endif
+ 
+ 
+ /*