r4897 - in /packages/libnet-arp-perl/trunk/debian: changelog
patches/00list patches/10alignment-and-headers.dpatch
patches/20skip_send_packet_test.dpatch
gwolf at users.alioth.debian.org
gwolf at users.alioth.debian.org
Wed Feb 28 02:09:45 CET 2007
Author: gwolf
Date: Wed Feb 28 02:09:45 2007
New Revision: 4897
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=4897
Log:
Updated Niko's patch as upstream reindented the code :-/ Added a minor
patch to skip some tests
Added:
packages/libnet-arp-perl/trunk/debian/patches/20skip_send_packet_test.dpatch (with props)
Modified:
packages/libnet-arp-perl/trunk/debian/changelog
packages/libnet-arp-perl/trunk/debian/patches/00list
packages/libnet-arp-perl/trunk/debian/patches/10alignment-and-headers.dpatch
Modified: packages/libnet-arp-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libnet-arp-perl/trunk/debian/changelog?rev=4897&op=diff
==============================================================================
--- packages/libnet-arp-perl/trunk/debian/changelog (original)
+++ packages/libnet-arp-perl/trunk/debian/changelog Wed Feb 28 02:09:45 2007
@@ -2,8 +2,10 @@
* New upstream release
* Now recommends libnet-pcap-perl
+ * Skips one of the tests, which requires real root access (and caused
+ an ugly FTBFS)
- -- Gunnar Wolf <gwolf at debian.org> Fri, 23 Feb 2007 19:57:09 -0600
+ -- Gunnar Wolf <gwolf at debian.org> Tue, 27 Feb 2007 19:04:50 -0600
libnet-arp-perl (0.8-2) unstable; urgency=low
Modified: packages/libnet-arp-perl/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libnet-arp-perl/trunk/debian/patches/00list?rev=4897&op=diff
==============================================================================
--- packages/libnet-arp-perl/trunk/debian/patches/00list (original)
+++ packages/libnet-arp-perl/trunk/debian/patches/00list Wed Feb 28 02:09:45 2007
@@ -1,1 +1,2 @@
10alignment-and-headers.dpatch
+20skip_send_packet_test
Modified: packages/libnet-arp-perl/trunk/debian/patches/10alignment-and-headers.dpatch
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libnet-arp-perl/trunk/debian/patches/10alignment-and-headers.dpatch?rev=4897&op=diff
==============================================================================
--- packages/libnet-arp-perl/trunk/debian/patches/10alignment-and-headers.dpatch (original)
+++ packages/libnet-arp-perl/trunk/debian/patches/10alignment-and-headers.dpatch Wed Feb 28 02:09:45 2007
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad trunk~/ARP.xs trunk/ARP.xs
---- trunk~/ARP.xs 2006-10-05 21:34:38.000000000 +0300
-+++ trunk/ARP.xs 2006-10-05 21:38:40.522608147 +0300
+--- trunk~/ARP.xs 2007-02-27 18:20:04.000000000 -0600
++++ trunk/ARP.xs 2007-02-27 18:24:21.000000000 -0600
@@ -27,6 +27,7 @@
#include <string.h>
#include <errno.h>
@@ -30,28 +30,30 @@
u_short op;
+ in_addr_t ipaddr;
- // Are you root?
- uid = getuid();
-@@ -128,12 +130,14 @@
- arp->pa_len = IP_ALEN; // Protocol address length
- arp->opcode = htons(op); // ARP operation
- memcpy(arp->source_add,(u_char *)ether_aton(smac),ETH_ALEN); // Source MAC
-- *(u_long *)arp->source_ip = inet_addr(sip); // Source IP
-+ ipaddr = inet_addr(sip);
-+ memcpy(arp->source_ip, (u_char *)&ipaddr, IP_ALEN); // Source IP
+ RETVAL = 1;
- if(strcmp(dmac,"ff:ff:ff:ff:ff:ff"))
- memcpy(arp->dest_add,(u_char *)ether_aton(dmac),ETH_ALEN); // Destination MAC
+@@ -158,12 +160,15 @@
+ arp->pa_len = IP_ALEN; // Protocol address length
+ arp->opcode = htons(op); // ARP operation
+ memcpy(arp->source_add,(u_char *)ether_aton(smac),ETH_ALEN); // Source MAC
+- *(u_long *)arp->source_ip = inet_addr(sip); // Source IP
++ ipaddr = inet_addr(sip);
++ memcpy(arp->source_ip, (u_char *)&ipaddr, IP_ALEN); // Source IP
-- *(u_long *)arp->dest_ip = inet_addr(dip); // Destination IP
-+ ipaddr = inet_addr(dip);
-+ memcpy(arp->dest_ip, (u_char *)&ipaddr, IP_ALEN); // Destination IP
+ if(strcmp(dmac,"ff:ff:ff:ff:ff:ff"))
+- memcpy(arp->dest_add,(u_char *)ether_aton(dmac),ETH_ALEN); // Destination MAC
++ memcpy(arp->dest_add,(u_char *)ether_aton(dmac),ETH_ALEN); // Destination MAC
++
++ ipaddr = inet_addr(dip);
++ memcpy(arp->dest_ip, (u_char *)&ipaddr, IP_ALEN); // Destination IP
+
+- *(u_long *)arp->dest_ip = inet_addr(dip); // Destination IP
- // Run packet!! Run!
+ // Run packet!! Run!
diff -urNad trunk~/arp.h trunk/arp.h
---- trunk~/arp.h 2006-10-05 21:34:38.000000000 +0300
-+++ trunk/arp.h 2006-10-05 21:38:40.522608147 +0300
+--- trunk~/arp.h 2007-02-27 18:20:04.000000000 -0600
++++ trunk/arp.h 2007-02-27 18:21:22.000000000 -0600
@@ -43,7 +43,7 @@
#define IP_ALEN 4
@@ -62,8 +64,8 @@
u_short proto_type; // protocol type
u_char ha_len; // hardware address len
diff -urNad trunk~/arp_lookup_linux.c trunk/arp_lookup_linux.c
---- trunk~/arp_lookup_linux.c 2006-10-05 21:34:38.000000000 +0300
-+++ trunk/arp_lookup_linux.c 2006-10-05 21:38:40.522608147 +0300
+--- trunk~/arp_lookup_linux.c 2007-02-27 18:20:04.000000000 -0600
++++ trunk/arp_lookup_linux.c 2007-02-27 18:21:22.000000000 -0600
@@ -19,6 +19,7 @@
*/
@@ -73,10 +75,10 @@
#define _PATH_PROCNET_ARP "/proc/net/arp"
diff -urNad trunk~/get_mac_linux.c trunk/get_mac_linux.c
---- trunk~/get_mac_linux.c 2006-10-05 21:34:38.000000000 +0300
-+++ trunk/get_mac_linux.c 2006-10-05 21:38:40.523607976 +0300
-@@ -20,6 +20,9 @@
-
+--- trunk~/get_mac_linux.c 2007-02-27 18:20:04.000000000 -0600
++++ trunk/get_mac_linux.c 2007-02-27 18:21:22.000000000 -0600
+@@ -23,6 +23,9 @@
+ #include <stdlib.h>
#include <sys/ioctl.h>
#include <net/ethernet.h>
+#include <string.h>
@@ -86,10 +88,10 @@
int get_mac_linux(u_char *dev, char *mac)
diff -urNad trunk~/send_packet_linux.c trunk/send_packet_linux.c
---- trunk~/send_packet_linux.c 2006-10-05 21:34:38.000000000 +0300
-+++ trunk/send_packet_linux.c 2006-10-05 21:38:40.523607976 +0300
-@@ -20,6 +20,9 @@
-
+--- trunk~/send_packet_linux.c 2007-02-27 18:20:04.000000000 -0600
++++ trunk/send_packet_linux.c 2007-02-27 18:21:22.000000000 -0600
+@@ -22,6 +22,9 @@
+ #include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <string.h>
Added: packages/libnet-arp-perl/trunk/debian/patches/20skip_send_packet_test.dpatch
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libnet-arp-perl/trunk/debian/patches/20skip_send_packet_test.dpatch?rev=4897&op=file
==============================================================================
--- packages/libnet-arp-perl/trunk/debian/patches/20skip_send_packet_test.dpatch (added)
+++ packages/libnet-arp-perl/trunk/debian/patches/20skip_send_packet_test.dpatch Wed Feb 28 02:09:45 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20skip_send_packet_test.dpatch by <gwolf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/t/send_packet.t trunk/t/send_packet.t
+--- trunk~/t/send_packet.t 2007-02-23 19:51:20.000000000 -0600
++++ trunk/t/send_packet.t 2007-02-27 19:02:11.000000000 -0600
+@@ -5,7 +5,7 @@
+ # Last update: 31.01.2007
+
+ use Net::ARP;
+-use Test::More qw( no_plan );
++use Test::More skip_all => 'Requires real root privileges to build';
+
+ BEGIN
+ {
Propchange: packages/libnet-arp-perl/trunk/debian/patches/20skip_send_packet_test.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-perl-cvs-commits
mailing list