uppkg

4 files changed, 31 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f9e233f4183..b1d768eae527 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = perl-net-pcap
 	pkgdesc = Perl/CPAN Module Net::Pcap
-	pkgver = 0.17
-	pkgrel = 8
+	pkgver = 0.18
+	pkgrel = 1
 	url = https://metacpan.org/release/Net-Pcap
 	arch = i686
 	arch = x86_64
@@ -10,12 +10,12 @@ pkgbase = perl-net-pcap
 	depends = perl
 	depends = libpcap
 	options = !emptydirs
-	source = http://cpan.metacpan.org/authors/id/S/SA/SAPER/Net-Pcap-0.17.tar.gz
+	source = http://cpan.metacpan.org/authors/id/S/SA/SAPER/Net-Pcap-0.18.tar.gz
 	source = makefile.patch
 	source = listdatalinks.patch
-	md5sums = fbe911ba5f57d5ba43494434ffb828a0
-	md5sums = 5e96f92128b562f66ba092d23700f6c1
-	md5sums = c6781cc15f79672b91fe3be96cb43c3d
+	md5sums = 18d7298dca72b53271d68646c34b6a39
+	md5sums = 9a8647b3eaacfed4a0d49cd74f20f8b7
+	md5sums = 8c982b3e323f67cc718d9bffc7843548
 
 pkgname = perl-net-pcap
 
diff --git a/PKGBUILD b/PKGBUILD
index 7086615eeba7..329eca9635f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 pkgname=perl-net-pcap
 _realname=Net-Pcap
-pkgver=0.17
-pkgrel=8
+pkgver=0.18
+pkgrel=1
 pkgdesc="Perl/CPAN Module Net::Pcap"
 arch=("i686" "x86_64")
 url="https://metacpan.org/release/$_realname"
@@ -12,15 +12,18 @@ source=("http://cpan.metacpan.org/authors/id/S/SA/SAPER/$_realname-$pkgver.tar.g
 	makefile.patch
 	listdatalinks.patch)
 depends=('perl' 'libpcap')
-md5sums=('fbe911ba5f57d5ba43494434ffb828a0'
-         '5e96f92128b562f66ba092d23700f6c1'
-         'c6781cc15f79672b91fe3be96cb43c3d')
+md5sums=('18d7298dca72b53271d68646c34b6a39'
+         '9a8647b3eaacfed4a0d49cd74f20f8b7'
+         '8c982b3e323f67cc718d9bffc7843548')
 
-build() {
-  cd $srcdir/$_realname-$pkgver
-  patch -p1 <../makefile.patch
-  patch -p1 <../listdatalinks.patch
+prepare() {
+  cd $_realname-$pkgver
+  patch -Np2 -b -z .orig <../makefile.patch
+  patch -Np2 -b -z .orig <../listdatalinks.patch
+}
 
+build() {
+  cd $_realname-$pkgver
   # install module in vendor directories.
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
@@ -35,7 +38,7 @@ fi
 # template end;
 }
 package() {
-  cd $srcdir/$_realname-$pkgver
+  cd $_realname-$pkgver
 
   make PERL_MM_USE_DEFAULT=1 DESTDIR="$pkgdir/" install
 
diff --git a/listdatalinks.patch b/listdatalinks.patch
index a0f22c32c35d..3c7613c19176 100644
--- a/listdatalinks.patch
+++ b/listdatalinks.patch
@@ -1,7 +1,7 @@
-diff -up Net-Pcap-0.17/Pcap.pm.orig Net-Pcap-0.17/Pcap.pm
---- Net-Pcap-0.17/Pcap.pm.orig	2013-03-15 23:19:38.000000000 -0600
-+++ Net-Pcap-0.17/Pcap.pm	2013-03-15 23:21:32.000000000 -0600
-@@ -704,6 +704,10 @@ Close the savefile associated with the d
+diff -up src/Net-Pcap-0.18/Pcap.pm.orig src/Net-Pcap-0.18/Pcap.pm
+--- src/Net-Pcap-0.18/Pcap.pm.orig	2016-05-15 07:24:03.000000000 -0600
++++ src/Net-Pcap-0.18/Pcap.pm	2018-02-20 21:56:00.000000000 -0700
+@@ -714,6 +714,10 @@ Close the savefile associated with the d
  
  =over
  
diff --git a/makefile.patch b/makefile.patch
index 4825457cde0a..dec360a9d2dc 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,12 +1,13 @@
-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
+diff -up src/Net-Pcap-0.18/Makefile.PL.orig src/Net-Pcap-0.18/Makefile.PL
+--- src/Net-Pcap-0.18/Makefile.PL.orig	2016-05-09 15:23:13.000000000 -0600
++++ src/Net-Pcap-0.18/Makefile.PL	2018-02-20 21:56:00.000000000 -0700
+@@ -62,40 +62,6 @@ Or get and install the WinPcap developer
+   http://www.winpcap.org/install/
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  REASON
- 
+-
 -} else { # other systems (Unix)
--    warn <<"REASON" and exit unless have_library('pcap');
+-    die <<"REASON" unless have_library('pcap');
 -        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -You appear to lack the pcap(3) library. \a
 -
@@ -21,7 +22,7 @@ diff -up Net-Pcap-0.17/Makefile.PL.orig Net-Pcap-0.17/Makefile.PL
 -        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -REASON
 -
--    warn <<"REASON" unless have_library('pcap', 'pcap_lib_version');
+-    die <<"REASON" unless have_library('pcap', 'pcap_lib_version');
 -        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -You appear to have an old version of the pcap library. \a
 -