Attachment 180528 Details for Bug 213486 – patch

[patch] patch

pgg.diff (text/plain), 5.70 KB, created by Kurt Jaeger on 2017-03-05 10:05:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2017-03-05 10:05:57 UTC

Size: 5.70 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 435450)
>+++ Makefile	(working copy)
>@@ -1,20 +1,21 @@
> # $FreeBSD$
> 
> PORTNAME=	pg_rman
>-PORTVERSION=	1.2.3
>-PORTREVISION=	2
>+PORTVERSION=	1.3.3
>+DISTVERSIONPREFIX=v
> CATEGORIES=	databases
>-MASTER_SITES=	http://pg-rman.googlecode.com/files/
> 
> MAINTAINER=	kuriyama@FreeBSD.org
> COMMENT=	Online backup and restore tool for PostgreSQL
> 
>-BROKEN=		Unfetchable (google code has gone away)
>-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
>-EXPIRATION_DATE=	2017-04-30
>+LICENSE=	BSD3CLAUSE
> 
>-USES=		gmake pgsql:9.2
>+USES=		gmake pgsql gettext-runtime
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	ossc-db
>+GH_TAGNAME=	44f0b26
> WANT_PGSQL=	client server
>+WANT_PGSQL_VER=	91+
> MAKE_ARGS=	USE_PGXS=1
> PLIST_FILES=	bin/pg_rman
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 435450)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (pg_rman-1.2.3.tar.gz) = ea1a4cd44bef716bc3c3f5a7d592f730730b666873a84f5bdee814b586b809bb
>-SIZE (pg_rman-1.2.3.tar.gz) = 97390
>+TIMESTAMP = 1488707200
>+SHA256 (ossc-db-pg_rman-v1.3.3-44f0b26_GH0.tar.gz) = 6515d89c2c06f4a06a22135a08962a13368bfd3eff1943493d3c15ba0f6009df
>+SIZE (ossc-db-pg_rman-v1.3.3-44f0b26_GH0.tar.gz) = 111307
>Index: files/patch-backup.c
>===================================================================
>--- files/patch-backup.c	(nonexistent)
>+++ files/patch-backup.c	(working copy)
>@@ -0,0 +1,16 @@
>+--- backup.c.orig	2017-03-03 06:31:45 UTC
>++++ backup.c
>+@@ -869,12 +869,7 @@ do_backup(pgBackupOption bkupopt)
>+ 	fclose(fp);
>+ 
>+ 	/* get system identifier of the current database.*/
>+-	controlFile = get_controlfile(pgdata, "pg_rman", &crc_ok);
>+-	if (!crc_ok)
>+-		ereport(WARNING,
>+-				(errmsg("control file appears to be corrupt"),
>+-				 errdetail("Calculated CRC checksum does not match value stored in file.")));
>+-
>++	controlFile = get_controlfile(pgdata, "pg_rman");
>+ 	result = controlFile->system_identifier;
>+ 	pg_free(controlFile);
>+ 	elog(DEBUG, "the system identifier of current target database : " UINT64_FORMAT, result);
>
>Property changes on: files/patch-backup.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-init.c
>===================================================================
>--- files/patch-init.c	(nonexistent)
>+++ files/patch-init.c	(working copy)
>@@ -0,0 +1,15 @@
>+--- init.c.orig	2017-03-03 06:31:45 UTC
>++++ init.c
>+@@ -84,11 +84,7 @@ do_init(void)
>+ 	}
>+ 
>+ 	/* get system identifier of the current database.*/
>+-	controlFile = get_controlfile(pgdata, "pg_rman", &crc_ok);
>+-	if (!crc_ok)
>+-		ereport(WARNING,
>+-				(errmsg("control file appears to be corrupt"),
>+-				 errdetail("Calculated CRC checksum does not match value stored in file.")));
>++	controlFile = get_controlfile(pgdata, "pg_rman");
>+ 	sysid = controlFile->system_identifier;
>+ 	checksum_ver = controlFile->data_checksum_version;
>+ 	pg_free(controlFile);
>
>Property changes on: files/patch-init.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pgut_pgut.c
>===================================================================
>--- files/patch-pgut_pgut.c	(nonexistent)
>+++ files/patch-pgut_pgut.c	(working copy)
>@@ -0,0 +1,17 @@
>+--- pgut/pgut.c.orig	2017-03-05 10:03:33 UTC
>++++ pgut/pgut.c
>+@@ -893,12 +893,12 @@ static void
>+ prompt_for_password(const char *username)
>+ {
>+ 	if (username == NULL)
>+-		simple_prompt("Password: ", password, sizeof(password), false);
>++		simple_prompt("Password: ", password, sizeof(password));
>+ 	else
>+ 	{
>+ 		char	message[256];
>+ 		snprintf(message, lengthof(message), "Password for user %s: ", username);
>+-		simple_prompt(message, password, sizeof(password), false);
>++		simple_prompt(message, password, sizeof(password));
>+ 	}
>+ }
>+ #endif
>
>Property changes on: files/patch-pgut_pgut.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-restore.c
>===================================================================
>--- files/patch-restore.c	(nonexistent)
>+++ files/patch-restore.c	(working copy)
>@@ -0,0 +1,21 @@
>+--- restore.c.orig	2017-03-03 06:31:45 UTC
>++++ restore.c
>+@@ -1256,16 +1256,8 @@ get_current_timeline(void)
>+ 	{
>+ 		bool	crc_ok;
>+ 
>+-		controlFile = get_controlfile(pgdata, "pg_rman", &crc_ok);
>+-		if (!crc_ok)
>+-		{
>+-			ereport(WARNING,
>+-					(errmsg("control file appears to be corrupt"),
>+-					 errdetail("Calculated CRC checksum does not match value stored in file.")));
>+-			result = 0;
>+-		}
>+-		else
>+-			result = controlFile->checkPointCopy.ThisTimeLineID;
>++		controlFile = get_controlfile(pgdata, "pg_rman");
>++		result = controlFile->checkPointCopy.ThisTimeLineID;
>+ 
>+ 		pg_free(controlFile);
>+ 	}
>
>Property changes on: files/patch-restore.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 213486: 175760 | 176363 | 180528 | 180551 | 180833 | 180860