head 1.10; access; symbols OPENPKG_E1_MP_HEAD:1.9 OPENPKG_E1_MP:1.9 OPENPKG_E1_MP_2_STABLE:1.9 OPENPKG_E1_FP:1.9 OPENPKG_2_STABLE_MP:1.9 OPENPKG_2_STABLE_20061018:1.9 OPENPKG_2_STABLE_20060622:1.9 OPENPKG_2_STABLE:1.9.0.2 OPENPKG_2_STABLE_BP:1.9 OPENPKG_2_5_RELEASE:1.7 OPENPKG_2_5_SOLID:1.7.0.6 OPENPKG_2_5_SOLID_BP:1.7 OPENPKG_2_4_RELEASE:1.7 OPENPKG_2_4_SOLID:1.7.0.4 OPENPKG_2_4_SOLID_BP:1.7 OPENPKG_CW_FP:1.7 OPENPKG_2_3_RELEASE:1.7 OPENPKG_2_3_SOLID:1.7.0.2 OPENPKG_2_3_SOLID_BP:1.7 OPENPKG_2_2_RELEASE:1.3 OPENPKG_2_2_SOLID:1.3.0.2 OPENPKG_2_2_SOLID_BP:1.3 OPENPKG_2_1_RELEASE:1.1.4.2 OPENPKG_2_1_SOLID:1.1.0.4 OPENPKG_2_1_SOLID_BP:1.1 OPENPKG_2_0_RELEASE:1.1 OPENPKG_2_0_SOLID:1.1.0.2 OPENPKG_2_0_SOLID_BP:1.1; locks; strict; comment @# @; 1.10 date 2009.04.30.21.21.47; author rse; state Exp; branches; next 1.9; commitid 2s9A1tdcaQhIn5Mt; 1.9 date 2006.03.07.14.43.36; author rse; state Exp; branches; next 1.8; commitid Q0VP7GSl09iX8gor; 1.8 date 2006.02.04.09.20.39; author rse; state Exp; branches; next 1.7; commitid MJ8L2RwUg69Wlfkr; 1.7 date 2005.01.29.09.35.21; author rse; state Exp; branches; next 1.6; 1.6 date 2005.01.20.15.42.40; author ms; state Exp; branches; next 1.5; 1.5 date 2005.01.20.15.35.24; author ms; state Exp; branches; next 1.4; 1.4 date 2005.01.20.14.40.53; author hms; state Exp; branches; next 1.3; 1.3 date 2004.07.07.14.57.49; author ms; state Exp; branches; next 1.2; 1.2 date 2004.07.07.14.12.23; author ms; state Exp; branches; next 1.1; 1.1 date 2003.10.23.20.20.38; author rse; state Exp; branches 1.1.4.1; next ; 1.1.4.1 date 2004.07.07.14.33.54; author thl; state Exp; branches; next 1.1.4.2; 1.1.4.2 date 2004.07.07.20.13.47; author thl; state Exp; branches; next ; desc @@ 1.10 log @upgrading package: sed 4.1.5 -> 4.2 @ text @Index: lib/regex_internal.h --- lib/regex_internal.h.orig 2009-03-31 08:52:25 +0200 +++ lib/regex_internal.h 2009-04-30 22:41:19 +0200 @@@@ -458,7 +458,9 @@@@ #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) +#ifdef HAVE_ALLOCA_H #include +#endif #ifndef _LIBC # if HAVE_ALLOCA @ 1.9 log @remove unportable code as it seems to be not necessary @ text @a0 43 Index: configure --- configure.orig 2006-02-03 10:24:40 +0100 +++ configure 2006-03-07 15:40:49 +0100 @@@@ -11265,16 +11265,7 @@@@ esac done ;; gettext-fix ) - sed -e '/^mkinstalldirs *=/a\' \ - -e "install_sh=$install_sh" \ - -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \ - intl/Makefile > intl/Makefile.tmp - mv intl/Makefile.tmp intl/Makefile - sed -e '/^mkinstalldirs *=/a\' \ - -e "install_sh=$install_sh" \ - -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \ - po/Makefile > po/Makefile.tmp - mv po/Makefile.tmp po/Makefile ;; + ;; esac done _ACEOF Index: lib/getline.c --- lib/getline.c.orig 2005-06-21 16:09:37 +0200 +++ lib/getline.c 2006-03-07 15:37:47 +0100 @@@@ -23,6 +23,7 @@@@ #include #include +#include /* Read up to (and including) a '\n' from STREAM into *LINEPTR (and null-terminate it). *LINEPTR is a pointer returned from malloc (or Index: lib/getopt.c --- lib/getopt.c.orig 2005-06-21 16:09:37 +0200 +++ lib/getopt.c 2006-03-07 15:37:47 +0100 @@@@ -43,6 +43,7 @@@@ #endif #include +#include /* Comment out all this code if we are using the GNU C Library, and are not actually compiling the library itself. This code is part of the GNU C d2 3 a4 3 --- lib/regex_internal.h.orig 2005-12-06 09:50:56 +0100 +++ lib/regex_internal.h 2006-03-07 15:37:47 +0100 @@@@ -410,7 +410,9 @@@@ @ 1.8 log @upgrading package: sed 4.1.4 -> 4.1.5 @ text @d1 21 d24 1 a24 1 +++ lib/getline.c 2006-02-04 10:09:00 +0100 d35 1 a35 1 +++ lib/getopt.c 2006-02-04 10:11:57 +0100 d46 1 a46 1 +++ lib/regex_internal.h 2006-02-04 10:13:09 +0100 @ 1.7 log @upgrading package: sed 4.1.2 -> 4.1.4 @ text @d2 2 a3 2 --- lib/getline.c.orig 2003-08-26 11:11:17.000000000 +0200 +++ lib/getline.c 2003-10-23 22:19:20.000000000 +0200 d12 24 @ 1.6 log @backout sed upgrade, due to runtime problems on all platforms badly affecting the host OpenPKG instance (because OpenPKG itself uses sed) @ text @a11 19 Index: configure --- configure.orig 2004-07-06 09:19:36 +0200 +++ configure 2004-07-07 16:53:15 +0200 @@@@ -3466,6 +3466,7 @@@@ fi + ac_max=0 ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in" while : @@@@ -3548,6 +3549,7 @@@@ } # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + ac_max=0 for as_dir in $PATH do IFS=$as_save_IFS @ 1.5 log @correct patch offset and remove invalid patch hunk (no longer relevant in new version configure) @ text @d12 19 @ 1.4 log @upgrade package: sed 4.1.2 -> 4.1.3, patch modified - 1 hunk no longer needed @ text @d4 1 a4 1 @@@@ -18,6 +18,7 @@@@ a11 11 Index: configure --- configure.orig 2004-07-06 09:19:36 +0200 +++ configure 2004-07-07 16:53:15 +0200 @@@@ -3548,6 +3549,7 @@@@ } # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + ac_max=0 for as_dir in $PATH do IFS=$as_save_IFS @ 1.3 log @move the autoconf macro ac_max variable correction to a more ideal place out of the loop @ text @a14 8 @@@@ -3466,6 +3466,7 @@@@ fi + ac_max=0 ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in" while : @ 1.2 log @repair defective iteration and compare logic while testing for grep(1) and egrep(1) @ text @d14 3 a16 2 +++ configure 2004-07-07 16:08:59 +0200 @@@@ -3467,6 +3467,7 @@@@ d19 1 a20 1 + ac_max=0 d23 4 a26 5 do @@@@ -3567,6 +3568,7 @@@@ ac_count=0 d28 3 a30 3 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in" while : do @ 1.1 log @upgrading package: sed 4.0.7 -> 4.0.8 @ text @d12 19 @ 1.1.4.1 log @MFC: repair defective iteration and compare logic while testing for grep(1) and egrep(1) @ text @a11 19 Index: configure --- configure.orig 2004-07-06 09:19:36 +0200 +++ configure 2004-07-07 16:08:59 +0200 @@@@ -3467,6 +3467,7 @@@@ ac_count=0 + ac_max=0 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in" while : do @@@@ -3567,6 +3568,7 @@@@ ac_count=0 + ac_max=0 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in" while : do @ 1.1.4.2 log @MFC: move the autoconf macro ac_max variable correction to a more ideal place out of the loop @ text @d14 2 a15 3 +++ configure 2004-07-07 16:53:15 +0200 @@@@ -3466,6 +3466,7 @@@@ fi d18 1 d20 6 d27 1 d30 1 a30 8 @@@@ -3548,6 +3549,7 @@@@ } # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + ac_max=0 for as_dir in $PATH do IFS=$as_save_IFS @