Update pgpool2 to 3.5.0, based on patches provided by Mustafa Dogan.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update pgpool2 to 3.5.0, based on patches provided by Mustafa Dogan.
From: Filip Hajny <filip%joyent.com@localhost>
Date: Fri, 11 Mar 2016 19:46:15 +0000
Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Fri Mar 11 19:46:15 2016 +0000
Changeset:	bacb5481ff9236dfd848132a392fd464e0526132

Modified Files:
	pgpool2/Makefile
	pgpool2/PLIST
	pgpool2/distinfo
	pgpool2/patches/patch-configure
	pgpool2/patches/patch-src_include_pool.h
	pgpool2/patches/patch-src_sample_pgpool.conf.sample
Added Files:
	pgpool2/patches/patch-src_watchdog_wd__escalation.c
Removed Files:
	pgpool2/patches/patch-src_include_parser_stringinfo.h
	pgpool2/patches/patch-src_include_utils_palloc.h
	pgpool2/patches/patch-src_watchdog_wd__packet.c

Log Message:
Update pgpool2 to 3.5.0, based on patches provided by Mustafa Dogan.

3.5.0
=====

Incompatible changes

- Remove parallel query mode codes (Yugo Nagata)

  There are very few users and the maintenance efforts are not worth it.
  Codes for system db are also removed, since this was used in only
  parallel query mode and old query cache on disk.

- Rename parameter name from ifconfig_path to if_cmd_path (Yugo Nagata)

  ifconfig_path isn't appropriate for the parameter name because
  ifconfig command is obsolete and now ip command is used as default.

- Change the syntax of pcp commands arguments (Muhammad Usama)

- Change the output and the argument semantics of pcp_watchdog_info
  command
  (Muhammad Usama)

  The command is enhanced to show watchdog information about all
  pgpool-II nodes in the cluster. According to this, the argument to
  specify node index is changed so that 0 means local pgpool-II node
  instead of the first remote node.

New features

- Add new parameter "serialize_accept" (Tatsuo Ishii)

  This parameter defines whether to serialize accept() call for incoming
  client connections.  Default is off, which means no serializing (same
  behavior as pgpool-II 3.4 or before).  If this is off, the kernel
  wakes up all of pgpool-II child process to execute accept() and one of
  them actually accepts the incoming connection.  Problem here is,
  because so my child process wake up at a same time, heavy context
  switching occurred and the performance is affected.  This phenomena is
  a classic problem called "the thundering herd problem".  By enabling
  serialize_accept, only one of pgpool-II child process is woken up and
  executes accept() and the problem can be avoided.

- Import parser of PostgreSQL 9.5 (Yugo Nagata)

  pgpool-II can understand new syntax introduced in PostgreSQL 9.5 now.
  Especially GROUPING SET, CUBE, ROLLUP and TABLESAMPLE can be be load
  balanced and can be used in query cache (except for TABLESAMPLE).

  Also INSERT...ON CONFLICT and UPDATE tab SET (col1, col2, ...) =
  (SELECT ...) ... can now be properly handled in query rewriting in
  native replication mode.

- Allow to specify database for health check and streaming replication
  delay check. (Tatsuo Ishii)

  For this purpose new directive "health_check_database" and
  "sr_check_database" are added.

Enhancements

- Performance improvement in extened query protocol (Tatsuo Ishii)

  Unnecessary "flush" messages which used to be sent in each step of
  extended protocol messages (parse, bind, describe and execute) and
  brought significant communication overhead are removed. For now it
  only affects to streaming replication mode, that is, the performance
  of other modes remains same.

- watchdog feature enhancements (Muhammad Usama, Yugo Nagata)

  The goal of this enhancement is to address the shortcomings and
  problems in the pgpool watchdog and make the watchdog system more
  robust and adaptable. Patch created by Usama, and reviewed, tested,
  and debugged by Yugo.

  -- The watchdog should consider the quorum and only elect the
master/leader
     node if the quorum exist in the watchdog cluster.
  -- All the participating pgpool-II nodes in the watchdog cluster
