r15086 - in /trunk/libnet-arp-perl/debian: changelog control patches/20skip_send_packet_test.patch rules

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Sun Feb 17 21:36:41 2008
New Revision: 15086

URL: http://svn.debian.org/wsvn/?sc=1&rev=15086
Log:
* 20skip_send_packet_test.patch:
  + make test.pl use ifconfig(8) instead of Net::Pcap to get the name of
    the first active network interface when DEBIAN_BUILD is set
  + don't try to send any ARP packets, that requires real root privileges
* Switch build-dependency on libnet-pcap-perl to net-tools for ifconfig(8).

Modified:
    trunk/libnet-arp-perl/debian/changelog
    trunk/libnet-arp-perl/debian/control
    trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch
    trunk/libnet-arp-perl/debian/rules

Modified: trunk/libnet-arp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/changelog?rev=15086&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/changelog (original)
+++ trunk/libnet-arp-perl/debian/changelog Sun Feb 17 21:36:41 2008
@@ -33,6 +33,11 @@
   * Remove libnet-pcap-perl from the build-dependencies: it is only used
     to find a network device for the tests, and this requires real root
     privileges.
+  * 20skip_send_packet_test.patch: 
+    + make test.pl use ifconfig(8) instead of Net::Pcap to get the name of 
+      the first active network interface when DEBIAN_BUILD is set
+    + don't try to send any ARP packets, that requires real root privileges
+  * Switch build-dependency on libnet-pcap-perl to net-tools for ifconfig(8).
 
  -- Niko Tyni <ntyni at debian.org>  Sun, 17 Feb 2008 21:31:34 +0200
 

Modified: trunk/libnet-arp-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/control?rev=15086&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/control (original)
+++ trunk/libnet-arp-perl/debian/control Sun Feb 17 21:36:41 2008
@@ -1,7 +1,7 @@
 Source: libnet-arp-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 6), perl (>= 5.8.8-6), quilt (>= 0.40)
+Build-Depends: debhelper (>= 6), perl (>= 5.8.8-6), quilt (>= 0.40), net-tools
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at debian.org>
 Standards-Version: 3.7.3

Modified: trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch?rev=15086&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch (original)
+++ trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch Sun Feb 17 21:36:41 2008
@@ -9,3 +9,24 @@
  
  BEGIN
  {
+--- libnet-arp-perl.orig/test.pl
++++ libnet-arp-perl/test.pl
+@@ -21,6 +21,16 @@
+ 
+ BEGIN
+ {
++    if ($ENV{DEBIAN_BUILD}) {
++        print "Executing Debian-specific branch in test.pl\n";
++        $dev = `ifconfig |grep "Link encap:Ethernet" | cut -d" " -f1`;
++        chomp $dev;
++        if ($dev) {
++            $mac = Net::ARP::get_mac($dev);
++            print "MAC of $dev: $mac\n";
++        }
++        exit 0;
++    }
+     eval{ require Net::Pcap; };
+               
+     if($@ =~ /^Can\'t\slocate/)
+ 
+ print "Sending ARP reply packet via dev $dev... ";

Modified: trunk/libnet-arp-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/rules?rev=15086&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/rules (original)
+++ trunk/libnet-arp-perl/debian/rules Sun Feb 17 21:36:41 2008
@@ -57,8 +57,8 @@
 	dh_testroot
 	dh_clean -k
 
-	# Add commands to install the package into debian/$PACKAGE_NAME here
-	$(MAKE) test
+	# DEBIAN_BUILD is a special case in test.pl 
+	DEBIAN_BUILD=1 $(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 
 	# As this is a architecture dependent package, we are not