From d07330f785b19207b9a185d3ffd92528c3c7274a Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Mon, 17 Apr 2000 01:08:36 +0000 Subject: Upgrade to Setiathome v2.4. This is an important upgrade, as old (v1) client data stopped being accepted some time ago. Please let me know if there's a change I've missed. PR: 16699, 17569, 17807 --- astro/setiathome/Makefile | 50 ++++------- astro/setiathome/distinfo | 8 +- astro/setiathome/files/setiathome.1 | 169 ++++++++++++++++++++++------------- astro/setiathome/files/setiathome.sh | 10 +-- astro/setiathome/files/xsetiathome.1 | 80 +++++++++++++++++ astro/setiathome/pkg-descr | 19 ---- astro/setiathome/pkg-install | 2 +- 7 files changed, 212 insertions(+), 126 deletions(-) create mode 100644 astro/setiathome/files/xsetiathome.1 (limited to 'astro') diff --git a/astro/setiathome/Makefile b/astro/setiathome/Makefile index cb57ec9b6af2..7655e271940a 100644 --- a/astro/setiathome/Makefile +++ b/astro/setiathome/Makefile @@ -3,14 +3,14 @@ # Whom: stb@freebsd.org # # $FreeBSD$ -# PORTNAME= setiathome -PORTVERSION= 1.2 +PORTVERSION= 2.4 CATEGORIES= astro -MASTER_SITES= http://setiathome.ssl.berkeley.edu/software/ \ - ftp://ftp.cdrom.com/pub/setiathome/ \ - http://people.FreeBSD.org/~stb/mirror/setiathome.ssl.berkeley.edu/software/ +MASTER_SITES= ftp://ftp.cdrom.com/pub/setiathome/ \ + ftp://alien.ssl.berkeley.edu/pub/ \ + ftp://setidata.ssl.berkeley.edu/pub/ \ + ftp://serendip.ssl.berkeley.edu/pub/ MAINTAINER= stb@freebsd.org @@ -20,40 +20,23 @@ EXTRACT_CMD= tar EXTRACT_BEFORE_ARGS= -xf EXTRACT_AFTER_ARGS= -MAN1= setiathome.1 +MAN1= setiathome.1 xsetiathome.1 .include -.if ${OSVERSION} >= 400000 -PORTVERSION= 1.1 -DISTFILES= setiathome-1.1.i386-unknown-freebsd4.0.tar -WRKSRC= setiathome-1.1.i386-unknown-freebsd4.0 -.elif ${OSVERSION} >= 320000 -DISTFILES= setiathome-1.2.i386-unknown-freebsd3.2.tar -WRKSRC= setiathome-1.2.i386-unknown-freebsd3.2 -.elif ${OSVERSION} >= 310000 -DISTFILES= setiathome-1.2.i386-unknown-freebsd3.1.tar -WRKSRC= setiathome-1.2.i386-unknown-freebsd3.1 -.elif ${OSVERSION} >= 228000 -DISTFILES= setiathome-1.2.i386-unknown-freebsd2.2.8.tar -WRKSRC= setiathome-1.2.i386-unknown-freebsd2.2.8 -.elif ${OSVERSION} >= 227000 -DISTFILES= setiathome-1.2.i386-unknown-freebsd2.2.7.tar -WRKSRC= setiathome-1.2.i386-unknown-freebsd2.2.7 +.if ${OSVERSION} >= 310000 +DISTFILES= setiathome-2.4.i386-unknown-freebsd3.3.tar +WRKSRC= setiathome-2.4.i386-unknown-freebsd3.3 .elif ${OSVERSION} >= 226000 -DISTFILES= setiathome-1.2.i386-unknown-freebsd2.2.6.tar -WRKSRC= setiathome-1.2.i386-unknown-freebsd2.2.6 +DISTFILES= setiathome-2.4.i386-unknown-freebsd2.2.8.tar +WRKSRC= setiathome-2.4.i386-unknown-freebsd2.2.8 .else DISTFILES= .endif .if make(makesum) || defined(FETCH_ALL) -DISTFILES= setiathome-1.2.i386-unknown-freebsd2.2.6.tar \ - setiathome-1.2.i386-unknown-freebsd2.2.7.tar \ - setiathome-1.2.i386-unknown-freebsd2.2.8.tar \ - setiathome-1.2.i386-unknown-freebsd3.1.tar \ - setiathome-1.2.i386-unknown-freebsd3.2.tar \ - setiathome-1.1.i386-unknown-freebsd4.0.tar +DISTFILES= setiathome-2.4.i386-unknown-freebsd2.2.8.tar \ + setiathome-2.4.i386-unknown-freebsd3.3.tar .endif NO_BUILD= "binary distribution" @@ -76,9 +59,10 @@ pre-fetch: fi; do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${WRKSRC}/setiathome ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FILESDIR}/setiathome.sh ${PREFIX}/etc/rc.d - ${INSTALL_MAN} ${FILESDIR}/setiathome.1 ${MAN1PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKDIR}/${WRKSRC}/setiathome ${PREFIX}/bin + ${INSTALL_SCRIPT} ${FILESDIR}/setiathome.sh ${PREFIX}/etc/rc.d + ${INSTALL_MAN} ${FILESDIR}/setiathome.1 ${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${FILESDIR}/xsetiathome.1 ${MAN1PREFIX}/man/man1 post-install: @PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \ diff --git a/astro/setiathome/distinfo b/astro/setiathome/distinfo index 976c85a88b40..88629dd28ce0 100644 --- a/astro/setiathome/distinfo +++ b/astro/setiathome/distinfo @@ -1,6 +1,2 @@ -MD5 (setiathome-1.2.i386-unknown-freebsd2.2.6.tar) = 003f80532dfa676cab5f4e4ca88d013d -MD5 (setiathome-1.2.i386-unknown-freebsd2.2.7.tar) = bc44188baaaa4c498243a06afe9b3398 -MD5 (setiathome-1.2.i386-unknown-freebsd2.2.8.tar) = 6080aa90f864a8fe9f18a2c3b56da2cb -MD5 (setiathome-1.2.i386-unknown-freebsd3.1.tar) = c83a6f13b3356565891558cf23a0207b -MD5 (setiathome-1.2.i386-unknown-freebsd3.2.tar) = 7fda39ff2927fb03c315cc50de8d200b -MD5 (setiathome-1.1.i386-unknown-freebsd4.0.tar) = c94f4935f85e3d68de066039063afd7f +MD5 (setiathome-2.4.i386-unknown-freebsd2.2.8.tar) = 2fe0d24be297a913998c3fc110d97ee4 +MD5 (setiathome-2.4.i386-unknown-freebsd3.3.tar) = 0d9bb4cc621388a008bf81b6dcd43068 diff --git a/astro/setiathome/files/setiathome.1 b/astro/setiathome/files/setiathome.1 index 44825af97d9a..b718c0d86601 100644 --- a/astro/setiathome/files/setiathome.1 +++ b/astro/setiathome/files/setiathome.1 @@ -1,4 +1,3 @@ -.\" Copyright status unkown .\" $FreeBSD$ .Dd May 19, 1999 .Dt setiathome 1 LOCAL @@ -11,40 +10,46 @@ .Op Ar options .Sh DESCRIPTION .Nm -is the +is the .Ux -version of the +version of the .Tn SETI@home -client. It downloads radio telescope data from a network server, analyzes -the data looking for signals of extraterrestrial origin, and uploads results -to the server, repeating this cycle indefinitely. See -http://setiahome.ssl.berkeley.edu/ for more information. +client. +It downloads radio telescope data from a network server, +analyzes the data looking for signals of extraterrestrial origin, +and uploads results to the server, repeating this cycle indefinitely. +See +.Li http://setiathome.berkeley.edu +for more information. .Pp The first time you run .Nm -it will interactively ask you for email address, name, country etc. This -info is stored in a file and no interaction is needed when you run the -program subsequently. +it will interactively +ask you for E-mail address, name, country etc. +This info is stored in a file and no interaction is +needed when you run the program subsequently. .Pp After this you can run .Nm -in the background, and direct its output to +in the background, +and direct its output to .Pa /dev/null if you like. .Pp .Nm -can be freely aborted and restarted. It saves its state in files, -and will pick up where it left off. +can be freely aborted and restarted. +It saves its state in files, and will pick up where it left off. .Pp -If you want to run multiple instances of setiathome +If you want to run multiple instances of +.Nm (on a multiprocessor machine, or on multiple machines -that share a filesystem) each one must be run -in a different directory. +that share a filesystem) each one must be run in a different directory. .Pp .Nm requires about 0.5\ MBytes of disk space per working directory, and about -12\ MBytes of memory per instance. If you have ample physical memory, it's work load -should be almost undetectable. Additionally, +15\ MBytes of memory per instance. +If you have ample physical memory, its work load should be almost undetectable. +Additionally, .Nm requires a permanent or .Dq dial on demand @@ -119,56 +124,88 @@ to .Va working directory .Li && setiathome -email >/dev/null .Ed +.Pp to the user's crontab. .Sh OPTIONS .Bl -tag -width countries .It Fl countries -Show list of country codes (a numeric country code must be entered during -registration). +Show list of country codes. .It Fl email -Send email (to the email address registered with -.Tn SETI@home ) -on errors. Useful if you run -.Nm -in the background with the output directed to +Send E-mail (to login E-mail address) on errors. +Useful if you run in background directed to .Pa /dev/null . +.It Fl graphics +Generate a data stream for the +.Xr xsetiathome 1 +graphical interface. .It Fl login -Log in to or register with -.Tn SETI@home . +Login or create new account. .It Fl nice Ar N -Set +Set .Xr nice 1 -priority to +priority to .Ar N (default 1). -.It Fl proxy Va hostname Ns Xo -.Op Li : Ns Va port -.Xc -Use the HTTP proxy server -.Ar hostname -at port -.Ar port -to download work units and upload results. Alternatively, you can set the -environment variable -.Ev HTTP_PROXY . +.It Fl nolock +Omit the multiple-instance check, which uses file locking +(not available on some NFS systems). +.It Fl proxy Ar hostname : Ns Ar port +Connect to +.Tn SETI@home +server via specified HTTP proxy server and port. +.It Fl socks_passwd Ar password +SOCKS +.Ar password . +.It Fl socks_server Ar hostname : Ns Ar port +Connect to +.Tn SETI@home +server via specified SOCKS server and port. +Overrides +.Ev SOCKS_SERVER . +SOCKS versions 4 and 5 are supported. +.It Fl socks_user Ar name +SOCKS user +.Ar name . .It Fl stop_after_process -Process the current work unit and exit before uploading the result. +Stop after processing current work unit. +Do not send result. .It Fl stop_after_xfer -Process the current work unit and upload the result, then exit. +Stop after current work unit has been sent to the SETI +server and a new work unit has been obtained. +(See also +.Pa stop_after_send.sah +mentioned in +.Sx FILES +below.) +.It Fl verbose +Print a running summary of the work being done. .It Fl version Show software version. .El .Sh ENVIRONMENT -.Bl -tag -width HTTP_PROXY +.Bl -tag -width SOCKS_SERVER .It Ev HTTP_PROXY -The address (in the form -.Do Va hostname Ns +If defined, +.Nm +will connect through a proxy server, specified as +.Do Ns Va hostname Ns .Op Li : Ns Va port -.Dc ) -of a HTTP proxy server to download work units and upload results via. +.Dc . +.It Ev SOCKS_SERVER +If defined, +.Nm +will connect through a SOCKS server, specified as +.Do Ns Va hostname Ns +.Op Li : Ns Va port +.Dc . +.It Ev SOCKS_USER , Ev SOCKS_PASSWD +If defined, these will be used as the login name and password +for the SOCKS server. +Otherwise +.Nm +will query you. .El .Sh FILES -.Pp .Bl -tag -width /var/db -compact .It Pa /usr/local/etc/setiathome.conf Optional configuration file for the start-up script. @@ -176,7 +213,7 @@ Optional configuration file for the start-up script. Start-up script. .It Pa /var/db/setiathome/ Primary working directory. -.It Pa /var/db/setiathome/user_info.txt +.It Pa /var/db/setiathome/user_info.sah Registration data. .It Pa /var/db/setiathome/ Ns Va n Ns Pa / Working directories for additional process @@ -184,30 +221,38 @@ Working directories for additional process (when running more than one instance). .It Pa /var/db/setiathome/ Ns Xo .Op Ns Va n Ns Pa / Ns -.Pa lock.txt +.Pa lock.sah .Xc Lock file to prevent multiple instances to work on the same data. .It Pa /var/db/setiathome/ Ns Xo .Op Ns Va n Ns Pa / Ns -.Pa *.txt +.Pa *.sah .Xc Working files. +These should not be modified. +.It Pa /var/db/setiathome/ Ns Xo +.Op Ns Va n Ns Pa / Ns +.Pa pid.sah +.Xc +The process ID of the current instance. +.It Pa /var/db/setiathome/ Ns Xo +.Op Ns Va n Ns Pa / Ns +.Pa stop_after_send.sah +.Xc +While the client is running, touch this file in the working directory +to finish up your current work unit, return your result, and not +download a new work unit. +When the processing is finished, and the result sent, the client will stop. .El -.Sh BUGS -As of version 1.1, the proxy setting ignores the -.Va port -argument in both the option and the environment variable. -.Pp -There is currently no easy way to run -.Nm -continuosly if you don't have a permanent or -.Dq dial on demand -Internet connection. +.Sh SEE ALSO +.Xr xsetiathome 1 .Sh AUTHORS .Tn SETI@home was developed by David Anderson, Jeff Cobb, Charles Congdon, Charlie Fenton, David Gedye, Kyle Granger, Eric Korpela, Matt Lebofsky, Peter Leiser, Brad Silen, Woody Sullivan, and Dan Werthimer. .Pp -.An Stefan Bethke -amended the original manual page for this FreeBSD port. +.An Stefan Bethke Aq stb@freebsd.org +amended the original manual page for this +.Fx +port. diff --git a/astro/setiathome/files/setiathome.sh b/astro/setiathome/files/setiathome.sh index 939cc9ad3310..9d65ed660257 100644 --- a/astro/setiathome/files/setiathome.sh +++ b/astro/setiathome/files/setiathome.sh @@ -35,9 +35,9 @@ case $1 in "unable to start: ${seti_wrkdir}/${i} is missing." exit 72 fi - if [ ! -f ${seti_wrkdir}/${i}/user_info.txt ]; then + if [ ! -f ${seti_wrkdir}/${i}/user_info.sah ]; then logger -sp daemon.err -t setiathome \ - "unable to start: please log in to SETI@home first. (${seti_wrkdir}/${i}/user_info.txt is missing.)" + "unable to start: please log in to SETI@home first. (${seti_wrkdir}/${i}/user_info.sah is missing.)" exit 72 fi done @@ -57,7 +57,7 @@ case $1 in mkdir -p ${seti_wrkdir} chown ${seti_user} ${seti_wrkdir} chmod u=Xrw,g=Xr,o=Xr ${seti_wrkdir} - if [ -f ${seti_wrkdir}/user_info.txt ]; then + if [ -f ${seti_wrkdir}/user_info.sah ]; then echo " It seems you have already registered with SETI@home. Would you like" echo -n " to repeat the procedure? [Y/n] " read a @@ -78,8 +78,8 @@ case $1 in chown ${seti_user} ${seti_wrkdir}/${i} chmod 755 ${seti_wrkdir}/${i} # Assume the user want's all processes to run with the same registration - rm -f ${seti_wrkdir}/${i}/user_info.txt - ln -sf ../user_info.txt ${seti_wrkdir}/${i} + rm -f ${seti_wrkdir}/${i}/user_info.sah + ln -sf ../user_info.sah ${seti_wrkdir}/${i} i=`expr ${i} - 1` done fi diff --git a/astro/setiathome/files/xsetiathome.1 b/astro/setiathome/files/xsetiathome.1 new file mode 100644 index 000000000000..2e4849407b57 --- /dev/null +++ b/astro/setiathome/files/xsetiathome.1 @@ -0,0 +1,80 @@ +.\" $FreeBSD$ +.Dd Feb 13, 2000 +.Dt xsetiathome 1 LOCAL +.Os FreeBSD +.Sh NAME +.Nm xsetiathome +.Nd display SETI data under X Windows +.Sh SYNOPSIS +.Nm +.Op Fl fullscreen +.Sh DESCRIPTION +.Nm +is a graphical display for +.Xr setiathome 1 . +To use it you must run +.Xr setiathome 1 +with the +.Fl graphics +flag. +.Pp +A typical invocation of +.Nm +will look like this: +.Bd -literal -offset indent +% setiathome -graphics & +% xsetiathome +.Ed +.Pp +Alternatively, +.Nm +can be executed in screensaver mode, +which requires an external application such as +.Xr xautolock 1 . +.Sh OPTIONS +.Bl -tag -width fullscreenx +.It Fl fullscreen +Take over the entire display. +When running in this mode, any mouse presses will exit the application. +.El +.Sh SEE ALSO +.Xr setiathome 1 +.Sh BUGS +Please note, this +.Nm +binary is an initial experiment. +We are fully aware that it may have some significant bugs and +we are continuing to work on it. +Please do not report bugs on this binary at this time. +.Pp +Only one instance of +.Ic setiathome -graphics +can be operating at any one time on a system. +There is no conflict resolution with the allocated shared memory +segments and semaphores. +Therefore, only one instance of +.Nm +is practical. +.Pp +Outstanding shared memory segments and semaphores may be left +active in case of an abnormal exit of the +.Ic setiathome -graphics +process. +These can prevent any future invocation of +.Ic setiathome -graphics . +To resolve this problem, use +.Xr ipcs 1 +and +.Xr ipcrm 1 +to remove shared memory segments and semaphores that +are not associated with a process. +This behavior may vary depending upon how your +.Ux +system handles this situation. +.Pp +The +.Nm +process may affect system performance adversely. +This behavior may vary depending upon your version of the +X11 Window System client libraries and/or your X server +and its operating mode/visual depth. diff --git a/astro/setiathome/pkg-descr b/astro/setiathome/pkg-descr index 6839e292aaa7..51cae75ef8b7 100644 --- a/astro/setiathome/pkg-descr +++ b/astro/setiathome/pkg-descr @@ -5,23 +5,4 @@ program that downloads and analyzes radio telescope data. There's a small but captivating possibility that your computer will detect the faint murmur of a civilization beyond Earth. -This package includes an interactive install script which allows you to -set up a working directory under /var/db/setiathome, register with or -log in to SETI@home, and arranges for setiathome to be started at -system start-up. In this case, setiathome will be executed as user -`nobody'. - -setiathome will run at nice level 1 by default, with a single process. -If you are running a SMP system and therefore would like to run one -process per CPU, or would like setiathome to run under another user ID, -you have to set it up manually. - -setiathome requires about 0.5 MBytes disk space in its working -directory, and about 12 MBytes of memory. If you have ample physical -memory, it's work load should be almost undetectable. - -setiathome is a binary distribution currently available for FreeBSD -2.2.6, 2.2.7, 2.2.8, 3.1, and 4.0. Newer versions of FreeBSD should be able -to run older binaries. - WWW: http://setiathome.ssl.berkeley.edu/ diff --git a/astro/setiathome/pkg-install b/astro/setiathome/pkg-install index bcf6e0053a7b..57750ccf755b 100644 --- a/astro/setiathome/pkg-install +++ b/astro/setiathome/pkg-install @@ -51,7 +51,7 @@ case $2 in ${RCD} register - if [ ! -f ${DBDIR}/user_info.txt ]; then + if [ ! -f ${DBDIR}/user_info.sah ]; then echo "unable to start setiathome: it seems registration or login failed." exit 0 fi -- cgit v1.2.3