should have
     similar pgpool-II configurations.
  -- Watchdog nodes should have configurable watchdog node priority, to
give
     users more control on which node should become a leader node.
  -- More options for the node health-checking, especially watchdog
should allow
     external/3rd party node health checking system to integrate with
it.
  -- The watchdog should keep looking for problems like split-brain
syndrome and
     should automatically recover from it.
  -- Allow user to provide scripts to be executed at time of escalation
and
     de-escalation to master/leader nodes.

  Add these new parameters:

  -- wd_ipc_socket_dir:
     This parameter is used to specify the directory where the UNIX
domain
     socket accepting pgpool-II watchdog IPC connections will be
created.

  -- wd_priority:
     This new parameter can be used to elevate the current watchdog node
     priority in leader elections. The node with the higher wd_priority
     value will get selected as master/coordinator watchdog node when
     cluster will be electing its master node at cluster startup or in
the
     event of old master watchdog node failure.

  -- wd_de_escalation_command:
     This parameter holds the command that watchdog will execute on the
     master pgpool-II watchdog node when that node resigns from the
master
     node responsibilities.

  -- wd_monitoring_interfaces_list:
     This parameter holds a comma separated list of network device names
to
     be monitored by the watchdog process for the network link state.

- Overhauling pcp commands (Muhammad Usama)

  -- Improved handling of command argument:
     Long command line options can be used now.
  -- PCP password is safe:
     Don't pass password via command line, which causes security risks.
  -- Mutiple concurrent execution of pcp commands:
     Allow to execute a pcp command while running pcp_recovery_node
     which takes sometime to finish.

- SELECT count statics in "show pool_nodes" command results (Tatsuo
  Ishii)

  show pool_nodes results which briefly describes the status of each
backend
  now shows how many SELECTs are issued to them. So you can quickly
  recognize the effect of load balancing for example;

    test=# show pool_nodes;
     node_id | hostname | port  | status | lb_weight |  role   |
select_cnt
    ---------+----------+-------+--------+-----------+---------+------------
     0       | /tmp     | 11002 | 2      | 0.500000  | primary | 338230
     1       | /tmp     | 11003 | 2      | 0.500000  | standby | 163939
    (2 rows)

- Parser enhancements for query rewriting (Yugo Nagata)

  INSERT/UPDATE/DELETE with WITH clause, writable CTE, RETURNING clause
  can now be properly handled in query rewriting in native replication
mode.

- Allow to open pool_passwd file in read only mode by pgpool-II main
  process (Tatsuo Ishii)

- Allow to run pgpool in debug mode in regression tests (Tatsuo Ishii)

- doc:Add pgpool_adm documents (Tatsuo Ishii)

- doc:Update Chinese documents (Bambo Huang)

Bug fixes

- doc: Fix misinformation regarding load balancing in docs (Tatsuo
  Ishii)

  In streaming replication mode, DECLARE, FETCH, CLOSE and SHOW are sent
  to primary node only. Pointed out in [pgpool-general-jp: 1378].

- Issue fsync() when writing pgpool_status. (Tatsuo Ishii)

  This ensures that pgpool_status is saved to permanent storage and
  allow to survive after system crash.

