public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Authen-PAM/files/, dev-perl/Authen-PAM/
@ 2017-06-14  8:44 Kent Fredric
  0 siblings, 0 replies; only message in thread
From: Kent Fredric @ 2017-06-14  8:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c12611af0f7a824e7ad234e4ca3491ce74ab703d
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 08:43:57 2017 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 08:43:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12611af

dev-perl/Authen-PAM: Fix for '.' in @INC re bug #614660

require "foo.cfg"

Relied on '.' being in @INC to work, and can be worked around by
using explict

require "./foo.cfg"

Bug: https://bugs.gentoo.org/614660
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild |  4 +--
 dev-perl/Authen-PAM/files/no-dot-inc.patch       | 32 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild
index b38fdd7ce2d..910cb91d799 100644
--- a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild
+++ b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,5 +15,5 @@ IUSE=""
 
 RDEPEND="virtual/pam"
 DEPEND="${RDEPEND}"
-
+PATCHES=("${FILESDIR}/no-dot-inc.patch")
 export OPTIMIZE="$CFLAGS"

diff --git a/dev-perl/Authen-PAM/files/no-dot-inc.patch b/dev-perl/Authen-PAM/files/no-dot-inc.patch
new file mode 100644
index 00000000000..fa1d5492da9
--- /dev/null
+++ b/dev-perl/Authen-PAM/files/no-dot-inc.patch
@@ -0,0 +1,32 @@
+From cad0178cc0bdacd33f7faf2f86afa6d2a118f730 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Wed, 14 Jun 2017 20:39:17 +1200
+Subject: [PATCH] Fix for '.' removal from @INC in Perl 5.26
+
+  require "foo.ext"
+
+Never really implied it would load files from ./ , it only did so
+as a side effect of '.' being in @INC.
+
+The only way which works after 5.26 is to use an explicit ./  prefix,
+which is special-cased for this purpose.
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index f6e2d49..c7ffd45 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -10,7 +10,7 @@ sub configure {
+ 
+     # returns a reference to anonymous hash which is then interpreted as
+     # additional options to the WriteMakeFile
+-    $options = require "pam.cfg";
++    $options = require "./pam.cfg";
+ 
+     if ( $Config{'osname'} eq 'solaris' && $Config{'osvers'} eq '2.6') {
+       print "Adding a workaround for a bug in the Solaris 2.6 pam library\n";
+-- 
+2.13.1
+


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-06-14  8:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-14  8:44 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Authen-PAM/files/, dev-perl/Authen-PAM/ Kent Fredric

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox