Attachment #180528 for bug #213486




# $FreeBSD$

PORTNAME=	pg_rman
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

LICENSE=	BSD3CLAUSE
DEPRECATED=	Unfetchable for more than six months (google code has gone away)
EXPIRATION_DATE=	2017-04-30

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


Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (pg_rman-1.2.3.tar.gz) = ea1a4cd44bef716bc3c3f5a7d592f730730b666873a84f5bdee814b586b809bb	1	TIMESTAMP = 1488707200
2	SIZE (pg_rman-1.2.3.tar.gz) = 97390	2	SHA256 (ossc-db-pg_rman-v1.3.3-44f0b26_GH0.tar.gz) = 6515d89c2c06f4a06a22135a08962a13368bfd3eff1943493d3c15ba0f6009df
		3	SIZE (ossc-db-pg_rman-v1.3.3-44f0b26_GH0.tar.gz) = 111307




--- 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);




--- 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);




--- 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




--- 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);
 	}

Return to bug 213486

Lines 1-20 Link Here

(-)Makefile (-7 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pg_rman	3	PORTNAME= pg_rman
4	PORTVERSION= 1.2.3	4	PORTVERSION= 1.3.3
5	PORTREVISION= 2	5	DISTVERSIONPREFIX=v
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= http://pg-rman.googlecode.com/files/
8		7
9	MAINTAINER= kuriyama@FreeBSD.org	8	MAINTAINER= kuriyama@FreeBSD.org
10	COMMENT= Online backup and restore tool for PostgreSQL	9	COMMENT= Online backup and restore tool for PostgreSQL
11		10
12	BROKEN= Unfetchable (google code has gone away)	11	LICENSE= BSD3CLAUSE
13	DEPRECATED= Unfetchable for more than six months (google code has gone away)
14	EXPIRATION_DATE= 2017-04-30
15		12
16	USES= gmake pgsql:9.2	13	USES= gmake pgsql gettext-runtime
		14	USE_GITHUB= yes
		15	GH_ACCOUNT= ossc-db
		16	GH_TAGNAME= 44f0b26
17	WANT_PGSQL= client server	17	WANT_PGSQL= client server
		18	WANT_PGSQL_VER= 91+
18	MAKE_ARGS= USE_PGXS=1	19	MAKE_ARGS= USE_PGXS=1
19	PLIST_FILES= bin/pg_rman	20	PLIST_FILES= bin/pg_rman
20		21

Line 0 Link Here

(-)files/patch-backup.c (+16 lines)
	1	--- backup.c.orig 2017-03-03 06:31:45 UTC
	2	+++ backup.c
	3	@@ -869,12 +869,7 @@ do_backup(pgBackupOption bkupopt)
	4	fclose(fp);
	5
	6	/* get system identifier of the current database.*/
	7	- controlFile = get_controlfile(pgdata, "pg_rman", &crc_ok);
	8	- if (!crc_ok)
	9	- ereport(WARNING,
	10	- (errmsg("control file appears to be corrupt"),
	11	- errdetail("Calculated CRC checksum does not match value stored in file.")));
	12	-
	13	+ controlFile = get_controlfile(pgdata, "pg_rman");
	14	result = controlFile->system_identifier;
	15	pg_free(controlFile);
	16	elog(DEBUG, "the system identifier of current target database : " UINT64_FORMAT, result);

Line 0 Link Here

(-)files/patch-init.c (+15 lines)
	1	--- init.c.orig 2017-03-03 06:31:45 UTC
	2	+++ init.c
	3	@@ -84,11 +84,7 @@ do_init(void)
	4	}
	5
	6	/* get system identifier of the current database.*/
	7	- controlFile = get_controlfile(pgdata, "pg_rman", &crc_ok);
	8	- if (!crc_ok)
	9	- ereport(WARNING,
	10	- (errmsg("control file appears to be corrupt"),
	11	- errdetail("Calculated CRC checksum does not match value stored in file.")));
	12	+ controlFile = get_controlfile(pgdata, "pg_rman");
	13	sysid = controlFile->system_identifier;
	14	checksum_ver = controlFile->data_checksum_version;
	15	pg_free(controlFile);

Line 0 Link Here

(-)files/patch-pgut_pgut.c (+17 lines)
	1	--- pgut/pgut.c.orig 2017-03-05 10:03:33 UTC
	2	+++ pgut/pgut.c
	3	@@ -893,12 +893,12 @@ static void
	4	prompt_for_password(const char *username)
	5	{
	6	if (username == NULL)
	7	- simple_prompt("Password: ", password, sizeof(password), false);
	8	+ simple_prompt("Password: ", password, sizeof(password));
	9	else
	10	{
	11	char message[256];
	12	snprintf(message, lengthof(message), "Password for user %s: ", username);
	13	- simple_prompt(message, password, sizeof(password), false);
	14	+ simple_prompt(message, password, sizeof(password));
	15	}
	16	}
	17	#endif

Line 0 Link Here

(-)files/patch-restore.c (+21 lines)
	1	--- restore.c.orig 2017-03-03 06:31:45 UTC
	2	+++ restore.c
	3	@@ -1256,16 +1256,8 @@ get_current_timeline(void)
	4	{
	5	bool crc_ok;
	6
	7	- controlFile = get_controlfile(pgdata, "pg_rman", &crc_ok);
	8	- if (!crc_ok)
	9	- {
	10	- ereport(WARNING,
	11	- (errmsg("control file appears to be corrupt"),
	12	- errdetail("Calculated CRC checksum does not match value stored in file.")));
	13	- result = 0;
	14	- }
	15	- else
	16	- result = controlFile->checkPointCopy.ThisTimeLineID;
	17	+ controlFile = get_controlfile(pgdata, "pg_rman");
	18	+ result = controlFile->checkPointCopy.ThisTimeLineID;
	19
	20	pg_free(controlFile);
	21	}