r74062 - in /trunk/libsgml-parser-opensp-perl/debian: changelog control patches/binnmu_rebuild_fix.patch patches/series

[dom at users.alioth.debian.org]

Author: dom
Date: Fri May  6 18:26:22 2011
New Revision: 74062

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74062
Log:
  * Apply patch from Niko Tyni fixing FTBFS in directories with
    characters like '+', such as during binNMUs (Closes: #613199)

Added:
    trunk/libsgml-parser-opensp-perl/debian/patches/binnmu_rebuild_fix.patch
Modified:
    trunk/libsgml-parser-opensp-perl/debian/changelog
    trunk/libsgml-parser-opensp-perl/debian/control
    trunk/libsgml-parser-opensp-perl/debian/patches/series

Modified: trunk/libsgml-parser-opensp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsgml-parser-opensp-perl/debian/changelog?rev=74062&op=diff
==============================================================================
--- trunk/libsgml-parser-opensp-perl/debian/changelog (original)
+++ trunk/libsgml-parser-opensp-perl/debian/changelog Fri May  6 18:26:22 2011
@@ -1,3 +1,10 @@
+libsgml-parser-opensp-perl (0.994-2) unstable; urgency=low
+
+  * Apply patch from Niko Tyni fixing FTBFS in directories with
+    characters like '+', such as during binNMUs (Closes: #613199)
+
+ -- Dominic Hargreaves <dom at earth.li>  Fri, 06 May 2011 19:23:48 +0100
+
 libsgml-parser-opensp-perl (0.994-1) unstable; urgency=low
 
   * Initial Release. (Closes: #590063)

Modified: trunk/libsgml-parser-opensp-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsgml-parser-opensp-perl/debian/control?rev=74062&op=diff
==============================================================================
--- trunk/libsgml-parser-opensp-perl/debian/control (original)
+++ trunk/libsgml-parser-opensp-perl/debian/control Fri May  6 18:26:22 2011
@@ -3,7 +3,8 @@
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50~), libclass-accessor-perl, libtest-exception-perl, perl, libosp-dev, libtest-pod-perl, libtest-pod-coverage-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Nicholas Bamber <nicholas at periapt.co.uk>
+Uploaders: Nicholas Bamber <nicholas at periapt.co.uk>,
+  Dominic Hargreaves <dom at earth.li>
 Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/SGML-Parser-OpenSP/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libsgml-parser-opensp-perl/

Added: trunk/libsgml-parser-opensp-perl/debian/patches/binnmu_rebuild_fix.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsgml-parser-opensp-perl/debian/patches/binnmu_rebuild_fix.patch?rev=74062&op=file
==============================================================================
--- trunk/libsgml-parser-opensp-perl/debian/patches/binnmu_rebuild_fix.patch (added)
+++ trunk/libsgml-parser-opensp-perl/debian/patches/binnmu_rebuild_fix.patch Fri May  6 18:26:22 2011
@@ -1,0 +1,25 @@
+From: Niko Tyni <ntyni at debian.org>
+Date: Fri, 6 May 2011 18:03:59 +0300
+Subject: [PATCH] Don't pass the full path of the file to parse() in
+ restricted mode
+
+If the build directory name contains characters like '+', tests 11
+and 12 of t/13restricted.t fail because the opensp library considers
+the directory unsafe and skips it.
+
+(see PosixStorageManager::isSafe() in lib/PosixStorage.cxx of
+opensp-1.5.2)
+
+(adjusted to apply to file with DOS line endings)
+
+--- a/t/13restricted.t	2011-05-06 19:06:03.000000000 +0100
++++ b/t/13restricted.t	2011-05-06 19:19:19.000000000 +0100
+@@ -53,7 +53,7 @@
+ $h8->{ok1} = 0;
+ $h8->{ok2} = 0;
+ 
+-my $sd = File::Spec->catfile(File::Spec->rel2abs('.'), 'samples');
++my $sd = 'samples';
+ 
+ $p->search_dirs($sd);
+ 

Modified: trunk/libsgml-parser-opensp-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsgml-parser-opensp-perl/debian/patches/series?rev=74062&op=diff
==============================================================================
--- trunk/libsgml-parser-opensp-perl/debian/patches/series (original)
+++ trunk/libsgml-parser-opensp-perl/debian/patches/series Fri May  6 18:26:22 2011
@@ -1,1 +1,2 @@
 doc_misspelling.patch
+binnmu_rebuild_fix.patch