Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 76932 by Eric Sandall for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 76932 by Eric Sandall for review
  • Date: Tue, 28 Mar 2006 21:50:03 +0100 (BST)

Change 76932 by eric_sandall@sandalle-moby on 2006/03/28 21:45:48

* More cleanup.
* Now no longer uses `su` (thanks Jeremy)
* Runs as boinc user (setuid/setgid) if the user wants, otherwise
root

Affected files ...

... //sgl/grimoires/devel/science/boinc/BUILD#5 edit
... //sgl/grimoires/devel/science/boinc/CONFIGURE#2 edit
... //sgl/grimoires/devel/science/boinc/DETAILS#3 edit
... //sgl/grimoires/devel/science/boinc/HISTORY#13 edit
... //sgl/grimoires/devel/science/boinc/INSTALL#1 add
... //sgl/grimoires/devel/science/boinc/PRE_BUILD#4 edit
... //sgl/grimoires/devel/science/boinc/init.d/boinc#5 edit
... //sgl/grimoires/devel/science/boinc/init.d/boinc.conf#2 edit

Differences ...

==== //sgl/grimoires/devel/science/boinc/BUILD#5 (xtext) ====

@@ -1,4 +1,3 @@
-create_account boinc '/var/lib/boinc' &&
if [[ $BOINC_PARTS == client || $BOINC_PARTS == both ]]
then
OPTS="$OPTS --enable-client"

==== //sgl/grimoires/devel/science/boinc/CONFIGURE#2 (xtext) ====

@@ -1,2 +1,4 @@
-config_query_list BOINC_PARTS "Which part of boinc would you like to build?"
\
- both client server
+config_query_list BOINC_PARTS "Which part of boinc would you like to build?"
\
+ both client server
&&
+
+config_query BOINC_SETUID "Install boinc_client-cvs setuid/setgid so it
always runs as the boinc user?" y

==== //sgl/grimoires/devel/science/boinc/DETAILS#3 (xtext) ====

@@ -11,7 +11,7 @@

SOURCE_URL[0]=cvs://:pserver:anonymous:@alien.ssl.berkeley.edu:/home/cvs/cvsroot:boinc:stable
SOURCE_IGNORE=volatile
LICENSE[0]=GPL
- PATCHLEVEL=1
+ PATCHLEVEL=2
BUILD_API=2
WEB_SITE=http://boinc.berkeley.edu/
ENTERED=20010922

==== //sgl/grimoires/devel/science/boinc/HISTORY#13 (text) ====

@@ -2,14 +2,24 @@
* DETAILS: Added PATCHLEVEL so people get the boinc init script (if
they
haven't already) and so people with the current init script get the
fixed
version (also so wxgtk-no-unicode gets marked as optional ;)).
+ Set PATCHLEVEL=2 for yet more changes/fixes
+ * CONFIGURE: Ask if the user wants boinc_client-cvs setuid (for it to
work
+ 'out of the box' this defaults to 'y').
* DEPENDS: Made wxgtk-no-unicode optional (again...)
Added missing '&&' after first if/fi
Added dependencies on zlib and openssl
Note that the usage of libdn is through curl, not directly through
boinc
- * init.d/boinc: Fixed missing quote
- BOINC_PRAMS -> BOINC_PARMS
+ * PRE_BUILD,BUILD: Moved create_account from BUILD to PRE_BUILD
+ * INSTALL: Setuid/setgid /usr/bin/boinc_client-cvs (if the user wants
us to)
+ * init.d/boinc: BOINC_PRAMS -> BOINC_PARMS
Removed unecessary '-r' in rm for PIDFILE
- Removed quotes around the `su - boinc -c ...` command
+ Removed the usage of `su`, the client now runs as the user who runs
it
+ (or 'boinc' if the user answered 'y' to making it setuid)
+ No longer need to cd to $BOINC_HOME
+ Replace $NAME with 'boinc' as that's the name of the script, not
+ boinc_client-cvs
+ Added restart()
+ * init.d/boinc.conf: Removed BOINC_USER variable (no longer used)

2006-03-26 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: added patch for loss of presision when type casting a
void

==== //sgl/grimoires/devel/science/boinc/PRE_BUILD#4 (xtext) ====

@@ -1,4 +1,5 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/shmem-type-cast-presision-loss.patch &&
+create_account boinc '/var/lib/boinc' &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/shmem-type-cast-presision-loss.patch &&
./_autosetup

==== //sgl/grimoires/devel/science/boinc/init.d/boinc#5 (xtext) ====

@@ -27,19 +27,24 @@
if ! [ -e ${BOINC_HOME} ]; then
mkdir -p ${BOINC_HOME}
chown boinc:boinc ${BOINC_HOME}
- echo "Starting $NAME..."
+ echo "Starting boinc..."
cd ${BOINC_HOME}
- su - ${BOINC_USER} -c cd ${BOINC_HOME}; exec ${PROGRAM} ${ARGS}
-attach_project ${BOINC_URL} ${BOINC_KEY} ${BOINC_PARMS} >> ${BOINC_LOG}
2>>${$BOINC_ERROR} &
+ ${PROGRAM} ${ARGS} -attach_project ${BOINC_URL} ${BOINC_KEY}
${BOINC_PARMS} >> ${BOINC_LOG} 2>>${$BOINC_ERROR} &
else
- echo "Starting $NAME..."
+ echo "Starting boinc..."
cd ${BOINC_HOME}
- su - ${BOINC_USER} -c cd ${BOINC_HOME}; exec ${PROGRAM} ${ARGS}
${BOINC_PARMS} >> ${BOINC_LOG} 2>>${BOINC_ERROR} &
+ ${PROGRAM} ${ARGS} ${BOINC_PARMS} >> ${BOINC_LOG} 2>>${BOINC_ERROR} &
fi
}

function stop() {
- echo "Stopping $NAME..."
+ echo "Stopping boinc..."
killall -HUP ${PROGRAM}
rm -f ${PIDFILE}
}

+function restart() {
+ stop &&
+ sleep 2 &&
+ start
+}

==== //sgl/grimoires/devel/science/boinc/init.d/boinc.conf#2 (text) ====

@@ -1,5 +1,4 @@
BOINC_HOME='/var/lib/boinc'
-BOINC_USER='boinc'
BOINC_URL=''
BOINC_KEY=''
BOINC_LOGDIR=/var/log/boinc



  • [SM-Commit] PERFORCE change 76932 by Eric Sandall for review, Perforce Review Daemon, 03/28/2006

Archive powered by MHonArc 2.6.24.

Top of Page