- Fix reset query stuck problem (Muhammad Usama)

  It is reported that reset query (DISCARD ALL etc.) occasionally does
  not finish and pgpool child remain waiting for reply from the backend
  thus client cannot connect to pgpool (for example bug report #107).
  The cause of problem is not identified yet but if client suddenly
  closes connection to pgpool in the middle of query processing, backend
  may not accept the reset queries because they are not ready for query.

  The fix is to keep track of the status of frontend socket state and
not
  caching the PostgreSQL connection if the connection to frontend was
not
  properly terminated.

- test: Fix false alerm of regression tset 062 (Yugo Nagata)

- test: Fix broken regression test for native replication (Yugo Nagata)

  Test for insert-lock didn't work.

- test: Fix regress test to sleep after pgpool_reload (Yugo Nagata)

  Some regression tests modify configuration file and reloads. However,
  sometimes these were not applied to pgpool just after reloading.

- Fix inconsistency of sequence values in replication mode (Yugo Nagata)

  When a schema name was provided, the table name was quoted wrongly as
  like "public.mytbl" instead of "public"."mytbl". So, pool_regclass
  and to_regclass couldn't find right talbe oid and insert lock was
  never executed. This caused inconsistency between DB nodes.

- test: Fix complication error and segfault of timestamp rewrite test
  (Yugo Nagata)

- doc: Fix untranslated sentence in Japanese document (Yugo Nagata)

- Fix ancient bug of pool_push() and friends. (Tatsuo Ishii)

  It allocates buffer using realloc and uses the pointer
  returned. However it does the pointer calculation *before* realloc
  gets called. So the calculation uses the old pointer value, which
  causes various problems including segfault later.

  Also there were other problems with it. The buffer pointer and buffer
  size variable is not initialized. The buffer is not freed by
  pool_close. Typo in debugging message (3.4 or later only). They are
  fixed as well.

- doc: Fix wrong description in documents about log_standby_delay (Yugo
  Nagata)

- Fix segfalut that occurs when function is used in FROM clause (Yugo
  Nagata)

  PRPARE statements in streaming-reaplication mode and INSERT/UPDATE
  with SELECT in native-replication mode were affected. For example:

  - prepare p as select * from generate_series(1,1);
  - insert into tbl select now(), * from generate_series(1,1);

- doc: Add caution about JDBC driver version regarding
  app_name_redirect_preference_list
  (Tatsuo Ishii)

- Fix hang problmen reported in bug #145. (Tatsuo Ishii)

  The problem occurs when all the condition below are met:

  1) pgpool-II 3.4 or later
  2) streaming replication mode
  3) primary node is also load balance node
  4) extended protocol is used
  5) client_idle_limit reached

- Fix a in-memory query cache bug (Tatsuo Ishii)

  If extended query protocol is used and a bind/execute message arrives
  which uses a statement created by prior parse message, the temp_cache
  is not initialized by a parse messages. Thus messages are added to pre
  existing temp cache buffer which causes the trouble, that is, when the
  cached result returns, Data Row message and Command Complete message
  appeared twice.

  Per by bug #152.

- test: Fix regression test 065. (Tatsuo Ishii)

  The path to JDBC driver was explicitly defined. This is wrong. This
  should be inherited from JDBC_DRIVER environment variable.

- test: Fix possible hang-up of regression test 054.postgres_fdw (Yugo
  Nagata)

- test: Add option to regress.sh and pgpool_setup for unix domain socket
  directory (Yugo Nagata)

- doc: Add missing descriptions about default values to documents
  (Yugo Nagata)

- test: Fix regression test 055 for rhel7 rpm (Yugo Nagata)

- Fix reset query stuck problem (Muhammad Usama)

  The issue is already fixed in older branches and this fix adopts the
  same solution used by 3.3 series, i.e. closing the backend connection
  when client idle limit is reached.

- Fix bug with "SET TRANSACTION READ ONLY" (Tatsuo Ishii)

  Pgpool-II remembers that non read only queries (including SET) were
  executed in an explicit transaction and adds a "writing transaction"
  mark to the transaction. The mark affects the query routing behavior
  of pgpool-II while running in streaming replication mode. Pgpool-II
  starts sending queries to the primary after the mark is set. Because
  the effect of writing queries may appear on standbys after some delay
  in streaming replication mode, it is safer to route read queries to
  the primary after the mark is set.

  However there's oversight here. "SET TRANSACTION READ ONLY" does no
  data modification and should be treated as an exception.

  Per bug #157.

- test: Fix to use timeout command to handle time out of regress test
  062
  (Yugo Nagata)

- Fix to show wrong error (Tatsuo Ishii)

  connect_with_timeout() does not show proper error info when
  getsockopt(SO_ERROR) reports an error. Pointed out in bug #159.

