From 56100c286b972a98b5b98f24d3f57376ceb0a8fd Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Oct 16 2007 21:57:13 +0000 Subject: Add new patch to cvs --- diff --git a/hsqldb-1.8.0-specify-su-shell.patch b/hsqldb-1.8.0-specify-su-shell.patch new file mode 100644 index 0000000..43f610b --- /dev/null +++ b/hsqldb-1.8.0-specify-su-shell.patch @@ -0,0 +1,12 @@ +diff -up ./bin/hsqldb.sav ./bin/hsqldb +--- ./bin/hsqldb.sav 2007-10-16 17:29:58.000000000 -0400 ++++ ./bin/hsqldb 2007-10-16 17:30:25.000000000 -0400 +@@ -366,7 +366,7 @@ running with pid $HSQLDB_PID." + # Some OSes choke if there are newlines in this string. + # N.b.!!! The shell of the -c command is the target user's default + # login shell, so keep this command shell-independent! +- nohup su "$HSQLDB_OWNER" -c "cd '$SERVER_HOME' && echo "'$$'" > '$PIDFILE' && exec '$JAVA_EXECUTABLE' $SERVER_JVMARGS $TLS_SWITCHES -classpath '${SERVER_ADDL_CLASSPATH}${HSQLDB_JAR_PATH}' org.hsqldb.util.MainInvoker org.hsqldb.$TARGET_CLASS $INVOC_ADDL_ARGS" >> "$LOGFILE" 2>&1 & ++ nohup su "$HSQLDB_OWNER" -s /bin/sh -c "cd '$SERVER_HOME' && echo "'$$'" > '$PIDFILE' && exec '$JAVA_EXECUTABLE' $SERVER_JVMARGS $TLS_SWITCHES -classpath '${SERVER_ADDL_CLASSPATH}${HSQLDB_JAR_PATH}' org.hsqldb.util.MainInvoker org.hsqldb.$TARGET_CLASS $INVOC_ADDL_ARGS" >> "$LOGFILE" 2>&1 & + else + cd "$SERVER_HOME" || { + echo "Failed to cd to '$SERVER_HOME'" 1>&2 diff --git a/hsqldb.spec b/hsqldb.spec index c99f981..ff44769 100644 --- a/hsqldb.spec +++ b/hsqldb.spec @@ -38,7 +38,7 @@ Name: hsqldb Version: 1.8.0.8 -Release: 1jpp.3%{?dist} +Release: 1jpp.4%{?dist} Epoch: 1 Summary: Hsqldb Database Engine License: BSD Style @@ -269,6 +269,9 @@ fi %{_datadir}/%{name} %changelog +* Tue Oct 16 2007 Deepak Bhole 1.8.0.8-1jpp.4 +- Rebuild + * Tue Oct 16 2007 Deepak Bhole 1.8.0.8-1jpp.3 - Fix bz# 218135: Init script now specifies shell when starting service