Date: Mon, 10 Dec 2012 02:27:32 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308578 - in head/databases/postgresql-repmgr: . files Message-ID: <201212100227.qBA2RWJ8094044@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Dec 10 02:27:32 2012 New Revision: 308578 URL: http://svnweb.freebsd.org/changeset/ports/308578 Log: - Update to 1.2.0 - Update MASTER_SITES - Assign with expansion for RUN_DEPENDS -> BUILD_DEPENDS - Remove patch-strnlen after refactoring changes into new patches - Add patch to fix compilation by cherrypicking a commit in 2.x - Trim Makefile header PR: ports/174216 Submitted by: Kubilay Kocak <koobs.freebsd@gmail.com> (maintainer) Approved by: Alexander Pyhalov <alp@rsu.ru> (maintainer) Added: head/databases/postgresql-repmgr/files/patch-config.c (contents, props changed) head/databases/postgresql-repmgr/files/patch-repmgr.c (contents, props changed) Deleted: head/databases/postgresql-repmgr/files/patch-strnlen Modified: head/databases/postgresql-repmgr/Makefile (contents, props changed) head/databases/postgresql-repmgr/distinfo (contents, props changed) Modified: head/databases/postgresql-repmgr/Makefile ============================================================================== --- head/databases/postgresql-repmgr/Makefile Mon Dec 10 02:00:10 2012 (r308577) +++ head/databases/postgresql-repmgr/Makefile Mon Dec 10 02:27:32 2012 (r308578) @@ -1,19 +1,17 @@ -# New ports collection makefile for: repmgr -# Date created: January 15, 2011 -# Whom: alp@sfedu.ru +# Created by: alp@sfedu.ru # $FreeBSD$ PORTNAME= postgresql-repmgr -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.0 CATEGORIES= databases -MASTER_SITES= http://projects.2ndquadrant.it/sites/default/files/ +MASTER_SITES= http://www.repmgr.org/download/ DISTNAME= repmgr-${PORTVERSION} MAINTAINER= alp@sfedu.ru COMMENT= PostgreSQL replication manager BUILD_DEPENDS= postgresql-server>=9.0:${PORTSDIR}/databases/postgresql90-server -RUN_DEPENDS= postgresql-server>=9.0:${PORTSDIR}/databases/postgresql90-server \ +RUN_DEPENDS:= ${BUILD_DEPENDS} \ rsync:${PORTSDIR}/net/rsync USE_GMAKE= yes Modified: head/databases/postgresql-repmgr/distinfo ============================================================================== --- head/databases/postgresql-repmgr/distinfo Mon Dec 10 02:00:10 2012 (r308577) +++ head/databases/postgresql-repmgr/distinfo Mon Dec 10 02:27:32 2012 (r308578) @@ -1,2 +1,2 @@ -SHA256 (repmgr-1.1.0.tar.gz) = 7862c90b18522f59a2a18881eeba355b2fbe1956523005a1449dcc768ab3794c -SIZE (repmgr-1.1.0.tar.gz) = 48729 +SHA256 (repmgr-1.2.0.tar.gz) = 191c077a15b9f7fa729b8f1c4e5ace8b340fda6285c7b552545f94ca4490ec5b +SIZE (repmgr-1.2.0.tar.gz) = 51608 Added: head/databases/postgresql-repmgr/files/patch-config.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/postgresql-repmgr/files/patch-config.c Mon Dec 10 02:27:32 2012 (r308578) @@ -0,0 +1,11 @@ +--- ./config.c.orig 2012-12-04 19:40:15.395225527 +1100 ++++ ./config.c 2012-12-04 19:40:38.975104852 +1100 +@@ -77,7 +77,7 @@ + fclose (fp); + + /* Check config settings */ +- if (strnlen(options->cluster_name, MAXLEN)==0) ++ if (strlen(options->cluster_name)==0) + { + fprintf(stderr, "Cluster name is missing. " + "Check the configuration file.\n"); Added: head/databases/postgresql-repmgr/files/patch-repmgr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/postgresql-repmgr/files/patch-repmgr.c Mon Dec 10 02:27:32 2012 (r308578) @@ -0,0 +1,40 @@ +--- ./repmgr.c.orig 2012-07-28 02:30:35.000000000 +1000 ++++ ./repmgr.c 2012-12-04 19:41:06.157429458 +1100 +@@ -28,6 +28,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <sys/wait.h> + #include <time.h> + #include <unistd.h> + +@@ -1603,11 +1604,18 @@ + char script[MAXLEN]; + int r; + ++/* On some OS, true is located in a different place than in Linux */ ++#ifdef __FreeBSD__ ++#define TRUEBIN_PATH "/usr/bin/true" ++#else ++#define TRUEBIN_PATH "/bin/true" ++#endif ++ + /* Check if we have ssh connectivity to host before trying to rsync */ + if (!remote_user[0]) +- maxlen_snprintf(script, "ssh -o Batchmode=yes %s /bin/true", host); ++ maxlen_snprintf(script, "ssh -o Batchmode=yes %s %s", host, TRUEBIN_PATH); + else +- maxlen_snprintf(script, "ssh -o Batchmode=yes %s -l %s /bin/true", host, remote_user); ++ maxlen_snprintf(script, "ssh -o Batchmode=yes %s -l %s %s", host, remote_user, TRUEBIN_PATH); + + log_debug(_("command is: %s"), script); + r = system(script); +@@ -1625,7 +1633,7 @@ + char host_string[MAXLEN]; + int r; + +- if (strnlen(options.rsync_options, MAXLEN) == 0) ++ if (strlen(options.rsync_options) == 0) + maxlen_snprintf( + rsync_flags, "%s", + "--archive --checksum --compress --progress --rsh=ssh");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212100227.qBA2RWJ8094044>