>Number: 129182
>Category: ports
>Synopsis: [UPDATE] databases/pgpool-II to 2.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 25 16:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 7.1-PRERELEASE i386/amd64
>Organization:
>Environment:
FreeBSD 7.1-PRERELEASE i386/amd64
>Description:
- Upgrade pgpool-II from 2.0.1 to 2.1
- optionally install pgpool-recovery for PostgreSQL
- supersedes ports/127936 and ports/129178
Removed files: files/patch-main.c
>How-To-Repeat:
>Fix:
Index: ports/databases/pgpool-II/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/pgpool-II/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ports/databases/pgpool-II/Makefile 6 Jun 2008 13:16:58 -0000 1.16
+++ ports/databases/pgpool-II/Makefile 25 Nov 2008 16:07:50 -0000
@@ -6,10 +6,9 @@
#
PORTNAME= pgpool-II
-PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTVERSION= 2.1
CATEGORIES= databases
-MASTER_SITES= http://pgfoundry.org/frs/download.php/1521/
+MASTER_SITES= http://pgfoundry.org/frs/download.php/1843/
MAINTAINER= kuriyama at FreeBSD.org
COMMENT= A connection pool server for PostgreSQL
@@ -28,15 +27,35 @@
MAN8= pgpool.8
+OPTIONS= RECOVERY "Include recovery module for PostgreSQL" on
+
+.include <bsd.port.pre.mk>
+.if defined(WITH_RECOVERY)
+PLIST_SUB+= RECOVERY=""
+.else
+PLIST_SUB+= RECOVERY="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's| pg_config| ${LOCALBASE}/bin/pg_config|g' \
+ ${WRKSRC}/sql/pgpool-recovery/Makefile
+
+post-build:
+.if defined(WITH_RECOVERY)
+ @cd ${WRKSRC}/sql/pgpool-recovery && ${GMAKE}
+.endif
pre-install:
${MKDIR} ${DATADIR} ${EXAMPLESDIR}
post-install:
+.if defined(WITH_RECOVERY)
+ @cd ${WRKSRC}/sql/pgpool-recovery && ${GMAKE} install
+.endif
${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${DATADIR}
.for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start
${INSTALL_SCRIPT} ${WRKSRC}/sample/${f} ${EXAMPLESDIR}
.endfor
@@ -51,4 +70,4 @@
PORTDOCS+= ${PORTDOCShtml}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: ports/databases/pgpool-II/distinfo
===================================================================
RCS file: /home/pcvs/ports/databases/pgpool-II/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- ports/databases/pgpool-II/distinfo 27 Dec 2007 22:47:02 -0000 1.10
+++ ports/databases/pgpool-II/distinfo 25 Nov 2008 16:07:50 -0000
@@ -1,3 +1,3 @@
-MD5 (pgpool-II-2.0.1.tar.gz) = fdfd023b1400ae85455e8274bf0cb502
-SHA256 (pgpool-II-2.0.1.tar.gz) = f30ca8ec9ec30a277dbffb06a9d11510e22e24fb457267c568ed46b046708961
-SIZE (pgpool-II-2.0.1.tar.gz) = 913792
+MD5 (pgpool-II-2.1.tar.gz) = cf02f9358f46849bd526798868e13162
+SHA256 (pgpool-II-2.1.tar.gz) = 8834b6ca01eab57d2c947c1016f164e0538e45242f1d3a3fa99932dae87ba890
+SIZE (pgpool-II-2.1.tar.gz) = 932731
Index: ports/databases/pgpool-II/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/databases/pgpool-II/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- ports/databases/pgpool-II/pkg-plist 9 Mar 2008 19:01:52 -0000 1.8
+++ ports/databases/pgpool-II/pkg-plist 25 Nov 2008 16:07:50 -0000
@@ -21,9 +21,13 @@
lib/libpcp.so.0
%%DATADIR%%/dist_def_pgbench.sql
%%DATADIR%%/pgpool.pam
+%%DATADIR%%/replicate_def_pgbench.sql
%%DATADIR%%/system_db.sql
%%EXAMPLESDIR%%/pgpool_recovery
%%EXAMPLESDIR%%/pgpool_recovery_pitr
%%EXAMPLESDIR%%/pgpool_remote_start
+%%RECOVERY%%share/postgresql/contrib/pgpool-recovery.sql
+%%RECOVERY%%lib/postgresql/pgpool-recovery.so
+%%RECOVERY%%@dirrmtry share/postgresql/contrib
@dirrm %%EXAMPLESDIR%%
@dirrm %%DATADIR%%
Index: ports/databases/pgpool-II/files/patch-main.c
===================================================================
RCS file: ports/databases/pgpool-II/files/patch-main.c
diff -N ports/databases/pgpool-II/files/patch-main.c
--- ports/databases/pgpool-II/files/patch-main.c 7 Mar 2008 01:58:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
---- main.c.orig 2007-11-09 13:37:35.000000000 +0900
-+++ main.c 2008-03-03 10:24:27.651654702 +0900
-@@ -836,7 +836,13 @@
- status = bind(fd, (struct sockaddr *)&addr, len);
- if (status == -1)
- {
-- pool_error("bind() failed. reason: %s", strerror(errno));
-+ char *host = "", *serv = "";
-+ char hostname[NI_MAXHOST], servname[NI_MAXSERV];
-+ if (getnameinfo(&addr, len, hostname, sizeof(hostname), servname, sizeof(servname), 0) == 0) {
-+ host = hostname;
-+ serv = servname;
-+ }
-+ pool_error("bind(%s:%s) failed. reason: %s", host, serv, strerror(errno));
- myexit(1);
- }
-
-@@ -872,7 +878,7 @@
- status = bind(fd, (struct sockaddr *)&addr, len);
- if (status == -1)
- {
-- pool_error("bind() failed. reason: %s", strerror(errno));
-+ pool_error("bind(%s) failed. reason: %s", addr.sun_path, strerror(errno));
- myexit(1);
- }
-
-@@ -891,6 +897,12 @@
- return fd;
- }
-
-+static void myunlink(const char* path)
-+{
-+ if (unlink(path) == 0) return;
-+ pool_error("unlink(%s) failed: %s", path, strerror(errno));
-+}
-+
- static void myexit(int code)
- {
- char path[POOLMAXPATHLEN];
-@@ -917,10 +929,10 @@
- POOL_SETMASK(&UnBlockSig);
- }
-
-- unlink(un_addr.sun_path);
-- unlink(pcp_un_addr.sun_path);
-+ myunlink(un_addr.sun_path);
-+ myunlink(pcp_un_addr.sun_path);
- snprintf(path, sizeof(path), "%s/%s", pool_config->logdir, PID_FILE_NAME);
-- unlink(path);
-+ myunlink(path);
-
- pool_shmem_exit(code);
- exit(code);
>Release-Note:
>Audit-Trail:
>Unformatted: