rebase: upgrade to version 9.3.0

Version: 9.3.0-1

.gitignore

@@ -1,3 +1,3 @@
 /postgresql-9.2.4.tar.bz2
-/postgresql-9.2.4-US.pdf
+/postgresql-9.3.0-US.pdf
-/postgresql-9.1.9.tar.bz2
+/postgresql-9.3.0.tar.bz2

README.rpm-dist

@@ -1,6 +1,6 @@
 README.rpm-dist
 -----------------------------------------------------------------------------
-Version 9.2, for the PostgreSQL 9.2 RPM set.
+Version 9.3, for the PostgreSQL 9.3 RPM set.
 Devrim Gündüz <devrim@gunduz.org>
 -----------------------------------------------------------------------------
 
@@ -23,9 +23,9 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
 describe various RPM specifics, and to document special features found
 in the RPMset.
 
-This document is written to be applicable to version 9.2 of PostgreSQL,
+This document is written to be applicable to version 9.3 of PostgreSQL,
 which is the current version of the RPMs as of this writing. More to the 
-point, versions prior to 9.2 are not documented here.
+point, versions prior to 9.3 are not documented here.
 
 This document is intended for use only with the RPMs supplied in Red Hat
 Enterprise Linux, CentOS and Fedora.  Note that there are also "PGDG"
@@ -69,9 +69,9 @@ as 'postgres' you will need to set a password using passwd.
 
 UPGRADING AN INSTALLATION
 -----------------------------------------------------------------------------
-For a minor-version upgrade (such as 9.2.1 to 9.2.2), just install the
+For a minor-version upgrade (such as 9.3.1 to 9.3.2), just install the
 new RPMs; there's usually nothing more to it than that.  Upgrading
-across a major release of PostgreSQL (for example, from 9.1.x to 9.2.x)
+across a major release of PostgreSQL (for example, from 9.2.x to 9.3.x)
 requires more effort.
 
 If you are upgrading across more than one major release of PostgreSQL
@@ -83,7 +83,7 @@ and run the dump file through psql to restore your data.
 
 In some major releases, the RPMs also support in-place upgrade from the
 immediately previous major release.  Currently, you can upgrade in-place
-from 9.1.x to 9.2.x.  This is much faster than a dump and reload.
+from 9.2.x to 9.3.x.  This is much faster than a dump and reload.
 To do an in-place upgrade:
 * shut down the old postmaster ("systemctl stop postgresql.service")
 * optionally make a backup of /var/lib/pgsql/data/ (recommended!)
@@ -148,8 +148,9 @@ this:
 
 Executables:		/usr/bin
 Libraries:		/usr/lib (or /usr/lib64 on 64-bit machines)
-Documentation:		/usr/share/doc/postgresql-docs-x.y.z/html
+Documentation:		/usr/share/doc/postgresql/html
-Contrib documentation:	/usr/share/doc/postgresql-contrib-x.y.z
+PDF documentation:	/usr/share/doc/postgresql-docs
+Contrib documentation:	/usr/share/doc/postgresql-contrib
 Source:			not installed
 Data:			/var/lib/pgsql/data
 Backup area:		/var/lib/pgsql/backups
@@ -167,7 +168,7 @@ the beauty of RPM -- you don't have to keep track of the files, RPM does it
 for you.
 
 These RPMs are designed to be LSB-compliant -- if you find this not to be the
-case, please let us know by way of the pgsqlrpms-hackers@pgfoundry.org
+case, please let us know by way of the pgsql-pkg-yum@postgresql.org
 mailing list.
 
 MULTIPLE POSTMASTERS
@@ -340,7 +341,7 @@ CONTRIB FILES
 -------------------------------------------------------------------------------
 The contents of the contrib tree are packaged into the -contrib subpackage
 and are processed with make and make install.  There is documentation in
-/usr/share/doc/postgresql-contrib-VERSION for these modules.  Most of the
+/usr/share/doc/postgresql-contrib for these modules.  Most of the
 modules are in /usr/lib/pgsql (or /usr/lib64/pgsql) for loadable
 modules, and binaries are in /usr/bin.  In the future these files may be
 split out, depending upon function and dependencies.
@@ -348,9 +349,9 @@ split out, depending upon function and dependencies.
 MORE INFORMATION
 -------------------------------------------------------------------------------
 You can get more information at http://www.postgresql.org and 
