Control: tags 837242 + patch Control: tags 837242 + pending Dear maintainer,
I've prepared an NMU for jwchat (versioned as 1.0+dfsg-1.4) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Davy Graham: Blues At Gino's
diff -Nru jwchat-1.0+dfsg/debian/changelog jwchat-1.0+dfsg/debian/changelog --- jwchat-1.0+dfsg/debian/changelog 2013-09-24 15:13:05.000000000 +0200 +++ jwchat-1.0+dfsg/debian/changelog 2016-09-18 17:11:06.000000000 +0200 @@ -1,3 +1,14 @@ +jwchat (1.0+dfsg-1.4) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS: Can't locate scripts/JWCI18N.pm in @INC": + add a patch to prepend ./ to require() calls. + (Closes: #837242) + * Additionally add a second patch to handle the changed behaviour of + Regexp::Common::delimited, otherwise the whole I18N mechanism fails. + + -- gregor herrmann <gre...@debian.org> Sun, 18 Sep 2016 17:11:06 +0200 + jwchat (1.0+dfsg-1.3) unstable; urgency=low * Non-maintainer upload. diff -Nru jwchat-1.0+dfsg/debian/patches/perl-cwd-in-inc.patch jwchat-1.0+dfsg/debian/patches/perl-cwd-in-inc.patch --- jwchat-1.0+dfsg/debian/patches/perl-cwd-in-inc.patch 1970-01-01 01:00:00.000000000 +0100 +++ jwchat-1.0+dfsg/debian/patches/perl-cwd-in-inc.patch 2016-09-18 17:08:42.000000000 +0200 @@ -0,0 +1,30 @@ +Description: After the removal of cwd from @INC (CVE-2016-1238) + the various calls to require need to prefix the current path. +Origin: vendor +Bug-Debian: https://bugs.debian.org/837242 +Forwarded: no +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2016-09-18 + +--- a/scripts/templateparser.pl ++++ b/scripts/templateparser.pl +@@ -32,7 +32,7 @@ + my $TEMPLATEDIR = "src"; + my $DEFAULTLANG = "en"; + +-require "scripts/JWCI18N.pm"; ++require "./scripts/JWCI18N.pm"; + use File::Find; + use File::Path; + use File::Basename; +--- a/scripts/JWCI18N.pm ++++ b/scripts/JWCI18N.pm +@@ -30,7 +30,7 @@ + # Load language-specific functions + foreach my $language ( glob("po/*.pm")) { + if ($language =~ /^([-\w.\/\\~:]+)$/) { +- require $1; ++ require "./$1"; + } + else { + warn("$language is tainted. not loading"); diff -Nru jwchat-1.0+dfsg/debian/patches/perl-regexp-common.patch jwchat-1.0+dfsg/debian/patches/perl-regexp-common.patch --- jwchat-1.0+dfsg/debian/patches/perl-regexp-common.patch 1970-01-01 01:00:00.000000000 +0100 +++ jwchat-1.0+dfsg/debian/patches/perl-regexp-common.patch 2016-09-18 17:11:00.000000000 +0200 @@ -0,0 +1,24 @@ +Description: Regexp::Common::delimited has changed its behaviour, + we need to look at a different match variable, otherwise $vars is undefined + and the later Locale::Maketext calls fail +Origin: vendor +Forwarded: no +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2016-09-18 + +--- a/scripts/templateparser.pl ++++ b/scripts/templateparser.pl +@@ -136,7 +136,12 @@ + /\(\s*($RE{delimited}{-delim=>q{'"}}{-keep})(.*?)\s*\)$/ ) { + #print STDERR $match; + $str = substr( $1, 1, -1 ); # $str comes before $vars now +- $vars = $9; ++ if ($Regexp::Common::delimited::VERSION < 2016052801) { ++ $vars = $9; ++ } ++ else { ++ $vars = $6; ++ } + } + else { + next; diff -Nru jwchat-1.0+dfsg/debian/patches/series jwchat-1.0+dfsg/debian/patches/series --- jwchat-1.0+dfsg/debian/patches/series 2010-09-17 23:55:06.000000000 +0200 +++ jwchat-1.0+dfsg/debian/patches/series 2016-09-18 16:45:40.000000000 +0200 @@ -1,2 +1,4 @@ config-debian.diff removing_sound_support.patch +perl-cwd-in-inc.patch +perl-regexp-common.patch
signature.asc
Description: Digital Signature
