r12261 - in /trunk/libnet-arp-perl: Changes debian/changelog debian/control debian/copyright debian/rules debian/watch get_mac_bsd.c send_packet_bsd.c
ghostbar-guest at users.alioth.debian.org
ghostbar-guest at users.alioth.debian.org
Wed Jan 9 02:21:24 UTC 2008
Author: ghostbar-guest
Date: Wed Jan 9 02:21:23 2008
New Revision: 12261
URL: http://svn.debian.org/wsvn/?sc=1&rev=12261
Log:
new upstream release (ready to be uploaded)
debian/rules: touch $@ instead of touch *-stamp
debian/copyright: fixed formatting and added copyright note
debian/watch: now is dist-based
Modified:
trunk/libnet-arp-perl/Changes
trunk/libnet-arp-perl/debian/changelog
trunk/libnet-arp-perl/debian/control
trunk/libnet-arp-perl/debian/copyright
trunk/libnet-arp-perl/debian/rules
trunk/libnet-arp-perl/debian/watch
trunk/libnet-arp-perl/get_mac_bsd.c
trunk/libnet-arp-perl/send_packet_bsd.c
Modified: trunk/libnet-arp-perl/Changes
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/Changes?rev=12261&op=diff
==============================================================================
--- trunk/libnet-arp-perl/Changes (original)
+++ trunk/libnet-arp-perl/Changes Wed Jan 9 02:21:23 2008
@@ -1,3 +1,9 @@
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+Changes between 1.0.1 and 1.0.2
+
+FreeBSD 7 bugfixes by Niels Bakker
+
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Changes between 1.0 and 1.0.1
Modified: trunk/libnet-arp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/changelog?rev=12261&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/changelog (original)
+++ trunk/libnet-arp-perl/debian/changelog Wed Jan 9 02:21:23 2008
@@ -1,4 +1,4 @@
-libnet-arp-perl (1.0.1-2) UNRELEASED; urgency=low
+libnet-arp-perl (1.0.2-1) unstable; urgency=low
[ gregor herrmann ]
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -8,7 +8,15 @@
[ Damyan Ivanov ]
* [debian/watch] Stop capturing file extension
- -- Damyan Ivanov <dmn at debian.org> Tue, 06 Nov 2007 11:01:24 +0200
+ [ Jose Luis Rivas ]
+ * New upstream release
+ * debian/rules: `touch $@' instead of `touch *-stamp'
+ * debian/copyright:
+ + Fixed formatting.
+ + Added the copyright note missing.
+ * debian/watch: updated to use-dist way.
+
+ -- Jose Luis Rivas <ghostbar38 at gmail.com> Tue, 08 Jan 2008 21:43:49 -0430
libnet-arp-perl (1.0.1-1) unstable; urgency=low
Modified: trunk/libnet-arp-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/control?rev=12261&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/control (original)
+++ trunk/libnet-arp-perl/debian/control Wed Jan 9 02:21:23 2008
@@ -4,7 +4,7 @@
Build-Depends: debhelper (>= 5.0.0), libnet-pcap-perl, perl (>= 5.8.8-6), dpatch (>= 2.0.9)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>, gregor herrmann <gregor+debian at comodo.priv.at>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/Net-ARP/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libnet-arp-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-arp-perl/
Modified: trunk/libnet-arp-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/copyright?rev=12261&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/copyright (original)
+++ trunk/libnet-arp-perl/debian/copyright Wed Jan 9 02:21:23 2008
@@ -8,7 +8,11 @@
Updated versions can be found via the CPAN, at
http://www.cpan.org/modules/by-module/Net
-From ARP.pm:
+Copyright:
+
+ Copyright (C) 2004-2007 by Bastian Ballmann
+
+License:
This library is free software; you can redistribute it and/or
modify it under the same terms as Perl itself, either Perl version
Modified: trunk/libnet-arp-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/rules?rev=12261&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/rules (original)
+++ trunk/libnet-arp-perl/debian/rules Wed Jan 9 02:21:23 2008
@@ -38,7 +38,7 @@
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
- touch build-stamp
+ touch $@
clean: clean-patched unpatch
@@ -66,7 +66,7 @@
# the dirs, we delete them from the deb:
rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/share/perl5
- touch install-stamp
+ touch $@
# Build architecture-independent files here.
binary-indep: build install
Modified: trunk/libnet-arp-perl/debian/watch
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/watch?rev=12261&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/watch (original)
+++ trunk/libnet-arp-perl/debian/watch Wed Jan 9 02:21:23 2008
@@ -1,4 +1,4 @@
# format version number, currently 3; this line is compulsory!
version=3
-http://www.cpan.org/modules/by-module/Net/Net-ARP-(.*).(?:tar.gz|tar|tgz)
+http://search.cpan.org/dist/Net-ARP/ .*/Net-ARP-(.*).(?:tar.gz|tar|tgz)
Modified: trunk/libnet-arp-perl/get_mac_bsd.c
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/get_mac_bsd.c?rev=12261&op=diff
==============================================================================
--- trunk/libnet-arp-perl/get_mac_bsd.c (original)
+++ trunk/libnet-arp-perl/get_mac_bsd.c Wed Jan 9 02:21:23 2008
@@ -5,6 +5,9 @@
Programmed by Bastian Ballmann
Last update: 09.02.2006
+
+Fixed for FreeBSD by Niels Bakker
+Last update: 2007-12-26
This program is free software; you can redistribute
it and/or modify it under the terms of the
@@ -19,13 +22,18 @@
*/
#include <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <ifaddrs.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
+#include <net/ethernet.h>
+
int get_mac_bsd(u_char *dev, char *mac)
{
- struct ifaddrs *iface;
+ struct ifaddrs *iface, *iffirst;
if(strlen(mac) > 0)
strcpy(mac,"unknown");
@@ -35,28 +43,33 @@
if(strlen(dev) == 0)
return -1;
+<<<<<<< .working
strcpy(mac,"unknown");
getifaddrs(&iface);
+=======
+ strcpy(mac,"unknown");
+ if (getifaddrs(&iface))
+ return -1;
+
+ iffirst = iface;
+>>>>>>> .merge-right.r12260
while(iface->ifa_next != NULL)
- {
+ {
if(!strcmp(iface->ifa_name,dev))
{
- if(iface->ifa_addr->sa_family != AF_INET)
+ if (iface->ifa_addr->sa_family == AF_LINK)
{
- sprintf(mac,"%02x:%02x:%02x:%02x:%02x:%02x",
- iface->ifa_addr->sa_data[0] & 0xff,
- iface->ifa_addr->sa_data[1] & 0xff,
- iface->ifa_addr->sa_data[2] & 0xff,
- iface->ifa_addr->sa_data[3] & 0xff,
- iface->ifa_addr->sa_data[4] & 0xff,
- iface->ifa_addr->sa_data[5] & 0xff);
+ struct sockaddr_dl *sdl = (struct sockaddr_dl *) iface->ifa_addr;
+ sprintf(mac, "%s",
+ ether_ntoa((struct ether_addr *)LLADDR(sdl)));
break;
}
}
-
+
iface = iface->ifa_next;
}
+ freeifaddrs(iffirst);
return 0;
}
Modified: trunk/libnet-arp-perl/send_packet_bsd.c
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/send_packet_bsd.c?rev=12261&op=diff
==============================================================================
--- trunk/libnet-arp-perl/send_packet_bsd.c (original)
+++ trunk/libnet-arp-perl/send_packet_bsd.c Wed Jan 9 02:21:23 2008
@@ -29,14 +29,14 @@
int send_packet_bsd(u_char *dev, u_char *packet, u_int packetsize)
{
int bpffd, i;
- char bpfdev[10];
+ char bpfdev[12];
if( (strlen(dev) == 0) ||
(packetsize == 0) )
return 0;
// Open a bpf device
- for(i = 0; i < 9; i++)
+ for(i = 0; i < 512; i++)
{
sprintf(bpfdev,"/dev/bpf%d",i);
if((bpffd = open(bpfdev,O_WRONLY)) > 0)
More information about the Pkg-perl-cvs-commits
mailing list