diff options
author | adam <adam@pkgsrc.org> | 2010-04-15 07:55:31 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2010-04-15 07:55:31 +0000 |
commit | 4fb4c4e13bdbc98e26fa3272d72b82496faf1c4a (patch) | |
tree | abe00cc0fda391ef49275e581be8b9961ccb446e /databases/slony1 | |
parent | fb1a51b76e1e5a3c70c77394d93ab9bd48d3770b (diff) | |
download | pkgsrc-4fb4c4e13bdbc98e26fa3272d72b82496faf1c4a.tar.gz |
Changes 2.0.2:
* PostgreSQL 8.4 compatibility
* Fix - config dump was failing on string entries that were NULL
* Fix - REPAIR CONFIG could have collisions where, when we
load a schema, one entry in sl_table already has an OID value
that incorrectly matches a value that another update is trying to fix.
* Updated release notes to indicate that 2.0 only supports PostgreSQL 8.3+
* Change to configure.ac to allow it to run on autoconf 2.63; there was
something unsuitable about SLONREL_VERSION processing
* Fixes to Makefile for admin guide
* Various fixes to admin guide material
* Added an extra test to Schema name test that validates that things
can operate properly even if the DB lacks a "public" schema
* Fixed bug in tools/start_slon.sh
* Fixed pathname substitutions in a couple of altperl scripts
* Add a test which validates that the cluster schema name is valid;
pgAdminIII allowed setting up cluster names that slonik would refuse
to connect to.
* Revised regression tests to use SYNC/WAIT FOR EVENT instead of
queries that try to coordinate sl_status information with rather
less determinacy...
* Cleanup thread was generating spurious error messages due to
misinterpreting PG return codes. Rectified this, and added a
test in to make sure we're exercising the logic
Diffstat (limited to 'databases/slony1')
-rw-r--r-- | databases/slony1/Makefile | 9 | ||||
-rw-r--r-- | databases/slony1/PLIST | 14 | ||||
-rw-r--r-- | databases/slony1/distinfo | 12 | ||||
-rw-r--r-- | databases/slony1/patches/patch-aa | 6 | ||||
-rw-r--r-- | databases/slony1/patches/patch-ab | 40 |
5 files changed, 28 insertions, 53 deletions
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile index 0b25a444261..231bcc84e3b 100644 --- a/databases/slony1/Makefile +++ b/databases/slony1/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2010/02/10 19:34:07 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2010/04/15 07:55:31 adam Exp $ -DISTNAME= slony1-1.2.15 -PKGREVISION= 1 +DISTNAME= slony1-2.0.2 CATEGORIES= databases -MASTER_SITES= http://slony.info/downloads/1.2/source/ +MASTER_SITES= http://slony.info/downloads/2.0/source/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= adam@NetBSD.org @@ -12,6 +11,8 @@ COMMENT= Replication system for PostgreSQL PKG_DESTDIR_SUPPORT= user-destdir +PGSQL_VERSIONS_ACCEPTED=84 83 + DEPENDS+= postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server USE_TOOLS+= gmake diff --git a/databases/slony1/PLIST b/databases/slony1/PLIST index c195b6f5111..44f4a581205 100644 --- a/databases/slony1/PLIST +++ b/databases/slony1/PLIST @@ -1,18 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2008/01/14 18:58:02 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2010/04/15 07:55:31 adam Exp $ bin/slon bin/slonik bin/slony_logshipper lib/postgresql/slony1_funcs.so -lib/postgresql/xxid.so share/postgresql/slon.conf-sample share/postgresql/slony1_base.sql -share/postgresql/slony1_base.v74.sql -share/postgresql/slony1_base.v80.sql -share/postgresql/slony1_base.v81.sql +share/postgresql/slony1_base.v83.sql share/postgresql/slony1_funcs.sql -share/postgresql/slony1_funcs.v74.sql -share/postgresql/slony1_funcs.v80.sql -share/postgresql/slony1_funcs.v81.sql -share/postgresql/xxid.v74.sql -share/postgresql/xxid.v80.sql -share/postgresql/xxid.v81.sql +share/postgresql/slony1_funcs.v83.sql diff --git a/databases/slony1/distinfo b/databases/slony1/distinfo index 4f1b786ee2d..98f8a512772 100644 --- a/databases/slony1/distinfo +++ b/databases/slony1/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2008/10/06 09:54:42 adam Exp $ +$NetBSD: distinfo,v 1.8 2010/04/15 07:55:31 adam Exp $ -SHA1 (slony1-1.2.15.tar.bz2) = cc0f5e5d904070a2496a66fe9482c2fdbdda372c -RMD160 (slony1-1.2.15.tar.bz2) = c99a862bda6aca8adf7f838a872fc66eac556732 -Size (slony1-1.2.15.tar.bz2) = 871479 bytes -SHA1 (patch-aa) = 0d47e35c562b47afb826f3ee0c2b20f015940269 -SHA1 (patch-ab) = 8a8cc04e5d64be50fea0f2dd1e3da487223d8c45 +SHA1 (slony1-2.0.2.tar.bz2) = 7c23b02389be7b3236fa092114196a3cd69ad38a +RMD160 (slony1-2.0.2.tar.bz2) = a757aa8bb1fe6fdacd592ff5778858fba64b03e2 +Size (slony1-2.0.2.tar.bz2) = 933793 bytes +SHA1 (patch-aa) = 591635aa8badd2690629ffd4ba1d4a619d332fbc +SHA1 (patch-ab) = de4549aa7fae7aed10f4ebb14de8d5aea5419cb4 diff --git a/databases/slony1/patches/patch-aa b/databases/slony1/patches/patch-aa index 2f252bd73ea..1c0d9d93168 100644 --- a/databases/slony1/patches/patch-aa +++ b/databases/slony1/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2008/01/14 18:58:03 adam Exp $ +$NetBSD: patch-aa,v 1.5 2010/04/15 07:55:32 adam Exp $ ---- configure.orig 2007-11-12 23:46:59.000000000 +0100 +--- configure.orig 2009-05-08 22:10:34.000000000 +0000 +++ configure -@@ -1904,6 +1904,7 @@ case $host_os in +@@ -2014,6 +2014,7 @@ case $host_os in darwin*) template=darwin ;; dgux*) template=dgux ;; freebsd*) template=freebsd ;; diff --git a/databases/slony1/patches/patch-ab b/databases/slony1/patches/patch-ab index 85827effa13..407b61eaf1a 100644 --- a/databases/slony1/patches/patch-ab +++ b/databases/slony1/patches/patch-ab @@ -1,31 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2008/01/14 18:58:03 adam Exp $ +$NetBSD: patch-ab,v 1.2 2010/04/15 07:55:32 adam Exp $ ---- tests/run_test.sh.orig 2008-01-13 22:38:16.000000000 +0100 -+++ tests/run_test.sh -@@ -179,7 +179,7 @@ store_node() +--- tools/start_slon.sh.orig 2010-04-15 09:45:28.000000000 +0000 ++++ tools/start_slon.sh +@@ -16,7 +16,7 @@ test -r "$SLON_CONF" || (echo "No slon c - if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then - if [ ${alias} -ne ${originnode} ]; then -- if [ "x${logship}" == "xtrue" ]; then # Don't bother generating nodes used for log shipping -+ if [ "x${logship}" = "xtrue" ]; then # Don't bother generating nodes used for log shipping - status "Node ${alias} is a log shipping node - no need for STORE NODE" - else - echo "STORE NODE (id=${alias}, comment='node ${alias}');" >> $mktmp/slonik.script -@@ -219,7 +219,7 @@ store_path() - eval bport=\$PORT${j} - eval blogship=\$LOGSHIP${j} - if [ -n "${bdb}" -a "${bhost}" -a "${buser}" -a "${bport}" ]; then -- if [[ "x${logship}" == "xtrue" || "x${blogship}" == "xtrue" ]]; then -+ if [[ "x${logship}" = "xtrue" || "x${blogship}" = "xtrue" ]]; then - # log shipping node - no paths need exist that involve this node - status "log shipping between nodes(${i}/${j}) - ls(${logship}/${blogship}) - omit STORE PATH" - else -@@ -499,7 +499,7 @@ launch_slon() - fi - conninfo="dbname=${db} host=${host} user=${user} port=${port}" - -- if [ "x${logship}" == "xtrue" ]; then -+ if [ "x${logship}" = "xtrue" ]; then - status "do not launch slon for node ${alias} - it receives data via log shipping" - else - status "launching: $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster \"$conninfo\"" + PID_LINE=`grep pid_file $SLON_CONF | cut -d "#" -f 1 | grep "^[:space:]*pid_file='.*'"` + PID_FILE=`echo $PID_LINE | cut -d "=" -f 2 | cut -d "'" -f 2` +-if [ "x$PID_FILE" == "x" ]; then ++if [ "x$PID_FILE" = "x" ]; then + echo "pid_file not found in slon conf file - $SLON_CONF" + exit 1 + else |