CVS commit: pkgsrc/lang/erlang

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Aug 14 18:40:42 UTC 2018

Modified Files:
        pkgsrc/lang/erlang: distinfo
        pkgsrc/lang/erlang/patches:
            patch-erts_emulator_drivers_common_inet__drv.c

Log Message:
lang/erlang: make the SCTP patch work again.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/lang/erlang/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/erlang/distinfo
diff -u pkgsrc/lang/erlang/distinfo:1.59 pkgsrc/lang/erlang/distinfo:1.60
--- pkgsrc/lang/erlang/distinfo:1.59    Thu Jul 26 16:01:45 2018
+++ pkgsrc/lang/erlang/distinfo Tue Aug 14 18:40:42 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2018/07/26 16:01:45 jperkin Exp $
+$NetBSD: distinfo,v 1.60 2018/08/14 18:40:42 nia Exp $
 
 SHA1 (erlang/otp_src_21.0.tar.gz) = b9ba0909aef16f038b8c75e4d7fd0993ae4e3beb
 RMD160 (erlang/otp_src_21.0.tar.gz) = 6a13f1f49fddeb4bb0d5567ffe31ab232d80855b
@@ -7,7 +7,7 @@ Size (erlang/otp_src_21.0.tar.gz) = 8414
 SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3
 SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd
 SHA1 (patch-erts_configure) = dba8d72974e8c493cf2bb90e6b149a84dd9073da
-SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = b7784e5e8e025ca75d5279a63e0cb3f74c54bd6a
+SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = 854ae8d60f3f114da11306db425519a0063cacda
 SHA1 (patch-erts_emulator_sys_unix_sys__uds.c) = a165f977221acc8aba2ef30ca23d149a10af060a
 SHA1 (patch-erts_etc_unix_run__erl.c) = 9e2377ceba5021eaa2f0c729600df499954d134e
 SHA1 (patch-erts_lib__src_common_erl__printf.c) = 55decad8ca2266feddb310ab5d00394d717afca7

Index: pkgsrc/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c
diff -u pkgsrc/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c:1.2 pkgsrc/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c:1.3
--- pkgsrc/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c:1.2       Tue Dec 29 23:34:46 2015
+++ pkgsrc/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c   Tue Aug 14 18:40:42 2018
@@ -1,11 +1,11 @@
-$NetBSD: patch-erts_emulator_drivers_common_inet__drv.c,v 1.2 2015/12/29 23:34:46 dholland Exp $
+$NetBSD: patch-erts_emulator_drivers_common_inet__drv.c,v 1.3 2018/08/14 18:40:42 nia Exp $
 
 Unbreak build due to differences in the NetBSD SCTP implementation.
 
---- erts/emulator/drivers/common/inet_drv.c.orig       2015-11-17 11:35:14.000000000 +0000
+--- erts/emulator/drivers/common/inet_drv.c.orig       2018-06-19 07:07:55.000000000 +0000
 +++ erts/emulator/drivers/common/inet_drv.c
-@@ -567,6 +567,12 @@ typedef unsigned long  u_long;
- #     define sctp_adaptation_layer_event sctp_adaption_layer_event
+@@ -1551,6 +1551,12 @@ static void *realloc_wrapper(void *curre
+ #   define SCTP_ANC_BUFF_SIZE   INET_DEF_BUFFER/2 /* XXX: not very good... */
  #endif
  
 +#ifdef __NetBSD__
@@ -14,6 +14,6 @@ Unbreak build due to differences in the 
 +#define HAVE_DECL_SCTP_DELAYED_ACK_TIME 0
 +#endif
 +
- #if defined(__GNUC__) && defined(HAVE_SCTP_BINDX)
- static typeof(sctp_bindx) *p_sctp_bindx = NULL;
- #else
+ #ifdef HAVE_UDP
+ static int load_address(ErlDrvTermData* spec, int i, char* buf)
+ {