Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Dec 2020 10:22:10 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r556964 - in head: lang/php74 security/php74-openssl/files
Message-ID:  <202012041022.0B4AMAg6060032@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Fri Dec  4 10:22:09 2020
New Revision: 556964
URL: https://svnweb.freebsd.org/changeset/ports/556964

Log:
  lang/php74, security/php74-openssl: fix build with LibreSSL
  
  Upstream: https://bugs.php.net/bug.php?id=80368
  https://github.com/php/php-src/commit/ecee3f1209a7c0ac9f99c7f640b2f5df56656e58

Added:
  head/security/php74-openssl/files/
  head/security/php74-openssl/files/patch-openssl.c   (contents, props changed)
Modified:
  head/lang/php74/Makefile

Modified: head/lang/php74/Makefile
==============================================================================
--- head/lang/php74/Makefile	Fri Dec  4 10:20:44 2020	(r556963)
+++ head/lang/php74/Makefile	Fri Dec  4 10:22:09 2020	(r556964)
@@ -2,7 +2,7 @@
 
 PORTNAME=	php74
 DISTVERSION=	7.4.13
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=   PHP/distributions
 DISTNAME=	php-${DISTVERSION}

Added: head/security/php74-openssl/files/patch-openssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/php74-openssl/files/patch-openssl.c	Fri Dec  4 10:22:09 2020	(r556964)
@@ -0,0 +1,11 @@
+--- openssl.c.orig	2020-12-04 10:00:27.778868000 +0000
++++ openssl.c	2020-12-04 10:01:36.820415000 +0000
+@@ -6496,7 +6496,7 @@
+ 	int cipher_mode = EVP_CIPHER_mode(cipher_type);
+ 	memset(mode, 0, sizeof(struct php_openssl_cipher_mode));
+ 	switch (cipher_mode) {
+-#if PHP_OPENSSL_API_VERSION >= 0x10100
++#ifdef EVP_CIPH_OCB_MODE
+ 		case EVP_CIPH_GCM_MODE:
+ 		case EVP_CIPH_OCB_MODE:
+ 		case EVP_CIPH_CCM_MODE:



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