Wed Apr 30 07:13:26 2008 UTC ()
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.


(jmmv)
diff -r1.12 -r1.13 pkgsrc/meta-pkgs/boost/distinfo
diff -r1.1 -r1.2 pkgsrc/meta-pkgs/boost/patches/patch-r42674
diff -r1.1 -r1.2 pkgsrc/meta-pkgs/boost/patches/patch-r42745
cvs diff -r1.12 -r1.13 pkgsrc/meta-pkgs/boost/distinfo (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/distinfo 2008/04/28 21:35:25 1.12
+++ pkgsrc/meta-pkgs/boost/distinfo 2008/04/30 07:13:26 1.13
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.12 2008/04/28 21:35:25 jmmv Exp $ 1$NetBSD: distinfo,v 1.13 2008/04/30 07:13:26 jmmv Exp $
2 2
3SHA1 (boost_1_34_1.tar.bz2) = b771271d5cbd3bdb0f119dd66dfd36bad7a66866 3SHA1 (boost_1_34_1.tar.bz2) = b771271d5cbd3bdb0f119dd66dfd36bad7a66866
4RMD160 (boost_1_34_1.tar.bz2) = 303327ff852bc19dd7a94657fdef3c56f5882e06 4RMD160 (boost_1_34_1.tar.bz2) = 303327ff852bc19dd7a94657fdef3c56f5882e06
5Size (boost_1_34_1.tar.bz2) = 12986931 bytes 5Size (boost_1_34_1.tar.bz2) = 12986931 bytes
6SHA1 (patch-ac) = 453d4107df03e96e66cbdbebceebdfcbed2710c1 6SHA1 (patch-ac) = 453d4107df03e96e66cbdbebceebdfcbed2710c1
7SHA1 (patch-ad) = 074db0bdee7ca145cda2c938626b7d5e3e1e7368 7SHA1 (patch-ad) = 074db0bdee7ca145cda2c938626b7d5e3e1e7368
8SHA1 (patch-af) = f0a1fc4b9884663fbe5b9613bc61837b8e6e6af1 8SHA1 (patch-af) = f0a1fc4b9884663fbe5b9613bc61837b8e6e6af1
9SHA1 (patch-ah) = dc5d1d90998aad0f9689470166fd82f1eccdffe3 9SHA1 (patch-ah) = dc5d1d90998aad0f9689470166fd82f1eccdffe3
10SHA1 (patch-ak) = 32785c636ccc9be479db2d40d170f95e77d4e291 10SHA1 (patch-ak) = 32785c636ccc9be479db2d40d170f95e77d4e291
11SHA1 (patch-al) = 23756770d17d7958b0b9423e379fe0a1a2dd83f8 11SHA1 (patch-al) = 23756770d17d7958b0b9423e379fe0a1a2dd83f8
12SHA1 (patch-am) = 07f1e1e15d4129c7a8762ad2e81632fdd24e9515 12SHA1 (patch-am) = 07f1e1e15d4129c7a8762ad2e81632fdd24e9515
13SHA1 (patch-an) = 91887a9a37e9d891252e0556ee40b58a1c6bc6cf 13SHA1 (patch-an) = 91887a9a37e9d891252e0556ee40b58a1c6bc6cf
14SHA1 (patch-ao) = a8499a326f72c9fbfd31f0b0f23014729a2a0dae 14SHA1 (patch-ao) = a8499a326f72c9fbfd31f0b0f23014729a2a0dae
15SHA1 (patch-r42674) = f115b4ae5ab3e184d711a9d8968f3a435249e5f3 15SHA1 (patch-r42674) = c2b56a93f6a6d7fb71f1d639d5cfb2884b6e025e
16SHA1 (patch-r42745) = 432417b0ad4944c9da9f68cf2e855d91c698c4f6 16SHA1 (patch-r42745) = b1659fd244b1d8182b6d64923f112dc72c5ab5f3
cvs diff -r1.1 -r1.2 pkgsrc/meta-pkgs/boost/patches/Attic/patch-r42674 (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/patches/Attic/patch-r42674 2008/04/28 21:35:25 1.1
+++ pkgsrc/meta-pkgs/boost/patches/Attic/patch-r42674 2008/04/30 07:13:26 1.2
@@ -1,50 +1,58 @@ @@ -1,50 +1,58 @@
1$NetBSD: patch-r42674,v 1.1 2008/04/28 21:35:25 jmmv Exp $  1$NetBSD: patch-r42674,v 1.2 2008/04/30 07:13:26 jmmv Exp $
2  2
3Fix for CVE-2008-0171. Patch from Boost's svn repository, r42674.  3Fix for CVE-2008-0171. Patch from Boost's svn repository, r42674.
4  4
5--- boost/regex/v4/basic_regex_parser.hpp (revision 38864)  5--- boost/regex/v4/basic_regex_parser.hpp.orig 2008-04-30 09:00:21.000000000 +0200
6+++ boost/regex/v4/basic_regex_parser.hpp (revision 42674)  6+++ boost/regex/v4/basic_regex_parser.hpp 2008-04-30 09:01:13.000000000 +0200
7@@ -785,4 +785,5 @@  7@@ -784,6 +784,7 @@ bool basic_regex_parser<charT, traits>::
8 case syntax_element_jump:  8 // do nothing...
9 case syntax_element_startmark:  9 break;
10+ case syntax_element_backstep:  10 }
11 // can't legally repeat any of the above:  11+ case syntax_element_backstep:
12 fail(regex_constants::error_badrepeat, m_position - m_base);  12 insert_point = this->getoffset(this->m_last_state);
13@@ -1870,4 +1871,5 @@  13 }
14 {  14 //
15 re_syntax_base* b = this->getaddress(expected_alt_point);  15@@ -1869,6 +1870,7 @@ bool basic_regex_parser<charT, traits>::
16+ // Make sure we have exactly one alternative following this state:  16 }
17 if(b->type != syntax_element_alt)  17 else if(this->getaddress(static_cast<re_alt*>(b)->alt.i, b)->type == syntax_element_alt)
18 {  18 {
19@@ -1878,4 +1880,13 @@  19+ // Make sure we have exactly one alternative following this state:
20 {  20 fail(regex_constants::error_bad_pattern, m_position - m_base);
21 fail(regex_constants::error_bad_pattern, m_position - m_base);  21 return false;
22+ return false;  22 }
23+ }  23@@ -1877,6 +1879,15 @@ bool basic_regex_parser<charT, traits>::
24+ // check for invalid repetition of next state:  24 // append closing parenthesis state:
25+ b = this->getaddress(expected_alt_point);  25 //
26+ b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);  26 pb = static_cast<re_brace*>(this->append_state(syntax_element_endmark, sizeof(re_brace)));
27+ if((b->type != syntax_element_assert_backref)  27+ return false;
28+ && (b->type != syntax_element_startmark))  28+ }
29+ {  29+ // check for invalid repetition of next state:
30+ fail(regex_constants::error_badrepeat, m_position - m_base);  30+ b = this->getaddress(expected_alt_point);
31 return false;  31+ b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);
32 }  32+ if((b->type != syntax_element_assert_backref)
33--- libs/regex/test/regress/test_perl_ex.cpp (revision 30980)  33+ && (b->type != syntax_element_startmark))
34+++ libs/regex/test/regress/test_perl_ex.cpp (revision 42674)  34+ {
35@@ -122,4 +122,15 @@  35+ fail(regex_constants::error_badrepeat, m_position - m_base);
36 TEST_INVALID_REGEX("(?:(a)|b)(?(?<", perl);  36 pb->index = markid;
37 TEST_INVALID_REGEX("(?:(a)|b)(?(?<a", perl);  37 this->m_paren_start = last_paren_start;
38+  38 //
39+ TEST_INVALID_REGEX("(?(?!#?)+)", perl);  39--- libs/regex/test/regress/test_perl_ex.cpp.orig 2008-04-30 09:00:21.000000000 +0200
40+ TEST_INVALID_REGEX("(?(?=:-){0})", perl);  40+++ libs/regex/test/regress/test_perl_ex.cpp 2008-04-30 09:01:13.000000000 +0200
41+ TEST_INVALID_REGEX("(?(123){1})", perl);  41@@ -121,6 +121,17 @@ void test_conditionals()
42+ TEST_INVALID_REGEX("(?(?<=A)*)", perl);  42 TEST_INVALID_REGEX("(?:(a)|b)(?(?:", perl);
43+ TEST_INVALID_REGEX("(?(?<=A)+)", perl);  43 TEST_INVALID_REGEX("(?:(a)|b)(?(?<", perl);
44+  44 TEST_INVALID_REGEX("(?:(a)|b)(?(?<a", perl);
45+ TEST_INVALID_REGEX("(?<!*|^)", perl);  45+
46+ TEST_INVALID_REGEX("(?<!*|A)", perl);  46+ TEST_INVALID_REGEX("(?(?!#?)+)", perl);
47+ TEST_INVALID_REGEX("(?<=?|A)", perl);  47+ TEST_INVALID_REGEX("(?(?=:-){0})", perl);
48+ TEST_INVALID_REGEX("(?<=*|\B)", perl);  48+ TEST_INVALID_REGEX("(?(123){1})", perl);
49 }  49+ TEST_INVALID_REGEX("(?(?<=A)*)", perl);
50  50+ TEST_INVALID_REGEX("(?(?<=A)+)", perl);
 51+
 52+ TEST_INVALID_REGEX("(?<!*|^)", perl);
 53+ TEST_INVALID_REGEX("(?<!*|A)", perl);
 54+ TEST_INVALID_REGEX("(?<=?|A)", perl);
 55+ TEST_INVALID_REGEX("(?<=*|\B)", perl);
 56 }
 57
 58 void test_options()