- test: Add regress.sh missing \n in help messages (Yugo Nagata)

- Fix the logic issue in get_backends_status() function (Muhammad Usama)

  get_backends_status () function counts the number of current valid and
down
  backend nodes. The function assumed that the node was also invalid
when its
  connection status was down. However, that is not always right.

- Fix white/black_memqcache_table_list  not to require quotaion (Yugo
  Nagata)

  The tables and schemas name specified in *_memqcache_table_list
  were needed to be quoted by double quotation.

  Patch contributed by Dang Minh Huong.
  Per [pgpool-hackers: 1323]

- Fix FATAL error with reloading (Tatsuo Ishii)

  While reloading pgpool.conf, the number of DB nodes is tentatively set
  to 0, then counted up until reaching to the actual number of backends
  by the pgpool main process. Unfortunately the variable was on the
  shared memory and it confused pgpool child process when they were
using
  the variable and this caused FATAL error.

  Per bug #156 report by harukat.

- test: Add some tests for white/black_memqcache_table_list to
  regression
  test 006.memqcache (Yugo Nagata)

- Fix reset query stuck problem (Muhammad Usama, Tatsuo Ishii)

  When pool_read fails to read from frontend or pool_flush fails to
  write to the frontend, report FRONTEND_ERROR, rather than ERROR to
  disconnect and terminate pgpool child process, to prevent the query
  stuck problem.

- test: Fix some regression tests that failed in debug mode (Yugo
  Nagata)

- Fix performance degradation while using IPv6 (Muhammad Usama)

  Per bug #165.

3.4.3
=====

- Fix "cannot find xlog functions" error in pgpool-recovery
  (Muhammad Usama)

  The argument data type of PostgreSQL's pg_xlogfile_name() function
  has been changed from text to pg_lsn since PostgreSQL 9.4. And
  pgpool-recovery was still trying to locate the function by old
  signature.

- Fix problem with memory cache invalidation (Muhammad Usama)

  The internal buffer for storing the table oids needs to be homed in
  long living memory context as it has to survive throughout the child
  life.

  See [pgpool-general: 3643] for details.

- Pass empty string parameters in failover command when pgpool-II
  does not have a value for any particular parameter (Muhammad Usama)

  Instead of omitting the values for the parameters when pgpool-II does
  not have any value for a particular parameter, it now passes an empty
  string to the failover command. This makes sure that failover script
  will always receive the exact number of expected parameters.

- pgpool-II should use the local definition of snprintf functions only
  if they are not provided by OS (Muhammad Usama)

- Add debug info to show how much shared memory is allocated
  (Tatsuo Ishii)

- Downgrading the error level for EOF on backend connection for main
  process (Muhammad Usama)

  Throwing the FATAL error when EOF is encountered with backend is very
  harsh in pgpool main process and can cause undesirable behavior.
  Downgrading it to simple ERROR.

- doc: Clarify load balancing condition (Tatsuo Ishii)

- doc: Clarify description of pcp_promote_node (Tatsuo Ishii)

  It does not actually promote PostgreSQL standby.

- doc: Fix outdated limitation description about load balancing using
  JDBC driver (Tatsuo Ishii)

  Even if autocommit is false, load balancing is possible in certain
  conditions.

- Fix a misplaced code which makes a log code unreachable and rephrase
  the log message (Muhammad Usama)

- Fix a problem in elog.c when forwarding a message to frontend clients
  (Muhammad Usama)

  Error while forwarding the message to the frontend client can
  potentially cause the infinite recursion and terminate the child with
  ERRORDATA_STACK_SIZE exceeded error.

  Fix is to check the recursion depth of send_message_to_frontend()
  function and pulling the plug if it is more than two levels deep.

