summaryrefslogtreecommitdiff
path: root/lang/perl5.14/files
diff options
context:
space:
mode:
authorSergey Skvortsov <skv@FreeBSD.org>2010-07-15 14:48:51 +0000
committerSergey Skvortsov <skv@FreeBSD.org>2010-07-15 14:48:51 +0000
commitc82c63a794aef8d2e4b64f57f88391a3d216cbef (patch)
tree5e4cebc36c83b857582ed5aac8b5642e81d36b17 /lang/perl5.14/files
parentUpdate to 4.1. (diff)
Introduce Perl 5.12.1
Acknowledgements: kuriyama
Notes
Notes: svn path=/head/; revision=257819
Diffstat (limited to 'lang/perl5.14/files')
-rw-r--r--lang/perl5.14/files/patch-INST_PREFIX.t4
-rw-r--r--lang/perl5.14/files/patch-MM_Any.pm4
-rw-r--r--lang/perl5.14/files/patch-bug6997395
-rw-r--r--lang/perl5.14/files/patch-bug7195246
-rw-r--r--lang/perl5.14/files/patch-perl.c61
5 files changed, 4 insertions, 206 deletions
diff --git a/lang/perl5.14/files/patch-INST_PREFIX.t b/lang/perl5.14/files/patch-INST_PREFIX.t
index 9520ef26890c..12d47848eb42 100644
--- a/lang/perl5.14/files/patch-INST_PREFIX.t
+++ b/lang/perl5.14/files/patch-INST_PREFIX.t
@@ -1,5 +1,5 @@
---- lib/ExtUtils/t/INST_PREFIX.t.orig Wed Feb 15 12:46:31 2006
-+++ lib/ExtUtils/t/INST_PREFIX.t Wed Feb 15 12:46:52 2006
+--- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t.orig Wed Feb 15 12:46:31 2006
++++ cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t Wed Feb 15 12:46:52 2006
@@ -16,7 +16,7 @@ BEGIN {
}
diff --git a/lang/perl5.14/files/patch-MM_Any.pm b/lang/perl5.14/files/patch-MM_Any.pm
index 4e50627b00a8..b0b15f3d8909 100644
--- a/lang/perl5.14/files/patch-MM_Any.pm
+++ b/lang/perl5.14/files/patch-MM_Any.pm
@@ -1,5 +1,5 @@
---- lib/ExtUtils/MM_Any.pm.orig Wed Feb 15 12:20:43 2006
-+++ lib/ExtUtils/MM_Any.pm Wed Feb 15 12:22:29 2006
+--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm.orig Wed Feb 15 12:20:43 2006
++++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm Wed Feb 15 12:22:29 2006
@@ -1069,13 +1069,14 @@ sub init_INSTALL_from_PREFIX {
('$(PREFIX)') x 3;
}
diff --git a/lang/perl5.14/files/patch-bug69973 b/lang/perl5.14/files/patch-bug69973
deleted file mode 100644
index fe2119fe42a1..000000000000
--- a/lang/perl5.14/files/patch-bug69973
+++ /dev/null
@@ -1,95 +0,0 @@
-# http://rt.perl.org/rt3//Public/Bug/Display.html?id=69973
-# http://perl5.git.perl.org/perl.git/commitdiff_plain/0abd0d78a73da1c4d13b1c700526b7e5d03b32d4?hp=fe88edf0c4ada4230b84bdb5417029b8f766694a
-diff --git a/ext/re/t/regop.t b/ext/re/t/regop.t
-index 9118bf6..46e6ec0 100644
---- ext/re/t/regop.t
-+++ ext/re/t/regop.t
-@@ -231,12 +231,12 @@ anchored "ABC" at 0
- #Freeing REx: "(\\.COM|\\.EXE|\\.BAT|\\.CMD|\\.VBS|\\.VBE|\\.JS|\\.JSE|\\."......
- %MATCHED%
- floating ""$ at 3..4 (checking floating)
--1:1[1] 3:2[1] 5:2[64] 45:83[1] 47:84[1] 48:85[0]
--stclass EXACTF <.> minlen 3
--Found floating substr ""$ at offset 30...
--Does not contradict STCLASS...
--Guessed: match at offset 26
--Matching stclass EXACTF <.> against ".exe"
-+#1:1[1] 3:2[1] 5:2[64] 45:83[1] 47:84[1] 48:85[0]
-+#stclass EXACTF <.> minlen 3
-+#Found floating substr ""$ at offset 30...
-+#Does not contradict STCLASS...
-+#Guessed: match at offset 26
-+#Matching stclass EXACTF <.> against ".exe"
- ---
- #Compiling REx "[q]"
- #size 12 nodes Got 100 bytes for offset annotations.
-diff --git a/regcomp.c b/regcomp.c
-index 6e9fa26..eb5f12f 100644
---- regcomp.c
-+++ regcomp.c
-@@ -2833,13 +2833,18 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp,
- }
- } else {
- /*
-- Currently we assume that the trie can handle unicode and ascii
-- matches fold cased matches. If this proves true then the following
-- define will prevent tries in this situation.
--
-- #define TRIE_TYPE_IS_SAFE (UTF || optype==EXACT)
--*/
-+ Currently we do not believe that the trie logic can
-+ handle case insensitive matching properly when the
-+ pattern is not unicode (thus forcing unicode semantics).
-+
-+ If/when this is fixed the following define can be swapped
-+ in below to fully enable trie logic.
-+
- #define TRIE_TYPE_IS_SAFE 1
-+
-+*/
-+#define TRIE_TYPE_IS_SAFE (UTF || optype==EXACT)
-+
- if ( last && TRIE_TYPE_IS_SAFE ) {
- make_trie( pRExC_state,
- startbranch, first, cur, tail, count,
-diff --git a/regexec.c b/regexec.c
-index 402ede3..ec09c28 100644
---- regexec.c
-+++ regexec.c
-@@ -1105,16 +1105,15 @@ Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV *sv, char *strpos,
-
- #define REXEC_TRIE_READ_CHAR(trie_type, trie, widecharmap, uc, uscan, len, \
- uvc, charid, foldlen, foldbuf, uniflags) STMT_START { \
-- UV uvc_unfolded = 0; \
- switch (trie_type) { \
- case trie_utf8_fold: \
- if ( foldlen>0 ) { \
-- uvc_unfolded = uvc = utf8n_to_uvuni( uscan, UTF8_MAXLEN, &len, uniflags ); \
-+ uvc = utf8n_to_uvuni( uscan, UTF8_MAXLEN, &len, uniflags ); \
- foldlen -= len; \
- uscan += len; \
- len=0; \
- } else { \
-- uvc_unfolded = uvc = utf8n_to_uvuni( (U8*)uc, UTF8_MAXLEN, &len, uniflags ); \
-+ uvc = utf8n_to_uvuni( (U8*)uc, UTF8_MAXLEN, &len, uniflags ); \
- uvc = to_uni_fold( uvc, foldbuf, &foldlen ); \
- foldlen -= UNISKIP( uvc ); \
- uscan = foldbuf + UNISKIP( uvc ); \
-@@ -1140,7 +1139,6 @@ uvc, charid, foldlen, foldbuf, uniflags) STMT_START { \
- uvc = (UV)*uc; \
- len = 1; \
- } \
-- \
- if (uvc < 256) { \
- charid = trie->charmap[ uvc ]; \
- } \
-@@ -1153,9 +1151,6 @@ uvc, charid, foldlen, foldbuf, uniflags) STMT_START { \
- charid = (U16)SvIV(*svpp); \
- } \
- } \
-- if (!charid && trie_type == trie_utf8_fold && !UTF) { \
-- charid = trie->charmap[uvc_unfolded]; \
-- } \
- } STMT_END
-
- #define REXEC_FBC_EXACTISH_CHECK(CoNd) \
diff --git a/lang/perl5.14/files/patch-bug71952 b/lang/perl5.14/files/patch-bug71952
deleted file mode 100644
index c36c7d721edb..000000000000
--- a/lang/perl5.14/files/patch-bug71952
+++ /dev/null
@@ -1,46 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=71952
-# http://perl5.git.perl.org/perl.git/commitdiff_plain/1f15e670edb515b744e9021b4a42a7955da83093?hp=1f730e6c11736bad913e605b064200a67117e898
-diff --git a/sv.c b/sv.c
-index 4e80e18..a3eb187 100644
---- sv.c
-+++ sv.c
-@@ -5664,7 +5664,8 @@ Perl_sv_clear(pTHX_ register SV *const sv)
- && !CvCONST(destructor)
- /* Don't bother calling an empty destructor */
- && (CvISXSUB(destructor)
-- || CvSTART(destructor)->op_next->op_type != OP_LEAVESUB))
-+ || (CvSTART(destructor)
-+ && (CvSTART(destructor)->op_next->op_type != OP_LEAVESUB))))
- {
- SV* const tmpref = newRV(sv);
- SvREADONLY_on(tmpref); /* DESTROY() could be naughty */
-diff --git a/t/op/method.t b/t/op/method.t
-index afa8cfb..b602ca2 100644
---- t/op/method.t
-+++ t/op/method.t
-@@ -10,7 +10,7 @@ BEGIN {
- require "test.pl";
- }
-
--print "1..78\n";
-+print "1..79\n";
-
- @A::ISA = 'B';
- @B::ISA = 'C';
-@@ -292,3 +292,16 @@ EOT
- "check if UNIVERSAL::AUTOLOAD works",
- );
- }
-+
-+# Test for #71952: crash when looking for a nonexistent destructor
-+# Regression introduced by fbb3ee5af3d4
-+{
-+ fresh_perl_is(<<'EOT',
-+sub M::DESTROY; bless {}, "M" ; print "survived\n";
-+EOT
-+ "survived",
-+ {},
-+ "no crash with a declared but missing DESTROY method"
-+ );
-+}
-+
diff --git a/lang/perl5.14/files/patch-perl.c b/lang/perl5.14/files/patch-perl.c
deleted file mode 100644
index 2f3753750e72..000000000000
--- a/lang/perl5.14/files/patch-perl.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- perl.c
-+++ perl.c
- #else /* IAMSUID */
-@@ -4882,6 +4882,28 @@
- incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
- #endif
-
-+#ifdef SITEARCH_EXP
-+ /* sitearch is always relative to sitelib on Windows for
-+ * DLL-based path intuition to work correctly */
-+# if !defined(WIN32)
-+ incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);
-+# endif
-+#endif
-+
-+#ifdef SITELIB_EXP
-+# if defined(WIN32)
-+ /* this picks up sitearch as well */
-+ incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);
-+# else
-+ incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
-+# endif
-+#endif
-+
-+#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
-+ /* Search for version-specific dirs below here */
-+ incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
-+#endif
-+
- #ifdef ARCHLIB_EXP
- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
- #endif
-@@ -4915,28 +4937,6 @@
- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
- #endif
-
--#ifdef SITEARCH_EXP
-- /* sitearch is always relative to sitelib on Windows for
-- * DLL-based path intuition to work correctly */
--# if !defined(WIN32)
-- incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);
--# endif
--#endif
--
--#ifdef SITELIB_EXP
--# if defined(WIN32)
-- /* this picks up sitearch as well */
-- incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);
--# else
-- incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
--# endif
--#endif
--
--#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
-- /* Search for version-specific dirs below here */
-- incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
--#endif
--
- #ifdef PERL_VENDORARCH_EXP
- /* vendorarch is always relative to vendorlib on Windows for
- * DLL-based path intuition to work correctly */