cvs diff -r1.1 -r1.2 pkgsrc/meta-pkgs/boost/patches/Attic/patch-r42745 (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/patches/Attic/patch-r42745 2008/04/28 21:35:25 1.1
+++ pkgsrc/meta-pkgs/boost/patches/Attic/patch-r42745 2008/04/30 07:13:26 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-r42745,v 1.1 2008/04/28 21:35:25 jmmv Exp $  1$NetBSD: patch-r42745,v 1.2 2008/04/30 07:13:26 jmmv Exp $
2  2
3Fix for CVE-2008-0171. Patch from Boost's svn repository, r42745.  3Fix for CVE-2008-0171. Patch from Boost's svn repository, r42745.
4  4
5--- libs/regex/test/regress/test_perl_ex.cpp (revision 42674)  5--- libs/regex/test/regress/test_perl_ex.cpp.orig 2008-04-30 09:01:13.000000000 +0200
6+++ libs/regex/test/regress/test_perl_ex.cpp (revision 42745)  6+++ libs/regex/test/regress/test_perl_ex.cpp 2008-04-30 09:03:04.000000000 +0200
7@@ -132,5 +132,5 @@  7@@ -131,7 +131,7 @@ void test_conditionals()
8 TEST_INVALID_REGEX("(?<!*|A)", perl);  8 TEST_INVALID_REGEX("(?<!*|^)", perl);
9 TEST_INVALID_REGEX("(?<=?|A)", perl);  9 TEST_INVALID_REGEX("(?<!*|A)", perl);
10- TEST_INVALID_REGEX("(?<=*|\B)", perl);  10 TEST_INVALID_REGEX("(?<=?|A)", perl);
11+ TEST_INVALID_REGEX("(?<=*|\\B)", perl);  11- TEST_INVALID_REGEX("(?<=*|\B)", perl);
12 }  12+ TEST_INVALID_REGEX("(?<=*|\\B)", perl);
13  13 }
 14
 15 void test_options()