Bug#835432: polymake: FTBFS with '.' removed from perl's @INC

[David Bremner]

Benjamin Lorenz  writes:

> On 25/08/16 19:59, David Bremner wrote:
>> Dominic Hargreaves  writes:
>> 
>>>
>>> This bug will become RC when the perl package change removing '.' from
>>> @INC by default is uploaded to unstable, expected in a week or two.
>>>
>>> By the way, when preparing this patch I found that the git repository
>>> at git://anonscm.debian.org/collab-maint/polymake.git was behind the
>>> Debian archive.
>> 
>> 
>> Hi Dom!
>> 
>> Thanks for the patch. I'll wait a few days to see if upstream has an
>> comments / suggestions.
>> 
>> d

Here's a deb diff applying Dom's patch.

Dom, could you upload the resulting package? I'm key-less at the moment.

d
diff -Nru polymake-3.0r2/debian/changelog polymake-3.0r2/debian/changelog
--- polymake-3.0r2/debian/changelog	2016-07-27 02:09:16.0 -0300
+++ polymake-3.0r2/debian/changelog	2016-08-29 16:52:54.0 -0300
@@ -1,3 +1,10 @@
+polymake (3.0r2-2) unstable; urgency=medium
+
+  * Bug fix: force . in @INC for configure, thanks
+to Dominic Hargreaves (Closes: #835432).
+
+ -- David Bremner   Mon, 29 Aug 2016 16:51:55 -0300
+
 polymake (3.0r2-1) unstable; urgency=medium
 
   * New upstream bugfix release, in particular support gcc 6
diff -Nru polymake-3.0r2/debian/patches/0001-debcherry-fixup-patch.patch polymake-3.0r2/debian/patches/0001-debcherry-fixup-patch.patch
--- polymake-3.0r2/debian/patches/0001-debcherry-fixup-patch.patch	2016-07-27 02:14:30.0 -0300
+++ polymake-3.0r2/debian/patches/0001-debcherry-fixup-patch.patch	2016-08-29 16:54:28.0 -0300
@@ -1,7 +1,7 @@
-From e7239f4303b8e18e02e4ec6b4e5e484591973b44 Mon Sep 17 00:00:00 2001
+From d1bd95ba866088cb79bf55b0d19d2cc8d277a751 Mon Sep 17 00:00:00 2001
 From: David Bremner 
-Date: Wed, 27 Jul 2016 14:14:30 +0900
-Subject: [PATCH] debcherry fixup patch
+Date: Mon, 29 Aug 2016 16:54:28 -0300
+Subject: [PATCH 1/2] debcherry fixup patch
 
 16f769b fix libnormaliz for gmp 6.1
 	 - extra changes or conflicts
diff -Nru polymake-3.0r2/debian/patches/0002-Run-configure.pl-with-I.-to-fix-problems-when-.-is-r.patch polymake-3.0r2/debian/patches/0002-Run-configure.pl-with-I.-to-fix-problems-when-.-is-r.patch
--- polymake-3.0r2/debian/patches/0002-Run-configure.pl-with-I.-to-fix-problems-when-.-is-r.patch	1969-12-31 20:00:00.0 -0400
+++ polymake-3.0r2/debian/patches/0002-Run-configure.pl-with-I.-to-fix-problems-when-.-is-r.patch	2016-08-29 16:54:28.0 -0300
@@ -0,0 +1,29 @@
+From 10b3fb45bd334ed69767dcb31105145554026004 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves 
+Date: Thu, 25 Aug 2016 16:36:45 +0100
+Subject: [PATCH 2/2] Run configure.pl with -I. to fix problems when '.' is
+ removed from @INC
+
+---
+ configure | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index ca94fa6..94b7086 100755
+--- a/configure
 b/configure
+@@ -19,11 +19,11 @@ ExtractPerl() {
+ 
+ case "$*" in *PERL=*)
+   ExtractPerl "$@"
+-  exec $Perl $Script "$@"
++  exec $Perl -I. $Script "$@"
+   ;;
+ ?*)
+-  exec perl $Script "$@"
++  exec perl -I. $Script "$@"
+   ;;
+ esac
+ 
+-exec perl $Script
++exec perl -I. $Script
diff -Nru polymake-3.0r2/debian/patches/series polymake-3.0r2/debian/patches/series
--- polymake-3.0r2/debian/patches/series	2016-07-27 02:14:30.0 -0300
+++ polymake-3.0r2/debian/patches/series	2016-08-29 16:54:28.0 -0300
@@ -1,2 +1,3 @@
 # exported from git by git-debcherry
 0001-debcherry-fixup-patch.patch
+0002-Run-configure.pl-with-I.-to-fix-problems-when-.-is-r.patch


signature.asc
Description: PGP signature

Bug#835432: polymake: FTBFS with '.' removed from perl's @INC

[Benjamin Lorenz]

On 25/08/16 19:59, David Bremner wrote:
> Dominic Hargreaves  writes:
> 
>>
>> This bug will become RC when the perl package change removing '.' from
>> @INC by default is uploaded to unstable, expected in a week or two.
>>
>> By the way, when preparing this patch I found that the git repository
>> at git://anonscm.debian.org/collab-maint/polymake.git was behind the
>> Debian archive.
> 
> 
> Hi Dom!
> 
> Thanks for the patch. I'll wait a few days to see if upstream has an
> comments / suggestions.
> 
> d

Hi,

thanks for the patch, seems fine to me. I have applied it to our
development branch and will also add it to the next bugfix-release. For
the time being, it would be best if you could add it to the debian patches.

Best,
Benjamin

Bug#835432: polymake: FTBFS with '.' removed from perl's @INC

[David Bremner]

Dominic Hargreaves  writes:

>
> This bug will become RC when the perl package change removing '.' from
> @INC by default is uploaded to unstable, expected in a week or two.
>
> By the way, when preparing this patch I found that the git repository
> at git://anonscm.debian.org/collab-maint/polymake.git was behind the
> Debian archive.


Hi Dom!

Thanks for the patch. I'll wait a few days to see if upstream has an
comments / suggestions.

d

Bug#835432: polymake: FTBFS with '.' removed from perl's @INC

[Dominic Hargreaves]

Source: polymake
Version: 3.0r2-1
Severity: important
User: debian-p...@lists.debian.org
Usertags: perl-cwd-inc-removal
Tags: patch

This package FTBFS when '.' is removed from @INC, as seen at [1].
This change is being made for security reasons; for more background,
see #588017 and [2]. Please see the attached patch which fixes this
by invoking configure.pl with "-I.".

This bug will become RC when the perl package change removing '.' from
@INC by default is uploaded to unstable, expected in a week or two.

By the way, when preparing this patch I found that the git repository
at git://anonscm.debian.org/collab-maint/polymake.git was behind the
Debian archive.

Thanks,
Dominic.

[1] 

[2] 
>From 210ea4895a1e56461a7776b6e4336a3a7c4d0f82 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves 
Date: Thu, 25 Aug 2016 16:36:45 +0100
Subject: [PATCH] Run configure.pl with -I. to fix problems when '.' is removed
 from @INC

---
 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index ca94fa6..94b7086 100755
--- a/configure
+++ b/configure
@@ -19,11 +19,11 @@ ExtractPerl() {
 
 case "$*" in *PERL=*)
   ExtractPerl "$@"
-  exec $Perl $Script "$@"
+  exec $Perl -I. $Script "$@"
   ;;
 ?*)
-  exec perl $Script "$@"
+  exec perl -I. $Script "$@"
   ;;
 esac
 
-exec perl $Script
+exec perl -I. $Script
-- 
2.1.4