-http://yum.pgsqlrpms.org
+http://yum.postgresql.org
 
 Please help make this packaging better -- let us know if you find problems, or
 better ways of doing things. You can reach us by e-mail at
-pgsqlrpms-hackers@pgfoundry.org
+pgsql-pkg-yum@postgresql.org
 -------------------------------------------------------------------------------

generate-pdf.sh

@@ -32,7 +32,7 @@ cd postgresql-$VERSION
 
 # Apply any patches that affect the PDF documentation
 
-patch -p1 < ../postgresql-multi-sockets.patch
+# patch -p1 < ../xxx.patch
 
 # Configure ...
 

postgresql-9.2.4-aarch64-atomic-upgrade.patch

@@ -1,34 +0,0 @@
-diff --git a/postgresql-9.1.9/src/include/storage/s_lock.h b/postgresql-9.1.9/src/include/storage/s_lock.h
-index 987fb9c..1ba718c 100644
---- a/postgresql-9.1.9/src/include/storage/s_lock.h
-+++ b/postgresql-9.1.9/src/include/storage/s_lock.h
-@@ -296,6 +296,29 @@ tas(volatile slock_t *lock)
- #endif	 /* __arm__ */
- 
- 
-+/*
-+ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
-+ */
-+#if defined(__aarch64__) || defined(__aarch64)
-+#ifdef HAVE_GCC_INT_ATOMICS
-+#define HAS_TEST_AND_SET
-+
-+#define TAS(lock) tas(lock)
-+
-+typedef int slock_t;
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	return __sync_lock_test_and_set(lock, 1);
-+}
-+
-+#define S_UNLOCK(lock) __sync_lock_release(lock)
-+
-+#endif	 /* HAVE_GCC_INT_ATOMICS */
-+#endif	 /* __aarch64__ */
-+
-+
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
- #if defined(__s390__) || defined(__s390x__)
- #define HAS_TEST_AND_SET

postgresql-9.2.4-perl-5.18.patch

@@ -1,83 +0,0 @@
-commit 035a5e1e8c346efe25df6be4627b5f24cc3736b1
-Author:     Tom Lane <tgl@sss.pgh.pa.us>
-AuthorDate: Mon Jun 3 14:19:26 2013 -0400
-Commit:     Tom Lane <tgl@sss.pgh.pa.us>
-CommitDate: Mon Jun 3 14:19:26 2013 -0400
-
-    Add semicolons to eval'd strings to hide a minor Perl behavioral change.
-    
-    "eval q{foo}" used to complain that the error was on line 2 of the eval'd
-    string, because eval internally tacked on "\n;" so that the end of the
-    erroneous command was indeed on line 2.  But as of Perl 5.18 it more
-    sanely says that the error is on line 1.  To avoid Perl-version-dependent
-    regression test results, use "eval q{foo;}" instead in the two places
-    where this matters.  Per buildfarm.
-    
-    Since people might try to use newer Perl versions with older PG releases,
-    back-patch as far as 9.0 where these test cases were added.
-
-diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
-index 29c1d11..d23a302 100644
---- a/src/pl/plperl/expected/plperl.out
-+++ b/src/pl/plperl/expected/plperl.out
-@@ -626,8 +626,8 @@ DO $$ open my $fh, "</nonesuch"; $$ LANGUAGE plperl;
- ERROR:  'open' trapped by operation mask at line 1.
- CONTEXT:  PL/Perl anonymous code block
- -- check that eval is allowed and eval'd restricted ops are caught
--DO $$ eval q{chdir '.'}; warn "Caught: $@"; $$ LANGUAGE plperl;
--WARNING:  Caught: 'chdir' trapped by operation mask at line 2.
-+DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
-+WARNING:  Caught: 'chdir' trapped by operation mask at line 1.
- CONTEXT:  PL/Perl anonymous code block
- -- check that compiling do (dofile opcode) is allowed
- -- but that executing it for a file not already loaded (via require) dies
-diff --git a/src/pl/plperl/expected/plperl_init.out b/src/pl/plperl/expected/plperl_init.out
-index a21ea0b..133828e 100644
---- a/src/pl/plperl/expected/plperl_init.out
-+++ b/src/pl/plperl/expected/plperl_init.out
-@@ -1,14 +1,14 @@
- -- test plperl.on_plperl_init errors are fatal
- -- This test tests setting on_plperl_init after loading plperl
- LOAD 'plperl';
--SET SESSION plperl.on_plperl_init = ' system("/nonesuch") ';
-+SET SESSION plperl.on_plperl_init = ' system("/nonesuch"); ';
- SHOW plperl.on_plperl_init;
-- plperl.on_plperl_init 
-------------------------
--  system("/nonesuch") 
-+ plperl.on_plperl_init  
-+------------------------
-+  system("/nonesuch"); 
- (1 row)
- 
- DO $$ warn 42 $$ language plperl;
--ERROR:  'system' trapped by operation mask at line 2.
-+ERROR:  'system' trapped by operation mask at line 1.
- CONTEXT:  while executing plperl.on_plperl_init
- PL/Perl anonymous code block
-diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql
-index ad36161..dc6b169 100644
---- a/src/pl/plperl/sql/plperl.sql
-+++ b/src/pl/plperl/sql/plperl.sql
-@@ -405,7 +405,7 @@ DO $$ qx("/nonesuch"); $$ LANGUAGE plperl;
- DO $$ open my $fh, "</nonesuch"; $$ LANGUAGE plperl;
- 
- -- check that eval is allowed and eval'd restricted ops are caught
--DO $$ eval q{chdir '.'}; warn "Caught: $@"; $$ LANGUAGE plperl;
-+DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
- 
- -- check that compiling do (dofile opcode) is allowed
- -- but that executing it for a file not already loaded (via require) dies
-diff --git a/src/pl/plperl/sql/plperl_init.sql b/src/pl/plperl/sql/plperl_init.sql
-index d60268d..4ebf3f8 100644
---- a/src/pl/plperl/sql/plperl_init.sql
-+++ b/src/pl/plperl/sql/plperl_init.sql
-@@ -3,7 +3,7 @@
- -- This test tests setting on_plperl_init after loading plperl
- LOAD 'plperl';
- 
--SET SESSION plperl.on_plperl_init = ' system("/nonesuch") ';
-+SET SESSION plperl.on_plperl_init = ' system("/nonesuch"); ';
- 
- SHOW plperl.on_plperl_init;
- 

