head 1.4; access; symbols; locks; strict; comment @# @; 1.4 date 2009.09.23.19.02.09; author rse; state Exp; branches; next 1.3; commitid NARBaovacXLPUP4u; 1.3 date 2009.09.20.18.42.55; author rse; state Exp; branches; next 1.2; commitid CX02n3r48GgeUr4u; 1.2 date 2007.12.07.08.33.03; author rse; state Exp; branches; next 1.1; commitid 1ABiCFLKv8dlwtIs; 1.1 date 2007.10.02.14.23.57; author rse; state Exp; branches; next ; commitid dI4vh8dUxhyhA1As; desc @@ 1.4 log @upgrading package: erlang R13B01 -> R13B02.1 @ text @Index: erts/configure --- erts/configure.orig 2009-09-21 11:29:49 +0200 +++ erts/configure 2009-09-23 20:39:09 +0200 @@@@ -11331,7 +11331,7 @@@@ -if test "x$enable_sctp" == "xyes" ; then +if test "x$enable_sctp" = "xyes" ; then echo "$as_me:$LINENO: checking for netinet/sctp.h" >&5 echo $ECHO_N "checking for netinet/sctp.h... $ECHO_C" >&6 if test "${ac_cv_header_netinet_sctp_h+set}" = set; then Index: erts/emulator/Makefile.in --- erts/emulator/Makefile.in.orig 2009-09-18 16:06:45 +0200 +++ erts/emulator/Makefile.in 2009-09-23 20:39:09 +0200 @@@@ -611,7 +611,7 @@@@ $(OBJDIR)/%.o: beam/%.c - $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@@ + $(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@@ else Index: erts/emulator/beam/erl_time_sup.c --- erts/emulator/beam/erl_time_sup.c.orig 2009-06-05 14:53:17 +0200 +++ erts/emulator/beam/erl_time_sup.c 2009-09-23 20:39:09 +0200 @@@@ -650,6 +650,9 @@@@ t.tm_sec = *second; t.tm_isdst = isdst; the_clock = mktime(&t); + if (the_clock == -1) { + return 0; + } #ifdef HAVE_GMTIME_R gmtime_r(&the_clock, (tm = &tmbuf)); #else Index: erts/emulator/drivers/common/inet_drv.c --- erts/emulator/drivers/common/inet_drv.c.orig 2009-06-05 14:53:08 +0200 +++ erts/emulator/drivers/common/inet_drv.c 2009-09-23 20:39:09 +0200 @@@@ -5305,12 +5305,15 @@@@ if (pmtud_enable) cflags |= SPP_PMTUD_ENABLE; if (pmtud_disable) cflags |= SPP_PMTUD_DISABLE; +# ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY + /* The followings are missing in FreeBSD 7.1 */ sackdelay_enable =eflags& SCTP_FLAG_SACDELAY_ENABLE; sackdelay_disable=eflags& SCTP_FLAG_SACDELAY_DISABLE; if (sackdelay_enable && sackdelay_disable) return -1; if (sackdelay_enable) cflags |= SPP_SACKDELAY_ENABLE; if (sackdelay_disable) cflags |= SPP_SACKDELAY_DISABLE; +# endif arg.pap.spp_flags = cflags; # endif @@@@ -6211,13 +6214,15 @@@@ if (ap.spp_flags & SPP_PMTUD_DISABLE) { i = LOAD_ATOM (spec, i, am_pmtud_disable); n++; } - +# ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY + /* SPP_SACKDELAY_* not in FreeBSD 7.1 */ if (ap.spp_flags & SPP_SACKDELAY_ENABLE) { i = LOAD_ATOM (spec, i, am_sackdelay_enable); n++; } if (ap.spp_flags & SPP_SACKDELAY_DISABLE) { i = LOAD_ATOM (spec, i, am_sackdelay_disable); n++; } # endif +# endif PLACE_FOR(spec, i, LOAD_NIL_CNT + LOAD_LIST_CNT + 2*LOAD_TUPLE_CNT); Index: erts/emulator/hipe/hipe_x86.c --- erts/emulator/hipe/hipe_x86.c.orig 2009-03-12 13:16:21 +0100 +++ erts/emulator/hipe/hipe_x86.c 2009-09-23 20:39:09 +0200 @@@@ -130,7 +130,7 @@@@ abort(); map_start = mmap(map_hint, map_bytes, PROT_EXEC|PROT_READ|PROT_WRITE, - MAP_PRIVATE|MAP_ANONYMOUS + MAP_PRIVATE|MAP_ANON #ifdef __x86_64__ |MAP_32BIT #endif Index: erts/etc/unix/Install.src --- erts/etc/unix/Install.src.orig 2009-09-18 16:07:12 +0200 +++ erts/etc/unix/Install.src 2009-09-23 20:39:09 +0200 @@@@ -172,4 +172,4 @@@@ ./misc/format_man_pages $ERL_ROOT fi - +exit 0 Index: lib/asn1/c_src/Makefile.in --- lib/asn1/c_src/Makefile.in.orig 2009-09-18 16:10:43 +0200 +++ lib/asn1/c_src/Makefile.in 2009-09-23 20:39:09 +0200 @@@@ -114,7 +114,7 @@@@ $(CC) -c $(CFLAGS) -o $(OBJ_FILES) $(C_FILES) $(SHARED_OBJ_FILES): $(OBJ_FILES) $(LIBDIR) - $(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) $(CLIB_FLAGS) $(LIBS) + $(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) $(LIBDIR): -mkdir -p $(LIBDIR) Index: lib/crypto/c_src/Makefile.in --- lib/crypto/c_src/Makefile.in.orig 2009-09-18 16:12:32 +0200 +++ lib/crypto/c_src/Makefile.in 2009-09-23 20:39:09 +0200 @@@@ -136,7 +136,7 @@@@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/priv/obj $(INSTALL_DIR) $(RELSYSDIR)/priv/lib - $(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj + $(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj $(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj $(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib Index: lib/erl_interface/src/connect/ei_resolve.c --- lib/erl_interface/src/connect/ei_resolve.c.orig 2009-03-12 13:19:12 +0100 +++ lib/erl_interface/src/connect/ei_resolve.c 2009-09-23 20:39:09 +0200 @@@@ -54,6 +54,10 @@@@ #include "ei_resolve.h" #include "ei_locking.h" +#if defined(HAVE_GETHOSTBYNAME_R) && defined(__FreeBSD__) +#undef HAVE_GETHOSTBYNAME_R +#endif + #ifdef HAVE_GETHOSTBYNAME_R void ei_init_resolve(void) Index: lib/et/src/et_contents_viewer.erl --- lib/et/src/et_contents_viewer.erl.orig 2009-03-13 12:11:21 +0100 +++ lib/et/src/et_contents_viewer.erl 2009-09-23 20:39:09 +0200 @@@@ -347,7 +347,6 @@@@ 'Caps_Lock' -> {noreply, S}; _ -> - io:format("~p: ignored: ~p~n", [?MODULE, KeySym]), {noreply, S} end; handle_info({gs, _Obj, configure, [], [W, H | _]}, S) -> Index: lib/et/src/et_viewer.erl --- lib/et/src/et_viewer.erl.orig 2009-03-13 12:11:22 +0100 +++ lib/et/src/et_viewer.erl 2009-09-23 20:39:09 +0200 @@@@ -976,8 +976,7 @@@@ noreply(S). click_error(Click, S) -> - gs:config(S#state.canvas, beep), - io:format("~p: ignored: ~p~n", [?MODULE, Click]). + gs:config(S#state.canvas, beep). %%%---------------------------------------------------------------------- %%% Clone viewer Index: lib/gs/src/tool_utils.erl --- lib/gs/src/tool_utils.erl.orig 2009-03-12 13:23:23 +0100 +++ lib/gs/src/tool_utils.erl 2009-09-23 20:39:09 +0200 @@@@ -40,6 +40,9 @@@@ }). +%% Browser executable list (openURL command line protocol required) +-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera", "firefox", "seamonkey"]). + %%---------------------------------------------------------------------- %% open_help(Parent, File) %% Parent = gsobj() (GS root object or parent window) @@@@ -80,7 +83,7 @@@@ {unix,Type} -> case Type of darwin -> "open " ++ File; - _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" + _Else -> unix_url_command("file:" ++ File) end; {win32,_AnyType} -> "start " ++ filename:nativename(File); @@@@ -95,7 +98,7 @@@@ {unix,Type} -> case Type of darwin -> "open " ++ File; - _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" + _Else -> unix_url_command("file:" ++ File) end; {win32,_AnyType} -> "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); @@@@ -432,3 +435,53 @@@@ [Last]; insert_newlines(Other) -> Other. + +%% find_browser(BrowserList) => string() | false +%% BrowserList - [string()] +%% Given a list of basenames, find the first available executable. + +find_browser([]) -> + false; + +find_browser([H | T]) -> + case os:find_executable(H) of + false -> + find_browser(T); + Browser -> + Browser + end. + +%% unix_url_command(URL) => string() +%% URL - string() +%% Open an URL, using a browser which supports the openURL command +%% line protocol. If no browser is found, the empty string will be +%% returned. + +unix_url_command(URL) -> + Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", + + case os:getenv("BROWSER") of + false -> + %% look for a compatible browser + case find_browser(?BROWSERS) of + false -> + ""; + Browser -> + case regexp:gsub(Template, "BROWSER", Browser) of + {ok, Command, 0} -> + %% Template does not contain "BROWSER" placeholder + ""; + {ok, Command, _} -> + Command + end + end; + + Value -> + case regexp:gsub(Template, "BROWSER", Value) of + {ok, Command2, 0} -> + %% no placeholder + ""; + {ok, Command2, _} -> + Command2 + end + end. Index: lib/hipe/regalloc/Makefile --- lib/hipe/regalloc/Makefile.orig 2009-04-16 11:24:04 +0200 +++ lib/hipe/regalloc/Makefile 2009-09-23 20:39:09 +0200 @@@@ -46,7 +46,6 @@@@ hipe_node_sets hipe_spillcost hipe_reg_worklists \ hipe_adj_list \ hipe_temp_map \ - hipe_optimistic_regalloc \ hipe_coalescing_regalloc \ hipe_graph_coloring_regalloc \ hipe_regalloc_loop \ Index: lib/inets/src/http_client/http.erl --- lib/inets/src/http_client/http.erl.orig 2009-09-18 14:47:45 +0200 +++ lib/inets/src/http_client/http.erl 2009-09-23 20:39:09 +0200 @@@@ -292,6 +292,8 @@@@ case {Sync, Stream} of {true, self} -> {error, streaming_error}; + {true, {self,once}} -> + {error, streaming_error}; _ -> RecordHeaders = header_record(NewHeaders, #http_request_h{}, Index: lib/odbc/c_src/odbcserver.c --- lib/odbc/c_src/odbcserver.c.orig 2009-06-05 14:55:24 +0200 +++ lib/odbc/c_src/odbcserver.c 2009-09-23 20:39:09 +0200 @@@@ -119,6 +119,7 @@@@ #include #include #include +#include #endif #include Index: lib/sasl/src/rb.erl --- lib/sasl/src/rb.erl.orig 2009-03-12 13:18:20 +0100 +++ lib/sasl/src/rb.erl 2009-09-23 20:39:09 +0200 @@@@ -415,7 +415,7 @@@@ Ref = make_ref(), case (catch {Ref,binary_to_term(Bin)}) of {'EXIT',_} -> - {error, "Inclomplete erlang term in log"}; + {error, "Incomplete erlang term in log"}; {Ref,Term} -> {ok, Term} end Index: lib/snmp/src/misc/snmp_config.erl --- lib/snmp/src/misc/snmp_config.erl.orig 2009-09-18 16:12:14 +0200 +++ lib/snmp/src/misc/snmp_config.erl 2009-09-23 20:39:09 +0200 @@@@ -1743,7 +1743,7 @@@@ "%% {\"standard inform\", \"std_inform\", inform}.\n" "%%\n\n", Hdr = header() ++ Comment, - Conf = [{"stadard_trap", "std_trap", NotifyType}], + Conf = [{"standard trap", "std_trap", NotifyType}], write_agent_notify_config(Dir, Hdr, Conf). write_agent_notify_config(Dir, Hdr, Conf) -> Index: lib/stdlib/src/calendar.erl --- lib/stdlib/src/calendar.erl.orig 2009-09-18 16:06:56 +0200 +++ lib/stdlib/src/calendar.erl 2009-09-23 20:39:09 +0200 @@@@ -216,11 +216,19 @@@@ -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()]. local_time_to_universal_time_dst(DateTime) -> - UtDst = erlang:localtime_to_universaltime(DateTime, true), - Ut = erlang:localtime_to_universaltime(DateTime, false), %% Reverse check the universal times - LtDst = erlang:universaltime_to_localtime(UtDst), - Lt = erlang:universaltime_to_localtime(Ut), + {UtDst, LtDst} = + try + UtDst0 = erlang:localtime_to_universaltime(DateTime, true), + {UtDst0, erlang:universaltime_to_localtime(UtDst0)} + catch error:badarg -> {error, error} + end, + {Ut, Lt} = + try + Ut0 = erlang:localtime_to_universaltime(DateTime, false), + {Ut0, erlang:universaltime_to_localtime(Ut0)} + catch error:badarg -> {error, error} + end, %% Return the valid universal times case {LtDst,Lt} of {DateTime,DateTime} when UtDst =/= Ut -> Index: lib/wx/configure --- lib/wx/configure.orig 2009-09-21 11:29:46 +0200 +++ lib/wx/configure 2009-09-23 20:39:09 +0200 @@@@ -3901,7 +3901,7 @@@@ ;; *) DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS" - CFLAGS="-g -Wall -O2 -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS" + CFLAGS="-Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS %%CFLAGS%%" ;; esac @ 1.3 log @upgrading package: erlang R12B.2 -> R13B01 @ text @d2 3 a4 3 --- erts/configure.orig 2009-06-07 20:02:14 +0200 +++ erts/configure 2009-09-17 23:12:20 +0200 @@@@ -10819,7 +10819,7 @@@@ d14 3 a16 3 --- erts/emulator/Makefile.in.orig 2009-04-16 11:23:30 +0200 +++ erts/emulator/Makefile.in 2009-09-17 23:12:20 +0200 @@@@ -591,7 +591,7 @@@@ d27 1 a27 1 +++ erts/emulator/beam/erl_time_sup.c 2009-09-17 23:12:20 +0200 d40 1 a40 1 +++ erts/emulator/drivers/common/inet_drv.c 2009-09-17 23:12:20 +0200 d76 1 a76 1 +++ erts/emulator/hipe/hipe_x86.c 2009-09-17 23:12:20 +0200 a85 11 Index: erts/emulator/sys/unix/sys_float.c --- erts/emulator/sys/unix/sys_float.c.orig 2009-03-12 13:16:31 +0100 +++ erts/emulator/sys/unix/sys_float.c 2009-09-17 23:12:20 +0200 @@@@ -57,6 +57,7 @@@@ void erts_thread_init_fp_exception(void) { unsigned long *fpe = erts_alloc(ERTS_ALC_T_FP_EXCEPTION, sizeof(*fpe)); + *fpe = 0; erts_tsd_set(fpe_key, fpe); } d87 3 a89 3 --- erts/etc/unix/Install.src.orig 2009-03-12 13:16:56 +0100 +++ erts/etc/unix/Install.src 2009-09-17 23:12:20 +0200 @@@@ -165,4 +165,4 @@@@ d96 2 a97 2 --- lib/asn1/c_src/Makefile.in.orig 2009-03-12 13:24:44 +0100 +++ lib/asn1/c_src/Makefile.in 2009-09-17 23:12:20 +0200 a106 14 Index: lib/compiler/src/beam_utils.erl --- lib/compiler/src/beam_utils.erl.orig 2009-04-16 11:24:31 +0200 +++ lib/compiler/src/beam_utils.erl 2009-09-17 23:12:20 +0200 @@@@ -650,8 +650,8 @@@@ Regs2 = x_live([Src1,Src2], Regs1), Regs = live_join_label(Fail, D, Regs2), live_opt(Is, Regs, D, [I|Acc]); -live_opt([{bs_append,Fail,Src1,_,_,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) -> - Regs1 = x_live([Src1,Src2], x_dead([Dst], Regs0)), +live_opt([{bs_append,Fail,Src1,_,Live,_,Src2,_,Dst}=I|Is], _Regs0, D, Acc) -> + Regs1 = x_dead([Dst], x_live([Src1,Src2], live_call(Live))), Regs = live_join_label(Fail, D, Regs1), live_opt(Is, Regs, D, [I|Acc]); live_opt([{bs_private_append,Fail,Src1,_,Src2,_,Dst}=I|Is], Regs0, D, Acc) -> d108 2 a109 2 --- lib/crypto/c_src/Makefile.in.orig 2009-03-12 13:29:01 +0100 +++ lib/crypto/c_src/Makefile.in 2009-09-17 23:12:20 +0200 d121 1 a121 1 +++ lib/erl_interface/src/connect/ei_resolve.c 2009-09-17 23:12:20 +0200 a132 15 Index: lib/erl_interface/src/decode/decode_big.c --- lib/erl_interface/src/decode/decode_big.c.orig 2009-03-12 13:20:31 +0100 +++ lib/erl_interface/src/decode/decode_big.c 2009-09-17 23:12:20 +0200 @@@@ -52,7 +52,10 @@@@ u = (unsigned char *) s; for (i = 0; i < b->arity; ++i) { dt[i] = u[i*2]; - dt[i] |= ((unsigned short) u[(i*2)+1]) << 8; + if ((i*2 + 1) < digit_bytes) + { + dt[i] |= ((unsigned short) u[(i*2)+1]) << 8; + } } } else { s++; /* skip sign byte */ d135 1 a135 1 +++ lib/et/src/et_contents_viewer.erl 2009-09-17 23:12:20 +0200 d146 1 a146 1 +++ lib/et/src/et_viewer.erl 2009-09-17 23:12:20 +0200 d159 1 a159 1 +++ lib/gs/src/tool_utils.erl 2009-09-17 23:12:20 +0200 d244 1 a244 1 +++ lib/hipe/regalloc/Makefile 2009-09-17 23:12:20 +0200 d254 3 a256 3 --- lib/inets/src/http_client/http.erl.orig 2009-06-05 14:55:50 +0200 +++ lib/inets/src/http_client/http.erl 2009-09-17 23:12:20 +0200 @@@@ -293,6 +293,8 @@@@ d263 2 a264 2 RecordHeaders = header_record(NewHeaders, #http_request_h{}, Host, Version), d267 1 a267 1 +++ lib/odbc/c_src/odbcserver.c 2009-09-17 23:12:20 +0200 d278 1 a278 1 +++ lib/sasl/src/rb.erl 2009-09-17 23:12:20 +0200 d289 3 a291 3 --- lib/snmp/src/misc/snmp_config.erl.orig 2009-03-12 13:27:40 +0100 +++ lib/snmp/src/misc/snmp_config.erl 2009-09-17 23:12:20 +0200 @@@@ -1738,7 +1738,7 @@@@ d301 2 a302 2 --- lib/stdlib/src/calendar.erl.orig 2009-03-12 13:17:57 +0100 +++ lib/stdlib/src/calendar.erl 2009-09-17 23:12:20 +0200 d328 3 a330 3 --- lib/wx/configure.orig 2009-06-07 20:02:11 +0200 +++ lib/wx/configure 2009-09-17 23:12:20 +0200 @@@@ -3210,7 +3210,7 @@@@ @ 1.2 log @upgrading package: erlang R11B.5 -> R12B.0 @ text @d1 12 d14 60 a73 38 --- erts/emulator/Makefile.in.orig 2007-11-26 19:55:14 +0100 +++ erts/emulator/Makefile.in 2007-12-07 09:22:01 +0100 @@@@ -248,8 +248,10 @@@@ endif WITH_SCTP=@@WITH_SCTP@@ ifdef WITH_SCTP +ifneq ($(findstring freebsd,$(TARGET)),freebsd) LIBS += -lsctp endif +endif ORG_THR_LIBS=@@EMU_THR_LIBS@@ THR_LIB_NAME=@@EMU_THR_LIB_NAME@@ Index: erts/emulator/beam/erl_process_dump.c --- erts/emulator/beam/erl_process_dump.c.orig 2007-11-26 19:59:28 +0100 +++ erts/emulator/beam/erl_process_dump.c 2007-12-07 09:22:01 +0100 @@@@ -372,9 +372,11 @@@@ static void dump_externally(int to, void *to_arg, Eterm term) { - byte sbuf[1024]; /* encode and hope for the best ... */ - byte* s; - byte* p; + byte *sbuf, *s, *p; + unsigned size; + + size = encode_size_struct(term, TERM_TO_BINARY_DFLAGS); + sbuf = (byte *) erts_alloc(ERTS_ALC_T_TMP, size); if (is_fun(term)) { /* @@@@ -406,4 +408,6 @@@@ while (s < p) { erts_print(to, to_arg, "%02X", *s++); } + + erts_free(ERTS_ALC_T_TMP, (void *) sbuf); } d75 3 a77 3 --- erts/emulator/hipe/hipe_x86.c.orig 2007-11-26 19:59:40 +0100 +++ erts/emulator/hipe/hipe_x86.c 2007-12-07 09:22:01 +0100 @@@@ -112,7 +112,7 @@@@ d86 11 d98 3 a100 3 --- erts/etc/unix/Install.src.orig 2007-11-26 19:55:53 +0100 +++ erts/etc/unix/Install.src 2007-12-07 09:22:01 +0100 @@@@ -148,4 +148,4 @@@@ d107 3 a109 3 --- lib/asn1/c_src/Makefile.in.orig 2007-11-26 14:12:06 +0100 +++ lib/asn1/c_src/Makefile.in 2007-12-07 09:22:01 +0100 @@@@ -129,7 +129,7 @@@@ d118 14 d133 3 a135 3 --- lib/crypto/c_src/Makefile.in.orig 2007-11-26 20:01:59 +0100 +++ lib/crypto/c_src/Makefile.in 2007-12-07 09:22:01 +0100 @@@@ -135,7 +135,7 @@@@ d145 3 a147 3 --- lib/erl_interface/src/connect/ei_resolve.c.orig 2007-11-26 19:57:25 +0100 +++ lib/erl_interface/src/connect/ei_resolve.c 2007-12-07 09:22:01 +0100 @@@@ -51,6 +51,10 @@@@ d158 15 d174 3 a176 3 --- lib/et/src/et_contents_viewer.erl.orig 2002-10-03 00:10:21 +0200 +++ lib/et/src/et_contents_viewer.erl 2007-12-07 09:22:01 +0100 @@@@ -346,7 +346,6 @@@@ d185 3 a187 3 --- lib/et/src/et_viewer.erl.orig 2007-11-26 14:09:44 +0100 +++ lib/et/src/et_viewer.erl 2007-12-07 09:22:01 +0100 @@@@ -975,8 +975,7 @@@@ d198 3 a200 3 --- lib/gs/src/tool_utils.erl.orig 2007-11-26 20:03:09 +0100 +++ lib/gs/src/tool_utils.erl 2007-12-07 09:22:01 +0100 @@@@ -37,6 +37,9 @@@@ d205 1 a205 1 +-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera"]). d210 1 a210 1 @@@@ -77,7 +80,7 @@@@ d219 1 a219 1 @@@@ -92,7 +95,7 @@@@ d228 1 a228 1 @@@@ -429,3 +432,53 @@@@ d283 3 a285 3 --- lib/hipe/regalloc/Makefile.orig 2007-11-26 19:58:39 +0100 +++ lib/hipe/regalloc/Makefile 2007-12-07 09:24:17 +0100 @@@@ -41,7 +41,6 @@@@ d293 12 d306 3 a308 3 --- lib/odbc/c_src/odbcserver.c.orig 2007-11-26 14:08:42 +0100 +++ lib/odbc/c_src/odbcserver.c 2007-12-07 09:22:01 +0100 @@@@ -111,6 +111,7 @@@@ d315 1 a315 1 #include "ei.h" d317 3 a319 3 --- lib/sasl/src/rb.erl.orig 2007-12-04 14:02:32 +0100 +++ lib/sasl/src/rb.erl 2007-12-07 09:22:01 +0100 @@@@ -414,7 +414,7 @@@@ d329 3 a331 3 --- lib/snmp/src/misc/snmp_config.erl.orig 2007-11-26 15:58:11 +0100 +++ lib/snmp/src/misc/snmp_config.erl 2007-12-07 09:22:01 +0100 @@@@ -1733,7 +1733,7 @@@@ d340 39 @ 1.1 log @upgrading package: erlang R11B.3 -> R11B.5 @ text @d2 3 a4 3 --- erts/emulator/Makefile.in.orig 2007-03-27 15:26:54 +0200 +++ erts/emulator/Makefile.in 2007-10-02 13:24:47 +0200 @@@@ -265,8 +265,10 @@@@ d16 3 a18 3 --- erts/emulator/beam/erl_process_dump.c.orig 2007-04-25 10:07:32 +0200 +++ erts/emulator/beam/erl_process_dump.c 2007-10-02 13:24:47 +0200 @@@@ -382,9 +382,11 @@@@ d33 1 a33 1 @@@@ -416,4 +418,6 @@@@ d41 2 a42 2 --- erts/emulator/hipe/hipe_x86.c.orig 2006-08-29 11:49:44 +0200 +++ erts/emulator/hipe/hipe_x86.c 2007-10-02 13:24:47 +0200 d53 2 a54 2 --- erts/etc/unix/Install.src.orig 2007-03-27 15:27:48 +0200 +++ erts/etc/unix/Install.src 2007-10-02 13:24:47 +0200 d62 2 a63 2 --- lib/asn1/c_src/Makefile.in.orig 2007-06-11 13:37:45 +0200 +++ lib/asn1/c_src/Makefile.in 2007-10-02 13:24:47 +0200 d74 2 a75 2 --- lib/crypto/c_src/Makefile.in.orig 2007-06-11 14:59:08 +0200 +++ lib/crypto/c_src/Makefile.in 2007-10-02 13:24:47 +0200 d86 2 a87 2 --- lib/erl_interface/src/connect/ei_resolve.c.orig 2006-11-06 14:53:29 +0100 +++ lib/erl_interface/src/connect/ei_resolve.c 2007-10-02 13:24:47 +0200 d101 1 a101 1 +++ lib/et/src/et_contents_viewer.erl 2007-10-02 13:24:47 +0200 d111 3 a113 3 --- lib/et/src/et_viewer.erl.orig 2002-10-14 15:49:18 +0200 +++ lib/et/src/et_viewer.erl 2007-10-02 13:24:47 +0200 @@@@ -982,8 +982,7 @@@@ d124 2 a125 2 --- lib/gs/src/tool_utils.erl.orig 2007-06-11 15:00:04 +0200 +++ lib/gs/src/tool_utils.erl 2007-10-02 13:24:47 +0200 d209 5 a213 3 --- lib/hipe/regalloc/Makefile.orig 2007-06-11 14:56:03 +0200 +++ lib/hipe/regalloc/Makefile 2007-10-02 13:50:23 +0200 @@@@ -43,7 +43,6 @@@@ d215 1 a215 1 hipe_optimistic_regalloc \ a216 1 - hipe_optimistic_regalloc \ a218 1 hipe_ls_regalloc \ d220 2 a221 2 --- lib/odbc/c_src/odbcserver.c.orig 2007-01-29 14:17:56 +0100 +++ lib/odbc/c_src/odbcserver.c 2007-10-02 13:24:47 +0200 d231 2 a232 2 --- lib/sasl/src/rb.erl.orig 2007-06-11 14:53:04 +0200 +++ lib/sasl/src/rb.erl 2007-10-02 13:24:47 +0200 d243 3 a245 3 --- lib/snmp/src/misc/snmp_config.erl.orig 2007-03-14 14:29:59 +0100 +++ lib/snmp/src/misc/snmp_config.erl 2007-10-02 13:24:47 +0200 @@@@ -1705,7 +1705,7 @@@@ a253 14 Index: lib/stdlib/src/io_lib_pretty.erl --- lib/stdlib/src/io_lib_pretty.erl.orig 2007-06-11 14:52:56 +0200 +++ lib/stdlib/src/io_lib_pretty.erl 2007-10-02 13:24:47 +0200 @@@@ -167,7 +167,9 @@@@ %% Reuse the list created by io_lib:write_binary()... pp_binary([LT,LT,S,GT,GT], Col, Ll, Ind, LD) -> N = max(8, Ll - Col - LD), - [LT,LT,pp_binary(S, N, N, Ind),GT,GT]. + [LT,LT,pp_binary(S, N, N, Ind),GT,GT]; +pp_binary(S, _Col, _Ll, _Ind, _LD) -> + S. pp_binary([BS, $, | S], N, N0, Ind) -> Len = length(BS) + 1, @