CVS commit: pkgsrc/databases/pgpool2

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Aug 17 17:05:14 UTC 2022

Modified Files:
        pkgsrc/databases/pgpool2: Makefile distinfo
Added Files:
        pkgsrc/databases/pgpool2/patches: patch-src_main_pgpool__logger.c

Log Message:
pgpool2: update HOMEPAGE + fix build error on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/pgpool2/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/pgpool2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/pgpool2/patches/patch-src_main_pgpool__logger.c

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

Modified files:

Index: pkgsrc/databases/pgpool2/Makefile
diff -u pkgsrc/databases/pgpool2/Makefile:1.10 pkgsrc/databases/pgpool2/Makefile:1.11
--- pkgsrc/databases/pgpool2/Makefile:1.10      Tue May 24 11:50:12 2022
+++ pkgsrc/databases/pgpool2/Makefile   Wed Aug 17 17:05:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/05/24 11:50:12 adam Exp $
+# $NetBSD: Makefile,v 1.11 2022/08/17 17:05:14 tnn Exp $
 
 DISTNAME=      pgpool-II-4.3.2
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME:S/-II/2/}
@@ -6,7 +6,7 @@ CATEGORIES=     databases
 MASTER_SITES=  https://www.pgpool.net/mediawiki/images/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.pgpool.net/mediawiki/
+HOMEPAGE=      https://www.pgpool.net/mediawiki/index.php/Main_Page
 COMMENT=       Middleware between PostgreSQL servers and a PostgreSQL database client
 LICENSE=       modified-bsd
 

Index: pkgsrc/databases/pgpool2/distinfo
diff -u pkgsrc/databases/pgpool2/distinfo:1.8 pkgsrc/databases/pgpool2/distinfo:1.9
--- pkgsrc/databases/pgpool2/distinfo:1.8       Tue May 24 11:50:12 2022
+++ pkgsrc/databases/pgpool2/distinfo   Wed Aug 17 17:05:14 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2022/05/24 11:50:12 adam Exp $
+$NetBSD: distinfo,v 1.9 2022/08/17 17:05:14 tnn Exp $
 
 BLAKE2s (pgpool-II-4.3.2.tar.gz) = 11cae621379e32e1d16f4d738483d521b8b5bcc9404ad6a435983fe557131835
 SHA512 (pgpool-II-4.3.2.tar.gz) = 771426257eddb5c48504c80a2c8cccf44a18f7ea50df55654b7e9e017bda561a73a3e1f0db79785785ff6893d6df26f73b55310d0184ef3301838d12290d3d4c
@@ -8,6 +8,7 @@ SHA1 (patch-src_Makefile.in) = 467e7b9a2
 SHA1 (patch-src_auth_pool__hba.c) = e677effdc067273342adedfd0611661fc03ca059
 SHA1 (patch-src_include_pool.h) = eae2f78a996e3204d75d23378ad6e95333282926
 SHA1 (patch-src_include_utils_fe__ports.h) = 7aea07d78cf2295844286935a330a90e0e411825
+SHA1 (patch-src_main_pgpool__logger.c) = edf1a6c90f13dbe1810e921af08f9d2fda5c91d0
 SHA1 (patch-src_main_pgpool__main.c) = 1e680d9143bc745618ecdc61cb4791a90719a5ff
 SHA1 (patch-src_sample_pgpool.conf.sample) = 3a12aa1a9107a77b536912ab46d98888c3640ef6
 SHA1 (patch-src_tools_pgproto_read.c) = a533898b74eb2c43a8aa24285f8cdd3d1e9ac2e2

Added files:

Index: pkgsrc/databases/pgpool2/patches/patch-src_main_pgpool__logger.c
diff -u /dev/null pkgsrc/databases/pgpool2/patches/patch-src_main_pgpool__logger.c:1.1
--- /dev/null   Wed Aug 17 17:05:14 2022
+++ pkgsrc/databases/pgpool2/patches/patch-src_main_pgpool__logger.c    Wed Aug 17 17:05:14 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_main_pgpool__logger.c,v 1.1 2022/08/17 17:05:14 tnn Exp $
+
+Fix build on SunOS.
+
+--- src/main/pgpool_logger.c.orig      2022-05-18 02:52:38.000000000 +0000
++++ src/main/pgpool_logger.c
+@@ -1116,10 +1116,15 @@ set_next_rotation_time(void)
+       rotinterval = pool_config->log_rotation_age * SECS_PER_MINUTE;  /* convert to seconds */
+       now = (pg_time_t) time(NULL);
+       tm = localtime(&now);
+-      now += tm->tm_gmtoff;
++#if defined(__sun__)
++      pg_time_t gmtoff = (pg_time_t)mktime(tm) - now;
++#else
++      pg_time_t gmtoff = (pg_time_t)tm->tm_gmtoff;
++#endif
++      now += gmtoff;
+       now -= now % rotinterval;
+       now += rotinterval;
+-      now -= tm->tm_gmtoff;
++      now -= gmtoff;
+       next_rotation_time = now;
+ }
+