postgresql-9.2.4-upgrade-and-perm-problems.patch

@@ -1,54 +0,0 @@
-diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
-index c5ecb84..a519a9e 100644
---- a/contrib/pg_upgrade/server.c
-+++ b/contrib/pg_upgrade/server.c
-@@ -166,7 +166,6 @@ static void
- stop_postmaster_atexit(void)
- {
- 	stop_postmaster(true);
--
- }
- 
- 
-@@ -235,7 +234,23 @@ start_postmaster(ClusterInfo *cluster)
- 							  false,
- 							  "%s", cmd);
- 
--	/* Check to see if we can connect to the server; if not, report it. */
-+	/*
-+	 * We set this here to make sure atexit() shuts down the server,
-+	 * but only if we started the server successfully.  We do it
-+	 * before checking for connectivity in case the server started but
-+	 * there is a connectivity failure.  If pg_ctl did not return success,
-+	 * we will exit below.
-+	 */
-+	if (pg_ctl_return)
-+		os_info.running_cluster = cluster;
-+
-+	/*
-+	 * pg_ctl -w might have failed because the server couldn't be started,
-+	 * or there might have been a connection problem in _checking_ if the
-+	 * server has started.  Therefore, even if pg_ctl failed, we continue
-+	 * and test for connectivity in case we get a connection reason for the
-+	 * failure.
-+	 */
- 	if ((conn = get_db_conn(cluster, "template1")) == NULL ||
- 		PQstatus(conn) != CONNECTION_OK)
- 	{
-@@ -249,12 +264,13 @@ start_postmaster(ClusterInfo *cluster)
- 	}
- 	PQfinish(conn);
- 
--	/* If the connection didn't fail, fail now */
-+	/*
-+	 * If pg_ctl failed, and the connection didn't fail, fail now.  This
-+	 * could happen if the server was already running.
-+	 */
- 	if (!pg_ctl_return)
- 		pg_log(PG_FATAL, "pg_ctl failed to start the %s server, or connection failed\n",
- 			   CLUSTER_NAME(cluster));
--
--	os_info.running_cluster = cluster;
- }
- 
- 

postgresql-aarch64-atomic-upgrade.patch

@@ -1,3 +1,11 @@
+Add support for atomic operations TAS/S_UNLOCK in aarch64
+
+This was already added to upstream 9.3.0+ version but we need to add this into
+pre-upgrade postgresql version (until we are not upgrading also from 9.3.0+).
+
+~> upstream (612ecf311b)
+~> #970661
+
 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
 index d4a783f..29124b1 100644
 --- a/src/include/storage/s_lock.h

postgresql-man.patch

@@ -1,4 +1,7 @@
-# PostgreSQL manual page completion
+PostgreSQL ecpg/initdb manual page fixes
+
+This was generated based on automatic Red Hat manual page scan (private
+RHBZ#948933).
 
 ### ecpg ###
 
@@ -11,7 +14,7 @@ diff -up postgresql-9.2.4/doc/src/sgml/man1/ecpg.1.broken postgresql-9.2.4/doc/s
  .PP
 +\fB\-h \fR
 +.RS 4
-+Parse a header file, this option includes otion \fB\-c\fR\&.
++Parse a header file, this option includes option \fB\-c\fR\&.
 +.RE
 +.PP
  \fB\-i\fR

postgresql-python3.patch

@@ -1,62 +0,0 @@
-This won't be needed in 9.2.1 and later.
-
-
-commit 770556d6c69c4edf219d4ace2e4fb29a1f2c35df
-Author: Tom Lane <tgl@sss.pgh.pa.us>
-Date:   Sat Sep 8 17:39:02 2012 -0400
-
-    Adjust PL/Python regression tests some more for Python 3.3.
-    
-    Commit 2cfb1c6f77734db81b6e74bcae630f93b94f69be fixed some issues caused
-    by Python 3.3 choosing to iterate through dict entries in a different order
-    than before.  But here's another one: the test cases adjusted here made two
-    bad entries in a dict and expected the one complained of would always be
-    the same.
-    
-    Possibly this should be back-patched further than 9.2, but there seems
-    little point unless the earlier fix is too.
-
-diff --git a/src/pl/plpython/expected/plpython_trigger.out b/src/pl/plpython/expected/plpython_trigger.out
-index 4c46b2b..25060b0 100644
---- a/src/pl/plpython/expected/plpython_trigger.out
-+++ b/src/pl/plpython/expected/plpython_trigger.out
-@@ -476,7 +476,7 @@ DROP TRIGGER stupid_trigger6 ON trigger_test;
- -- TD keys not corresponding to row columns
- CREATE FUNCTION stupid7() RETURNS trigger
- AS $$
--    TD["new"] = {'a': 'foo', 'b': 'bar'}
-+    TD["new"] = {'v': 'foo', 'a': 'bar'}
-     return "MODIFY";
- $$ LANGUAGE plpythonu;
- CREATE TRIGGER stupid_trigger7
-@@ -490,7 +490,7 @@ DROP TRIGGER stupid_trigger7 ON trigger_test;
- -- Unicode variant
- CREATE FUNCTION stupid7u() RETURNS trigger
- AS $$
--    TD["new"] = {u'a': 'foo', u'b': 'bar'}
-+    TD["new"] = {u'v': 'foo', u'a': 'bar'}
-     return "MODIFY"
- $$ LANGUAGE plpythonu;
- CREATE TRIGGER stupid_trigger7
-diff --git a/src/pl/plpython/sql/plpython_trigger.sql b/src/pl/plpython/sql/plpython_trigger.sql
-index 2a4859f..9727f44 100644
---- a/src/pl/plpython/sql/plpython_trigger.sql
-+++ b/src/pl/plpython/sql/plpython_trigger.sql
-@@ -253,7 +253,7 @@ DROP TRIGGER stupid_trigger6 ON trigger_test;
- 
- CREATE FUNCTION stupid7() RETURNS trigger
- AS $$
--    TD["new"] = {'a': 'foo', 'b': 'bar'}
-+    TD["new"] = {'v': 'foo', 'a': 'bar'}
-     return "MODIFY";
- $$ LANGUAGE plpythonu;
- 
-@@ -270,7 +270,7 @@ DROP TRIGGER stupid_trigger7 ON trigger_test;
- 
- CREATE FUNCTION stupid7u() RETURNS trigger
- AS $$
--    TD["new"] = {u'a': 'foo', u'b': 'bar'}
-+    TD["new"] = {u'v': 'foo', u'a': 'bar'}
-     return "MODIFY"
- $$ LANGUAGE plpythonu;
- 

postgresql-var-run-socket.patch

@@ -12,16 +12,14 @@ server package update, without requiring any existing postgresql.conf
 to be updated.  (Of course, a user who dislikes this behavior can still
 override it via postgresql.conf.)
 
-This patch must be applied after postgresql-multi-sockets.patch, at
-least until 9.3 when that will be part of the upstream package.
 
-
+diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
-diff -Naur postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.2/contrib/pg_upgrade/test.sh
+index 30bc527..4e8f6a4 100644
---- postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh	2013-01-03 17:33:45.581567466 -0500
+--- a/contrib/pg_upgrade/test.sh
-+++ postgresql-9.2.2/contrib/pg_upgrade/test.sh	2013-01-03 17:40:22.923364917 -0500
++++ b/contrib/pg_upgrade/test.sh
-@@ -78,6 +78,12 @@
+@@ -107,6 +107,12 @@ done
- rm -rf "$logdir"
+ EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
- mkdir "$logdir"
+ export EXTRA_REGRESS_OPTS
  
 +# we want the Unix sockets in $temp_root
 +PGHOST=$temp_root
@@ -32,10 +30,11 @@ diff -Naur postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.2/
  # enable echo so the user can see what is being executed
  set -x
  
-diff -Naur postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c postgresql-9.2.2/src/backend/utils/misc/guc.c
+diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
---- postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c	2013-01-03 17:37:56.632977951 -0500
+index a055231..20b8c87 100644
-+++ postgresql-9.2.2/src/backend/utils/misc/guc.c	2013-01-03 17:38:30.183271588 -0500
+--- a/src/backend/utils/misc/guc.c
-@@ -2901,7 +2901,7 @@
++++ b/src/backend/utils/misc/guc.c
+@@ -2929,7 +2929,7 @@ static struct config_string ConfigureNamesString[] =
  		},
  		&Unix_socket_directories,
  #ifdef HAVE_UNIX_SOCKETS
@@ -44,10 +43,11 @@ diff -Naur postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c postgresql-9.2.
  #else
  		"",
  #endif
-diff -Naur postgresql-9.2.2.sockets/src/bin/initdb/initdb.c postgresql-9.2.2/src/bin/initdb/initdb.c
+diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
---- postgresql-9.2.2.sockets/src/bin/initdb/initdb.c	2013-01-03 17:37:56.633977974 -0500
+index 5fc7291..d871341 100644
-+++ postgresql-9.2.2/src/bin/initdb/initdb.c	2013-01-03 17:38:30.185271611 -0500
+--- a/src/bin/initdb/initdb.c
-@@ -1007,7 +1007,7 @@
++++ b/src/bin/initdb/initdb.c
+@@ -1203,7 +1203,7 @@ setup_config(void)
  
  #ifdef HAVE_UNIX_SOCKETS
  	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -56,9 +56,10 @@ diff -Naur postgresql-9.2.2.sockets/src/bin/initdb/initdb.c postgresql-9.2.2/src
  #else
  	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
  #endif
-diff -Naur postgresql-9.2.2.sockets/src/include/pg_config_manual.h postgresql-9.2.2/src/include/pg_config_manual.h
+diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
---- postgresql-9.2.2.sockets/src/include/pg_config_manual.h	2012-12-03 15:16:10.000000000 -0500
+index 02bcd92..8aaf58b 100644
-+++ postgresql-9.2.2/src/include/pg_config_manual.h	2013-01-03 17:38:30.185271611 -0500
+--- a/src/include/pg_config_manual.h
++++ b/src/include/pg_config_manual.h
 @@ -144,7 +144,7 @@
   * here's where to twiddle it.  You can also override this at runtime
   * with the postmaster's -k switch.
