diff --git a/net/p5-Net-DHCP/Makefile b/net/p5-Net-DHCP/Makefile index 65b6dfea86f..60de98383ce 100644 --- a/net/p5-Net-DHCP/Makefile +++ b/net/p5-Net-DHCP/Makefile @@ -1,7 +1,8 @@ COMMENT = object methods to create a DHCP packet -DISTNAME = Net-DHCP-0.7 -PKGNAME = p5-Net-DHCP-0.700 +DISTNAME = Net-DHCP-0.9 +PKGNAME = p5-Net-DHCP-0.900 +CPAN_AUTHOR = DJZORT CATEGORIES = net @@ -14,6 +15,7 @@ PERMIT_PACKAGE = Yes MODULES = cpan BUILD_DEPENDS = devel/p5-Module-Build>=0.28 +RUN_DEPENDS = devel/p5-Ref-Util TEST_DEPENDS = devel/p5-Test-Requires \ devel/p5-Test-Warn \ net/p5-Net-Frame-Dump \ @@ -23,6 +25,6 @@ CONFIGURE_STYLE = modbuild PKG_ARCH = * -MODCPAN_EXAMPLES = Yes +MODCPAN_EXAMPLES = Yes .include diff --git a/net/p5-Net-DHCP/distinfo b/net/p5-Net-DHCP/distinfo index b1c2934c963..45bce41616a 100644 --- a/net/p5-Net-DHCP/distinfo +++ b/net/p5-Net-DHCP/distinfo @@ -1,2 +1,2 @@ -SHA256 (Net-DHCP-0.7.tar.gz) = UyI0eteIQT1459QhGkFL/vP782hvMY2R5aI4gXZaxHQ= -SIZE (Net-DHCP-0.7.tar.gz) = 52938 +SHA256 (Net-DHCP-0.9.tar.gz) = dlfk21sGEcE8GjoIdiLpP/s2XOMeexw0MqG1dXnh0xY= +SIZE (Net-DHCP-0.9.tar.gz) = 88472 diff --git a/net/p5-Net-DHCP/patches/patch-t_102-discover-offer-request-ack_t b/net/p5-Net-DHCP/patches/patch-t_102-discover-offer-request-ack_t index 5c742be4e44..01443662f4c 100644 --- a/net/p5-Net-DHCP/patches/patch-t_102-discover-offer-request-ack_t +++ b/net/p5-Net-DHCP/patches/patch-t_102-discover-offer-request-ack_t @@ -3,18 +3,12 @@ Net::Frame::Simple has a long dependency chain, avoid porting, skip tests Index: t/102-discover-offer-request-ack.t --- t/102-discover-offer-request-ack.t.orig +++ t/102-discover-offer-request-ack.t -@@ -6,11 +6,11 @@ use FindBin; - - use strict; +@@ -5,6 +5,8 @@ use Test::More tests => 6; + use Test::Warn qw( warning_like ); + use FindBin (); +use Test::Requires qw(Net::Frame::Simple); -+use Net::Frame::Dump::Offline; + BEGIN { use_ok('Net::DHCP::Packet'); } - BEGIN { use_ok('Net::DHCP::Constants', ':htype_codes', ':dhcp_message',':dhcp_hashes' ); } -- --use Net::Frame::Simple; --use Net::Frame::Dump::Offline; - - my @data; + BEGIN { use_ok('Net::DHCP::Constants', ':bootp_codes', ':htype_codes', ':dhcp_message',':dhcp_hashes' ); } diff --git a/net/p5-Net-DHCP/patches/patch-t_103-real-nak_t b/net/p5-Net-DHCP/patches/patch-t_103-real-nak_t index 7866fbc0a2c..540ac969938 100644 --- a/net/p5-Net-DHCP/patches/patch-t_103-real-nak_t +++ b/net/p5-Net-DHCP/patches/patch-t_103-real-nak_t @@ -3,18 +3,12 @@ Net::Frame::Simple has a long dependency chain, avoid porting, skip tests Index: t/103-real-nak.t --- t/103-real-nak.t.orig +++ t/103-real-nak.t -@@ -6,11 +6,11 @@ use FindBin; - - use strict; +@@ -5,6 +5,8 @@ use Test::More tests => 21; + use Test::Warn qw( warning_like ); + use FindBin (); +use Test::Requires qw(Net::Frame::Simple); -+use Net::Frame::Dump::Offline; + BEGIN { use_ok('Net::DHCP::Packet'); } - BEGIN { use_ok('Net::DHCP::Constants'); } -- --use Net::Frame::Simple; --use Net::Frame::Dump::Offline; + BEGIN { use_ok('Net::DHCP::Constants', ':bootp_codes'); } - my %values = ( - htype => 0, diff --git a/net/p5-Net-DHCP/patches/patch-t_104-offer-o90-o120_t b/net/p5-Net-DHCP/patches/patch-t_104-offer-o90-o120_t index 38e99943314..5421eeae2a7 100644 --- a/net/p5-Net-DHCP/patches/patch-t_104-offer-o90-o120_t +++ b/net/p5-Net-DHCP/patches/patch-t_104-offer-o90-o120_t @@ -3,18 +3,12 @@ Net::Frame::Simple has a long dependency chain, avoid porting, skip tests Index: t/104-offer-o90-o120.t --- t/104-offer-o90-o120.t.orig +++ t/104-offer-o90-o120.t -@@ -6,11 +6,11 @@ use FindBin; - - use strict; +@@ -4,6 +4,8 @@ use warnings; + use Test::More tests => 3; + use FindBin (); +use Test::Requires qw(Net::Frame::Simple); -+use Net::Frame::Dump::Offline; + BEGIN { use_ok('Net::DHCP::Packet'); } - BEGIN { use_ok('Net::DHCP::Constants'); } -- --use Net::Frame::Simple; --use Net::Frame::Dump::Offline; + BEGIN { use_ok('Net::DHCP::Constants', ':bootp_codes'); } - my %values = ( - htype => 1, diff --git a/net/p5-Net-DHCP/patches/patch-t_105-discover-offer-o122-o82_t b/net/p5-Net-DHCP/patches/patch-t_105-discover-offer-o122-o82_t index a1dda130e42..a112c9b9680 100644 --- a/net/p5-Net-DHCP/patches/patch-t_105-discover-offer-o122-o82_t +++ b/net/p5-Net-DHCP/patches/patch-t_105-discover-offer-o122-o82_t @@ -3,18 +3,12 @@ Net::Frame::Simple has a long dependency chain, avoid porting, skip tests Index: t/105-discover-offer-o122-o82.t --- t/105-discover-offer-o122-o82.t.orig +++ t/105-discover-offer-o122-o82.t -@@ -6,11 +6,11 @@ use FindBin; - - use strict; +@@ -4,6 +4,8 @@ use warnings; + use Test::More tests => 4; + use FindBin (); +use Test::Requires qw(Net::Frame::Simple); -+use Net::Frame::Dump::Offline; + BEGIN { use_ok('Net::DHCP::Packet'); } - BEGIN { use_ok('Net::DHCP::Constants'); } -- --use Net::Frame::Simple; --use Net::Frame::Dump::Offline; - - my @data; + BEGIN { use_ok('Net::DHCP::Constants', ':bootp_codes'); } diff --git a/net/p5-Net-DHCP/patches/patch-t_106-discover-offer-o60-o43-o82_t b/net/p5-Net-DHCP/patches/patch-t_106-discover-offer-o60-o43-o82_t index ea3796611c7..2d199594440 100644 --- a/net/p5-Net-DHCP/patches/patch-t_106-discover-offer-o60-o43-o82_t +++ b/net/p5-Net-DHCP/patches/patch-t_106-discover-offer-o60-o43-o82_t @@ -3,18 +3,12 @@ Net::Frame::Simple has a long dependency chain, avoid porting, skip tests Index: t/106-discover-offer-o60-o43-o82.t --- t/106-discover-offer-o60-o43-o82.t.orig +++ t/106-discover-offer-o60-o43-o82.t -@@ -6,11 +6,11 @@ use FindBin; - - use strict; +@@ -4,6 +4,8 @@ use warnings; + use Test::More tests => 4; + use FindBin (); +use Test::Requires qw(Net::Frame::Simple); -+use Net::Frame::Dump::Offline; + BEGIN { use_ok('Net::DHCP::Packet'); } - BEGIN { use_ok('Net::DHCP::Constants'); } -- --use Net::Frame::Simple; --use Net::Frame::Dump::Offline; - - my @data; + BEGIN { use_ok('Net::DHCP::Constants', ':bootp_codes'); } diff --git a/net/p5-Net-DHCP/patches/patch-t_107-query-active-qry-unass-qry-unk_t b/net/p5-Net-DHCP/patches/patch-t_107-query-active-qry-unass-qry-unk_t index b6e6077b66d..25880a0268e 100644 --- a/net/p5-Net-DHCP/patches/patch-t_107-query-active-qry-unass-qry-unk_t +++ b/net/p5-Net-DHCP/patches/patch-t_107-query-active-qry-unass-qry-unk_t @@ -3,18 +3,12 @@ Net::Frame::Simple has a long dependency chain, avoid porting, skip tests Index: t/107-query-active-qry-unass-qry-unk.t --- t/107-query-active-qry-unass-qry-unk.t.orig +++ t/107-query-active-qry-unass-qry-unk.t -@@ -6,11 +6,11 @@ use FindBin; - - use strict; +@@ -5,6 +5,8 @@ use Test::More tests => 8; + use Test::Warn qw( warning_like ); + use FindBin (); +use Test::Requires qw(Net::Frame::Simple); -+use Net::Frame::Dump::Offline; + BEGIN { use_ok('Net::DHCP::Packet'); } - BEGIN { use_ok('Net::DHCP::Constants'); } -- --use Net::Frame::Simple; --use Net::Frame::Dump::Offline; - - my @data; + BEGIN { use_ok('Net::DHCP::Constants', ':bootp_codes'); } diff --git a/net/p5-Net-DHCP/patches/patch-t_108-discover-offer-o12-o55-o61_t b/net/p5-Net-DHCP/patches/patch-t_108-discover-offer-o12-o55-o61_t new file mode 100644 index 00000000000..f62ef7e756b --- /dev/null +++ b/net/p5-Net-DHCP/patches/patch-t_108-discover-offer-o12-o55-o61_t @@ -0,0 +1,14 @@ +Net::Frame::Simple has a long dependency chain, avoid porting, skip tests + +Index: t/108-discover-offer-o12-o55-o61.t +--- t/108-discover-offer-o12-o55-o61.t.orig ++++ t/108-discover-offer-o12-o55-o61.t +@@ -4,6 +4,8 @@ use warnings; + use Test::More tests => 6; + use FindBin (); + ++use Test::Requires qw(Net::Frame::Simple); ++ + BEGIN { use_ok('Net::DHCP::Packet'); } + BEGIN { use_ok('Net::DHCP::Constants', ':bootp_codes'); } + diff --git a/net/p5-Net-DHCP/patches/patch-t_109-dhcpfo-inform-release-o77_t b/net/p5-Net-DHCP/patches/patch-t_109-dhcpfo-inform-release-o77_t new file mode 100644 index 00000000000..91d3b624fe4 --- /dev/null +++ b/net/p5-Net-DHCP/patches/patch-t_109-dhcpfo-inform-release-o77_t @@ -0,0 +1,14 @@ +Net::Frame::Simple has a long dependency chain, avoid porting, skip tests + +Index: t/109-dhcpfo-inform-release-o77.t +--- t/109-dhcpfo-inform-release-o77.t.orig ++++ t/109-dhcpfo-inform-release-o77.t +@@ -4,6 +4,8 @@ use warnings; + use Test::More tests => 6; + use FindBin (); + ++use Test::Requires qw(Net::Frame::Simple); ++ + BEGIN { use_ok('Net::DHCP::Packet'); } + BEGIN { use_ok('Net::DHCP::Constants', ':bootp_codes'); } + diff --git a/net/p5-Net-DHCP/pkg/PLIST b/net/p5-Net-DHCP/pkg/PLIST index 9932aa7283b..7bcd868fd12 100644 --- a/net/p5-Net-DHCP/pkg/PLIST +++ b/net/p5-Net-DHCP/pkg/PLIST @@ -18,7 +18,7 @@ share/examples/p5-Net-DHCP/dhcp_sniffer.pl share/examples/p5-Net-DHCP/dhcpd.pl share/examples/p5-Net-DHCP/dhcpd_test.pl share/examples/p5-Net-DHCP/dumpianatoxml.pl -share/examples/p5-Net-DHCP/l2tp-dhcp-inform +share/examples/p5-Net-DHCP/l2tp-dhcp-inform.pl share/examples/p5-Net-DHCP/lease_query.pl share/examples/p5-Net-DHCP/list_dho.pl share/examples/p5-Net-DHCP/send_packet.pl