Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-ARP/files/
Date: Sun, 05 Dec 2021 21:46:05
Message-Id: 1638740714.16687df684f38a9d0e3b49e375951c7f4de3b5ec.conikost@gentoo
1 commit: 16687df684f38a9d0e3b49e375951c7f4de3b5ec
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu Nov 25 16:55:01 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 5 21:45:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16687df6
7
8 dev-perl/Net-ARP: remove unused patch
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 dev-perl/Net-ARP/files/Net-ARP-1.0.9-tests.patch | 117 -----------------------
15 1 file changed, 117 deletions(-)
16
17 diff --git a/dev-perl/Net-ARP/files/Net-ARP-1.0.9-tests.patch b/dev-perl/Net-ARP/files/Net-ARP-1.0.9-tests.patch
18 deleted file mode 100644
19 index 3cd799a629b7..000000000000
20 --- a/dev-perl/Net-ARP/files/Net-ARP-1.0.9-tests.patch
21 +++ /dev/null
22 @@ -1,117 +0,0 @@
23 -From 38c823ef25d78205e24314233ae7a503967b53e9 Mon Sep 17 00:00:00 2001
24 -From: Kent Fredric <kentnl@g.o>
25 -Date: Wed, 13 Dec 2017 22:22:20 +1300
26 -Subject: Guard tests that require network device names and root via ENV
27 -
28 ----
29 - Makefile.PL | 9 ---------
30 - t/arp_lookup.t | 10 ++++++++--
31 - t/send_packet.t | 13 +++++++++++--
32 - test.pl | 23 ++++++++---------------
33 - 4 files changed, 27 insertions(+), 28 deletions(-)
34 -
35 -diff --git a/Makefile.PL b/Makefile.PL
36 -index e1a4ee7..fbfe0b0 100755
37 ---- a/Makefile.PL
38 -+++ b/Makefile.PL
39 -@@ -18,15 +18,6 @@
40 - use ExtUtils::MakeMaker;
41 - use Config;
42 -
43 --BEGIN {
44 -- eval { require Net::Pcap };
45 --
46 -- if($@)
47 -- {
48 -- print "Module Net::Pcap is required for make test!\n";
49 -- }
50 --}
51 --
52 - if($Config{'osname'} =~ /linux/i)
53 - {
54 - $flags = "-DLINUX";
55 -diff --git a/t/arp_lookup.t b/t/arp_lookup.t
56 -index 4cf9626..df68c90 100644
57 ---- a/t/arp_lookup.t
58 -+++ b/t/arp_lookup.t
59 -@@ -13,8 +13,14 @@ ok( $mac eq "unknown", "unkown mac on strange dev value -> $mac" );
60 - $mac = Net::ARP::arp_lookup("$fu","127.0.0.1");
61 - ok( $mac eq "unknown", "unkown mac on strange dev value 2 -> $mac" );
62 -
63 --$mac = Net::ARP::arp_lookup("eth0","this_is_not_an_ip_address");
64 --ok( $mac eq "unknown", "unkown mac on strange ip value -> $mac" );
65 -+SKIP: {
66 -+
67 -+ skip "TEST_ARP_IF unset", 1 unless exists $ENV{TEST_ARP_IF};
68 -+
69 -+ $mac = Net::ARP::arp_lookup($ENV{TEST_ARP_IF},"this_is_not_an_ip_address");
70 -+ ok( $mac eq "unknown", "unkown mac on strange ip value -> $mac" );
71 -+
72 -+}
73 -
74 - #Net::ARP::arp_lookup("eth0","192.168.1.1","fu");
75 - #ok( $mac eq "unknown", "unkown mac on strange mac value" );
76 -diff --git a/t/send_packet.t b/t/send_packet.t
77 -index 1f95f4f..3b4b998 100644
78 ---- a/t/send_packet.t
79 -+++ b/t/send_packet.t
80 -@@ -5,9 +5,18 @@
81 - # Last update: 22.06.2013
82 -
83 - use Net::ARP;
84 --use Test::More qw( no_plan );
85 -+use Test::More;
86 -+BEGIN {
87 -+ if ( $> != 0 ) {
88 -+ plan skip_all => "This test must be run as root";
89 -+ }
90 -+ if ( not exists $ENV{TEST_ARP_IF} ) {
91 -+ plan skip_all => "TEST_ARP_IF not specified";
92 -+ }
93 -+ $dev = $ENV{TEST_ARP_IF};
94 -+ plan qw/no_plan/;
95 -+}
96 -
97 --$dev="lo";
98 - print "Using device $dev to test send_packet()\n";
99 -
100 - $ret = Net::ARP::send_packet("strange_dev", # network interface
101 -diff --git a/test.pl b/test.pl
102 -index 27af515..c2e4cc2 100755
103 ---- a/test.pl
104 -+++ b/test.pl
105 -@@ -19,23 +19,16 @@
106 - use ExtUtils::testlib;
107 - use Net::ARP;
108 -
109 --BEGIN
110 --{
111 -- eval{ require Net::Pcap; };
112 --
113 -- if($@ =~ /^Can\'t\slocate/)
114 -- {
115 -- $dev = "eth0";
116 -- }
117 -- else
118 -- {
119 -- import Net::Pcap;
120 -- $dev = Net::Pcap::lookupdev(\$errbuf);
121 -- }
122 -+if ( $> != 0 ) {
123 -+ print "SKIPPED: test must be run as root\n";
124 -+ exit 0;
125 - }
126 --
127 -+if ( not exists $ENV{TEST_ARP_IF} ) {
128 -+ print "SKIPPED: TEST_ARP_IF unset\n";
129 -+ exit 0;
130 -+}
131 -+$dev = $ENV{TEST_ARP_IF};
132 - print "Sending ARP reply packet via dev $dev... ";
133 --
134 - $ret = Net::ARP::send_packet($dev, # network interface
135 - '127.0.0.1', # source ip
136 - '127.0.0.1', # destination ip
137 ---
138 -2.14.3
139 -