r43569 - in /trunk/libautodie-perl/debian: README.source changelog control patches/ patches/fix-on-hppa.patch patches/series rules

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Thu Sep 3 08:19:00 UTC 2009


Author: ryan52-guest
Date: Thu Sep  3 08:18:46 2009
New Revision: 43569

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=43569
Log:
Ready for upload.

Added:
    trunk/libautodie-perl/debian/README.source
    trunk/libautodie-perl/debian/patches/
    trunk/libautodie-perl/debian/patches/fix-on-hppa.patch
    trunk/libautodie-perl/debian/patches/series
Modified:
    trunk/libautodie-perl/debian/changelog
    trunk/libautodie-perl/debian/control
    trunk/libautodie-perl/debian/rules

Added: trunk/libautodie-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libautodie-perl/debian/README.source?rev=43569&op=file
==============================================================================
--- trunk/libautodie-perl/debian/README.source (added)
+++ trunk/libautodie-perl/debian/README.source Thu Sep  3 08:18:46 2009
@@ -1,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.

Modified: trunk/libautodie-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libautodie-perl/debian/changelog?rev=43569&op=diff
==============================================================================
--- trunk/libautodie-perl/debian/changelog (original)
+++ trunk/libautodie-perl/debian/changelog Thu Sep  3 08:18:46 2009
@@ -1,8 +1,9 @@
-libautodie-perl (2.06.01-2) UNRELEASED; urgency=low
+libautodie-perl (2.06.01-2) unstable; urgency=low
 
   * Update jawnsy's email address
+  * fix build on hppa, patch from Niko Tyni (Closes: #543761)
 
- -- Ryan Niebur <ryanryan52 at gmail.com>  Tue, 01 Sep 2009 21:18:03 -0700
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Thu, 03 Sep 2009 01:18:42 -0700
 
 libautodie-perl (2.06.01-1) unstable; urgency=low
 

Modified: trunk/libautodie-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libautodie-perl/debian/control?rev=43569&op=diff
==============================================================================
--- trunk/libautodie-perl/debian/control (original)
+++ trunk/libautodie-perl/debian/control Thu Sep  3 08:18:46 2009
@@ -1,7 +1,7 @@
 Source: libautodie-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
 Build-Depends-Indep: libbsd-resource-perl, libipc-system-simple-perl,
  libsub-identify-perl (>= 0.04), libtest-perl-critic-perl,
  libtest-pod-coverage-perl, libtest-pod-perl, perl (>= 5.10)

Added: trunk/libautodie-perl/debian/patches/fix-on-hppa.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libautodie-perl/debian/patches/fix-on-hppa.patch?rev=43569&op=file
==============================================================================
--- trunk/libautodie-perl/debian/patches/fix-on-hppa.patch (added)
+++ trunk/libautodie-perl/debian/patches/fix-on-hppa.patch Thu Sep  3 08:18:46 2009
@@ -1,0 +1,89 @@
+From 00960c2d7b761522c06e3b4e1418019ebad2681b Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Sun, 30 Aug 2009 13:58:35 +0300
+Subject: [PATCH] Allow for flock returning EAGAIN instead of EWOULDBLOCK on linux/parisc
+
+Contrary to the documentation, flock(2) returns EAGAIN instead of
+EWOULDBLOCK on the Linux parisc port (aka. hppa).
+
+http://bugs.debian.org/543731
+
+--- a/lib/Fatal.pm
++++ b/lib/Fatal.pm
+@@ -5,6 +5,7 @@
+ use strict;
+ use warnings;
+ use Tie::RefHash;   # To cache subroutine refs
++use Config;
+ 
+ use constant PERL510     => ( $] >= 5.010 );
+ 
+@@ -52,6 +53,10 @@
+     MSWin32 => 33,
+ );
+ 
++# the linux parisc port has separate EAGAIN and EWOULDBLOCK,
++# and the kernel returns EAGAIN
++my $try_EAGAIN = ($^O eq 'linux' and $Config{archname} =~ /hppa|parisc/) ? 1 : 0;
++
+ # We have some tags that can be passed in for use with import.
+ # These are all assumed to be CORE::
+ 
+@@ -720,6 +725,11 @@
+         my $EWOULDBLOCK = eval { POSIX::EWOULDBLOCK(); }
+                           || $_EWOULDBLOCK{$^O}
+                           || _autocroak("Internal error - can't overload flock - EWOULDBLOCK not defined on this system.");
++        my $EAGAIN = $EWOULDBLOCK;
++        if ($try_EAGAIN) {
++            $EAGAIN = eval { POSIX::EAGAIN(); }
++                          || _autocroak("Internal error - can't overload flock - EAGAIN not defined on this system.");
++        }
+ 
+         require Fcntl;      # For Fcntl::LOCK_NB
+ 
+@@ -735,7 +745,9 @@
+             # If we failed, but we're using LOCK_NB and
+             # returned EWOULDBLOCK, it's not a real error.
+ 
+-            if (\$_[1] & Fcntl::LOCK_NB() and \$! == $EWOULDBLOCK ) {
++            if (\$_[1] & Fcntl::LOCK_NB() and
++                (\$! == $EWOULDBLOCK or
++                ($try_EAGAIN and \$! == $EAGAIN ))) {
+                 return \$retval;
+             }
+ 
+--- a/t/flock.t
++++ b/t/flock.t
+@@ -2,7 +2,8 @@
+ use strict;
+ use Test::More;
+ use Fcntl qw(:flock);
+-use POSIX qw(EWOULDBLOCK);
++use POSIX qw(EWOULDBLOCK EAGAIN);
++use Config;
+ 
+ require Fatal;
+ 
+@@ -10,6 +11,9 @@
+                   || $Fatal::_EWOULDBLOCK{$^O}
+                   || plan skip_all => "EWOULDBLOCK not defined on this system";
+ 
++my $try_EAGAIN = ($^O eq 'linux' and $Config{archname} =~ /hppa|parisc/) ? 1 : 0;
++my $EAGAIN = eval { EAGAIN() };
++
+ my ($self_fh, $self_fh2);
+ 
+ eval {
+@@ -55,7 +59,11 @@
+     $return = flock($self_fh2, LOCK_EX | LOCK_NB);
+ };
+ 
+-is($!+0, $EWOULDBLOCK, "Double-flocking should be EWOULDBLOCK");
++if (!$try_EAGAIN) {
++    is($!+0, $EWOULDBLOCK, "Double-flocking should be EWOULDBLOCK");
++} else {
++    ok($!+0 == $EWOULDBLOCK || $!+0 == $EAGAIN, "Double-flocking should be EWOULDBLOCK or EAGAIN");
++}
+ ok(!$return, "flocking a file twice should fail");
+ is($@, "", "Non-blocking flock should not fail on EWOULDBLOCK");
+ 

Added: trunk/libautodie-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libautodie-perl/debian/patches/series?rev=43569&op=file
==============================================================================
--- trunk/libautodie-perl/debian/patches/series (added)
+++ trunk/libautodie-perl/debian/patches/series Thu Sep  3 08:18:46 2009
@@ -1,0 +1,1 @@
+fix-on-hppa.patch

Modified: trunk/libautodie-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libautodie-perl/debian/rules?rev=43569&op=diff
==============================================================================
--- trunk/libautodie-perl/debian/rules (original)
+++ trunk/libautodie-perl/debian/rules Thu Sep  3 08:18:46 2009
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_auto_test:
 	TEST_AUTHOR=1 dh_auto_test




More information about the Pkg-perl-cvs-commits mailing list