From e569d871472860b283542b40a09bee059e6656bf9da93404d4414314f1efbeb3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 13 Nov 2018 14:45:57 +0000 Subject: [PATCH] Accepting request 647646 from home:pmonrealgonzalez:branches:devel:languages:perl - updated to 0.18 [Bugfixes] - CPAN RT #77807: Net::Pcap is no longer limited to one callback function, thanks to a patch by James Rouzier. - CPAN RT #55163: Typo in eg/pcapdump (Iain Arnell and Jose Pedro Oliveira). - CPAN RT #83842: Typo in Net:Pcap (Xavier Guimard). [API] - Added pcap_offline_filter() (Martijn Lievaart). [Code] - use warnings (David Farrell). [Documentation] - Moved HISTORY from README to main documentation. - Rewrote AUTHORS to acknowledge all contributors. - Updated copyright years. [Tests] - Added timeouts to prevent tests from hanging (Patrice Auffret). - t/17-lib_version.t: adjust regexp to match Apple builds (David Farrell). - t/50-poe-component-pcap.t: small improvments. - Added t/50-net-pcap-easy.t to test with Net::Pcap::Easy. - Added t/50-anyevent-pcap.t to test with AnyEvent::Pcap. - Make t/50-* pass with old versions of Test::More [Distribution] - Converted the Changes file to CPAN::Changes::Spec format. - Makefile.PL: append CCFLAGS to $Config{ccflags} instead of overriding it. - Makefile.PL: now dies when libpcap isn't found. OBS-URL: https://build.opensuse.org/request/show/647646 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Net-Pcap?expand=0&rev=11 --- Net-Pcap-0.17.tar.gz | 3 -- Net-Pcap-0.18.tar.gz | 3 ++ ...Pcap-avoid-pcap_rmtauth-redefinition.patch | 41 +++++++++++++++++++ perl-Net-Pcap-fix_libpcap_detection.patch | 13 ------ perl-Net-Pcap.changes | 41 +++++++++++++++++++ perl-Net-Pcap.spec | 21 ++++++---- 6 files changed, 97 insertions(+), 25 deletions(-) delete mode 100644 Net-Pcap-0.17.tar.gz create mode 100644 Net-Pcap-0.18.tar.gz create mode 100644 perl-Net-Pcap-avoid-pcap_rmtauth-redefinition.patch delete mode 100644 perl-Net-Pcap-fix_libpcap_detection.patch diff --git a/Net-Pcap-0.17.tar.gz b/Net-Pcap-0.17.tar.gz deleted file mode 100644 index 2159a96..0000000 --- a/Net-Pcap-0.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aaee41ebea17924abdc2d683ec940b3e6b0dc1e5e344178395f57774746a5452 -size 92853 diff --git a/Net-Pcap-0.18.tar.gz b/Net-Pcap-0.18.tar.gz new file mode 100644 index 0000000..517b09b --- /dev/null +++ b/Net-Pcap-0.18.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb9bd44948c23544bb9d4e28261dbd0dbb3e7564709487a7855576e0d9b68307 +size 94207 diff --git a/perl-Net-Pcap-avoid-pcap_rmtauth-redefinition.patch b/perl-Net-Pcap-avoid-pcap_rmtauth-redefinition.patch new file mode 100644 index 0000000..436e9c8 --- /dev/null +++ b/perl-Net-Pcap-avoid-pcap_rmtauth-redefinition.patch @@ -0,0 +1,41 @@ +--- ./Makefile.PL 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); +--- ./stubs.inc 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 + + + /* diff --git a/perl-Net-Pcap-fix_libpcap_detection.patch b/perl-Net-Pcap-fix_libpcap_detection.patch deleted file mode 100644 index c48a423..0000000 --- a/perl-Net-Pcap-fix_libpcap_detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Net-Pcap-0.17/Makefile.PL -=================================================================== ---- Net-Pcap-0.17.orig/Makefile.PL -+++ Net-Pcap-0.17/Makefile.PL -@@ -22,8 +22,6 @@ elsif ($^O eq 'cygwin') { - cygwin_pcap_headers(); - } - else { -- $options{CCFLAGS} = "-Wall -Wwrite-strings" -- if $Config{ccname} eq "gcc" and $] >= 5.006; - $options{LIBS} = '-lpcap'; - } - diff --git a/perl-Net-Pcap.changes b/perl-Net-Pcap.changes index 25c8e2a..af20739 100644 --- a/perl-Net-Pcap.changes +++ b/perl-Net-Pcap.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Fri Nov 9 17:22:28 UTC 2018 - Pedro Monreal Gonzalez + +- updated to 0.18 + [Bugfixes] + - CPAN RT #77807: Net::Pcap is no longer limited to one callback function, + thanks to a patch by James Rouzier. + - CPAN RT #55163: Typo in eg/pcapdump (Iain Arnell and Jose Pedro Oliveira). + - CPAN RT #83842: Typo in Net:Pcap (Xavier Guimard). + + [API] + - Added pcap_offline_filter() (Martijn Lievaart). + + [Code] + - use warnings (David Farrell). + + [Documentation] + - Moved HISTORY from README to main documentation. + - Rewrote AUTHORS to acknowledge all contributors. + - Updated copyright years. + + [Tests] + - Added timeouts to prevent tests from hanging (Patrice Auffret). + - t/17-lib_version.t: adjust regexp to match Apple builds (David Farrell). + - t/50-poe-component-pcap.t: small improvments. + - Added t/50-net-pcap-easy.t to test with Net::Pcap::Easy. + - Added t/50-anyevent-pcap.t to test with AnyEvent::Pcap. + - Make t/50-* pass with old versions of Test::More + + [Distribution] + - Converted the Changes file to CPAN::Changes::Spec format. + - Makefile.PL: append CCFLAGS to $Config{ccflags} instead of overriding it. + - Makefile.PL: now dies when libpcap isn't found. + - Makefile.PL: declare minimum Perl version (David Farrell). + +- Removed patch perl-Net-Pcap-fix_libpcap_detection.patch + +- Added patch to avoid a redefinition of the pcap_rmtauth struct + already defined in libpcap >= 1.9.0 + * perl-Net-Pcap-avoid-pcap_rmtauth-redefinition.patch + ------------------------------------------------------------------- Sat Jul 27 11:58:51 UTC 2013 - coolo@suse.com diff --git a/perl-Net-Pcap.spec b/perl-Net-Pcap.spec index baafd2a..8eadff2 100644 --- a/perl-Net-Pcap.spec +++ b/perl-Net-Pcap.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Net-Pcap # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: perl-Net-Pcap -Version: 0.17 +Version: 0.18 Release: 0 Summary: Interface to pcap LBL packet capture library -License: Artistic-1.0 or GPL-1.0+ +License: Artistic-1.0 OR GPL-1.0-or-later Group: Development/Libraries/Perl -Source: http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/Net-Pcap-%{version}.tar.gz -# pbleser: fix libpcap detection on >= 12.1 (i586) as for some reason, using -Wwrite-strings causes -# it to fail -- bnc#711611 -Patch1: perl-Net-Pcap-fix_libpcap_detection.patch -Url: http://search.cpan.org/dist/Net-Pcap +Source: https://cpan.metacpan.org/authors/id/S/SA/SAPER/Net-Pcap-%{version}.tar.gz +%if 0%{?suse_version} >= 01550 +Patch1: perl-Net-Pcap-avoid-pcap_rmtauth-redefinition.patch +%endif +URL: https://metacpan.org/release/Net-Pcap BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} BuildRequires: gcc @@ -46,6 +46,7 @@ BuildRequires: libpcap Requires: perl(Carp) Requires: perl(Socket) Requires: perl(Sys::Hostname) +Requires: perl(Test::More) >= 0.45 Requires: perl(XSLoader) %description @@ -77,7 +78,9 @@ available on the current host. %prep %setup -q -n "Net-Pcap-%{version}" +%if 0%{?suse_version} >= 01550 %patch1 -p1 +%endif %__sed -i '/^auto_install/d' Makefile.PL