Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a9f3f744e542586dd39046d3bd87a61dd271d550)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a9f3f744e542586dd39046d3bd87a61dd271d550)
  • Date: Sun, 9 Mar 2008 07:28:25 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird/HISTORY | 4 +++
database/firebird/init.d/firebird2 | 4 +--
database/postgresql/HISTORY | 4 +++
database/postgresql/init.d/postgresql | 36
+++++++++++++++-------------------
science/avogadro/DETAILS | 4 +--
science/avogadro/HISTORY | 3 ++
6 files changed, 31 insertions(+), 24 deletions(-)

New commits:
commit e7da4702a0a1ec4c5a546260b8b7eb6dd55973c5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

postgresql - fix init script

commit 2cbd610d87e8ef839a6b3c418a04f18934f246f8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird - fix startup problem

commit dffb01cf0df0f26b25c65ff44c1b7ca6e744b6dc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

avogadro-0.6.1

diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 7fb2ef2..c499c46 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,7 @@
+2008-03-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * init.d/firebird2: fix for latest su
+ move -l option to end
+
2008-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.0.17755-ReleaseCandidate2
* PREPARE: version 2.1 is no longer experimental
diff --git a/database/firebird/init.d/firebird2
b/database/firebird/init.d/firebird2
index 38392a5..a813d44 100755
--- a/database/firebird/init.d/firebird2
+++ b/database/firebird/init.d/firebird2
@@ -23,8 +23,8 @@ case $1 in
echo "Starting Firebird Super Server"
mkdir -p $RUND
chown firebird:firebird $RUND
- su -l "firebird" -s /bin/sh -m \
- -c "$FB -start -forever -pidfile $PID"
+ su -s "/bin/sh" -m \
+ -c "$FB -start -forever -pidfile $PID" -l "firebird"
evaluate_retval
;;
stop)
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 2c48df7..48044d0 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,7 @@
+2008-03-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * init.d/postgresql: cleanup.
+ fix for su from latest coreutils
+
2008-02-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: Updated to 8.3.0

diff --git a/database/postgresql/init.d/postgresql
b/database/postgresql/init.d/postgresql
index b222b6d..8d9e942 100644
--- a/database/postgresql/init.d/postgresql
+++ b/database/postgresql/init.d/postgresql
@@ -11,19 +11,13 @@ start()
{
echo "Starting postmaster..."
cd "$DBPATH" &&
- if [[ -z "$PORT" ]]; then
- if [[ "$LOGFILE" = 'syslog' ]]; then
- su -l "$USER" -s /bin/sh -c "pg_ctl start -D '$DBPATH'"
- else
- su -l "$USER" -s /bin/sh -c "pg_ctl start -D '$DBPATH' -l '$LOGFILE'"
- fi
- else
- if [[ "$LOGFILE" = 'syslog' ]]; then
- su -l "$USER" -s /bin/sh -c "pg_ctl start -D '$DBPATH' -o \"-i -p
'$PORT'\""
- else
- su -l "$USER" -s /bin/sh -c "pg_ctl start -D '$DBPATH' -l '$LOGFILE'
-o \"-i -p '$PORT'\""
- fi
- fi
+ if [[ ! -z "$PORT" ]]; then
+ PGPORT="-p $PORT"
+ fi &&
+ if [[ ! "$LOGFILE" = 'syslog' ]]; then
+ PGLOG="-l $LOGFILE"
+ fi &&
+ su -s /bin/sh -m -c "pg_ctl start -D '$DBPATH' $PGPORT $PGLOG" -l "$USER"
evaluate_retval
}

@@ -31,17 +25,19 @@ stop()
{
echo "Stopping postmaster..."
cd "$DBPATH" &&
- su -l "$USER" -s /bin/sh -c "pg_ctl stop -D '$DBPATH' -m fast"
+ su -s /bin/sh -c "pg_ctl stop -D '$DBPATH' -m fast" -l "$USER"
evaluate_retval
}

restart()
{
echo "Restarting postmaster..."
- cd "$DBPATH" &&
- if [[ "$LOGFILE" = 'syslog' ]]; then
- su -l "$USER" -s /bin/sh -c "pg_ctl restart -D '$DBPATH'"
- else
- su -l "$USER" -s /bin/sh -c "pg_ctl restart -D '$DBPATH' -l '$LOGFILE'"
- fi
+ stop
+ start
+# cd "$DBPATH" &&
+# if [[ "$LOGFILE" = 'syslog' ]]; then
+# su -l "$USER" -s /bin/sh -c "pg_ctl restart -D '$DBPATH'"
+# else
+# su -l "$USER" -s /bin/sh -c "pg_ctl restart -D '$DBPATH' -l '$LOGFILE'"
+# fi
}
diff --git a/science/avogadro/DETAILS b/science/avogadro/DETAILS
index 7d10bcd..72032ad 100755
--- a/science/avogadro/DETAILS
+++ b/science/avogadro/DETAILS
@@ -1,6 +1,6 @@
SPELL=avogadro
- VERSION=0.6.0
-
SOURCE_HASH=sha512:fcaddc696549b713cc601e6a1d8173773783a580430c2d077c94e75228385b4d0a2ce46560395a106c0620e6f53dc297db718e93207dc10e84902a5f783aa0bb
+ VERSION=0.6.1
+
SOURCE_HASH=sha512:27a0bcc9717d5f6d6f85238b7236c10841d7b9f719b07951c1b592e397471358ba1244c9af54fa88bb74638ccf2836285347ee8bc980a396bc6ddf38016b7d14
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/science/avogadro/HISTORY b/science/avogadro/HISTORY
index fb52924..c165746 100644
--- a/science/avogadro/HISTORY
+++ b/science/avogadro/HISTORY
@@ -1,3 +1,6 @@
+2008-03-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.1
+
2008-03-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.0
spell created



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a9f3f744e542586dd39046d3bd87a61dd271d550), Treeve Jelbert, 03/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page