Hi,

Small diff to update pgpool-II to it's latest version.
A lot of patches have been commited upstream.
Tested on @amd64 with PostgreSQL 10.3

Comments, ok ?

Regards,
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile	11 Jan 2018 19:27:01 -0000	1.9
+++ Makefile	17 Apr 2018 15:39:01 -0000
@@ -2,8 +2,7 @@
 
 COMMENT= 	connection pool server for PostgreSQL
 
-DISTNAME= 	pgpool-II-3.7.0
-REVISION=       0
+DISTNAME= 	pgpool-II-3.7.3
 
 CATEGORIES= 	databases
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo	19 Dec 2017 09:02:03 -0000	1.6
+++ distinfo	17 Apr 2018 15:39:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.7.0.tar.gz) = UtQJST/1mWR31Y0Bzjds7LMzWGmoxrhAY2BNZ27u+og=
-SIZE (pgpool-II-3.7.0.tar.gz) = 3269076
+SHA256 (pgpool-II-3.7.3.tar.gz) = pY/OfLmzGY0dwYtA5HBm0wBJ6AWejOZ6Vo1bHgtrkec=
+SIZE (pgpool-II-3.7.3.tar.gz) = 3259752
Index: patches/patch-src_main_main_c
===================================================================
RCS file: patches/patch-src_main_main_c
diff -N patches/patch-src_main_main_c
--- patches/patch-src_main_main_c	19 Dec 2017 09:02:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_main_main_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/main/main.c
---- src/main/main.c.orig
-+++ src/main/main.c
-@@ -186,7 +186,7 @@ int main(int argc, char **argv)
- 	}
- #ifdef USE_SSL
- 	/* global ssl init */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L)
- 	OPENSSL_init_ssl(0, NULL);
- #else
- 	SSL_library_init();
Index: patches/patch-src_rewrite_pool_lobj_c
===================================================================
RCS file: patches/patch-src_rewrite_pool_lobj_c
diff -N patches/patch-src_rewrite_pool_lobj_c
--- patches/patch-src_rewrite_pool_lobj_c	19 Dec 2017 09:02:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_rewrite_pool_lobj_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/rewrite/pool_lobj.c
---- src/rewrite/pool_lobj.c.orig
-+++ src/rewrite/pool_lobj.c
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <netinet/in.h>
-+#include <stdint.h>
- 
- #include "pool.h"
- #include "rewrite/pool_lobj.h"
Index: patches/patch-src_utils_pool_select_walker_c
===================================================================
RCS file: patches/patch-src_utils_pool_select_walker_c
diff -N patches/patch-src_utils_pool_select_walker_c
--- patches/patch-src_utils_pool_select_walker_c	19 Dec 2017 09:02:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_utils_pool_select_walker_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/utils/pool_select_walker.c
---- src/utils/pool_select_walker.c.orig
-+++ src/utils/pool_select_walker.c
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <stdint.h>
- 
- #include "pool.h"
- #include "utils/elog.h"
Index: patches/patch-src_watchdog_wd_lifecheck_c
===================================================================
RCS file: patches/patch-src_watchdog_wd_lifecheck_c
diff -N patches/patch-src_watchdog_wd_lifecheck_c
--- patches/patch-src_watchdog_wd_lifecheck_c	19 Dec 2017 09:02:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_watchdog_wd_lifecheck_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/watchdog/wd_lifecheck.c
---- src/watchdog/wd_lifecheck.c.orig
-+++ src/watchdog/wd_lifecheck.c
-@@ -26,6 +26,7 @@
- #include <ctype.h>
- #include <time.h>
- #include <string.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <netdb.h>
Index: patches/patch-src_watchdog_wd_ping_c
===================================================================
RCS file: patches/patch-src_watchdog_wd_ping_c
diff -N patches/patch-src_watchdog_wd_ping_c
--- patches/patch-src_watchdog_wd_ping_c	19 Dec 2017 09:02:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_watchdog_wd_ping_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/watchdog/wd_ping.c
---- src/watchdog/wd_ping.c.orig
-+++ src/watchdog/wd_ping.c
-@@ -25,6 +25,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <netdb.h>
Index: patches/patch-src_watchdog_wd_utils_c
===================================================================
RCS file: patches/patch-src_watchdog_wd_utils_c
diff -N patches/patch-src_watchdog_wd_utils_c
--- patches/patch-src_watchdog_wd_utils_c	19 Dec 2017 09:02:03 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_watchdog_wd_utils_c,v 1.1 2017/12/19 09:02:03 pea Exp $
-
-Index: src/watchdog/wd_utils.c
---- src/watchdog/wd_utils.c.orig
-+++ src/watchdog/wd_utils.c
-@@ -154,7 +154,7 @@ static void calculate_hmac_sha256(const char *data, in
- 	unsigned int res_len = WD_AUTH_HASH_LEN;
- 	HMAC_CTX *ctx = NULL;
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L)
- 	ctx = HMAC_CTX_new();
- 	HMAC_CTX_reset(ctx);
- #else
-@@ -165,7 +165,7 @@ static void calculate_hmac_sha256(const char *data, in
- 	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 (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L)
- 	HMAC_CTX_reset(ctx);
- 	HMAC_CTX_free(ctx);
- #else

Reply via email to