* [gentoo-commits] proj/pgsql-patches:patches-9.2 commit in: /
@ 2012-05-20 15:39 Aaron Swenson
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Swenson @ 2012-05-20 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 3187e5643721f9666a8ac69859a4a340967e197c
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 15:38:29 2012 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sun May 20 15:38:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=3187e564
Commited upstream.
---
pg_ctl-exit-status.patch | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/pg_ctl-exit-status.patch b/pg_ctl-exit-status.patch
deleted file mode 100644
index 6f78167..0000000
--- a/pg_ctl-exit-status.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
---- a/src/bin/pg_ctl/pg_ctl.c 2011-08-18 17:23:13.000000000 -0400
-+++ b/src/bin/pg_ctl/pg_ctl.c 2011-08-27 17:18:26.424185561 -0400
-@@ -1184,7 +1184,7 @@
- }
- }
- printf(_("%s: no server running\n"), progname);
-- exit(1);
-+ exit(3);
- }
-
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/pgsql-patches:patches-9.2 commit in: /
@ 2012-05-22 19:00 Aaron Swenson
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Swenson @ 2012-05-22 19:00 UTC (permalink / raw
To: gentoo-commits
commit: dad9c6d9e0f2141d03e1be123d702bc157c41cf1
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 18:59:27 2012 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Tue May 22 18:59:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=dad9c6d9
Fixed regress patch by regressing.
---
regress.patch | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/regress.patch b/regress.patch
index 2c5883a..cf706a6 100644
--- a/regress.patch
+++ b/regress.patch
@@ -1,51 +1,53 @@
-diff -Naurw a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
---- a/src/test/regress/pg_regress.c 2012-05-10 18:35:09.000000000 -0400
-+++ b/src/test/regress/pg_regress.c 2012-05-20 09:56:07.126786540 -0400
-@@ -798,7 +798,7 @@
+diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
+--- a/src/test/regress/pg_regress.c 2011-04-27 17:17:22.000000000 -0400
++++ b/src/test/regress/pg_regress.c 2011-05-02 19:01:20.470763739 -0400
+@@ -806,7 +806,7 @@
datadir = tmp;
/* psql will be installed into temp-install bindir */
- psqldir = bindir;
-+ /* psqldir = bindir; */
++ /* psqldir = bindir; */
/*
* Set up shared library paths to include the temp install.
-@@ -898,7 +898,7 @@
+@@ -906,7 +906,7 @@
/* And now we can build and execute the shell command */
snprintf(psql_cmd, sizeof(psql_cmd),
- SYSTEMQUOTE "\"%s%spsql\" -X -c \"%s\" \"%s\"" SYSTEMQUOTE,
-+ SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -c \"%s\" \"%s\"" SYSTEMQUOTE,
++ SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -c \"%s\" \"%s\"" SYSTEMQUOTE,
psqldir ? psqldir : "",
psqldir ? "/" : "",
query_escaped,
-@@ -2201,7 +2201,7 @@
+@@ -2207,8 +2207,8 @@
* Check if there is a postmaster running already.
*/
snprintf(buf2, sizeof(buf2),
- SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
-+ SYSTEMQUOTE "\"%s/psql\" -h @SOCKETDIR@ -X postgres <%s 2>%s" SYSTEMQUOTE,
- bindir, DEVNULL, DEVNULL);
+- bindir, DEVNULL, DEVNULL);
++ SYSTEMQUOTE "\"%s/psql\" -h @SOCKETDIR@ -X postgres <%s 2>%s" SYSTEMQUOTE,
++ psqldir, DEVNULL, DEVNULL);
for (i = 0; i < 16; i++)
-@@ -2233,7 +2233,7 @@
+ {
+@@ -2239,7 +2239,7 @@
*/
header(_("starting postmaster"));
snprintf(buf, sizeof(buf),
- SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
-+ SYSTEMQUOTE "\"%s/postgres\" -k @SOCKETDIR@ -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
++ SYSTEMQUOTE "\"%s/postgres\" -k @SOCKETDIR@ -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
bindir, temp_install,
debug ? " -d 5" : "",
hostname ? hostname : "",
-diff -Naurw a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
---- a/src/test/regress/pg_regress_main.c 2012-05-10 18:35:09.000000000 -0400
-+++ b/src/test/regress/pg_regress_main.c 2012-05-20 09:57:41.523599810 -0400
+diff -Naur a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
+--- a/src/test/regress/pg_regress_main.c 2011-04-27 17:17:22.000000000 -0400
++++ b/src/test/regress/pg_regress_main.c 2011-05-02 19:02:23.571086780 -0400
@@ -64,7 +64,7 @@
"%s ", launcher);
snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
- SYSTEMQUOTE "\"%s%spsql\" -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE,
-+ SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE,
++ SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE,
psqldir ? psqldir : "",
psqldir ? "/" : "",
dblist->str,
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/pgsql-patches:patches-9.2 commit in: /
@ 2013-02-08 16:15 Aaron Swenson
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Swenson @ 2013-02-08 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 8ffa99014df2987a45cc9bd43d54583cc9f00475
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 8 16:14:59 2013 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Fri Feb 8 16:14:59 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=8ffa9901
Default to /run/postgresql.
---
base.patch | 2 +-
server.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/base.patch b/base.patch
index 20afa59..88ea26b 100644
--- a/base.patch
+++ b/base.patch
@@ -127,7 +127,7 @@ diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
* with the postmaster's -k switch.
*/
-#define DEFAULT_PGSOCKET_DIR "/tmp"
-+#define DEFAULT_PGSOCKET_DIR "@GENTOO_PORTAGE_EPREFIX@@RUNDIR@/run/postgresql"
++#define DEFAULT_PGSOCKET_DIR "@GENTOO_PORTAGE_EPREFIX@/run/postgresql"
/*
* The random() function is expected to yield values between 0 and
diff --git a/server.patch b/server.patch
index 05f06b2..369e24a 100644
--- a/server.patch
+++ b/server.patch
@@ -147,7 +147,7 @@ diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
* with the postmaster's -k switch.
*/
-#define DEFAULT_PGSOCKET_DIR "/tmp"
-+#define DEFAULT_PGSOCKET_DIR "@GENTOO_PORTAGE_EPREFIX@@RUNDIR@/run/postgresql"
++#define DEFAULT_PGSOCKET_DIR "@GENTOO_PORTAGE_EPREFIX@/run/postgresql"
/*
* The random() function is expected to yield values between 0 and
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-08 16:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-20 15:39 [gentoo-commits] proj/pgsql-patches:patches-9.2 commit in: / Aaron Swenson
-- strict thread matches above, loose matches on Subject: below --
2012-05-22 19:00 Aaron Swenson
2013-02-08 16:15 Aaron Swenson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox