Browse Source
Merge pull request #1655 from dangowrt/update-postgresql
update postgresqllilik-openwrt-22.03
Jo-Philipp Wich
9 years ago
5 changed files with 77 additions and 113 deletions
Split View
Diff Options
-
+11 -38libs/postgresql/Makefile
-
+52 -72libs/postgresql/files/postgresql.init
-
+11 -0libs/postgresql/patches/001-configure_fixes.patch
-
+2 -2libs/postgresql/patches/200-ranlib.patch
-
+1 -1libs/postgresql/patches/800-busybox-default-pager.patch
+ 11
- 38
libs/postgresql/Makefile
View File
+ 52
- 72
libs/postgresql/files/postgresql.init
View File
| @ -1,93 +1,73 @@ | |||
| #!/bin/sh /etc/rc.common | |||
| # Copyright (C) 2006 OpenWrt.org | |||
| # Copyright (C) 2006-2015 OpenWrt.org | |||
| START=50 | |||
| EXTRA_COMMANDS="status reload" | |||
| PROG=/usr/bin/postmaster | |||
| config_load "postgresql" | |||
| config_get pgdata config PGDATA | |||
| config_get pguser config PGUSER | |||
| config_get pgctl config PG_CTL | |||
| config_get pglog config PGLOG | |||
| USE_PROCD=1 | |||
| start() { | |||
| if [ ! -e /usr/bin/su ]; then | |||
| echo "The su command is requred to run postgres" | |||
| exit 1 | |||
| fi | |||
| EXTRA_COMMANDS="status" | |||
| EXTRA_HELP=" status Show current status of the PostgreSQL server" | |||
| if [ ! -d ${pgdata} ]; then | |||
| echo "Create the data directory (${pgdata}) and try again" | |||
| exit 1 | |||
| fi | |||
| fix_hosts() { | |||
| # make sure localhost (without a dot) is in /etc/hosts | |||
| grep -q 'localhost$' /etc/hosts || echo '127.0.0.1 localhost' >> /etc/hosts | |||
| } | |||
| echo "starting postgres..." | |||
| # make sure localhost (without a dot) is in /etc/hosts | |||
| grep -q 'localhost$' /etc/hosts || echo '127.0.0.1 localhost' >> /etc/hosts | |||
| fix_perms() { | |||
| # for whatever reason, /dev/null gets wrong perms | |||
| chmod a+w /dev/null | |||
| } | |||
| # for whatever reason, /dev/null gets wrong perms | |||
| chmod a+w /dev/null | |||
| cleanup() { | |||
| if [ -f "$1/postmaster.pid" ]; then | |||
| rm "$1/postmaster.pid" | |||
| fi | |||
| } | |||
| if [ -f ${pgdata}/postmaster.pid ]; then | |||
| rm ${pgdata}/postmaster.pid | |||
| fi | |||
| start_service() { | |||
| config_load "postgresql" | |||
| config_get pgdata config PGDATA | |||
| config_get pguser config PGUSER | |||
| config_get pgctl config PG_CTL | |||
| config_get pgopts config PGOPTS | |||
| config_get pgopts config PGOPTS | |||
| if [ -n "${pgopts}" ]; then | |||
| pgopts="-o ${pgopts}" | |||
| fi | |||
| /usr/bin/su ${pguser} -c "/usr/bin/postmaster -D '${pgdata}' &" >> ${pglog} 2>&1 | |||
| user_exists postgres 5432 || user_add postgres 5432 | |||
| group_exists postgres 5432 || group_add postgres 5432 | |||
| while : | |||
| do | |||
| cnt=$((${cnt} + 1)) | |||
| if [ -f "${pgdata}/postmaster.pid" ]; then | |||
| ret=0 | |||
| break | |||
| fi | |||
| if [ ! -d "${pgdata}" ]; then | |||
| echo "Create the data directory (${pgdata}) and try again" | |||
| return 1 | |||
| fi | |||
| if [ ${cnt} -eq 30 ]; then | |||
| echo "Postgres failed to start. See ${pglog} for details" | |||
| ret=1 | |||
| break | |||
| fi | |||
| sleep 1 | |||
| done | |||
| fix_perms | |||
| fix_hosts | |||
| echo "ok" | |||
| return ${ret} | |||
| } | |||
| procd_open_instance | |||
| stop() { | |||
| echo "stopping postgres..." | |||
| /usr/bin/su ${pguser} -c "${pgctl} stop -D '${pgdata}' -s -m fast" | |||
| ret=$? | |||
| if [ -f ${pgdata}/postmaster.pid ]; then | |||
| rm ${pgdata}/postmaster.pid | |||
| fi | |||
| echo "ok" | |||
| return ${ret} | |||
| } | |||
| procd_set_param user ${pguser} | |||
| procd_set_param command $PROG | |||
| procd_append_param command -D "${pgdata}" | |||
| [ -n "${pgopts}" ] && procd_append_param command -o "${pgopts}" | |||
| restart() { | |||
| echo "restarting postgres..." | |||
| /usr/bin/su ${pguser} -c "${pgctl} stop -D '${pgdata}' -s -m fast -w" | |||
| if [ -f ${pgdata}/postmaster.pid ]; then | |||
| rm ${pgdata}/postmaster.pid | |||
| fi | |||
| /usr/bin/su ${pguser} -c "/usr/bin/postmaster -D '${pgdata}' &" >> ${pglog} 2>&1 | |||
| echo "ok" | |||
| return $? | |||
| procd_set_param respawn retry=60 | |||
| procd_close_instance | |||
| } | |||
| reload() { | |||
| echo "reloading postgres..." | |||
| /usr/bin/su ${pguser} -c "${pgctl} reload -D '${pgdata}' -s" | |||
| echo "ok" | |||
| reload_service() { | |||
| config_load "postgresql" | |||
| config_get pgdata config PGDATA | |||
| config_get pguser config PGUSER | |||
| config_get pgctl config PG_CTL | |||
| ${pgctl} reload -U ${pguser} -D '${pgdata}' -s | |||
| } | |||
| status() { | |||
| echo "status postgres..." | |||
| /usr/bin/su ${pguser} -c "${pgctl} status -D '${pgdata}'" | |||
| echo "ok" | |||
| config_load "postgresql" | |||
| config_get pgdata config PGDATA | |||
| config_get pguser config PGUSER | |||
| config_get pgctl config PG_CTL | |||
| echo "status postgres..." | |||
| ${pgctl} status -U ${pguser} -D '${pgdata}' | |||
| echo "ok" | |||
| } | |||
+ 11
- 0
libs/postgresql/patches/001-configure_fixes.patch
View File
| @ -0,0 +1,11 @@ | |||
| --- a/configure.in | |||
| +++ b/configure.in | |||
| @@ -25,7 +25,7 @@ recommended. You can remove the check f | |||
| your responsibility whether the result works or not.])]) | |||
| AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group]) | |||
| AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) | |||
| -AC_CONFIG_AUX_DIR(config) | |||
| +AC_CONFIG_AUX_DIR([config]) | |||
| AC_PREFIX_DEFAULT(/usr/local/pgsql) | |||
| AC_SUBST(configure_args, [$ac_configure_args]) | |||
+ 2
- 2
libs/postgresql/patches/200-ranlib.patch
View File
| @ -1,10 +1,10 @@ | |||
| --- a/src/port/Makefile | |||
| +++ b/src/port/Makefile | |||
| @@ -53,6 +53,7 @@ uninstall: | |||
| @@ -52,6 +52,7 @@ uninstall: | |||
| libpgport.a: $(OBJS) | |||
| $(AR) $(AROPT) $@ $^ | |||
| + $(RANLIB) libpgport.a | |||
| # thread.o needs PTHREAD_CFLAGS (but thread_srv.o does not) | |||
| thread.o: thread.c | |||
| thread.o: CFLAGS+=$(PTHREAD_CFLAGS) | |||