diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-03 05:55:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 05:55:59 +0000 |
| commit | 5356c6b7c5e60633d0e95bf749b8f762a9f0ae2a (patch) | |
| tree | b614302e97cd667be02889e2e75ecb4098dba5a6 /pkgs/servers/sql | |
| parent | eb3ce282cba3051a53fb2747d01897c1fe300f21 (diff) | |
| parent | 2dfcfcc1a9070c4c246b8a5047aada2a52599494 (diff) | |
Merge pull request #175174 from trofi/update-pgpool
pgpool: 4.0.6 -> 4.3.2
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/pgpool/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/sql/pgpool/pgpool.patch | 23 |
2 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 101f8163659eb..f144348744a91 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -2,16 +2,14 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.0.6"; + version = "4.3.2"; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz"; - sha256 = "0blmbqczyrgzykby2z3xzmhzd8kgij9izxv50n5cjn5azf7dn8g5"; + sha256 = "02jg0c6k259i0r927dng9h0y58q965swshg2c9mzqhazcdiga5ap"; }; - patches = [ ./pgpool.patch ]; - buildInputs = [ postgresql openssl pam libmemcached ]; configureFlags = [ diff --git a/pkgs/servers/sql/pgpool/pgpool.patch b/pkgs/servers/sql/pgpool/pgpool.patch deleted file mode 100644 index 7c9d92a88bf7d..0000000000000 --- a/pkgs/servers/sql/pgpool/pgpool.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/main/main.c b/src/main/main.c -index eec3c3e4..4169112b 100644 ---- a/src/main/main.c -+++ b/src/main/main.c -@@ -337,10 +337,14 @@ main(int argc, char **argv) - char dirnamebuf[POOLMAXPATHLEN + 1]; - char *dirp; - -- strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf)); -- dirp = dirname(dirnamebuf); -- snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s", -- dirp, pool_config->pool_passwd); -+ if (pool_config->pool_passwd[0] != '/') { -+ strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf)); -+ dirp = dirname(dirnamebuf); -+ snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s", -+ dirp, pool_config->pool_passwd); -+ } else -+ strlcpy(pool_passwd, pool_config->pool_passwd, -+ sizeof(pool_passwd)); - pool_init_pool_passwd(pool_passwd, POOL_PASSWD_R); - } - |