<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/71ed9644913123c6f46af296e6bf26d6fcd2b7d5">https://github.com/macports/macports-ports/commit/71ed9644913123c6f46af296e6bf26d6fcd2b7d5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 71ed9644913 p5-net-pcap: update to version 0.20
</span>71ed9644913 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 71ed9644913123c6f46af296e6bf26d6fcd2b7d5
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Apr 19 17:51:05 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> p5-net-pcap: update to version 0.20
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove outdated patches now included upstream.
</span>---
perl/p5-net-pcap/Portfile | 12 +++---
...t-Pcap-0.18-Adapt-a-test-to-libpcap-1.8.0.patch | 13 -------
perl/p5-net-pcap/files/fix-build-netpcap.patch | 44 ----------------------
3 files changed, 5 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-net-pcap/Portfile b/perl/p5-net-pcap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 910ac8070c2..081c6b095d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-net-pcap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-net-pcap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup perl5 1.0
perl5.branches 5.28 5.30 5.32 5.34
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.setup Net-Pcap 0.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.setup Net-Pcap 0.20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license {Artistic-1 GPL}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,13 +19,11 @@ long_description Net::Pcap is a Perl binding to the LBL pcap(3) \
</span> monitoring, network debugging, etc.
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1959ae0cc70fdd8b4cdb2d9028123fd83338c8d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cb9bd44948c23544bb9d4e28261dbd0dbb3e7564709487a7855576e0d9b68307
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a3b2e686f8ccd36baad5d6125452ddb2d300ab9a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f6698d62ff6727f9d0ffae7b974d966eb5bb2c03df07790d034bb510591aca42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 97852
</span>
if {${perl5.major} != ""} {
depends_lib-append \
port:libpcap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles fix-build-netpcap.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Net-Pcap-0.18-Adapt-a-test-to-libpcap-1.8.0.patch
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-net-pcap/files/Net-Pcap-0.18-Adapt-a-test-to-libpcap-1.8.0.patch b/perl/p5-net-pcap/files/Net-Pcap-0.18-Adapt-a-test-to-libpcap-1.8.0.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5432d97242b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-net-pcap/files/Net-Pcap-0.18-Adapt-a-test-to-libpcap-1.8.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/t/09-error.t b/t/09-error.t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- t/09-error.t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ t/09-error.t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@ is( $@, '', "compile() with an invalid filter string" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is( $res, -1, " - result must not be null: $res" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval { $err = Net::Pcap::geterr($pcap) };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is( $@, '', "geterr()" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--like( $err, '/^(?:parse|syntax) error$/', " - \$err must not be null: $err" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+like( $err, '/(^|: )(?:parse|syntax) error$/', " - \$err must not be null: $err" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Testing compile() with a valid filter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval { $res = Net::Pcap::compile($pcap, \$filter, "tcp", 0, $mask) };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-net-pcap/files/fix-build-netpcap.patch b/perl/p5-net-pcap/files/fix-build-netpcap.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2ad1f6023ef..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-net-pcap/files/fix-build-netpcap.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -up ./Makefile.PL.tv ./Makefile.PL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Makefile.PL.tv 2018-09-21 10:32:09.165570705 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Makefile.PL 2018-09-21 10:45:39.096591301 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,7 +106,7 @@ REASON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We also store the list of available functions in a file for skipping the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # corresponding tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my @funcs = have_functions(find_functions());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$options{DEFINE} .= cpp_defines(@funcs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$options{DEFINE} .= cpp_defines(@funcs). "-DHAVE_PCAP_SETSAMPLING";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- open(FUNCS, '>funcs.txt') or warn "warning: can't write 'funcs.txt': $!\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print FUNCS join("\n", @funcs), "\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(FUNCS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -up ./Pcap.xs.tv ./Pcap.xs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -up ./stubs.inc.tv ./stubs.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./stubs.inc.tv 2018-09-21 10:30:08.653034412 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./stubs.inc 2018-09-21 10:46:41.339897943 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -354,11 +354,6 @@ int pcap_parsesrcstr(const char *source,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma message( "Warning: the function pcap_open() is not available" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--struct pcap_rmtauth {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *username;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *password;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcap_t * pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcap_t * pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *err) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -511,6 +511,7 @@ HANDLE pcap_getevent(pcap_t *p) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma message( "Warning: the function pcap_setsampling() is not available" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct pcap_samp {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int method;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -522,6 +523,7 @@ struct pcap_samp *pcap_setsampling(pcap_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span></pre><pre style='margin:0'>
</pre>