ports/63668: Maintainer update: misc/upclient (wonko -> hostingwired)
Cyrille Lefevre
cyrille.lefevre at laposte.net
Wed Mar 3 00:20:11 UTC 2004
>Number: 63668
>Category: ports
>Synopsis: Maintainer update: misc/upclient (wonko -> hostingwired)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 02 16:20:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sat Jan 31 15:17:05 CET 2004 root at gits:/disk3/freebsd/current/obj/disk3/freebsd/current/src/sys/CUSTOM i386
>Description:
Makefile
PORTREVISION bumped
MASTER_SITE_SOURCEFORGE added to MASTER_SITES
MASTER_SITE_SUBDIR added
USE_RC_SUBR added
*_SUB added
pkg-descr
WWW updated
pkg-message
uptimes.wonko.com -> uptimes.hostingwired.com
pkg-plist
share/doc/upclient -> %%DOCSDIR%%
files/patch-aa (src/Makefile)
ditto pkg-message
files/patch-options.c
ditto pkg-message
files/upclient.sh
converted to rc.subr
files/patch-upclient.man
new file
>How-To-Repeat:
uptimes.wonko.com is dead.
>Fix:
take care, ths patch is in two parts, the first one is
a diff against /dev/null and the second one, a cvs diff.
--- /dev/null Wed Mar 3 00:45:37 2004
+++ files/patch-upclient.man Wed Mar 3 00:46:38 2004
@@ -0,0 +1,20 @@
+--- src/man/upclient.man.orig Tue May 27 09:03:42 2003
++++ src/man/upclient.man Wed Mar 3 00:46:01 2004
+@@ -67,7 +67,7 @@
+
+ .Sh GETTING STARTED \" Section Header - required - don't modify
+ 1. Create an account at:
+-.Ar http://uptimes.wonko.com/ .
++.Ar http://uptimes.hostingwired.com/ .
+ 2. Add a host, this gives you an authorization key.
+ 3. Paste your auth key into
+ .Pa __CONFIGFILE__ .
+@@ -75,7 +75,7 @@
+ .Op sudo
+ .Ic __SBINDIR__/__BINNAME__.
+ 5. Visit your account at
+-.Ar http://uptimes.wonko.com/
++.Ar http://uptimes.hostingwired.com/
+ to view your
+ machine's status and other collected statistics.
+ .Pp
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/upclient/Makefile,v
retrieving revision 1.26
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.26 Makefile
--- Makefile 23 Jan 2004 18:12:13 -0000 1.26
+++ Makefile 2 Mar 2004 15:11:55 -0000
@@ -7,9 +7,11 @@
PORTNAME= upclient
PORTVERSION= 5.0.b8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= http://uptimes.wonko.com/files/
+MASTER_SITES= http://uptimes.hostingwired.com/files/ \
+ ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= cyrille.lefevre at laposte.net
@@ -21,6 +23,7 @@
LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_REINPLACE= yes
+USE_RC_SUBR= yes
ALL_TARGET= bsd
BUILD_WRKSRC= ${WRKSRC}/src
@@ -32,6 +35,10 @@
# Local variables
#
+REINPLACE_SUB= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
+RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+PKGMESSAGE_SUB= PREFIX=${PREFIX}
+
DOC_FILES= AUTHORS COPYING FAQ HISTORY INSTALL README TODO
DOC_FILES+= doc/UptimesProtocol5
DOC_FILES+= HISTORY-BETA
@@ -49,16 +56,20 @@
# Post-patch
#
-post-patch: patch-prefix patch-pkgmessage
+post-patch: patch-inplace patch-startup patch-pkgmessage
-patch-prefix:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
- -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+patch-inplace:
+ @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/clientchk \
${WRKSRC}/src/Makefile
+patch-startup:
+ @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/upclient.sh > ${WRKDIR}/upclient.sh
+
patch-pkgmessage:
- @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
+ @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${MSG_FILE} > ${PKGMESSAGE}
# Install
#
@@ -97,7 +108,7 @@
.endif
install-startup:
- @${INSTALL_SCRIPT} ${FILESDIR}/upclient.sh \
+ @${INSTALL_SCRIPT} ${WRKDIR}/upclient.sh \
${PREFIX}/etc/rc.d/upclient.sh
install-doc:
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/misc/upclient/pkg-descr,v
retrieving revision 1.4
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.4 pkg-descr
--- pkg-descr 19 Nov 2001 06:38:25 -0000 1.4
+++ pkg-descr 2 Mar 2004 14:57:22 -0000
@@ -2,4 +2,4 @@
sends it to a server where you can compare it to many other hosts and
browse through various statistical information.
-WWW: http://uptimes.wonko.com/
+WWW: http://upclient.sourceforge.net
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/misc/upclient/pkg-message,v
retrieving revision 1.4
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.4 pkg-message
--- pkg-message 19 Nov 2001 06:38:25 -0000 1.4
+++ pkg-message 2 Mar 2004 23:29:31 -0000
@@ -1,9 +1,9 @@
Before running the client for the first time, be sure to:
1. visit the Uptimes project's web site and register yourself
- (WWW: http://uptimes.wonko.com/newuser.php).
- 2. log in (WWW: http://uptimes.wonko.com/).
- 3. Add your host (WWW: http://uptimes.wonko.com/hosts.php?op=add).
+ (WWW: http://uptimes.hostingwired.com/newuser.php).
+ 2. log in (WWW: http://uptimes.hostingwired.com/login.php).
+ 3. Add your host (WWW: http://uptimes.hostingwired.com/account.php).
It is very important that you do not lose the generated key
since, for instance, they are no way to get it back by any way.
@@ -14,10 +14,10 @@
- AuthKey is the ID you've received when you added your host.
- Interval is the amount of time between each update.
- (WWW: http://uptimes.wonko.com/uptimes42.html).
+ (WWW: http://uptimes.hostingwired.com/protocol.html).
Don't set this higher than 10 minutes, or else your host
won't appear in the list.
- UptimeServer is the Uptimes Project's data server, currently
- uptimes.wonko.com (Since the official Uptimes Project's data
- server has been terminated, data.uptimes.net must not be used
- anymore. So, please, take care about that).
+ uptimes.hostingwired.com (Since the official Uptimes Project's
+ server has been terminated, uptimes.wonko.com and data.uptimes.net
+ must not be used anymore. So, please, take care about that).
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/misc/upclient/pkg-plist,v
retrieving revision 1.6
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.6 pkg-plist
--- pkg-plist 14 Feb 2003 00:16:51 -0000 1.6
+++ pkg-plist 30 Jul 2003 19:56:36 -0000
@@ -6,18 +6,18 @@
sbin/clientchk
sbin/upchk
sbin/upclient
-%%PORTDOCS%%share/doc/upclient/AUTHORS
-%%PORTDOCS%%share/doc/upclient/COPYING
-%%PORTDOCS%%share/doc/upclient/FAQ
-%%PORTDOCS%%share/doc/upclient/HISTORY
-%%PORTDOCS%%share/doc/upclient/HISTORY-BETA
-%%PORTDOCS%%share/doc/upclient/INSTALL
-%%PORTDOCS%%share/doc/upclient/README
-%%PORTDOCS%%share/doc/upclient/TODO
-%%PORTDOCS%%share/doc/upclient/UptimesProtocol5
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY-BETA
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UptimesProtocol5
share/locale/de/LC_MESSAGES/upclient.mo
share/locale/es/LC_MESSAGES/upclient.mo
share/locale/fr/LC_MESSAGES/upclient.mo
share/locale/it/LC_MESSAGES/upclient.mo
share/locale/nl/LC_MESSAGES/upclient.mo
-%%PORTDOCS%%@dirrm share/doc/upclient
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/misc/upclient/files/patch-aa,v
retrieving revision 1.7
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.7 patch-aa
--- files/patch-aa 12 Jun 2003 01:31:42 -0000 1.7
+++ files/patch-aa 2 Mar 2004 23:42:26 -0000
@@ -1,6 +1,12 @@
---- src/Makefile.orig Wed Dec 18 01:01:16 2002
-+++ src/Makefile Mon Feb 3 20:18:03 2003
-@@ -46,7 +46,7 @@
+--- src/Makefile.orig Tue May 27 09:13:02 2003
++++ src/Makefile Wed Mar 3 00:41:50 2004
+@@ -41,12 +41,12 @@
+ binname = upclient
+
+ # Uptimes Server
+-uptimes_server = uptimes.wonko.com
++uptimes_server = uptimes.hostingwired.com
+
OPTIMIZATION_CFLAGS=-O3
# System directories
Index: files/patch-options.c
===================================================================
RCS file: /home/ncvs/ports/misc/upclient/files/patch-options.c,v
retrieving revision 1.5
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.5 patch-options.c
--- files/patch-options.c 3 Jan 2003 06:35:32 -0000 1.5
+++ files/patch-options.c 2 Mar 2004 23:47:43 -0000
@@ -1,5 +1,5 @@
---- src/options.c.orig Sat Nov 30 03:27:15 2002
-+++ src/options.c Wed Dec 18 01:43:00 2002
+--- src/options.c.orig Tue May 27 09:03:43 2003
++++ src/options.c Wed Mar 3 00:47:28 2004
@@ -60,7 +60,7 @@
* Minimum value is enforced. A warning is logged if greater than upper limit.
*/
@@ -9,3 +9,12 @@
#define UPPER_INTERVAL 600 /* warning if exceeded */
/* Macros */
+@@ -79,7 +79,7 @@
+ * These are the configuration options available.
+ */
+ char cfg_authkey[AUTHKEY_REQUIRED_LEN + 1] = "";
+-char cfg_upserver[UPSERVER_MAXLEN + 1] = "uptimes.wonko.com";
++char cfg_upserver[UPSERVER_MAXLEN + 1] = "uptimes.hostingwired.com";
+ long int cfg_interval = DEFAULT_INTERVAL;
+ char cfg_pidfile[PIDFILE_MAXLEN + 1] = PIDFILE;
+ char cfg_proxyserver[PROXYSERVER_MAXLEN + 1] = "";
Index: files/upclient.sh
===================================================================
RCS file: /home/ncvs/ports/misc/upclient/files/upclient.sh,v
retrieving revision 1.4
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.4 upclient.sh
--- files/upclient.sh 14 Feb 2003 00:16:51 -0000 1.4
+++ files/upclient.sh 3 Mar 2004 00:06:54 -0000
@@ -2,89 +2,51 @@
#
# $FreeBSD: ports/misc/upclient/files/upclient.sh,v 1.3 2003/01/03 06:35:32 petef Exp $
#
-# Start or stop upclient.
+# PROVIDE: upclient
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
+#
+# Add the following line to /etc/rc.conf to enable upclient:
+#
+# upclient_enable="YES"
#
-rc_file=${0##*/}
-rc_arg=$1
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${rc_file}\$"); then
- echo "${rc_file}: Cannot determine PREFIX." >&2
- echo "Please use the complete pathname." >&2
- exit 64
-fi
-
-program_dir=${PREFIX}/sbin
-program_file=upclient
-program_path=${program_dir}/${program_file}
-
-config_dir=${PREFIX}/etc
-config_file=${program_file}.conf
-config_path=${config_dir}/${config_file}
-
-sample_path=${config_path}.sample
-
-pid_dir=/var/run
-pid_file=${program_file}.pid
-pid_path=${pid_dir}/${pid_file}
-
-syslog_facility=daemon.err
-
-case "$rc_arg" in
-start)
- if [ ! -x ${program_path} ]; then
- logger -sp ${syslog_facility} -t ${program_file} \
- "unable to start: ${program_path} is missing."
- exit 72
- fi
- if [ ! -f ${config_path} ]; then
- logger -sp ${syslog_facility} -t ${program_file} \
- "unable to start: ${config_path} is missing."
- exit 72
- fi
+upclient_precmd ()
+{
ws=" "
- if ! grep -qs "^[$ws]*AuthKey[$ws]*=" ${config_path}; then
- logger -sp ${syslog_facility} -t ${program_file} \
- "unable to start: AuthKey is missing from" \
- "${config_path}."
- exit 72
- fi
- if grep -qs "^[$ws]*AuthKey[$ws]*=[$ws]*your_authkey" ${config_path}
- then
- logger -sp ${syslog_facility} -t ${program_file} \
- "unable to start: AuthKey isn't configured in" \
- "${config_path}."
- exit 72
- fi
+ grep -qs "^[$ws]*AuthKey[$ws]*=" ${configfile} ||
+ err 1 "AuthKey is missing from ${configfile}."
+ grep -qs "^[$ws]*AuthKey[$ws]*=[$ws]*your_authkey" ${configfile} &&
+ err 1 "AuthKey isn't configured in ${configfile}."
+
+ hn=uptimes.wonko.com
+ egrep -qs "^[$ws]*UptimeServer[$ws]*=[$ws]*${hn}[$ws]*" ${configfile} &&
+ err 1 "${configfile} needs to be updated from ${samplefile}."
+
kw="IdleTime|OS|(OS|CPU)Level"
- if egrep -qs "^[$ws]*Send($kw)[$ws]*=" ${config_path}
- then
- logger -sp ${syslog_facility} -t ${program_file} \
- "unable to start: ${config_path} needs to be updated" \
- "from ${sample_path}."
- exit 72
- fi
- ${program_path} 2> /dev/null &&
- echo -n " ${program_file}"
- ;;
-stop)
- if [ -r ${pid_path} ]; then
- kill $(cat ${pid_path}) 2> /dev/null
- else
- killall ${program_file} 2> /dev/null
- fi
- ;;
-restart)
- $0 stop
- $0 start
- ;;
-status)
- ps -auxww | egrep ${program_file} | egrep -v "($0|egrep)"
- ;;
-*)
- echo "usage: ${rc_file} {start|stop|restart|status}" >&2
- exit 64
- ;;
-esac
+ egrep -qs "^[$ws]*Send($kw)[$ws]*=" ${configfile} &&
+ err 1 "${configfile} needs to be updated from ${samplefile}."
+
+ :
+}
+
+upclient_enable=NO
+upclient_flags=
+
+. /etc/rc.subr
+
+name=upclient
+rcvar=$(set_rcvar)
+
+# private
+configfile=%%PREFIX%%/etc/${name}.conf
+samplefile=${configfile}.sample
+
+# public
+command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
+required_files=${configfile}
+start_precmd=${name}_precmd
-exit 0
+load_rc_config ${name}
+run_rc_command "$1"
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list