head 1.6; access; symbols OPENPKG_E1_MP_HEAD:1.5 OPENPKG_E1_MP:1.5 OPENPKG_E1_MP_2_STABLE:1.4.4.1 OPENPKG_E1_FP:1.4.4.1 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.4.4.1 OPENPKG_2_STABLE_20060622:1.4 OPENPKG_2_STABLE:1.4.0.4 OPENPKG_2_STABLE_BP:1.4 OPENPKG_2_5_RELEASE:1.4 OPENPKG_2_5_SOLID:1.4.0.2 OPENPKG_2_5_SOLID_BP:1.4 OPENPKG_2_3_SOLID:1.2.0.2 OPENPKG_2_4_RELEASE:1.1 OPENPKG_2_4_SOLID:1.1.0.2 OPENPKG_2_4_SOLID_BP:1.1; locks; strict; comment @# @; 1.6 date 2008.01.02.16.22.59; author rse; state Exp; branches; next 1.5; commitid Qs6Uo4bgWPyLhRLs; 1.5 date 2006.08.20.14.05.16; author rse; state Exp; branches; next 1.4; commitid MX9lX7mfmi0YAAJr; 1.4 date 2005.09.23.14.00.43; author rse; state Exp; branches 1.4.4.1; next 1.3; 1.3 date 2005.09.05.14.59.24; author rse; state Exp; branches; next 1.2; 1.2 date 2005.09.05.14.56.42; author rse; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2005.06.13.11.46.48; author rse; state Exp; branches 1.1.2.1; next ; 1.4.4.1 date 2006.10.16.14.58.00; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; 1.2.2.1 date 2005.09.05.14.58.53; author rse; state Exp; branches; next ; 1.1.2.1 date 2005.09.05.14.57.12; author rse; state Exp; branches; next ; desc @@ 1.6 log @fix building under Perl 5.10 @ text @Index: wml_aux/iselect/Makefile.in --- wml_aux/iselect/Makefile.in.orig 2005-12-01 18:50:13 +0100 +++ wml_aux/iselect/Makefile.in 2008-01-02 16:56:54 +0100 @@@@ -12,7 +12,7 @@@@ # compiler tools CC = @@CC@@ -CFLAGS = @@CFLAGS@@ -I. +CFLAGS = @@CFLAGS@@ -I. @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ debug = @@debug@@ Index: wml_aux/tidy/Makefile sed: -e expression #1, char 23: unknown option to `s' Index: wml_backend/p2_mp4h/pcre/pcre.c --- wml_backend/p2_mp4h/pcre/pcre.c.orig 2005-12-01 18:50:13 +0100 +++ wml_backend/p2_mp4h/pcre/pcre.c 2008-01-02 16:56:54 +0100 @@@@ -716,12 +716,23 @@@@ while ((cd->ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0'; +if (min < 0 || min > 65535) + { + *errorptr = ERR5; + return p; + } + if (*p == '}') max = min; else { if (*(++p) != '}') { max = 0; while((cd->ctypes[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0'; + if (max < 0 || max > 65535) + { + *errorptr = ERR5; + return p; + } if (max < min) { *errorptr = ERR4; Index: wml_backend/p3_eperl/configure.in --- wml_backend/p3_eperl/configure.in.orig 2005-12-01 18:50:13 +0100 +++ wml_backend/p3_eperl/configure.in 2008-01-02 16:57:28 +0100 @@@@ -159,7 +159,7 @@@@ define ) rc=yes AC_DEFINE(HAVE_PERL_DYNALOADER) - perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a + perl_dla= ;; * ) rc=no Index: wml_backend/p3_eperl/configure --- wml_backend/p3_eperl/configure.orig 2005-12-01 18:50:13 +0100 +++ wml_backend/p3_eperl/configure 2008-01-02 16:57:37 +0100 @@@@ -678,7 +678,7 @@@@ #define HAVE_PERL_DYNALOADER 1 EOF - perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a + perl_dla= ;; * ) rc=no Index: wml_backend/p3_eperl/eperl_main.c --- wml_backend/p3_eperl/eperl_main.c.orig 2005-12-01 18:50:13 +0100 +++ wml_backend/p3_eperl/eperl_main.c 2008-01-02 16:56:54 +0100 @@@@ -265,7 +265,7 @@@@ exit(rc); } -struct option options[] = { +static struct option options[] = { { "define", 1, NULL, 'd' }, { "setenv", 1, NULL, 'D' }, { "includedir", 1, NULL, 'I' }, Index: wml_common/gd/Makefile.PL.in --- wml_common/gd/Makefile.PL.in.orig 2005-12-01 18:50:13 +0100 +++ wml_common/gd/Makefile.PL.in 2008-01-02 16:56:54 +0100 @@@@ -12,8 +12,8 @@@@ # Uncomment the line below if you're getting link errors # having to do with missing math functions (like floor) - 'LIBS' => ["-lm @@LIBPNG@@"], - 'DEFINE' => '@@DEFS@@' + 'LIBS' => ["-lm @@LIBPNG@@ -L/openpkg-dev/lib -lz"], + 'DEFINE' => '@@DEFS@@ @@CPPFLAGS@@' # Uncomment the line below if you're using a perl compiled # for fastCGI (http://www.fastcgi.com/). # 'DEFINE' => '-DFCGI' @ 1.5 log @upgrading package: wml 2.0.9 -> 2.0.11 @ text @d3 1 a3 1 +++ wml_aux/iselect/Makefile.in 2006-08-20 15:48:19 +0200 d17 1 a17 1 +++ wml_backend/p2_mp4h/pcre/pcre.c 2006-08-20 15:48:19 +0200 d42 24 d68 1 a68 1 +++ wml_backend/p3_eperl/eperl_main.c 2006-08-20 15:48:19 +0200 d80 1 a80 1 +++ wml_common/gd/Makefile.PL.in 2006-08-20 15:48:19 +0200 @ 1.4 log @fix building under new GCC 4.0 world order @ text @d2 2 a3 2 --- wml_aux/iselect/Makefile.in.orig 2002-10-18 22:06:44 +0200 +++ wml_aux/iselect/Makefile.in 2005-06-13 13:22:23 +0200 d13 2 a14 19 Index: wml_common/gd/Makefile.PL.in --- wml_common/gd/Makefile.PL.in.orig 2000-03-12 17:22:30 +0100 +++ wml_common/gd/Makefile.PL.in 2005-06-13 11:51:23 +0200 @@@@ -12,8 +12,8 @@@@ # Uncomment the line below if you're getting link errors # having to do with missing math functions (like floor) - 'LIBS' => ["-lm @@LIBPNG@@"], - 'DEFINE' => '@@DEFS@@' + 'LIBS' => ["-lm @@LIBPNG@@ -L/openpkg-dev/lib -lz"], + 'DEFINE' => '@@DEFS@@ @@CPPFLAGS@@' # Uncomment the line below if you're using a perl compiled # for fastCGI (http://www.fastcgi.com/). # 'DEFINE' => '-DFCGI' ----------------------------------------------------------------------------- Security Fix (CAN-2005-2491, partially) d16 2 a17 2 --- wml_backend/p2_mp4h/pcre/pcre.c.orig 2002-06-15 23:24:09 +0200 +++ wml_backend/p2_mp4h/pcre/pcre.c 2005-09-05 16:53:43 +0200 d43 2 a44 2 --- wml_backend/p3_eperl/eperl_main.c.orig 2002-08-08 23:56:26 +0200 +++ wml_backend/p3_eperl/eperl_main.c 2005-09-23 14:55:19 +0200 d54 4 a57 9 Index: wml_backend/p3_eperl/eperl_proto.h --- wml_backend/p3_eperl/eperl_proto.h.orig 2002-10-18 23:48:38 +0200 +++ wml_backend/p3_eperl/eperl_proto.h 2005-09-23 14:55:10 +0200 @@@@ -53,7 +53,6 @@@@ extern void mysighandler(int rc); extern void myinit(void); extern void myexit(int rc); -extern struct option options[]; extern int main(int argc, char **argv, char **env); d59 9 a67 1 /* eperl_parse.c */ @ 1.4.4.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @d2 2 a3 2 --- wml_aux/iselect/Makefile.in.orig 2005-12-01 18:50:13 +0100 +++ wml_aux/iselect/Makefile.in 2006-08-20 15:48:19 +0200 d13 19 a31 2 Index: wml_aux/tidy/Makefile sed: -e expression #1, char 23: unknown option to `s' d33 2 a34 2 --- wml_backend/p2_mp4h/pcre/pcre.c.orig 2005-12-01 18:50:13 +0100 +++ wml_backend/p2_mp4h/pcre/pcre.c 2006-08-20 15:48:19 +0200 d60 2 a61 2 --- wml_backend/p3_eperl/eperl_main.c.orig 2005-12-01 18:50:13 +0100 +++ wml_backend/p3_eperl/eperl_main.c 2006-08-20 15:48:19 +0200 d71 9 a79 4 Index: wml_common/gd/Makefile.PL.in --- wml_common/gd/Makefile.PL.in.orig 2005-12-01 18:50:13 +0100 +++ wml_common/gd/Makefile.PL.in 2006-08-20 15:48:19 +0200 @@@@ -12,8 +12,8 @@@@ d81 1 a81 9 # Uncomment the line below if you're getting link errors # having to do with missing math functions (like floor) - 'LIBS' => ["-lm @@LIBPNG@@"], - 'DEFINE' => '@@DEFS@@' + 'LIBS' => ["-lm @@LIBPNG@@ -L/openpkg-dev/lib -lz"], + 'DEFINE' => '@@DEFS@@ @@CPPFLAGS@@' # Uncomment the line below if you're using a perl compiled # for fastCGI (http://www.fastcgi.com/). # 'DEFINE' => '-DFCGI' @ 1.3 log @remove crap from patch @ text @d59 23 @ 1.2 log @apply Security Fix (CAN-2005-2491, partially) @ text @a12 2 Index: wml_aux/tidy/Makefile sed: -e expression #1, char 23: unknown option to `s' @ 1.2.2.1 log @apply Security Fix (CAN-2005-2491, partially) @ text @d13 2 @ 1.1 log @try to fix building under Fedora and NetBSD @ text @d29 32 @ 1.1.2.1 log @apply Security Fix (CAN-2005-2491, partially) @ text @a28 32 ----------------------------------------------------------------------------- Security Fix (CAN-2005-2491, partially) Index: wml_backend/p2_mp4h/pcre/pcre.c --- wml_backend/p2_mp4h/pcre/pcre.c.orig 2002-06-15 23:24:09 +0200 +++ wml_backend/p2_mp4h/pcre/pcre.c 2005-09-05 16:53:43 +0200 @@@@ -716,12 +716,23 @@@@ while ((cd->ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0'; +if (min < 0 || min > 65535) + { + *errorptr = ERR5; + return p; + } + if (*p == '}') max = min; else { if (*(++p) != '}') { max = 0; while((cd->ctypes[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0'; + if (max < 0 || max > 65535) + { + *errorptr = ERR5; + return p; + } if (max < min) { *errorptr = ERR4; @