- Fix "select() system call interrupted" error (Tatsuo Ishii)

  The health check process complains above and then:

  ERROR:  failed to make persistent db connection
  DETAIL:  connection to host:"x.x.x.x:5432 failed

  However, the healthchek triggers neither fail over nor retrying. So,
  except the annoying messages above, everything goes well. This could
  occur more easily if 1) num_init_children is big and 2) pgpool
  children go into idle state (no query arrived from client for
  child_life_time seconds).

  Original bug report is [pgpool-general: 3756] Connection Interrupted.
  Patch created by Tatsuo Ishii. Enhancement from Usama.

- Fix the case when user table includes spaces (Tatsuo Ishii)

  For example if table names including spaces are used, pgpool-II cannot
  be handled correctly by the internal functions which access system
  catalogs and it results in SQL errors. Solution is, to always use
  delimited identifier.

  Per bug #136.
  http://www.pgpool.net/mantisbt/view.php?id=136

  Also see [pgpool-general: 3818].

- Allow to use in-memory query cache size more than 4GB (Tatsuo Ishii)

  This should have been allowed since in memory query cache was born.

- Do not send a query for checking insert lock in non replication mode
  with extended query (Tatsuo Ishii)

- Save pgpool_status to disk each time when it is changed
  (Tatsuo Ishii)

  Previously, pgpool-II saves pgpool_status file when pgpool-II
  explicitly is going shutdown. This is fine in most cases and it saves
  slight CPU cycles. But if pgpool-II killed abnormally or the system
  forces pgpool-II to go down by OOM killer, next pgpool-II restarting
  could load obsolete status file.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bacb5481ff9236dfd848132a392fd464e0526132

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pgpool2/Makefile                                   | 27 ++++++++--------------
 pgpool2/PLIST                                      | 24 +++++++++----------
 pgpool2/distinfo                                   | 19 ++++++++-------
 pgpool2/patches/patch-configure                    |  7 +++---
 .../patches/patch-src_include_parser_stringinfo.h  | 13 -----------
 pgpool2/patches/patch-src_include_pool.h           | 11 +++++----
 pgpool2/patches/patch-src_include_utils_palloc.h   | 13 -----------
 .../patches/patch-src_sample_pgpool.conf.sample    |  1 +
 .../patches/patch-src_watchdog_wd__escalation.c    | 16 +++++++++++++
 pgpool2/patches/patch-src_watchdog_wd__packet.c    | 13 -----------
 10 files changed, 56 insertions(+), 88 deletions(-)

diffs:
diff --git a/pgpool2/Makefile b/pgpool2/Makefile
index 2a2ada5..690d98b 100644
--- a/pgpool2/Makefile
+++ b/pgpool2/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2015/04/13 19:59:59 fhajny Exp $
 #
 
