Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Sep 2020 13:14:33 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550182 - head/devel/pecl-swoole/files
Message-ID:  <202009261314.08QDEXXU014538@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Sat Sep 26 13:14:33 2020
New Revision: 550182
URL: https://svnweb.freebsd.org/changeset/ports/550182

Log:
  Fix compliation with libressl.
  
  PR:		249535
  Submitted by:	dave at jetcafe dot org

Added:
  head/devel/pecl-swoole/files/patch-src_protocol_dtls.cc   (contents, props changed)
Modified:
  head/devel/pecl-swoole/files/patch-config.m4

Modified: head/devel/pecl-swoole/files/patch-config.m4
==============================================================================
--- head/devel/pecl-swoole/files/patch-config.m4	Sat Sep 26 13:10:25 2020	(r550181)
+++ head/devel/pecl-swoole/files/patch-config.m4	Sat Sep 26 13:14:33 2020	(r550182)
@@ -1,6 +1,6 @@
---- config.m4.orig	2019-06-14 08:30:12 UTC
+--- config.m4.orig	2020-08-30 04:51:37 UTC
 +++ config.m4
-@@ -296,7 +296,7 @@ if test "$PHP_SWOOLE" != "no"; then
+@@ -268,7 +268,7 @@ if test "$PHP_SWOOLE" != "no"; then
      AC_CHECK_LIB(c, poll, AC_DEFINE(HAVE_POLL, 1, [have poll]))
      AC_CHECK_LIB(c, sendfile, AC_DEFINE(HAVE_SENDFILE, 1, [have sendfile]))
      AC_CHECK_LIB(c, kqueue, AC_DEFINE(HAVE_KQUEUE, 1, [have kqueue]))

Added: head/devel/pecl-swoole/files/patch-src_protocol_dtls.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pecl-swoole/files/patch-src_protocol_dtls.cc	Sat Sep 26 13:14:33 2020	(r550182)
@@ -0,0 +1,29 @@
+--- src/protocol/dtls.cc.orig	2020-08-30 04:51:37 UTC
++++ src/protocol/dtls.cc
+@@ -73,13 +73,17 @@ long BIO_ctrl(BIO *b, int cmd, long lval, void *ptrval
+     case BIO_CTRL_DGRAM_GET_FALLBACK_MTU:
+         retval = 1500;
+         break;
++#ifdef BIO_CTRL_DGRAM_GET_MTU_OVERHEAD
+     case BIO_CTRL_DGRAM_GET_MTU_OVERHEAD:
+         retval = 96;  // random guess
+         break;
++#endif
++#ifdef BIO_CTRL_DGRAM_SET_PEEK_MODE
+     case BIO_CTRL_DGRAM_SET_PEEK_MODE:
+         ((Session *) BIO_get_data(b))->peek_mode = !!lval;
+         retval = 1;
+         break;
++#endif
+     case BIO_CTRL_PUSH:
+     case BIO_CTRL_POP:
+     case BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT:
+@@ -119,7 +123,7 @@ BIO_METHOD *BIO_get_methods(void) {
+     BIO_meth_set_ctrl(_bio_methods, BIO_ctrl);
+     BIO_meth_set_create(_bio_methods, BIO_create);
+     BIO_meth_set_destroy(_bio_methods, BIO_destroy);
+-    BIO_meth_set_callback_ctrl(_bio_methods, BIO_callback_ctrl);
++    BIO_meth_set_callback_ctrl(_bio_methods, (long (*)(BIO *, int, BIO_info_cb *)) BIO_callback_ctrl);
+ 
+     return _bio_methods;
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009261314.08QDEXXU014538>