head 1.10; access; symbols OPENPKG_2_STABLE_MP:1.4 OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.4 OPENPKG_E1_FP:1.4 OPENPKG_2_STABLE_20061018:1.4 OPENPKG_2_STABLE:1.4.0.6 OPENPKG_2_STABLE_BP:1.4 OPENPKG_2_5_SOLID:1.4.0.4 OPENPKG_2_5_SOLID_BP:1.4 OPENPKG_2_3_SOLID:1.4.0.2 OPENPKG_2_4_RELEASE:1.2 OPENPKG_2_4_SOLID:1.2.0.2 OPENPKG_2_4_SOLID_BP:1.2; locks; strict; comment @# @; 1.10 date 2009.10.19.20.12.22; author rse; state Exp; branches; next 1.9; commitid 0jTP5HCeOCp7tb8u; 1.9 date 2009.04.11.21.26.53; author rse; state Exp; branches; next 1.8; commitid YtSQqEhePklk1EJt; 1.8 date 2008.09.06.07.51.24; author rse; state Exp; branches; next 1.7; commitid sNSMJ3QHaFT1uGht; 1.7 date 2008.08.13.06.17.30; author rse; state Exp; branches; next 1.6; commitid saPhh0JakmlDJAet; 1.6 date 2008.01.10.20.47.35; author rse; state Exp; branches; next 1.5; commitid yl8QggQfRA7BuUMs; 1.5 date 2007.11.01.19.30.53; author rse; state Exp; branches; next 1.4; commitid 4XXjB9ngaBNMjUDs; 1.4 date 2005.08.18.14.25.34; author cs; state dead; branches 1.4.2.1; next 1.3; 1.3 date 2005.06.22.18.27.23; author rse; state Exp; branches; next 1.2; 1.2 date 2005.06.10.16.47.44; author steve; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2005.06.09.12.47.50; author steve; state Exp; branches; next ; 1.4.2.1 date 2005.09.05.08.08.22; author rse; state Exp; branches; next ; 1.2.2.1 date 2005.09.05.08.04.58; author rse; state Exp; branches; next ; desc @@ 1.10 log @upgrading package: pcre 7.9 -> 8.00 @ text @Index: configure --- configure.orig 2009-10-19 16:12:16 +0200 +++ configure 2009-10-19 22:07:07 +0200 @@@@ -3041,13 +3041,6 @@@@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } fi ac_exeext=$ac_cv_exeext @@@@ -7604,13 +7597,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + : fi ac_ext=c Index: pcreposix.h --- pcreposix.h.orig 2009-09-02 17:33:39 +0200 +++ pcreposix.h 2009-10-19 22:06:19 +0200 @@@@ -132,6 +132,12 @@@@ /* The functions */ +/* link-time symbol namespace conflict prevention */ +#define regcomp pcreposix_regcomp +#define regexec pcreposix_regexec +#define regerror pcreposix_regerror +#define regfree pcreposix_regfree + PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int); PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t, regmatch_t *, int); @ 1.9 log @upgrading package: pcre 7.8 -> 7.9 @ text @d2 7 a8 7 --- configure.orig 2009-04-11 16:10:35 +0200 +++ configure 2009-04-11 23:21:37 +0200 @@@@ -5844,13 +5844,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 d10 1 a10 1 -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check d12 1 a12 1 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check d14 1 a14 2 - { (exit 1); exit 1; }; }; } + : d17 2 a18 2 ac_ext=c @@@@ -6479,13 +6473,7 @@@@ d24 1 a24 1 -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check d26 1 a26 1 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check d32 1 a32 1 ac_ext=cpp d34 3 a36 3 --- pcreposix.h.orig 2009-03-11 17:47:05 +0100 +++ pcreposix.h 2009-04-11 23:20:58 +0200 @@@@ -131,6 +131,12 @@@@ @ 1.8 log @upgrading package: pcre 7.7 -> 7.8 @ text @d1 33 d35 3 a37 3 --- pcreposix.h.orig 2007-08-01 11:06:39 +0200 +++ pcreposix.h 2008-01-10 21:46:25 +0100 @@@@ -129,6 +129,12 @@@@ @ 1.7 log @apply a bugfix from FreeBSD ports @ text @a16 12 Index: pcre_compile.c --- pcre_compile.c +++ pcre_compile.c @@@@ -4931,7 +4931,7 @@@@ (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) { cd->external_options = newoptions; - options = newoptions; + options = *optionsptr = newoptions; } else { @ 1.6 log @upgrading package: pcre 7.4 -> 7.5 @ text @d17 12 @ 1.5 log @apply a preventive link-time symbol namespace conflict workaround (we got caught by a symbol conflict and resulting segfault in the RPM 5 camp and this change prevents such sitations already in advance) @ text @d3 1 a3 1 +++ pcreposix.h 2007-11-01 20:28:15 +0100 @ 1.4 log @upgrading package: pcre 6.2 -> 6.3 @ text @d1 4 a4 6 Index: Makefile.in --- Makefile.in.orig 2005-06-22 10:40:52 +0200 +++ Makefile.in 2005-06-22 20:23:03 +0200 @@@@ -171,7 +171,7 @@@@ pcre_scanner_unittest@@EXEEXT@@ \ pcre_stringpiece_unittest@@EXEEXT@@ d6 1 a6 2 -all: libpcre.la @@POSIX_LIB@@ pcretest@@EXEEXT@@ pcregrep@@EXEEXT@@ @@MAYBE_CPP_TARGETS@@ @@ON_WINDOWS@@ winshared +all: libpcre.la @@POSIX_LIB@@ pcretest@@EXEEXT@@ pcregrep@@EXEEXT@@ @@ON_WINDOWS@@ winshared d8 9 a16 13 pcregrep@@EXEEXT@@: libpcre.la pcregrep.@@OBJEXT@@ @@ON_WINDOWS@@ winshared $(LINK) -o pcregrep@@EXEEXT@@ pcregrep.@@OBJEXT@@ libpcre.la @@@@ -437,8 +437,8 @@@@ @@NOT_ON_WINDOWS@@ $(LIBTOOL) --mode=install $(INSTALL) libpcre.la $(DESTDIR)$(LIBDIR)/libpcre.la @@NOT_ON_WINDOWS@@ echo "$(LIBTOOL) --mode=install $(INSTALL) libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la" @@NOT_ON_WINDOWS@@ $(LIBTOOL) --mode=install $(INSTALL) libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la -@@NOT_ON_WINDOWS@@ echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la" -@@NOT_ON_WINDOWS@@ $(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la +@@NOT_ON_WINDOWS@@ # echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la" +@@NOT_ON_WINDOWS@@ # $(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la @@NOT_ON_WINDOWS@@ $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR) $(mkinstalldirs) $(DESTDIR)$(INCDIR) $(INSTALL_DATA) pcre.h $(DESTDIR)$(INCDIR)/pcre.h @ 1.4.2.1 log @apply Security Fix (CAN-2005-2491) @ text @d1 23 a23 108 Security Fix (CAN-2005-2491) Index: pcre.c --- pcre.c.orig 2004-09-13 16:20:00 +0200 +++ pcre.c 2005-09-05 10:07:05 +0200 @@@@ -1245,7 +1245,18 @@@@ int min = 0; int max = -1; +/* Read the minimum value and do a paranoid check: a negative value indicates +an integer overflow. */ + while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0'; +if (min < 0 || min > 65535) + { + *errorptr = ERR5; + return p; + } + +/* Read the maximum value if there is one, and again do a paranoid on its size. +Also, max must not be less than min. */ if (*p == '}') max = min; else { @@@@ -1253,6 +1264,11 @@@@ { max = 0; while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0'; + if (max < 0 || max > 65535) + { + *errorptr = ERR5; + return p; + } if (max < min) { *errorptr = ERR4; @@@@ -4475,6 +4491,7 @@@@ BOOL class_utf8; #endif BOOL inescq = FALSE; +BOOL capturing; unsigned int brastackptr = 0; size_t size; uschar *code; @@@@ -5021,6 +5038,7 @@@@ case '(': branch_newextra = 0; bracket_length = 1 + LINK_SIZE; + capturing = FALSE; /* Handle special forms of bracket, which all start (? */ @@@@ -5108,6 +5126,9 @@@@ case 'P': ptr += 3; + + /* Handle the definition of a named subpattern */ + if (*ptr == '<') { const uschar *p; /* Don't amalgamate; some compilers */ @@@@ -5120,9 +5141,12 @@@@ } name_count++; if (ptr - p > max_name_size) max_name_size = (ptr - p); + capturing = TRUE; /* Named parentheses are always capturing */ break; } + /* Handle back references and recursive calls to named subpatterns */ + if (*ptr == '=' || *ptr == '>') { while ((compile_block.ctypes[*(++ptr)] & ctype_word) != 0); @@@@ -5297,18 +5321,24 @@@@ continue; } - /* If options were terminated by ':' control comes here. Fall through - to handle the group below. */ + /* If options were terminated by ':' control comes here. This is a + non-capturing group with an options change. There is nothing more that + needs to be done because "capturing" is already set FALSE by default; + we can just fall through. */ + } } - /* Extracting brackets must be counted so we can process escapes in a - Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to - need an additional 3 bytes of store per extracting bracket. However, if - PCRE_NO_AUTO)CAPTURE is set, unadorned brackets become non-capturing, so we - must leave the count alone (it will aways be zero). */ + /* Ordinary parentheses, not followed by '?', are capturing unless + PCRE_NO_AUTO_CAPTURE is set. */ + + else capturing = (options & PCRE_NO_AUTO_CAPTURE) == 0; + + /* Capturing brackets must be counted so we can process escapes in a + Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to need + an additional 3 bytes of memory per capturing bracket. */ - else if ((options & PCRE_NO_AUTO_CAPTURE) == 0) + if (capturing) { bracount++; if (bracount > EXTRACT_BASIC_MAX) bracket_length += 3; @ 1.3 log @upgrading package: pcre 6.0 -> 6.1 @ text @@ 1.2 log @Removed C++ targets from makefile and commented out installation of C++ bindings @ text @d2 2 a3 2 --- Makefile.in.orig 2005-06-07 10:36:38 +0200 +++ Makefile.in 2005-06-10 13:56:47 +0200 d8 1 a8 1 -all: libpcre.la @@POSIX_LIB@@ @@MAYBE_CPP_TARGETS@@ pcretest@@EXEEXT@@ pcregrep@@EXEEXT@@ @@ON_WINDOWS@@ winshared @ 1.2.2.1 log @apply Security Fix (CAN-2005-2491) @ text @a23 132 ------------------------------------------------------------------------------ Security Fix (CAN-2005-2491) Index: pcre_compile.c --- pcre_compile.c.orig 2005-06-22 10:40:52 +0200 +++ pcre_compile.c 2005-08-01 11:58:12 +0200 @@@@ -698,7 +698,18 @@@@ int min = 0; int max = -1; +/* Read the minimum value and do a paranoid check: a negative value indicates +an integer overflow. */ + while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0'; +if (min < 0 || min > 65535) + { + *errorcodeptr = ERR5; + return p; + } + +/* Read the maximum value if there is one, and again do a paranoid on its size. +Also, max must not be less than min. */ if (*p == '}') max = min; else { @@@@ -706,6 +717,11 @@@@ { max = 0; while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0'; + if (max < 0 || max > 65535) + { + *errorcodeptr = ERR5; + return p; + } if (max < min) { *errorcodeptr = ERR4; @@@@ -714,16 +730,11 @@@@ } } -/* Do paranoid checks, then fill in the required variables, and pass back the -pointer to the terminating '}'. */ +/* Fill in the required variables, and pass back the pointer to the terminating +'}'. */ -if (min > 65535 || max > 65535) - *errorcodeptr = ERR5; -else - { - *minp = min; - *maxp = max; - } +*minp = min; +*maxp = max; return p; } @@@@ -3856,6 +3867,7 @@@@ BOOL class_utf8; #endif BOOL inescq = FALSE; +BOOL capturing; unsigned int brastackptr = 0; size_t size; uschar *code; @@@@ -4410,6 +4422,7 @@@@ case '(': branch_newextra = 0; bracket_length = 1 + LINK_SIZE; + capturing = FALSE; /* Handle special forms of bracket, which all start (? */ @@@@ -4497,6 +4510,9 @@@@ case 'P': ptr += 3; + + /* Handle the definition of a named subpattern */ + if (*ptr == '<') { const uschar *p; /* Don't amalgamate; some compilers */ @@@@ -4509,9 +4525,12 @@@@ } name_count++; if (ptr - p > max_name_size) max_name_size = (ptr - p); + capturing = TRUE; /* Named parentheses are always capturing */ break; } + /* Handle back references and recursive calls to named subpatterns */ + if (*ptr == '=' || *ptr == '>') { while ((compile_block.ctypes[*(++ptr)] & ctype_word) != 0); @@@@ -4695,18 +4714,24 @@@@ continue; } - /* If options were terminated by ':' control comes here. Fall through - to handle the group below. */ + /* If options were terminated by ':' control comes here. This is a + non-capturing group with an options change. There is nothing more that + needs to be done because "capturing" is already set FALSE by default; + we can just fall through. */ + } } - /* Extracting brackets must be counted so we can process escapes in a - Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to - need an additional 3 bytes of store per extracting bracket. However, if - PCRE_NO_AUTO)CAPTURE is set, unadorned brackets become non-capturing, so we - must leave the count alone (it will aways be zero). */ + /* Ordinary parentheses, not followed by '?', are capturing unless + PCRE_NO_AUTO_CAPTURE is set. */ + + else capturing = (options & PCRE_NO_AUTO_CAPTURE) == 0; + + /* Capturing brackets must be counted so we can process escapes in a + Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to need + an additional 3 bytes of memory per capturing bracket. */ - else if ((options & PCRE_NO_AUTO_CAPTURE) == 0) + if (capturing) { bracount++; if (bracount > EXTRACT_BASIC_MAX) bracket_length += 3; @ 1.1 log @fixed the install phase for build without C++ Compiler @ text @d1 13 a13 3 --- Makefile.in.orig 2005-06-07 10:36:38.000000000 +0200 +++ Makefile.in 2005-06-09 14:11:36.152948488 +0200 @@@@ -437,9 +437,12 @@@@ d19 3 a21 7 -@@NOT_ON_WINDOWS@@ $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR) +@@NOT_ON_WINDOWS@@ ( if [ -f libpcrecpp.la ] ; then \ + echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la" ;\ + $(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la ;\ + $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR) ;\ + fi \ + ) a23 1 $(INSTALL_DATA) $(top_srcdir)/pcreposix.h $(DESTDIR)$(INCDIR)/pcreposix.h @