-DISTNAME=	pgpool-II-3.4.2
+DISTNAME=	pgpool-II-3.5.0
 PKGNAME=	postgresql${PGSQL_VERSION}-pgpool2-${DISTNAME:S/pgpool-II-//}
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
@@ -13,27 +13,15 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	postgresql${PGSQL_VERSION}-server>=0:../../databases/postgresql${PGSQL_VERSION}-server
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake
 
 .include "options.mk"
-.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=		PGPOOL_USER PGPOOL_GROUP PGGROUP PGHOME VARBASE
 
-.include "../../mk/pgsql.buildlink3.mk"
-
-PLIST_VARS+=		ext
-# PostgreSQL 9.1 and above supports loadable extensions
-.if ${PGSQL_VERSION} >= 91
-PLIST.ext=		yes
-.endif
-
-BUILD_DIRS=		. src/sql
-
 EGDIR=			share/examples/pgpool2
 
 PGPOOL_USER?=		pgpool
@@ -41,10 +29,10 @@ PGPOOL_GROUP?=		${PGGROUP}
 PGGROUP?=		pgsql
 PGHOME?=		${PREFIX}/${PGGROUP}
 
-PKG_GROUPS=		${PGPOOL_GROUP}
-PKG_USERS=		${PGPOOL_USER}:${PGPOOL_GROUP}
-PKG_GROUPS_VARS+=	PGPOOL_GROUP
-PKG_USERS_VARS=		PGPOOL_USER
+PKG_GROUPS=			${PGPOOL_GROUP}
+PKG_USERS=			${PGPOOL_USER}:${PGPOOL_GROUP}
+PKG_GROUPS_VARS+=		PGPOOL_GROUP
+PKG_USERS_VARS=			PGPOOL_USER
 PKG_HOME.${PGPOOL_USER}=	${PGHOME}
 PKG_SHELL.${PGPOOL_GROUP}=	${SH}
 
@@ -62,6 +50,8 @@ SUBST_VARS.path=	PGPOOL_LOGDIR PGPOOL_PIDDIR
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+BUILD_DIRS=		. src/sql
+
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/${EGDIR}
 
 SMF_NAME=		pgpool
@@ -77,4 +67,5 @@ CONF_FILES_PERMS+=	${EGDIR}/pool_passwd ${PKG_SYSCONFDIR}/pool_passwd \
 post-install:
 	${TOUCH} ${DESTDIR}${PREFIX}/share/examples/pgpool2/pool_passwd
 
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pgpool2/PLIST b/pgpool2/PLIST
index 43cb358..15a10b8 100644
--- a/pgpool2/PLIST
+++ b/pgpool2/PLIST
@@ -9,7 +9,6 @@ bin/pcp_proc_info
 bin/pcp_promote_node
 bin/pcp_recovery_node
 bin/pcp_stop_pgpool
-bin/pcp_systemdb_info
 bin/pcp_watchdog_info
 bin/pg_md5
 bin/pgpool
@@ -18,9 +17,9 @@ include/pcp.h
 include/pool_process_reporting.h
 include/pool_type.h
 lib/libpcp.la
-${PLIST.ext}lib/postgresql/pgpool-recovery.so
-${PLIST.ext}lib/postgresql/pgpool-regclass.so
-${PLIST.ext}lib/postgresql/pgpool_adm.so
+lib/postgresql/pgpool-recovery.so
+lib/postgresql/pgpool-regclass.so
+lib/postgresql/pgpool_adm.so
 man/man8/pgpool.8
 share/examples/pgpool2/pcp.conf.sample
 share/examples/pgpool2/pgpool.conf.sample
@@ -31,12 +30,11 @@ share/examples/pgpool2/pool_hba.conf.sample
 share/examples/pgpool2/pool_passwd
 share/pgpool2/insert_lock.sql
 share/pgpool2/pgpool.pam
-share/pgpool2/system_db.sql
-${PLIST.ext}share/postgresql/extension/pgpool-recovery.sql
-${PLIST.ext}share/postgresql/extension/pgpool-regclass.sql
-${PLIST.ext}share/postgresql/extension/pgpool_adm--1.0.sql
-${PLIST.ext}share/postgresql/extension/pgpool_adm.control
-${PLIST.ext}share/postgresql/extension/pgpool_recovery--1.1.sql
-${PLIST.ext}share/postgresql/extension/pgpool_recovery.control
-${PLIST.ext}share/postgresql/extension/pgpool_regclass--1.0.sql
-${PLIST.ext}share/postgresql/extension/pgpool_regclass.control
+share/postgresql/extension/pgpool-recovery.sql
+share/postgresql/extension/pgpool-regclass.sql
+share/postgresql/extension/pgpool_adm--1.0.sql
+share/postgresql/extension/pgpool_adm.control
+share/postgresql/extension/pgpool_recovery--1.1.sql
+share/postgresql/extension/pgpool_recovery.control
+share/postgresql/extension/pgpool_regclass--1.0.sql
+share/postgresql/extension/pgpool_regclass.control
diff --git a/pgpool2/distinfo b/pgpool2/distinfo
index 5146594..6e00059 100644
--- a/pgpool2/distinfo
+++ b/pgpool2/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.4 2015/04/13 19:59:59 fhajny Exp $
+$NetBSD$
 
-SHA1 (pgpool-II-3.4.2.tar.gz) = a16e4597d9cc5eebbda675eef73133db1435e02a
-RMD160 (pgpool-II-3.4.2.tar.gz) = 610005f62863e60a770cd97d8945a10405d0ae21
-Size (pgpool-II-3.4.2.tar.gz) = 2133363 bytes
-SHA1 (patch-configure) = a5a4dd630a0fd558759f9a513c0e42c08143f1ab
-SHA1 (patch-src_include_parser_stringinfo.h) = 4ce7b8501e1b3288466a6fd73ad491806a0b7774
-SHA1 (patch-src_include_pool.h) = 5bd4fb25e6304dee4a23c6047b66432d8a922336
-SHA1 (patch-src_include_utils_palloc.h) = 05f43cdd70c0394b2ed9baec87f558d43bf3ef7b
-SHA1 (patch-src_sample_pgpool.conf.sample) = 140b58d481477264c41edaab2079c97c00cc93d0
-SHA1 (patch-src_watchdog_wd__packet.c) = 4546aa82be136096db598b5b01d4cc8217e6b6e0
+SHA1 (pgpool-II-3.5.0.tar.gz) = f5041afe078bc8c414e4db8ab0119c4e76aaaaab
+RMD160 (pgpool-II-3.5.0.tar.gz) = 0ed82d605da0fc0ed7ff3f9c45e7731307f53299
+SHA512 (pgpool-II-3.5.0.tar.gz) = da11dd552fdad3d13676681b562972050a71f0cd0240456b76e99b860f94dc733b05f1c12bb3de3bf1d1f3f3762ef8f5533416c8c311639b97ed716e0818a172
+Size (pgpool-II-3.5.0.tar.gz) = 2205490 bytes
+SHA1 (patch-configure) = a220d49eecd5408f576f22226089daa298b27d4c
+SHA1 (patch-src_include_pool.h) = 74409384d735695d44466468833088959753d9d2
+SHA1 (patch-src_sample_pgpool.conf.sample) = db3f6e280d3b02dd6c5abab9aba087ce30acbaa5
+SHA1 (patch-src_watchdog_wd__escalation.c) = 63ac5ea3f8853eb953707e79f351ae1eea3a8b25
diff --git a/pgpool2/patches/patch-configure b/pgpool2/patches/patch-configure
index b54b7c1..00df760 100644
--- a/pgpool2/patches/patch-configure
+++ b/pgpool2/patches/patch-configure
@@ -1,14 +1,15 @@
 $NetBSD: patch-configure,v 1.4 2015/04/13 19:59:59 fhajny Exp $
 
 Pick a better name for the package.
---- configure.orig	2015-04-08 07:58:47.000000000 +0000
+
+--- configure.orig	2016-02-10 08:53:31.000000000 +0000
 +++ configure
-@@ -3858,7 +3858,7 @@ fi
+@@ -3979,7 +3979,7 @@ fi
  
  
  # Define the identity of the package.
 - PACKAGE='pgpool-II'
 + PACKAGE='pgpool2'
-  VERSION='3.4.2'
+  VERSION='3.5.0'
  
  
diff --git a/pgpool2/patches/patch-src_include_parser_stringinfo.h b/pgpool2/patches/patch-src_include_parser_stringinfo.h
deleted file mode 100644
index a40948a..0000000
--- a/pgpool2/patches/patch-src_include_parser_stringinfo.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_include_parser_stringinfo.h,v 1.1 2015/04/13 19:59:59 fhajny Exp $
-
-Fix build on SunOS.
---- src/include/parser/stringinfo.h.orig	2015-04-08 07:28:03.000000000 +0000
-+++ src/include/parser/stringinfo.h
-@@ -19,6 +19,7 @@
- #define STRINGINFO_H
- 
- #include <stdio.h>
-+#include <stdarg.h>
- #include "pg_config_manual.h"
- 
- /* port.h */
diff --git a/pgpool2/patches/patch-src_include_pool.h b/pgpool2/patches/patch-src_include_pool.h
index c2fb4ba..f83f98c 100644
--- a/pgpool2/patches/patch-src_include_pool.h
+++ b/pgpool2/patches/patch-src_include_pool.h
@@ -1,10 +1,11 @@
-$NetBSD: patch-src_include_pool.h,v 1.1 2015/04/13 19:59:59 fhajny Exp $
+$NetBSD$
 
 Default pid file location.
---- src/include/pool.h.orig	2015-04-08 07:58:44.000000000 +0000
-+++ src/include/pool.h
-@@ -78,7 +78,7 @@
- #define DEFAULT_SOCKET_DIR "/tmp"
+
+--- src/include/pool.h.orig	2016-02-20 00:28:07.000000000 +0200
++++ src/include/pool.h		2016-02-20 00:29:09.000000000 +0200
+@@ -81,7 +81,7 @@
+ #define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
  
  /* pid file name */
 -#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
diff --git a/pgpool2/patches/patch-src_include_utils_palloc.h b/pgpool2/patches/patch-src_include_utils_palloc.h
deleted file mode 100644
index 96b88f6..0000000
--- a/pgpool2/patches/patch-src_include_utils_palloc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_include_utils_palloc.h,v 1.1 2015/04/13 19:59:59 fhajny Exp $
-
-Fix build on SunOS.
---- src/include/utils/palloc.h.orig	2015-04-08 07:28:03.000000000 +0000
-+++ src/include/utils/palloc.h
-@@ -28,6 +28,7 @@
- #ifndef PALLOC_H
- #define PALLOC_H
- 
-+#include <stdarg.h>
- #include "pg_config_manual.h"
- 
- /*
diff --git a/pgpool2/patches/patch-src_sample_pgpool.conf.sample b/pgpool2/patches/patch-src_sample_pgpool.conf.sample
index d099eb3..fa6e54c 100644
--- a/pgpool2/patches/patch-src_sample_pgpool.conf.sample
+++ b/pgpool2/patches/patch-src_sample_pgpool.conf.sample
@@ -1,6 +1,7 @@
 $NetBSD: patch-src_sample_pgpool.conf.sample,v 1.1 2015/04/13 20:00:00 fhajny Exp $
 
 Default pid file location.
+
 --- src/sample/pgpool.conf.sample.orig	2015-04-08 07:58:44.000000000 +0000
 +++ src/sample/pgpool.conf.sample
 @@ -211,10 +211,10 @@ debug_level = 0
diff --git a/pgpool2/patches/patch-src_watchdog_wd__escalation.c b/pgpool2/patches/patch-src_watchdog_wd__escalation.c
new file mode 100644
index 0000000..5ec1091
--- /dev/null
+++ b/pgpool2/patches/patch-src_watchdog_wd__escalation.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Add sys/wait.h unconditionally, same as other source files.
+
+--- src/watchdog/wd_escalation.c.orig	2016-02-10 08:53:31.000000000 +0000
++++ src/watchdog/wd_escalation.c
+@@ -27,9 +27,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ 
+-#ifdef __FreeBSD__
+ #include <sys/wait.h>
+-#endif
+ 
+ #include "pool.h"
+ #include "utils/elog.h"
diff --git a/pgpool2/patches/patch-src_watchdog_wd__packet.c b/pgpool2/patches/patch-src_watchdog_wd__packet.c
deleted file mode 100644
index 8d0a0ae..0000000
--- a/pgpool2/patches/patch-src_watchdog_wd__packet.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_watchdog_wd__packet.c,v 1.1 2015/04/13 20:00:00 fhajny Exp $
-
-Needs sys/wait.h here too.
---- src/watchdog/wd_packet.c.orig	2015-04-08 07:28:03.000000000 +0000
-+++ src/watchdog/wd_packet.c
-@@ -33,6 +33,7 @@
- #include <sys/un.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/wait.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
- #include <netdb.h>
Prev by Date: delete clang. Updated in pkgsrc.
Next by Date: Simplify PKGNAME definition
Previous by Thread: delete clang. Updated in pkgsrc.
Next by Thread: Simplify PKGNAME definition
Indexes:
Home | Main Index | Thread Index | Old Index