Index: head/databases/pgpool-II-33/Makefile =================================================================== --- head/databases/pgpool-II-33/Makefile (revision 462487) +++ head/databases/pgpool-II-33/Makefile (revision 462488) @@ -1,90 +1,92 @@ # $FreeBSD$ PORTNAME= pgpool-II -PORTVERSION= 3.3.7 +PORTVERSION= 3.3.20 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ PKGNAMESUFFIX= 33 MAINTAINER= michelle@sorbs.net COMMENT= Connection pool server for PostgreSQL LICENSE= MIT BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= library 'ssl' is required for OpenSSL - +DEPRECATED= Will be deprecated by upstream, please switch to newer pgpool versions +EXPIRATION_DATE= 2018-07-31 RUN_DEPENDS= rsync:net/rsync USES= gmake libtool perl5 pgsql WANT_PGSQL= client USE_PERL5= run GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP} -CONFLICTS= pgpool-3.* pgpool-II-22-2.* pgpool-II-23-2.* pgpool-II-30-3.* pgpool-II-3.* +CONFLICTS= pgpool-3.* pgpool-II-30-3.* pgpool-II-3.* USE_RC_SUBR= pgpool DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp \ TODO doc/pgpool-en.html doc/pgpool-ja.html doc/pgpool.css \ doc/tutorial-en.html doc/tutorial-ja.html OPTIONS_DEFINE+= DOCS SSL LIBMEMCACHED PAM OPTIONS_DEFAULT= SSL PAM # Buggy configure: adding eg. --without-pam to CONFIGURE_ARGS causes # USE_PAM to be *defined* in config.h Omit the --with-pam or # --without-pam flags entirely to leave PAM turned off. Similarly for # --with-memcached. LIBMEMCACHED_DESC= Build with MemCached support LIBMEMCACHED_BUILD_DEPENDS= libmemcached>=1.0:databases/libmemcached LIBMEMCACHED_CONFIGURE_ON= --with-memcached=${LOCALBASE}/lib/libmemcached +LIBMEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached SSL_CONFIGURE_WITH= openssl SSL_USES= ssl PAM_DESC= Build with PAM support PAM_CONFIGURE_ON= --with-pam PAM_USE= PAM=yes FUNC_CONTRIB_DIR= ${PREFIX}/share/postgresql/contrib FUNC_LIB_DIR= ${PREFIX}/lib/postgresql FUNCTIONS= pgpool-recovery pgpool-regclass FUNC_CONTRIB= pgpool-recovery/uninstall_pgpool-recovery.sql \ pgpool-recovery/pgpool-recovery.sql \ pgpool-regclass/uninstall_pgpool-regclass.sql \ pgpool-regclass/pgpool-regclass.sql FUNC_LIB= pgpool-recovery/pgpool-recovery.so \ pgpool-regclass/pgpool-regclass.so post-build: .for f in ${FUNCTIONS} cd ${WRKSRC}/sql/${f} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} .endfor post-install: ${MKDIR} ${STAGEDIR}${FUNC_CONTRIB_DIR} .for f in ${FUNC_CONTRIB} ${INSTALL_DATA} ${WRKSRC}/sql/${f} ${STAGEDIR}${FUNC_CONTRIB_DIR} .endfor ${MKDIR} ${STAGEDIR}${FUNC_LIB_DIR} .for f in ${FUNC_LIB} ${INSTALL_LIB} ${WRKSRC}/sql/${f} ${STAGEDIR}${FUNC_LIB_DIR} .endfor ${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql \ ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql \ ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR} .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start ${INSTALL_SCRIPT} ${WRKSRC}/sample/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} ${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/databases/pgpool-II-33/distinfo =================================================================== --- head/databases/pgpool-II-33/distinfo (revision 462487) +++ head/databases/pgpool-II-33/distinfo (revision 462488) @@ -1,2 +1,3 @@ -SHA256 (pgpool-II-3.3.7.tar.gz) = b1bfc8c48be252f6c4e54521d24a0e28e86d0027b18aa4ccf6b8405508319032 -SIZE (pgpool-II-3.3.7.tar.gz) = 1808677 +TIMESTAMP = 1519208789 +SHA256 (pgpool-II-3.3.20.tar.gz) = f78e5901b4ff9b0634fcb0c470fa0f2c3dc80365a2407f021f63c38614ba04c6 +SIZE (pgpool-II-3.3.20.tar.gz) = 1793528 Index: head/databases/pgpool-II-33/files/patch-pool_hba.c =================================================================== --- head/databases/pgpool-II-33/files/patch-pool_hba.c (revision 462487) +++ head/databases/pgpool-II-33/files/patch-pool_hba.c (revision 462488) @@ -1,10 +1,10 @@ ---- ./pool_hba.c.orig 2014-03-24 14:30:01.000000000 +0000 -+++ ./pool_hba.c 2014-06-29 14:58:09.893352941 +0100 +--- pool_hba.c.orig 2018-02-13 05:20:52 UTC ++++ pool_hba.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "pool.h" #include "pool_path.h" Index: head/databases/pgpool-II-33/files/patch-recovery.c =================================================================== --- head/databases/pgpool-II-33/files/patch-recovery.c (revision 462487) +++ head/databases/pgpool-II-33/files/patch-recovery.c (revision 462488) @@ -1,19 +1,19 @@ ---- ./recovery.c.orig 2014-03-24 14:30:01.000000000 +0000 -+++ ./recovery.c 2014-06-29 14:55:21.756363519 +0100 -@@ -117,7 +117,7 @@ +--- recovery.c.orig 2018-02-13 05:20:52 UTC ++++ recovery.c +@@ -115,7 +115,7 @@ int start_recovery(int recovery_node) if (REPLICATION) { - pool_log("starting 2nd stage"); + pool_log("starting 2nd stage. waiting connections from clients to be closed"); /* 2nd stage */ *InRecovery = RECOVERY_ONLINE; -@@ -430,6 +430,6 @@ +@@ -437,6 +437,6 @@ int wait_connection_closed(void) sleep(3); } while (i++ < WAIT_RETRY_COUNT); - pool_error("wait_connection_closed: existing connections did not close in %d sec.", pool_config->recovery_timeout); + pool_error("wait_connection_closed: existing connections (%d) did not close in %d sec.", Req_info->conn_counter, pool_config->recovery_timeout); return 1; } Index: head/databases/pgpool-II-33/files/patch-watchdog__watchdog.h =================================================================== --- head/databases/pgpool-II-33/files/patch-watchdog__watchdog.h (revision 462487) +++ head/databases/pgpool-II-33/files/patch-watchdog__watchdog.h (revision 462488) @@ -1,31 +1,31 @@ ---- ./watchdog/watchdog.h.orig 2014-03-24 14:30:01.000000000 +0000 -+++ ./watchdog/watchdog.h 2014-06-29 14:55:21.760361453 +0100 +--- watchdog/watchdog.h.orig 2018-02-13 05:20:52 UTC ++++ watchdog/watchdog.h @@ -56,6 +56,28 @@ #define WD_TIME_DIFF_SEC(a,b) (int)(((a).tv_sec - (b).tv_sec) + \ ((a).tv_usec - (b).tv_usec) / 1000000.0) +/* For valid x, exactly one of WIFSIGNALED(x), WIFEXITED(x), WIFSTOPPED(x) is true. */ +#ifndef WIFSIGNALED +# define WIFSIGNALED(x) (WTERMSIG (x) != 0 && WTERMSIG(x) != 0x7f) +#endif +#ifndef WIFEXITED +# define WIFEXITED(x) (WTERMSIG (x) == 0) +#endif +#ifndef WIFSTOPPED +# define WIFSTOPPED(x) (WTERMSIG (x) == 0x7f) +#endif + +/* The termination signal. Only to be accessed if WIFSIGNALED(x) is true. */ +#ifndef WTERMSIG +# define WTERMSIG(x) ((x) & 0x7f) +#endif + + +/* The exit status. Only to be accessed if WIFEXITED(x) is true. */ +#ifndef WEXITSTATUS +# define WEXITSTATUS(x) (((x) >> 8) & 0xff) +#endif + /* * packet number of watchdog negotiation */