From owner-svn-ports-all@freebsd.org Thu May 17 09:32:06 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03BBEEE3883; Thu, 17 May 2018 09:32:06 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD7F17632F; Thu, 17 May 2018 09:32:05 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 903082750E; Thu, 17 May 2018 09:32:05 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4H9W5G3013094; Thu, 17 May 2018 09:32:05 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4H9W4nW013091; Thu, 17 May 2018 09:32:04 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201805170932.w4H9W4nW013091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Thu, 17 May 2018 09:32:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470211 - in head/databases/pgpool-II-33: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in head/databases/pgpool-II-33: . files X-SVN-Commit-Revision: 470211 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 09:32:06 -0000 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@utanet.at Reported by: dewayne@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