| 1 |
commit: bf882114b85316d9e78b7be63cf1b8f742fbe056 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 3 08:29:28 2017 +0000 |
| 4 |
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 6 22:22:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf882114 |
| 7 |
|
| 8 |
dev-db/pgpool2: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/6411 |
| 11 |
|
| 12 |
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-db/pgpool2/files/pgpool_run_paths.patch | 180 ---------------------------- |
| 15 |
1 file changed, 180 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/pgpool2/files/pgpool_run_paths.patch b/dev-db/pgpool2/files/pgpool_run_paths.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index a1912af15e4..00000000000 |
| 20 |
--- a/dev-db/pgpool2/files/pgpool_run_paths.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,180 +0,0 @@ |
| 23 |
-diff -Naurw a/pgpool.conf.sample b/pgpool.conf.sample |
| 24 |
---- a/pgpool.conf.sample 2012-07-19 03:06:21.000000000 -0400 |
| 25 |
-+++ b/pgpool.conf.sample 2012-08-14 07:33:39.200695855 -0400 |
| 26 |
-@@ -31,10 +31,8 @@ |
| 27 |
- port = 9999 |
| 28 |
- # Port number |
| 29 |
- # (change requires restart) |
| 30 |
--socket_dir = '/tmp' |
| 31 |
-+socket_dir = '@PGSQL_SOCKETDIR@' |
| 32 |
- # Unix domain socket path |
| 33 |
-- # The Debian package defaults to |
| 34 |
-- # /var/run/postgresql |
| 35 |
- # (change requires restart) |
| 36 |
- |
| 37 |
- |
| 38 |
-@@ -43,10 +41,8 @@ |
| 39 |
- pcp_port = 9898 |
| 40 |
- # Port number for pcp |
| 41 |
- # (change requires restart) |
| 42 |
--pcp_socket_dir = '/tmp' |
| 43 |
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@' |
| 44 |
- # Unix domain socket path for pcp |
| 45 |
-- # The Debian package defaults to |
| 46 |
-- # /var/run/postgresql |
| 47 |
- # (change requires restart) |
| 48 |
- |
| 49 |
- # - Backend Connection Settings - |
| 50 |
-@@ -176,10 +172,10 @@ |
| 51 |
- # FILE LOCATIONS |
| 52 |
- #------------------------------------------------------------------------------ |
| 53 |
- |
| 54 |
--pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 55 |
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid' |
| 56 |
- # PID file name |
| 57 |
- # (change requires restart) |
| 58 |
--logdir = '/tmp' |
| 59 |
-+logdir = '@PGPOOL_SOCKETDIR@' |
| 60 |
- # Directory of pgPool status file |
| 61 |
- # (change requires restart) |
| 62 |
- |
| 63 |
-diff -Naurw a/pgpool.conf.sample-master-slave b/pgpool.conf.sample-master-slave |
| 64 |
---- a/pgpool.conf.sample-master-slave 2012-07-16 22:56:37.000000000 -0400 |
| 65 |
-+++ b/pgpool.conf.sample-master-slave 2012-08-14 07:33:39.201695842 -0400 |
| 66 |
-@@ -31,10 +31,8 @@ |
| 67 |
- port = 9999 |
| 68 |
- # Port number |
| 69 |
- # (change requires restart) |
| 70 |
--socket_dir = '/tmp' |
| 71 |
-+socket_dir = '@PGSQL_SOCKETDIR@' |
| 72 |
- # Unix domain socket path |
| 73 |
-- # The Debian package defaults to |
| 74 |
-- # /var/run/postgresql |
| 75 |
- # (change requires restart) |
| 76 |
- |
| 77 |
- |
| 78 |
-@@ -43,10 +41,8 @@ |
| 79 |
- pcp_port = 9898 |
| 80 |
- # Port number for pcp |
| 81 |
- # (change requires restart) |
| 82 |
--pcp_socket_dir = '/tmp' |
| 83 |
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@' |
| 84 |
- # Unix domain socket path for pcp |
| 85 |
-- # The Debian package defaults to |
| 86 |
-- # /var/run/postgresql |
| 87 |
- # (change requires restart) |
| 88 |
- |
| 89 |
- # - Backend Connection Settings - |
| 90 |
-@@ -176,10 +172,10 @@ |
| 91 |
- # FILE LOCATIONS |
| 92 |
- #------------------------------------------------------------------------------ |
| 93 |
- |
| 94 |
--pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 95 |
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid' |
| 96 |
- # PID file name |
| 97 |
- # (change requires restart) |
| 98 |
--logdir = '/tmp' |
| 99 |
-+logdir = '@PGPOOL_SOCKETDIR@' |
| 100 |
- # Directory of pgPool status file |
| 101 |
- # (change requires restart) |
| 102 |
- |
| 103 |
-diff -Naurw a/pgpool.conf.sample-replication b/pgpool.conf.sample-replication |
| 104 |
---- a/pgpool.conf.sample-replication 2012-07-16 22:56:37.000000000 -0400 |
| 105 |
-+++ b/pgpool.conf.sample-replication 2012-08-14 07:33:39.202695830 -0400 |
| 106 |
-@@ -31,10 +31,8 @@ |
| 107 |
- port = 9999 |
| 108 |
- # Port number |
| 109 |
- # (change requires restart) |
| 110 |
--socket_dir = '/tmp' |
| 111 |
-+socket_dir = '@PGSQL_SOCKETDIR@' |
| 112 |
- # Unix domain socket path |
| 113 |
-- # The Debian package defaults to |
| 114 |
-- # /var/run/postgresql |
| 115 |
- # (change requires restart) |
| 116 |
- |
| 117 |
- |
| 118 |
-@@ -43,10 +41,8 @@ |
| 119 |
- pcp_port = 9898 |
| 120 |
- # Port number for pcp |
| 121 |
- # (change requires restart) |
| 122 |
--pcp_socket_dir = '/tmp' |
| 123 |
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@' |
| 124 |
- # Unix domain socket path for pcp |
| 125 |
-- # The Debian package defaults to |
| 126 |
-- # /var/run/postgresql |
| 127 |
- # (change requires restart) |
| 128 |
- |
| 129 |
- # - Backend Connection Settings - |
| 130 |
-@@ -176,10 +172,10 @@ |
| 131 |
- # FILE LOCATIONS |
| 132 |
- #------------------------------------------------------------------------------ |
| 133 |
- |
| 134 |
--pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 135 |
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid' |
| 136 |
- # PID file name |
| 137 |
- # (change requires restart) |
| 138 |
--logdir = '/tmp' |
| 139 |
-+logdir = '@PGPOOL_SOCKETDIR@' |
| 140 |
- # Directory of pgPool status file |
| 141 |
- # (change requires restart) |
| 142 |
- |
| 143 |
-diff -Naurw a/pgpool.conf.sample-stream b/pgpool.conf.sample-stream |
| 144 |
---- a/pgpool.conf.sample-stream 2012-07-16 22:56:37.000000000 -0400 |
| 145 |
-+++ b/pgpool.conf.sample-stream 2012-08-14 07:33:39.203695818 -0400 |
| 146 |
-@@ -31,10 +31,8 @@ |
| 147 |
- port = 9999 |
| 148 |
- # Port number |
| 149 |
- # (change requires restart) |
| 150 |
--socket_dir = '/tmp' |
| 151 |
-+socket_dir = '@PGSQL_SOCKETDIR@' |
| 152 |
- # Unix domain socket path |
| 153 |
-- # The Debian package defaults to |
| 154 |
-- # /var/run/postgresql |
| 155 |
- # (change requires restart) |
| 156 |
- |
| 157 |
- |
| 158 |
-@@ -43,10 +41,8 @@ |
| 159 |
- pcp_port = 9898 |
| 160 |
- # Port number for pcp |
| 161 |
- # (change requires restart) |
| 162 |
--pcp_socket_dir = '/tmp' |
| 163 |
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@' |
| 164 |
- # Unix domain socket path for pcp |
| 165 |
-- # The Debian package defaults to |
| 166 |
-- # /var/run/postgresql |
| 167 |
- # (change requires restart) |
| 168 |
- |
| 169 |
- # - Backend Connection Settings - |
| 170 |
-@@ -176,10 +172,10 @@ |
| 171 |
- # FILE LOCATIONS |
| 172 |
- #------------------------------------------------------------------------------ |
| 173 |
- |
| 174 |
--pid_file_name = '/var/run/pgpool/pgpool.pid' |
| 175 |
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid' |
| 176 |
- # PID file name |
| 177 |
- # (change requires restart) |
| 178 |
--logdir = '/tmp' |
| 179 |
-+logdir = '@PGPOOL_SOCKETDIR@' |
| 180 |
- # Directory of pgPool status file |
| 181 |
- # (change requires restart) |
| 182 |
- |
| 183 |
-diff -Naurw a/pool.h b/pool.h |
| 184 |
---- a/pool.h 2012-07-02 00:09:18.000000000 -0400 |
| 185 |
-+++ b/pool.h 2012-08-14 07:26:56.005764702 -0400 |
| 186 |
-@@ -61,13 +61,13 @@ |
| 187 |
- #define HBA_CONF_FILE_NAME "pool_hba.conf" |
| 188 |
- |
| 189 |
- /* pid file directory */ |
| 190 |
--#define DEFAULT_LOGDIR "/tmp" |
| 191 |
-+#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@" |
| 192 |
- |
| 193 |
- /* Unix domain socket directory */ |
| 194 |
--#define DEFAULT_SOCKET_DIR "/tmp" |
| 195 |
-+#define DEFAULT_SOCKET_DIR "@PGSQL_SOCKETDIR@" |
| 196 |
- |
| 197 |
- /* pid file name */ |
| 198 |
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid" |
| 199 |
-+#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid" |
| 200 |
- |
| 201 |
- /* status file name */ |
| 202 |
- #define STATUS_FILE_NAME "pgpool_status" |
Archives