OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  r...@openpkg.org
  Module: openpkg-src                      Date:   20-Sep-2009 20:42:55
  Branch: HEAD                             Handle: 2009092019425500

  Modified files:
    openpkg-src/erlang      erlang.patch erlang.spec

  Log:
    upgrading package: erlang R12B.2 -> R13B01

  Summary:
    Revision    Changes     Path
    1.3         +204 -79    openpkg-src/erlang/erlang.patch
    1.14        +3  -3      openpkg-src/erlang/erlang.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/erlang/erlang.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 erlang.patch
  --- openpkg-src/erlang/erlang.patch   7 Dec 2007 08:33:03 -0000       1.2
  +++ openpkg-src/erlang/erlang.patch   20 Sep 2009 18:42:55 -0000      1.3
  @@ -1,46 +1,80 @@
  +Index: erts/configure
  +--- erts/configure.orig      2009-06-07 20:02:14 +0200
  ++++ erts/configure   2009-09-17 23:12:20 +0200
  +@@ -10819,7 +10819,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   2007-11-26 19:55:14 +0100
  -+++ erts/emulator/Makefile.in        2007-12-07 09:22:01 +0100
  -@@ -248,8 +248,10 @@
  - endif
  - with_sc...@with_sctp@
  - ifdef WITH_SCTP
  -+ifneq ($(findstring freebsd,$(TARGET)),freebsd)
  - LIBS += -lsctp
  - endif
  -+endif
  - 
  - org_thr_li...@emu_thr_libs@
  - thr_lib_na...@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);
  - }
  +--- 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 @@
  + 
  + 
  + $(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-17 23:12:20 +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-17 23:12:20 +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       2007-11-26 19:59:40 +0100
  -+++ erts/emulator/hipe/hipe_x86.c    2007-12-07 09:22:01 +0100
  -@@ -112,7 +112,7 @@
  +--- erts/emulator/hipe/hipe_x86.c.orig       2009-03-12 13:16:21 +0100
  ++++ erts/emulator/hipe/hipe_x86.c    2009-09-17 23:12:20 +0200
  +@@ -130,7 +130,7 @@
        abort();
        map_start = mmap(map_hint, map_bytes,
                     PROT_EXEC|PROT_READ|PROT_WRITE,
  @@ -49,19 +83,30 @@
    #ifdef __x86_64__
                     |MAP_32BIT
    #endif
  +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);
  + }
  + 
   Index: erts/etc/unix/Install.src
  ---- 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 @@
  +--- 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 @@
        ./misc/format_man_pages $ERL_ROOT
    fi
    
   -
   +exit 0
   Index: lib/asn1/c_src/Makefile.in
  ---- 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 @@
  +--- 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
  +@@ -114,7 +114,7 @@
        $(CC) -c $(CFLAGS) -o $(OBJ_FILES) $(C_FILES) 
    
    $(SHARED_OBJ_FILES): $(OBJ_FILES) $(LIBDIR)
  @@ -70,10 +115,24 @@
    
    $(LIBDIR):
        -mkdir -p $(LIBDIR)
  +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) 
->
   Index: lib/crypto/c_src/Makefile.in
  ---- 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 @@
  +--- 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
  +@@ -136,7 +136,7 @@
    release_spec: opt
        $(INSTALL_DIR) $(RELSYSDIR)/priv/obj
        $(INSTALL_DIR) $(RELSYSDIR)/priv/lib
  @@ -83,9 +142,9 @@
        $(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  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 @@
  +--- 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-17 23:12:20 
+0200
  +@@ -54,6 +54,10 @@
    #include "ei_resolve.h"
    #include "ei_locking.h"
    
  @@ -96,10 +155,25 @@
    #ifdef HAVE_GETHOSTBYNAME_R
    
    void ei_init_resolve(void)
  +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 */
   Index: lib/et/src/et_contents_viewer.erl
  ---- 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 @@
  +--- lib/et/src/et_contents_viewer.erl.orig   2009-03-13 12:11:21 +0100
  ++++ lib/et/src/et_contents_viewer.erl        2009-09-17 23:12:20 +0200
  +@@ -347,7 +347,6 @@
            'Caps_Lock' ->
                {noreply, S};
            _ ->
  @@ -108,9 +182,9 @@
        end;
    handle_info({gs, _Obj, configure, [], [W, H | _]}, S) ->
   Index: lib/et/src/et_viewer.erl
  ---- 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 @@
  +--- lib/et/src/et_viewer.erl.orig    2009-03-13 12:11:22 +0100
  ++++ lib/et/src/et_viewer.erl 2009-09-17 23:12:20 +0200
  +@@ -976,8 +976,7 @@
        noreply(S).
    
    click_error(Click, S) ->
  @@ -121,19 +195,19 @@
    %%%----------------------------------------------------------------------
    %%% Clone viewer
   Index: lib/gs/src/tool_utils.erl
  ---- 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 @@
  +--- lib/gs/src/tool_utils.erl.orig   2009-03-12 13:23:23 +0100
  ++++ lib/gs/src/tool_utils.erl        2009-09-17 23:12:20 +0200
  +@@ -40,6 +40,9 @@
               }).
    
    
   +%% Browser executable list (openURL command line protocol required)
  -+-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera"]).
  ++-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera", 
"firefox", "seamonkey"]).
   +
    %%----------------------------------------------------------------------
    %% open_help(Parent, File)
    %%   Parent = gsobj()  (GS root object or parent window)
  -@@ -77,7 +80,7 @@
  +@@ -80,7 +83,7 @@
                      {unix,Type} ->
                              case Type of
                                   darwin -> "open " ++ File;
  @@ -142,7 +216,7 @@
                          end;
                      {win32,_AnyType} ->
                          "start " ++ filename:nativename(File);
  -@@ -92,7 +95,7 @@
  +@@ -95,7 +98,7 @@
                      {unix,Type} ->
                              case Type of
                                   darwin -> "open " ++ File;
  @@ -151,7 +225,7 @@
                          end;
                      {win32,_AnyType} ->
                          "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/");
  -@@ -429,3 +432,53 @@
  +@@ -432,3 +435,53 @@
        [Last];
    insert_newlines(Other) ->
        Other.
  @@ -206,9 +280,9 @@
   +        end
   +    end.
   Index: lib/hipe/regalloc/Makefile
  ---- 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 @@
  +--- lib/hipe/regalloc/Makefile.orig  2009-04-16 11:24:04 +0200
  ++++ lib/hipe/regalloc/Makefile       2009-09-17 23:12:20 +0200
  +@@ -46,7 +46,6 @@
          hipe_node_sets hipe_spillcost hipe_reg_worklists \
          hipe_adj_list \
          hipe_temp_map \
  @@ -216,21 +290,33 @@
          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-06-05 14:55:50 +0200
  ++++ lib/inets/src/http_client/http.erl       2009-09-17 23:12:20 +0200
  +@@ -293,6 +293,8 @@
  +     case {Sync, Stream} of
  +     {true, self} ->
  +         {error, streaming_error};
  ++    {true, {self,once}} ->
  ++        {error, streaming_error};
  +     _ ->
  +         RecordHeaders = header_record(NewHeaders, #http_request_h{}, 
  +                                       Host, Version),
   Index: lib/odbc/c_src/odbcserver.c
  ---- 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 @@
  +--- lib/odbc/c_src/odbcserver.c.orig 2009-06-05 14:55:24 +0200
  ++++ lib/odbc/c_src/odbcserver.c      2009-09-17 23:12:20 +0200
  +@@ -119,6 +119,7 @@
    #include <sys/socket.h>
    #include <sys/uio.h>
    #include <netdb.h>
   +#include <netinet/in.h>
    #endif
    
  - #include "ei.h"
  + #include <limits.h>
   Index: lib/sasl/src/rb.erl
  ---- 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 @@
  +--- lib/sasl/src/rb.erl.orig 2009-03-12 13:18:20 +0100
  ++++ lib/sasl/src/rb.erl      2009-09-17 23:12:20 +0200
  +@@ -415,7 +415,7 @@
                    Ref = make_ref(),
                    case (catch {Ref,binary_to_term(Bin)}) of
                        {'EXIT',_} ->
  @@ -240,9 +326,9 @@
                            {ok, Term}
                    end
   Index: lib/snmp/src/misc/snmp_config.erl
  ---- 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 @@
  +--- 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 @@
    "%% {\"standard inform\", \"std_inform\", inform}.\n"
    "%%\n\n",
        Hdr = header() ++ Comment, 
  @@ -251,3 +337,42 @@
        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-03-12 13:17:57 +0100
  ++++ lib/stdlib/src/calendar.erl      2009-09-17 23:12:20 +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-06-07 20:02:11 +0200
  ++++ lib/wx/configure 2009-09-17 23:12:20 +0200
  +@@ -3210,7 +3210,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
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/erlang/erlang.spec
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 erlang.spec
  --- openpkg-src/erlang/erlang.spec    18 Apr 2009 13:10:11 -0000      1.13
  +++ openpkg-src/erlang/erlang.spec    20 Sep 2009 18:42:55 -0000      1.14
  @@ -22,8 +22,8 @@
   ##
   
   #   package version
  -%define       V_real R12B-2
  -%define       V_opkg R12B.2
  +%define       V_real R13B01
  +%define       V_opkg R13B01
   
   #   package information
   Name:         erlang
  @@ -36,7 +36,7 @@
   Group:        Language
   License:      Erlang Public License
   Version:      %{V_opkg}
  -Release:      20080409
  +Release:      20090920
   
   #   list of sources
   Source0:      http://www.erlang.org/download/otp_src_%{V_real}.tar.gz
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to