@@ -68,10 +69,11 @@ diff -Naur postgresql-9.2.2.sockets/src/include/pg_config_manual.h postgresql-9.
  
  /*
   * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.2.2.sockets/src/test/regress/pg_regress.c postgresql-9.2.2/src/test/regress/pg_regress.c
+diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
---- postgresql-9.2.2.sockets/src/test/regress/pg_regress.c	2012-12-03 15:16:10.000000000 -0500
+index b632326..943165c 100644
-+++ postgresql-9.2.2/src/test/regress/pg_regress.c	2013-01-03 17:38:30.186271622 -0500
+--- a/src/test/regress/pg_regress.c
-@@ -772,7 +772,7 @@
++++ b/src/test/regress/pg_regress.c
+@@ -772,7 +772,7 @@ initialize_environment(void)
  		if (hostname != NULL)
  			doputenv("PGHOST", hostname);
  		else
@@ -80,7 +82,7 @@ diff -Naur postgresql-9.2.2.sockets/src/test/regress/pg_regress.c postgresql-9.2
  		unsetenv("PGHOSTADDR");
  		if (port != -1)
  		{
-@@ -2246,7 +2246,7 @@
+@@ -2249,7 +2249,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
  		 */
  		header(_("starting postmaster"));
  		snprintf(buf, sizeof(buf),

postgresql.service

@@ -15,7 +15,7 @@
 # This will override the setting appearing below.
 
 # Note: changing PGPORT or PGDATA will typically require adjusting SELinux
-# configuration as well; see /usr/share/doc/postgresql-*/README.rpm-dist.
+# configuration as well; see /usr/share/doc/postgresql/README.rpm-dist.
 
 # Note: do not use a PGDATA pathname containing spaces, or you will
 # break postgresql-setup.

postgresql.spec

@@ -58,9 +58,9 @@
 
 Summary: PostgreSQL client programs
 Name: postgresql
-%global majorversion 9.2
+%global majorversion 9.3
-Version: 9.2.4
+Version: 9.3.0
-Release: 11%{?dist}
+Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -75,8 +75,8 @@ Url: http://www.postgresql.org/
 # in-place upgrade of an old database.  In most cases it will not be critical
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.1.9
+%global prevversion 9.2.4
-%global prevmajorversion 9.1
+%global prevmajorversion 9.2
 
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 # The PDF file is generated by generate-pdf.sh, which see for comments
@@ -102,29 +102,9 @@ Patch1: rpm-pgsql.patch
 Patch2: postgresql-logging.patch
 Patch3: postgresql-perl-rpath.patch
 Patch4: postgresql-config-comment.patch
-Patch5: postgresql-multi-sockets.patch
+Patch5: postgresql-var-run-socket.patch
-Patch6: postgresql-var-run-socket.patch
+Patch6: postgresql-man.patch
-
+Patch100: postgresql-aarch64-atomic-upgrade.patch
-# Comments for these patches are in the patch files.
-Patch8: postgresql-man.patch
-
-# Build even with Perl 5.18+
-# ~> upstream (035a5e1e8c34)
-Patch9: postgresql-9.2.4-perl-5.18.patch
-
-# Add support for atomic operations TAS/S_UNLOCK in aarch64.
-# ~> upstream (612ecf311b)
-# ~> #970661
-Patch10: postgresql-9.2.4-aarch64-atomic.patch
-Patch11: postgresql-9.2.4-aarch64-atomic-upgrade.patch
-
-# When user complicates access of 'postgres' user to the database, the
-# pg_upgrade can left the old server running - and re-run of pg_upgrade thus
-# does not help.  This patch stops the server in described scenario properly.
-# ~> not yet upstream, patch by Bruce Momjian:
-# ~> http://www.postgresql.org/message-id/20130812193347.GD12510@momjian.us
-# ~> #896161
-Patch12: postgresql-9.2.4-upgrade-and-perm-problems.patch
 
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -352,10 +332,6 @@ benchmarks.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch12 -p1
 
 # We used to run autoconf here, but there's no longer any real need to,
 # since Postgres ships with a reasonably modern configure script.
@@ -374,9 +350,8 @@ tar xfj %{SOURCE3}
 cp -p config/config.guess postgresql-%{prevversion}/config/config.guess
 cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
 
-pushd postgresql-%{prevversion}
+# apply once SOURCE3 is extracted
-%patch11 -p2
+%patch100 -d postgresql-%{prevversion} -p1
-popd
 %endif
 
 # remove .gitignore files to ensure none get into the RPMs (bug #642210)
@@ -886,6 +861,7 @@ fi
 %{_bindir}/pg_config
 %{_bindir}/pg_dump
 %{_bindir}/pg_dumpall
+%{_bindir}/pg_isready
 %{_bindir}/pg_restore
 %{_bindir}/psql
 %{_bindir}/reindexdb
@@ -900,6 +876,7 @@ fi
 %{_mandir}/man1/pg_config.*
 %{_mandir}/man1/pg_dump.*
 %{_mandir}/man1/pg_dumpall.*
+%{_mandir}/man1/pg_isready.*
 %{_mandir}/man1/pg_restore.*
 %{_mandir}/man1/psql.*
 %{_mandir}/man1/reindexdb.*
@@ -941,6 +918,7 @@ fi
 %{_datadir}/pgsql/extension/pgcrypto*
 %{_datadir}/pgsql/extension/pgrowlocks*
 %{_datadir}/pgsql/extension/pgstattuple*
+%{_datadir}/pgsql/extension/postgres_fdw*
 %{_datadir}/pgsql/extension/refint*
 %{_datadir}/pgsql/extension/seg*
 %{_datadir}/pgsql/extension/tablefunc*
@@ -976,11 +954,12 @@ fi
 %{_libdir}/pgsql/passwordcheck.so
 %{_libdir}/pgsql/pg_buffercache.so
 %{_libdir}/pgsql/pg_freespacemap.so
+%{_libdir}/pgsql/pg_stat_statements.so
 %{_libdir}/pgsql/pg_trgm.so
 %{_libdir}/pgsql/pgcrypto.so
 %{_libdir}/pgsql/pgrowlocks.so
 %{_libdir}/pgsql/pgstattuple.so
-%{_libdir}/pgsql/pg_stat_statements.so
+%{_libdir}/pgsql/postgres_fdw.so
 %{_libdir}/pgsql/refint.so
 %{_libdir}/pgsql/seg.so
 %{_libdir}/pgsql/tablefunc.so
@@ -989,6 +968,7 @@ fi
 %{_libdir}/pgsql/timetravel.so
 %{_libdir}/pgsql/tsearch2.so
 %{_libdir}/pgsql/unaccent.so
+%{_libdir}/pgsql/worker_spi.so
 %if %selinux
 %{_datadir}/pgsql/contrib/sepgsql.sql
 %{_libdir}/pgsql/sepgsql.so
@@ -1010,6 +990,7 @@ fi
 %{_bindir}/pg_standby
 %{_bindir}/pg_test_fsync
 %{_bindir}/pg_test_timing
+%{_bindir}/pg_xlogdump
 %{_bindir}/pgbench
 %{_bindir}/vacuumlo
 %{_mandir}/man1/oid2name.*
@@ -1017,6 +998,7 @@ fi
 %{_mandir}/man1/pg_standby.*
 %{_mandir}/man1/pg_test_fsync.*
 %{_mandir}/man1/pg_test_timing.*
+%{_mandir}/man1/pg_xlogdump.1.gz
 %{_mandir}/man1/pgbench.*
 %{_mandir}/man1/vacuumlo.*
 %{_mandir}/man3/dblink*
@@ -1089,6 +1071,7 @@ fi
 %{_libdir}/libecpg_compat.so
 %{_libdir}/libpgtypes.so
 %{_libdir}/pgsql/pgxs/
+%{_libdir}/pkgconfig/*.pc
 %{_mandir}/man1/ecpg.*
 %{_mandir}/man3/SPI_*
 
@@ -1137,6 +1120,10 @@ fi
 %endif
 
 %changelog
+* Tue Sep 10 2013 Pavel Raiskup <praiskup@redhat.com> - 9.3.0-1
+- update to 9.3 major version per release notes:
+  http://www.postgresql.org/docs/9.3/static/release-9-3.html
+
 * Thu Aug 15 2013 Pavel Raiskup <praiskup@redhat.com> - 9.2.4-11
 - upgrade: stop old server in case of permissions problem (#896161)
 

sources

@@ -1,3 +1,3 @@
 6ee5bb53b97da7c6ad9cb0825d3300dd  postgresql-9.2.4.tar.bz2
-64f70057a3a153e8e237d0c79ccc63e9  postgresql-9.2.4-US.pdf
+3d148088eed8b394705ae8df13b6d389  postgresql-9.3.0-US.pdf
-6b5ea53dde48fcd79acfc8c196b83535  postgresql-9.1.9.tar.bz2
+09aee56f3a15ce4a7ea32044fb845b53  postgresql-9.3.0.tar.bz2