Browse Source
Merge pull request #3220 from dangowrt/update-postgresql
postgresql: update to version 9.5.4 and major reworklilik-openwrt-22.03
Jo-Philipp Wich
8 years ago
committed by
GitHub
GitHub
5 changed files with 229 additions and 106 deletions
Unified View
Diff Options
-
+44 -86libs/postgresql/Makefile
-
+0 -3libs/postgresql/files/postgresql.config
-
+16 -17libs/postgresql/files/postgresql.init
-
+60 -0libs/postgresql/files/postgresql.sh
-
+109 -0libs/postgresql/patches/900-pg_ctl-setuid.patch
+ 44
- 86
libs/postgresql/Makefile
View File
+ 0
- 3
libs/postgresql/files/postgresql.config
View File
| @ -1,5 +1,2 @@ | |||||
| config postgresql config | config postgresql config | ||||
| option PGUSER postgres | |||||
| option PGDATA /var/postgresql/data | option PGDATA /var/postgresql/data | ||||
| option PGLOG /var/postgresql/data/postgresql.log | |||||
| option PG_CTL /usr/bin/pg_ctl | |||||
+ 16
- 17
libs/postgresql/files/postgresql.init
View File
+ 60
- 0
libs/postgresql/files/postgresql.sh
View File
| @ -0,0 +1,60 @@ | |||||
| #!/bin/sh | |||||
| PSQL="/usr/bin/psql" | |||||
| free_megs() { | |||||
| fsdir=$1 | |||||
| while [ ! -d "$fsdir" ]; do | |||||
| fsdir=$(dirname $fsdir) | |||||
| done | |||||
| df -m $fsdir | while read fs bl us av cap mnt; do [ "$av" = "Available" ] || echo $av; done | |||||
| } | |||||
| pg_init_data() { | |||||
| # make sure we got at least 50MB of free space | |||||
| [ $(free_megs $1) -lt 50 ] && return 1 | |||||
| pg_ctl initdb -U postgres -D $1 | |||||
| } | |||||
| pg_server_ready() { | |||||
| t=0 | |||||
| while [ $t -le 90 ]; do | |||||
| pg_ctl status -U postgres -D $1 2>/dev/null >/dev/null && return 0 | |||||
| t=$((t+1)) | |||||
| sleep 1 | |||||
| done | |||||
| return 1 | |||||
| } | |||||
| # $1: dbname, $2: username, $3: password | |||||
| pg_require_db() { | |||||
| pg_test_db $@ && return 0 | |||||
| ( echo "CREATE DATABASE $1;" | |||||
| echo -n "CREATE USER $2" | |||||
| [ "$3" ] && echo -n " WITH PASSWORD '$3'" | |||||
| echo ";" | |||||
| echo "GRANT ALL PRIVILEGES ON DATABASE \"$1\" to $2;" ) | | |||||
| $PSQL -U postgres -d template1 -e | |||||
| return $? | |||||
| } | |||||
| pg_test_db() { | |||||
| PGPASSWORD=$3 | |||||
| echo "SHOW ALL;" | $PSQL -U $2 -d $1 -q 2>/dev/null >/dev/null | |||||
| return $? | |||||
| } | |||||
| uci_require_db() { | |||||
| local dbname dbuser dbpass | |||||
| config_get dbname $1 name | |||||
| config_get dbuser $1 user | |||||
| config_get dbpass $1 pass | |||||
| pg_require_db $dbname $dbuser $dbpass | |||||
| } | |||||
| [ "$1" = "init" ] && { | |||||
| . /lib/functions.sh | |||||
| pg_server_ready $2 || exit 1 | |||||
| config_load postgresql | |||||
| config_foreach uci_require_db postgres-db | |||||
| } | |||||
+ 109
- 0
libs/postgresql/patches/900-pg_ctl-setuid.patch
View File
| @ -0,0 +1,109 @@ | |||||
| Index: postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c | |||||
| =================================================================== | |||||
| --- postgresql-9.5.4.orig/src/bin/pg_ctl/pg_ctl.c | |||||
| +++ postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c | |||||
| @@ -95,6 +95,7 @@ static char *event_source = NULL; | |||||
| static char *register_servicename = "PostgreSQL"; /* FIXME: + version ID? */ | |||||
| static char *register_username = NULL; | |||||
| static char *register_password = NULL; | |||||
| +static char *username = ""; | |||||
| static char *argv0 = NULL; | |||||
| static bool allow_core_files = false; | |||||
| static time_t start_time; | |||||
| @@ -2114,6 +2115,9 @@ do_help(void) | |||||
| #endif | |||||
| printf(_(" -s, --silent only print errors, no informational messages\n")); | |||||
| printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n")); | |||||
| +#if !defined(WIN32) && !defined(__CYGWIN__) | |||||
| + printf(_(" -U USERNAME user name of account PostgreSQL server is running as\n")); | |||||
| +#endif | |||||
| printf(_(" -V, --version output version information, then exit\n")); | |||||
| printf(_(" -w wait until operation completes\n")); | |||||
| printf(_(" -W do not wait until operation completes\n")); | |||||
| @@ -2310,6 +2314,7 @@ main(int argc, char **argv) | |||||
| {"pgdata", required_argument, NULL, 'D'}, | |||||
| {"silent", no_argument, NULL, 's'}, | |||||
| {"timeout", required_argument, NULL, 't'}, | |||||
| + {"username", required_argument, NULL, 'U'}, | |||||
| {"core-files", no_argument, NULL, 'c'}, | |||||
| {NULL, 0, NULL, 0} | |||||
| }; | |||||
| @@ -2350,20 +2355,6 @@ main(int argc, char **argv) | |||||
| } | |||||
| } | |||||
| - /* | |||||
| - * Disallow running as root, to forestall any possible security holes. | |||||
| - */ | |||||
| -#ifndef WIN32 | |||||
| - if (geteuid() == 0) | |||||
| - { | |||||
| - write_stderr(_("%s: cannot be run as root\n" | |||||
| - "Please log in (using, e.g., \"su\") as the " | |||||
| - "(unprivileged) user that will\n" | |||||
| - "own the server process.\n"), | |||||
| - progname); | |||||
| - exit(1); | |||||
| - } | |||||
| -#endif | |||||
| env_wait = getenv("PGCTLTIMEOUT"); | |||||
| if (env_wait != NULL) | |||||
| @@ -2449,11 +2440,15 @@ main(int argc, char **argv) | |||||
| wait_seconds_arg = true; | |||||
| break; | |||||
| case 'U': | |||||
| +#if defined(WIN32) || defined(__CYGWIN__) | |||||
| if (strchr(optarg, '\\')) | |||||
| register_username = pg_strdup(optarg); | |||||
| else | |||||
| /* Prepend .\ for local accounts */ | |||||
| register_username = psprintf(".\\%s", optarg); | |||||
| +#else | |||||
| + username = pg_strdup(optarg); | |||||
| +#endif | |||||
| break; | |||||
| case 'w': | |||||
| do_wait = true; | |||||
| @@ -2535,6 +2530,41 @@ main(int argc, char **argv) | |||||
| exit(1); | |||||
| } | |||||
| + /* | |||||
| + * Disallow running as root, to forestall any possible security holes. | |||||
| + */ | |||||
| +#if !defined(WIN32) && !defined(__CYGWIN__) | |||||
| + if (geteuid() == 0) | |||||
| + { | |||||
| + struct passwd *p; | |||||
| + if (!username || !strlen(username)) { | |||||
| + fprintf(stderr, | |||||
| + _("%s: when run as root, username needs to be provided\n"), | |||||
| + progname); | |||||
| + exit(1); | |||||
| + } | |||||
| + p = getpwnam(username); | |||||
| + if (!p) { | |||||
| + fprintf(stderr, | |||||
| + _("%s: invalid username: %s\n"), | |||||
| + progname, username); | |||||
| + exit(1); | |||||
| + } | |||||
| + if (!p->pw_uid) { | |||||
| + fprintf(stderr, | |||||
| + _("%s: user needs to be non-root\n"), | |||||
| + progname); | |||||
| + exit(1); | |||||
| + } | |||||
| + if (setgid(p->pw_gid) || setuid(p->pw_uid)) { | |||||
| + fprintf(stderr, | |||||
| + _("%s: failed to set user id %d: %d (%s)\n"), | |||||
| + progname, p->pw_uid, errno, strerror(errno)); | |||||
| + exit(1); | |||||
| + } | |||||
| + } | |||||
| +#endif | |||||
| + | |||||
| /* Note we put any -D switch into the env var above */ | |||||
| pg_config = getenv("PGDATA"); | |||||
| if (pg_config) | |||||