perl/perl-Net-Pcap: Updated for version 0.18.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 19 insertions, 51 deletions

diff --git a/perl/perl-Net-Pcap/makefile.patch b/perl/perl-Net-Pcap/makefile.patch
deleted file mode 100644
index 4825457cde0a3..0000000000000
--- a/perl/perl-Net-Pcap/makefile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up Net-Pcap-0.17/Makefile.PL.orig Net-Pcap-0.17/Makefile.PL
---- Net-Pcap-0.17/Makefile.PL.orig	2013-03-15 21:00:34.000000000 -0600
-+++ Net-Pcap-0.17/Makefile.PL	2013-03-15 21:00:47.000000000 -0600
-@@ -63,39 +63,6 @@ Or get and install the WinPcap developer
-         - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- REASON
- 
--} else { # other systems (Unix)
--    warn <<"REASON" and exit unless have_library('pcap');
--        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--You appear to lack the pcap(3) library. \a
--
--If it is installed in a non-standard location, please try setting the LIBS 
--and INC values on the command line.
--
--Or get the sources and install the pcap library from http://www.tcpdump.org/
--
--If you install the pcap library using a system package, make sure to also 
--install the corresponding -devel package, which contains the C headers needed 
--to compile this module. 
--        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--REASON
--
--    warn <<"REASON" unless have_library('pcap', 'pcap_lib_version');
--        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--You appear to have an old version of the pcap library. \a
--
--This module need a recent version of the pcap library in order to provide 
--access to all its features. You can still compile it with your old pcap 
--library but some functions won't be available, and trying to use them in 
--Perl programs will generate errors. Programs only using the old functions 
--should perform as previously. If not, don't hesitate to fill a bug. 
--
--You can get the latest sources of the pcap library at http://www.tcpdump.org/
--
--If you install the pcap library using a system package, make sure to also 
--install the corresponding -devel package, which contains the C headers needed 
--to compile this module. 
--        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--REASON
- }
- 
- # Now trying to detect which functions are actually available. 
diff --git a/perl/perl-Net-Pcap/pcapapi.patch b/perl/perl-Net-Pcap/pcapapi.patch
new file mode 100644
index 0000000000000..0ac25c320130a
--- /dev/null
+++ b/perl/perl-Net-Pcap/pcapapi.patch
@@ -0,0 +1,11 @@
+diff -up Net-Pcap-0.18/Makefile.PL.orig Net-Pcap-0.18/Makefile.PL
+--- Net-Pcap-0.18/Makefile.PL.orig	2019-06-13 00:50:15.000000000 -0600
++++ Net-Pcap-0.18/Makefile.PL	2019-06-13 01:00:15.000000000 -0600
+@@ -107,6 +107,7 @@ REASON
+ # corresponding tests. 
+ my @funcs = have_functions(find_functions());
+ $options{DEFINE} .= cpp_defines(@funcs);
++$options{DEFINE} .= " -DPCAP_API=\"\" -DHAVE_PCAP_OPEN -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 --git a/perl/perl-Net-Pcap/perl-Net-Pcap.SlackBuild b/perl/perl-Net-Pcap/perl-Net-Pcap.SlackBuild
index 7004a0b6dc915..70288baf55ad6 100644
--- a/perl/perl-Net-Pcap/perl-Net-Pcap.SlackBuild
+++ b/perl/perl-Net-Pcap/perl-Net-Pcap.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Net-Pcap
-VERSION=${VERSION:-0.17}
+VERSION=${VERSION:-0.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -32,7 +32,7 @@ DOCS="README"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,8 +72,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/makefile.patch
 patch -p1 < $CWD/listdatalinks.patch
+patch -p1 < $CWD/pcapapi.patch
 
 PERL_MM_USE_DEFAULT=1 perl Makefile.PL \
   PREFIX=/usr \
diff --git a/perl/perl-Net-Pcap/perl-Net-Pcap.info b/perl/perl-Net-Pcap/perl-Net-Pcap.info
index 5e2e21439ce1f..fa0a7844527d7 100644
--- a/perl/perl-Net-Pcap/perl-Net-Pcap.info
+++ b/perl/perl-Net-Pcap/perl-Net-Pcap.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Net-Pcap"
-VERSION="0.17"
+VERSION="0.18"
 HOMEPAGE="https://metacpan.org/pod/Net::Pcap"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SA/SAPER/Net-Pcap-0.17.tar.gz"
-MD5SUM="fbe911ba5f57d5ba43494434ffb828a0"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SA/SAPER/Net-Pcap-0.18.tar.gz"
+MD5SUM="18d7298dca72b53271d68646c34b6a39"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-IO-Interface"