svn commit: r564018 - in branches/2021Q1/www/serf: . files

[Lev A. Serebryakov]

Author: lev
Date: Thu Feb  4 11:38:06 2021
New Revision: 564018
URL: https://svnweb.freebsd.org/changeset/ports/564018

Log:
  MFH: r563962
  
   Fix incompatibility with KTLS.
  
  PR:		253214
  Submitted by:	madpilot at FreeBSD.org
  
  Approved by:	portmgr (blanket, FAQ 20.6.2)

Modified:
  branches/2021Q1/www/serf/Makefile
  branches/2021Q1/www/serf/files/patch-buckets_ssl__buckets.c
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/www/serf/Makefile
==============================================================================
--- branches/2021Q1/www/serf/Makefile	Thu Feb  4 11:25:56 2021	(r564017)
+++ branches/2021Q1/www/serf/Makefile	Thu Feb  4 11:38:06 2021	(r564018)
@@ -3,7 +3,7 @@
 
 PORTNAME=	serf
 PORTVERSION=	1.3.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	APACHE/serf
 

Modified: branches/2021Q1/www/serf/files/patch-buckets_ssl__buckets.c
==============================================================================
--- branches/2021Q1/www/serf/files/patch-buckets_ssl__buckets.c	Thu Feb  4 11:25:56 2021	(r564017)
+++ branches/2021Q1/www/serf/files/patch-buckets_ssl__buckets.c	Thu Feb  4 11:38:06 2021	(r564018)
@@ -1,6 +1,23 @@
 --- buckets/ssl_buckets.c.orig	2016-06-30 15:45:07 UTC
 +++ buckets/ssl_buckets.c
-@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio)
+ 
+ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
+ {
+-    long ret = 1;
++    long ret = 0;
+ 
+     switch (cmd) {
+     default:
+@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long nu
+         break;
+     case BIO_CTRL_FLUSH:
+         /* At this point we can't force a flush. */
++        ret = 1;
+         break;
+     case BIO_CTRL_PUSH:
+     case BIO_CTRL_POP:
+@@ -1156,7 +1157,7 @@ static void init_ssl_libraries(void)
          }
  #endif