From 23e65a7d7ec51e8fc983398a2f684ec240b5ac92 Mon Sep 17 00:00:00 2001 From: Tiziano Müller Date: Wed, 11 Jul 2007 08:46:51 +0000 Subject: Fixed s-s-d env var abuse (bug #175210, thanks to Roy Marples) (Portage version: 2.1.3_rc7) --- dev-db/postgresql/ChangeLog | 8 +++++++- dev-db/postgresql/files/postgresql.conf-8.0 | 7 +------ dev-db/postgresql/files/postgresql.conf-8.1 | 7 +------ dev-db/postgresql/files/postgresql.conf-8.2 | 7 +------ dev-db/postgresql/files/postgresql.init-8.0 | 8 +++----- dev-db/postgresql/files/postgresql.init-8.1 | 8 +++----- dev-db/postgresql/files/postgresql.init-8.2 | 7 ++++--- 7 files changed, 20 insertions(+), 32 deletions(-) (limited to 'dev-db') diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog index 00d3f7252b85..606d2a53ca0d 100644 --- a/dev-db/postgresql/ChangeLog +++ b/dev-db/postgresql/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/postgresql # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.350 2007/06/24 22:50:25 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.351 2007/07/11 08:46:50 dev-zero Exp $ + + 11 Jul 2007; Tiziano Müller + files/postgresql.conf-8.0, files/postgresql.init-8.0, + files/postgresql.conf-8.1, files/postgresql.init-8.1, + files/postgresql.conf-8.2, files/postgresql.init-8.2: + Fixed s-s-d env var abuse (bug #175210, thanks to Roy Marples) 24 Jun 2007; Tiziano Müller -files/postgresql-8.0.12-gentoo.patch, -files/postgresql-8.0.12-sh.patch, diff --git a/dev-db/postgresql/files/postgresql.conf-8.0 b/dev-db/postgresql/files/postgresql.conf-8.0 index 23956741a02e..6e439fc0f38b 100644 --- a/dev-db/postgresql/files/postgresql.conf-8.0 +++ b/dev-db/postgresql/files/postgresql.conf-8.0 @@ -38,10 +38,5 @@ WAIT_FOR_CLEANUP=10 # If you have to export environment variables for the database process, # this can be done here. -# Just define a new variable ENV_identifier="ENV_VAR_NAME=env_var_content", -# ENV_VAR_NAME will then be exported to the postgresql's environment. -# # Example: -# ENV_plr="R_HOME=/usr/lib/R" -# This exports a variable R_HOME with the content "/usr/lib/R" - +# export R_HOME="/usr/lib/R" diff --git a/dev-db/postgresql/files/postgresql.conf-8.1 b/dev-db/postgresql/files/postgresql.conf-8.1 index 23956741a02e..6e439fc0f38b 100644 --- a/dev-db/postgresql/files/postgresql.conf-8.1 +++ b/dev-db/postgresql/files/postgresql.conf-8.1 @@ -38,10 +38,5 @@ WAIT_FOR_CLEANUP=10 # If you have to export environment variables for the database process, # this can be done here. -# Just define a new variable ENV_identifier="ENV_VAR_NAME=env_var_content", -# ENV_VAR_NAME will then be exported to the postgresql's environment. -# # Example: -# ENV_plr="R_HOME=/usr/lib/R" -# This exports a variable R_HOME with the content "/usr/lib/R" - +# export R_HOME="/usr/lib/R" diff --git a/dev-db/postgresql/files/postgresql.conf-8.2 b/dev-db/postgresql/files/postgresql.conf-8.2 index 23956741a02e..6e439fc0f38b 100644 --- a/dev-db/postgresql/files/postgresql.conf-8.2 +++ b/dev-db/postgresql/files/postgresql.conf-8.2 @@ -38,10 +38,5 @@ WAIT_FOR_CLEANUP=10 # If you have to export environment variables for the database process, # this can be done here. -# Just define a new variable ENV_identifier="ENV_VAR_NAME=env_var_content", -# ENV_VAR_NAME will then be exported to the postgresql's environment. -# # Example: -# ENV_plr="R_HOME=/usr/lib/R" -# This exports a variable R_HOME with the content "/usr/lib/R" - +# export R_HOME="/usr/lib/R" diff --git a/dev-db/postgresql/files/postgresql.init-8.0 b/dev-db/postgresql/files/postgresql.init-8.0 index 355abc9d61cf..60a2237ec6ba 100644 --- a/dev-db/postgresql/files/postgresql.init-8.0 +++ b/dev-db/postgresql/files/postgresql.init-8.0 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0,v 1.3 2006/12/13 07:59:07 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0,v 1.4 2007/07/11 08:46:51 dev-zero Exp $ opts="${opts} reload" @@ -27,13 +27,11 @@ start() { rm -f "$PGDATA/postmaster.pid" fi - local env_vars - for var in ${!ENV_*} ; do env_vars="${env_vars} -e ${!var}" ; done start-stop-daemon --start \ --pidfile "${PGDATA}/postmaster.pid" \ --chuid ${PGUSER}:${PGGROUP} \ --exec /usr/bin/postmaster \ - ${env_vars} -- \ + -- \ -D "${PGDATA}" \ --silent-mode=true \ ${PGOPTS} diff --git a/dev-db/postgresql/files/postgresql.init-8.1 b/dev-db/postgresql/files/postgresql.init-8.1 index 8e6d74b732e5..666fad2424de 100644 --- a/dev-db/postgresql/files/postgresql.init-8.1 +++ b/dev-db/postgresql/files/postgresql.init-8.1 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.1,v 1.3 2006/12/13 07:59:07 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.1,v 1.4 2007/07/11 08:46:51 dev-zero Exp $ opts="${opts} reload" @@ -27,13 +27,11 @@ start() { rm -f "$PGDATA/postmaster.pid" fi - local env_vars - for var in ${!ENV_*} ; do env_vars="${env_vars} -e ${!var}" ; done start-stop-daemon --start \ --pidfile "${PGDATA}/postmaster.pid" \ --chuid ${PGUSER}:${PGGROUP} \ --exec /usr/bin/postmaster \ - ${env_vars} -- \ + -- \ -D "${PGDATA}" \ --silent-mode=true \ ${PGOPTS} diff --git a/dev-db/postgresql/files/postgresql.init-8.2 b/dev-db/postgresql/files/postgresql.init-8.2 index 6ccad4af17fe..0178c2c94829 100644 --- a/dev-db/postgresql/files/postgresql.init-8.2 +++ b/dev-db/postgresql/files/postgresql.init-8.2 @@ -1,4 +1,7 @@ #!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.2,v 1.2 2007/07/11 08:46:51 dev-zero Exp $ opts="${opts} reload" @@ -24,13 +27,11 @@ start() { rm -f "$PGDATA/postmaster.pid" fi - local env_vars - for var in ${!ENV_*} ; do env_vars="${env_vars} -e ${!var}" ; done start-stop-daemon --start \ --pidfile "${PGDATA}/postmaster.pid" \ --chuid ${PGUSER}:${PGGROUP} \ --exec /usr/bin/postmaster \ - ${env_vars} -- \ + -- \ -D "${PGDATA}" \ --silent-mode=true \ ${PGOPTS} -- cgit v1.2.3-65-gdbad