gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/wakeonlan: remove unused patch

Browse Source 
Closes: https://github.com/gentoo/gentoo/pull/19523
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
2021-02-18 17:59:47 +01:00
committed by Conrad Kostecki
parent a4f1ba8ad5
commit c8f73f4f31
1 changed files with 0 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup.patch
View File

@@ -1,90 +0,0 @@
--- wakeonlan-0.41.orig/wakeonlan
+++ wakeonlan-0.41/wakeonlan
@@ -5,6 +5,7 @@
#########################################################################
use strict;
+use Net::hostent;
use Socket;
use Getopt::Std;
use vars qw($VERSION $opt_v $opt_h $opt_i $opt_p $opt_f);
@@ -44,19 +45,64 @@
sub wake
{
- my $hwaddr = shift;
+ my $host = shift;
my $ipaddr = shift || $DEFAULT_IP;
my $port = shift || $DEFAULT_PORT;
my ($raddr, $them, $proto);
- my ($hwaddr_re, $pkt);
+ my ($hwaddr, $hwaddr_re, $pkt);
- # Validate hardware address (ethernet address)
+ # get the hardware address (ethernet address)
$hwaddr_re = join(':', ('[0-9A-Fa-f]{1,2}') x 6);
- if ($hwaddr !~ m/^$hwaddr_re$/) {
- warn "Invalid hardware address: $hwaddr\n";
- return undef;
+ if ($host =~ m/^$hwaddr_re$/) {
+ $hwaddr = $host;
+ } else {
+ # $host is not a hardware address, try to resolve it
+ my $ip_re = join('\.', ('([0-9]|[1-9][0-9]|1[0-9]{2}|2([0-4][0-9]|5[0-5]))') x 4);
+ my $ip_addr;
+ if ($host =~ m/^$ip_re$/) {
+ $ip_addr = $host;
+ } else {
+ my $h;
+ unless ($h = gethost($host)) {
+ warn "$host is not a hardware address and I could not resolve it as to an IP address.\n";
+ return undef;
+ }
+ $ip_addr = inet_ntoa($h->addr);
+ }
+ # look up ip in /etc/ethers
+ unless (open (ETHERS, '<', '/etc/ethers')) {
+ warn "$host is not a hardware address and I could not open /etc/ethers.\n";
+ return undef;
+ }
+ while (<ETHERS>) {
+ if (($_ !~ m/^$/) && ($_ !~ m/^#/)) { # ignore comments
+ my ($mac, $ip);
+ ($mac, $ip) = split(' ', $_, 3);
+ if ($ip =~ m/^$ip$/) {
+ if ($ip eq $ip_addr) {
+ $hwaddr = $mac;
+ last;
+ }
+ next;
+ } else {
+ my $h2;
+ unless ($h2 = gethost($ip)) {
+ next;
+ }
+ if (inet_ntoa($h2->addr) eq $ip_addr) {
+ $hwaddr = $mac;
+ last;
+ }
+ }
+ }
+ }
+ close (ETHERS);
+ unless (defined($hwaddr)) {
+ warn "Could not find $host in /etc/ethers\n";
+ return undef;
+ }
}
# Generate magic sequence
@@ -68,7 +114,7 @@
# Allocate socket and send packet
- $raddr = gethostbyname($ipaddr);
+ $raddr = gethostbyname($ipaddr)->addr;
$them = pack_sockaddr_in($port, $raddr);
$proto = getprotobyname('udp');