summaryrefslogtreecommitdiff
path: root/meta-pkgs/boost
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2008-04-30 07:13:26 +0000
committerjmmv <jmmv@pkgsrc.org>2008-04-30 07:13:26 +0000
commit55dfa13b6cb608882060a0bc11e57917ad60fb1f (patch)
treec8a93fe2772228c0e49702d3233bf0394d01d787 /meta-pkgs/boost
parent3e37272b59a12cba437631e2f5ebb99a637e62d3 (diff)
downloadpkgsrc-55dfa13b6cb608882060a0bc11e57917ad60fb1f.tar.gz
Fix patches mangled due to bad end line terminators. Noted by wiz@.
Looks like OS X's patch did deal with these patches correctly, whereas NetBSD's one complained.
Diffstat (limited to 'meta-pkgs/boost')
-rw-r--r--meta-pkgs/boost/distinfo6
-rw-r--r--meta-pkgs/boost/patches/patch-r42674108
-rw-r--r--meta-pkgs/boost/patches/patch-r4274528
3 files changed, 76 insertions, 66 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 9f02070cf72..c90cc33b534 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2008/04/28 21:35:25 jmmv Exp $
+$NetBSD: distinfo,v 1.13 2008/04/30 07:13:26 jmmv Exp $
SHA1 (boost_1_34_1.tar.bz2) = b771271d5cbd3bdb0f119dd66dfd36bad7a66866
RMD160 (boost_1_34_1.tar.bz2) = 303327ff852bc19dd7a94657fdef3c56f5882e06
@@ -12,5 +12,5 @@ SHA1 (patch-al) = 23756770d17d7958b0b9423e379fe0a1a2dd83f8
SHA1 (patch-am) = 07f1e1e15d4129c7a8762ad2e81632fdd24e9515
SHA1 (patch-an) = 91887a9a37e9d891252e0556ee40b58a1c6bc6cf
SHA1 (patch-ao) = a8499a326f72c9fbfd31f0b0f23014729a2a0dae
-SHA1 (patch-r42674) = f115b4ae5ab3e184d711a9d8968f3a435249e5f3
-SHA1 (patch-r42745) = 432417b0ad4944c9da9f68cf2e855d91c698c4f6
+SHA1 (patch-r42674) = c2b56a93f6a6d7fb71f1d639d5cfb2884b6e025e
+SHA1 (patch-r42745) = b1659fd244b1d8182b6d64923f112dc72c5ab5f3
diff --git a/meta-pkgs/boost/patches/patch-r42674 b/meta-pkgs/boost/patches/patch-r42674
index b176221603f..649dde707ec 100644
--- a/meta-pkgs/boost/patches/patch-r42674
+++ b/meta-pkgs/boost/patches/patch-r42674
@@ -1,50 +1,58 @@
-$NetBSD: patch-r42674,v 1.1 2008/04/28 21:35:25 jmmv Exp $
-
-Fix for CVE-2008-0171. Patch from Boost's svn repository, r42674.
-
---- boost/regex/v4/basic_regex_parser.hpp (revision 38864)
-+++ boost/regex/v4/basic_regex_parser.hpp (revision 42674)
-@@ -785,4 +785,5 @@
- case syntax_element_jump:
- case syntax_element_startmark:
-+ case syntax_element_backstep:
- // can't legally repeat any of the above:
- fail(regex_constants::error_badrepeat, m_position - m_base);
-@@ -1870,4 +1871,5 @@
- {
- re_syntax_base* b = this->getaddress(expected_alt_point);
-+ // Make sure we have exactly one alternative following this state:
- if(b->type != syntax_element_alt)
- {
-@@ -1878,4 +1880,13 @@
- {
- fail(regex_constants::error_bad_pattern, m_position - m_base);
-+ return false;
-+ }
-+ // check for invalid repetition of next state:
-+ b = this->getaddress(expected_alt_point);
-+ b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);
-+ if((b->type != syntax_element_assert_backref)
-+ && (b->type != syntax_element_startmark))
-+ {
-+ fail(regex_constants::error_badrepeat, m_position - m_base);
- return false;
- }
---- libs/regex/test/regress/test_perl_ex.cpp (revision 30980)
-+++ libs/regex/test/regress/test_perl_ex.cpp (revision 42674)
-@@ -122,4 +122,15 @@
- TEST_INVALID_REGEX("(?:(a)|b)(?(?<", perl);
- TEST_INVALID_REGEX("(?:(a)|b)(?(?<a", perl);
-+
-+ TEST_INVALID_REGEX("(?(?!#?)+)", perl);
-+ TEST_INVALID_REGEX("(?(?=:-){0})", perl);
-+ TEST_INVALID_REGEX("(?(123){1})", perl);
-+ TEST_INVALID_REGEX("(?(?<=A)*)", perl);
-+ TEST_INVALID_REGEX("(?(?<=A)+)", perl);
-+
-+ TEST_INVALID_REGEX("(?<!*|^)", perl);
-+ TEST_INVALID_REGEX("(?<!*|A)", perl);
-+ TEST_INVALID_REGEX("(?<=?|A)", perl);
-+ TEST_INVALID_REGEX("(?<=*|\B)", perl);
- }
-
+$NetBSD: patch-r42674,v 1.2 2008/04/30 07:13:26 jmmv Exp $
+
+Fix for CVE-2008-0171. Patch from Boost's svn repository, r42674.
+
+--- boost/regex/v4/basic_regex_parser.hpp.orig 2008-04-30 09:00:21.000000000 +0200
++++ boost/regex/v4/basic_regex_parser.hpp 2008-04-30 09:01:13.000000000 +0200
+@@ -784,6 +784,7 @@ bool basic_regex_parser<charT, traits>::
+ // do nothing...
+ break;
+ }
++ case syntax_element_backstep:
+ insert_point = this->getoffset(this->m_last_state);
+ }
+ //
+@@ -1869,6 +1870,7 @@ bool basic_regex_parser<charT, traits>::
+ }
+ else if(this->getaddress(static_cast<re_alt*>(b)->alt.i, b)->type == syntax_element_alt)
+ {
++ // Make sure we have exactly one alternative following this state:
+ fail(regex_constants::error_bad_pattern, m_position - m_base);
+ return false;
+ }
+@@ -1877,6 +1879,15 @@ bool basic_regex_parser<charT, traits>::
+ // append closing parenthesis state:
+ //
+ pb = static_cast<re_brace*>(this->append_state(syntax_element_endmark, sizeof(re_brace)));
++ return false;
++ }
++ // check for invalid repetition of next state:
++ b = this->getaddress(expected_alt_point);
++ b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);
++ if((b->type != syntax_element_assert_backref)
++ && (b->type != syntax_element_startmark))
++ {
++ fail(regex_constants::error_badrepeat, m_position - m_base);
+ pb->index = markid;
+ this->m_paren_start = last_paren_start;
+ //
+--- libs/regex/test/regress/test_perl_ex.cpp.orig 2008-04-30 09:00:21.000000000 +0200
++++ libs/regex/test/regress/test_perl_ex.cpp 2008-04-30 09:01:13.000000000 +0200
+@@ -121,6 +121,17 @@ void test_conditionals()
+ TEST_INVALID_REGEX("(?:(a)|b)(?(?:", perl);
+ TEST_INVALID_REGEX("(?:(a)|b)(?(?<", perl);
+ TEST_INVALID_REGEX("(?:(a)|b)(?(?<a", perl);
++
++ TEST_INVALID_REGEX("(?(?!#?)+)", perl);
++ TEST_INVALID_REGEX("(?(?=:-){0})", perl);
++ TEST_INVALID_REGEX("(?(123){1})", perl);
++ TEST_INVALID_REGEX("(?(?<=A)*)", perl);
++ TEST_INVALID_REGEX("(?(?<=A)+)", perl);
++
++ TEST_INVALID_REGEX("(?<!*|^)", perl);
++ TEST_INVALID_REGEX("(?<!*|A)", perl);
++ TEST_INVALID_REGEX("(?<=?|A)", perl);
++ TEST_INVALID_REGEX("(?<=*|\B)", perl);
+ }
+
+ void test_options()
diff --git a/meta-pkgs/boost/patches/patch-r42745 b/meta-pkgs/boost/patches/patch-r42745
index 2944354b281..29480a621bd 100644
--- a/meta-pkgs/boost/patches/patch-r42745
+++ b/meta-pkgs/boost/patches/patch-r42745
@@ -1,13 +1,15 @@
-$NetBSD: patch-r42745,v 1.1 2008/04/28 21:35:25 jmmv Exp $
-
-Fix for CVE-2008-0171. Patch from Boost's svn repository, r42745.
-
---- libs/regex/test/regress/test_perl_ex.cpp (revision 42674)
-+++ libs/regex/test/regress/test_perl_ex.cpp (revision 42745)
-@@ -132,5 +132,5 @@
- TEST_INVALID_REGEX("(?<!*|A)", perl);
- TEST_INVALID_REGEX("(?<=?|A)", perl);
-- TEST_INVALID_REGEX("(?<=*|\B)", perl);
-+ TEST_INVALID_REGEX("(?<=*|\\B)", perl);
- }
-
+$NetBSD: patch-r42745,v 1.2 2008/04/30 07:13:26 jmmv Exp $
+
+Fix for CVE-2008-0171. Patch from Boost's svn repository, r42745.
+
+--- libs/regex/test/regress/test_perl_ex.cpp.orig 2008-04-30 09:01:13.000000000 +0200
++++ libs/regex/test/regress/test_perl_ex.cpp 2008-04-30 09:03:04.000000000 +0200
+@@ -131,7 +131,7 @@ void test_conditionals()
+ TEST_INVALID_REGEX("(?<!*|^)", perl);
+ TEST_INVALID_REGEX("(?<!*|A)", perl);
+ TEST_INVALID_REGEX("(?<=?|A)", perl);
+- TEST_INVALID_REGEX("(?<=*|\B)", perl);
++ TEST_INVALID_REGEX("(?<=*|\\B)", perl);
+ }
+
+ void test_options()
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 00:37:26 +0000