svn commit: r470211 - in head/databases/pgpool-II-33: . files

[Torsten Zuehlsdorff]

Author: tz
Date: Thu May 17 09:32:04 2018
New Revision: 470211
URL: https://svnweb.freebsd.org/changeset/ports/470211

Log:
  databases/pgpool-II-33: Fix build with LibreSSL
  
  The build was broken after the latest update of the port,
  but only on amd64, not i386.
  
  PR:		226099
  Submitted by:	w.schwarzenfeld at utanet.at
  Reported by:	dewayne at heuristicsystems.com.au

Added:
  head/databases/pgpool-II-33/files/patch-main.c   (contents, props changed)
  head/databases/pgpool-II-33/files/patch-pool__config.l   (contents, props changed)
  head/databases/pgpool-II-33/files/patch-wd__packet.c   (contents, props changed)
Modified:
  head/databases/pgpool-II-33/Makefile

Modified: head/databases/pgpool-II-33/Makefile
==============================================================================
--- head/databases/pgpool-II-33/Makefile	Thu May 17 09:10:37 2018	(r470210)
+++ head/databases/pgpool-II-33/Makefile	Thu May 17 09:32:04 2018	(r470211)
@@ -2,6 +2,7 @@
 
 PORTNAME=	pgpool-II
 PORTVERSION=	3.3.20
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 PKGNAMESUFFIX=	33

Added: head/databases/pgpool-II-33/files/patch-main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/pgpool-II-33/files/patch-main.c	Thu May 17 09:32:04 2018	(r470211)
@@ -0,0 +1,11 @@
+--- main.c.orig	2018-02-22 11:15:58 UTC
++++ main.c
+@@ -360,7 +360,7 @@ int main(int argc, char **argv)
+ 
+ #ifdef USE_SSL
+     /* global ssl init */
+-    #if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++    #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+         OPENSSL_init_ssl(0, NULL);
+     else
+         SSL_library_init();

Added: head/databases/pgpool-II-33/files/patch-pool__config.l
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/pgpool-II-33/files/patch-pool__config.l	Thu May 17 09:32:04 2018	(r470211)
@@ -0,0 +1,11 @@
+--- pool_config.l.orig	2018-02-22 11:24:41 UTC
++++ pool_config.l
+@@ -2871,7 +2871,7 @@ int pool_get_config(char *confpath, POOL
+ 			pool_config->backend_desc->num_backends = local_num_backends;
+ 
+ 	pool_debug("num_backends: %d total_weight: %f",
+-			   pool_config->backend_desc->num_backends, total_weight);
++			  (long) pool_config->backend_desc->num_backends, total_weight);
+ 	/*
+ 	 * Normalize load balancing weights. What we are doing here is,
+ 	 * assign 0 to RAND_MAX to each backend's weight according to the

Added: head/databases/pgpool-II-33/files/patch-wd__packet.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/pgpool-II-33/files/patch-wd__packet.c	Thu May 17 09:32:04 2018	(r470211)
@@ -0,0 +1,20 @@
+--- watchdog/wd_packet.c.orig	2018-02-22 00:06:40 UTC
++++ watchdog/wd_packet.c
+@@ -1211,7 +1211,7 @@ static void calculate_hmac_sha256(const 
+ 	unsigned int res_len = WD_AUTH_HASH_LEN;
+ 	HMAC_CTX *ctx = NULL;
+ 	
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+ 	ctx = HMAC_CTX_new();
+ 	HMAC_CTX_reset(ctx);
+ #else
+@@ -1222,7 +1222,7 @@ static void calculate_hmac_sha256(const 
+ 	HMAC_Init_ex(ctx, key, strlen(key), EVP_sha256(), NULL);
+ 	HMAC_Update(ctx, (unsigned char*)data, len);
+ 	HMAC_Final(ctx, (unsigned char*)str, &res_len);
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+ 	HMAC_CTX_reset(ctx);
+ 	HMAC_CTX_free(ctx);
+ #else