This is an automated email from the git hooks/post-receive script.
grinorcole-guest pushed a commit to branch master
in repository libnet-interface-perl.
commit ba2428d212db183fc258dcced1c287634bbe3a4c
Author: Christopher Hoskin <christopher.hos...@gmail.com>
Date: Sat Feb 21 20:54:35 2015 +0000
Use perl_makemaker build system, import patch for rt.cpan.org Bug #83994
---
debian/patches/Upstream-Bug-83994.patch | 31 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/patches/update-configure.ac.patch | 2 +-
debian/rules | 2 +-
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/debian/patches/Upstream-Bug-83994.patch
b/debian/patches/Upstream-Bug-83994.patch
new file mode 100644
index 0000000..ac4e2cc
--- /dev/null
+++ b/debian/patches/Upstream-Bug-83994.patch
@@ -0,0 +1,31 @@
+Description: ***
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=83994
+Origin: other,https://rt.cpan.org/Public/Bug/Display.html?id=83994
+From: <al...@cpan.org>
+Last-Update: 2015-02-21
+
+--- a/inst/netsymbols.pl
++++ b/inst/netsymbols.pl
+@@ -189,14 +189,20 @@
+ }
+ }
+
++sub guess {
++ my $path = shift;
++ return $path if (-e $Config{usrinc} .'/'. $path);
++}
+
+
+ cleanslurp();
+-slurp('sys/socket.h'); # parse sys/socket.h and its
#includes
++
++my $socket_h = guess('sys/socket.h') ||
guess('x86_64-linux-gnu/bits/socket.h') ||
guess('i386-linux-gnu/bits/socket.h');
++slurp($socket_h); # parse sys/socket.h and its #includes
+ fill(\%fam,\%unique,'^#\s*define\s+((?:A|P)F_[^\s]+)\s+([^\s]+)');
+ # repeat in case symbol dependencies are out of order
+ cleanslurp();
+-slurp('sys/socket.h');
++slurp($socket_h);
+ fill(\%fam,'','^#\s*define\s+((?:A|P)F_[^\s]+)\s+([^\s]+)');
+
+
diff --git a/debian/patches/series b/debian/patches/series
index a9a0b58..2dd099e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
update-configure.ac.patch
+Upstream-Bug-83994.patch
diff --git a/debian/patches/update-configure.ac.patch
b/debian/patches/update-configure.ac.patch
index 7d4fd2f..4e2cf4a 100644
--- a/debian/patches/update-configure.ac.patch
+++ b/debian/patches/update-configure.ac.patch
@@ -1,7 +1,7 @@
Description: Update configure.ac to use AC_LANG_SOURCE macro in the input
parameter of If-Else macros to suppress warnings in autoconf 2.68 and later.
Author: Christopher Hoskin <christopher.hos...@gmail.com>
-Forwarded:
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=102270
Last-Update: 2015-02-21
--- a/configure.ac
diff --git a/debian/rules b/debian/rules
index 069a8a4..def64a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@ --with autotools-dev,autoreconf
+ dh $@ --with autotools-dev,autoreconf --buildsystem=perl_makemaker
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libnet-interface-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
