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 c4a8acc1db2572b4524bfcb7f77d55b889cf6f0e Author: Christopher Hoskin <christopher.hos...@gmail.com> Date: Fri Sep 23 17:02:47 2016 +0100 Update socket_h.patch --- debian/changelog | 1 + debian/patches/manpage.patch | 2 +- debian/patches/reproducible-build.patch | 4 ++-- debian/patches/socket_h.patch | 37 +++++++++++++++++++-------------- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 582cc22..e92a6e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ libnet-interface-perl (1.015-1) UNRELEASED; urgency=medium * Enable hardening * Fix man page spellings * Update Standards-Version to 3.9.8 (no changes required) + * Update socket_h.patch -- Christopher Hoskin <christopher.hos...@gmail.com> Fri, 23 Sep 2016 06:02:50 +0100 diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch index 13da083..34f1712 100644 --- a/debian/patches/manpage.patch +++ b/debian/patches/manpage.patch @@ -51,7 +51,7 @@ Last-Update: 2016-09-23 --- a/inst/netsymbols.pl +++ b/inst/netsymbols.pl -@@ -788,6 +788,9 @@ +@@ -800,6 +800,9 @@ i.e. |, $utxt, q| diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch index 26a84e7..18c70df 100644 --- a/debian/patches/reproducible-build.patch +++ b/debian/patches/reproducible-build.patch @@ -12,7 +12,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=105762 --- a/inst/netsymbols.pl +++ b/inst/netsymbols.pl -@@ -393,13 +393,13 @@ +@@ -405,13 +405,13 @@ ### populate C portion # @@ -29,7 +29,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=105762 # iffs are not unique so we can safely purge unwanted symbols here my @iffs = sort grep {/^IFF_/ && $_ !~ /IFF_DRV/} keys %ifs; my @iffIN6 = sort grep {/^IN6_IFF/} keys %ifs; -@@ -793,7 +793,7 @@ +@@ -805,7 +805,7 @@ =head1 AUTHOR Michael Robinton <mich...@bizsystems.com> diff --git a/debian/patches/socket_h.patch b/debian/patches/socket_h.patch index 4fdd347..082c5c2 100644 --- a/debian/patches/socket_h.patch +++ b/debian/patches/socket_h.patch @@ -1,26 +1,31 @@ Description: Architecture independent patch for CPAN bug #83994 Author: Christopher Hoskin <christopher.hos...@gmail.com> Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=83994 -Last-Update: 2015-05-02 +Last-Update: 2016-09-23 --- a/inst/netsymbols.pl +++ b/inst/netsymbols.pl -@@ -110,10 +110,14 @@ +@@ -147,8 +147,20 @@ return if $slurped{$in}; $slurped{$in} = 1; local *F; -- open (F,$Config{usrinc} .'/'. $in) or return; -- my @new = <F>; -- close F; -- push @slurp, @new; -+ my $incpth = $Config{incpth}; -+ while ($incpth =~ /(\S+)/g) { -+ open (F,$1 .'/'. $in) or next; -+ my @new = <F>; -+ close F; -+ push @slurp, @new; -+ return; +- my $file = ($sw) ? +- $in : $Config{usrinc} .'/'. $in; ++ my $file; ++ if ($sw) { ++ $file = $in; ++ } else { ++ my $incpth = $Config{incpth}; ++ while ($incpth =~ /(\S+)/g) { ++ my $path=$1 .'/'. $in; ++ if (-e $path) { ++ $file=$path; ++ last; ++ } ++ } ++ return unless ($file); + } - } - - # input: hash pointer, + open (F,$file) or return; + my @new = <F>; + close F; + -- 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