From e21781df2ef6bfdb1a650bab5298b0261c8f7d3c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 26 Feb 2013 23:48:35 -0600 Subject: Update package names and fix library FTBFS --- servers/auth_server_lin/debian/changelog | 2 +- servers/auth_server_lin/debian/control | 10 +- .../debian/remotefpga-authserver.init | 108 --------------------- .../auth_server_lin/debian/ulab-authserver.init | 108 +++++++++++++++++++++ servers/auth_server_lin/src/main.cpp | 4 +- 5 files changed, 116 insertions(+), 116 deletions(-) delete mode 100644 servers/auth_server_lin/debian/remotefpga-authserver.init create mode 100644 servers/auth_server_lin/debian/ulab-authserver.init (limited to 'servers/auth_server_lin') diff --git a/servers/auth_server_lin/debian/changelog b/servers/auth_server_lin/debian/changelog index eeaccb1..9302e69 100644 --- a/servers/auth_server_lin/debian/changelog +++ b/servers/auth_server_lin/debian/changelog @@ -1,4 +1,4 @@ -remotefpga-authserver (0.5-0ubuntu0) karmic; urgency=low +ulab-authserver (0.5-0ubuntu0) karmic; urgency=low * Karmic rebuild diff --git a/servers/auth_server_lin/debian/control b/servers/auth_server_lin/debian/control index 7d604b9..894a4dd 100644 --- a/servers/auth_server_lin/debian/control +++ b/servers/auth_server_lin/debian/control @@ -1,12 +1,12 @@ -Source: remotefpga-authserver +Source: ulab-authserver Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 -Package: remotefpga-authserver +Package: ulab-authserver Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: RemoteFPGA Authentication Server - RemoteFPGA Authentication Server +Description: uLab Authentication Server + uLab Authentication Server diff --git a/servers/auth_server_lin/debian/remotefpga-authserver.init b/servers/auth_server_lin/debian/remotefpga-authserver.init deleted file mode 100644 index d691efb..0000000 --- a/servers/auth_server_lin/debian/remotefpga-authserver.init +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: remotefpga-authserver -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Should-Start: console-screen kbd acpid hal krb5-kdc nis -# Should-Stop: console-screen kbd -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: RemoteFPGA Authentication Server -# Description: RemoteFPGA Authentication Server -### END INIT INFO -# /etc/init.d/remotefpga-authserver: start or stop the RemoteFPGA Authentication Server -# -# description: RemoteFPGA Authentication Server -# - -. /lib/lsb/init-functions - -set -e - -PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/opt/trinity/bin/remotefpga_authserver -PIDFILE=/var/run/remotefpga_authserver.pid -UPGRADEFILE=/var/run/remotefpga_authserver.upgrade - -DESC="RemoteFPGA Authentication Server" - -# If we upgraded the daemon, we can't use the --exec argument to -# start-stop-daemon since the inode will have changed. The risk here is that -# in a situation where the daemon died, its pidfile was not cleaned up, and -# some other process is now running under that pid, start-stop-daemon will send -# signals to an innocent process. However, this seems like a corner case. -# C'est la vie! -if [ -e $UPGRADEFILE ]; then - SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON" -else - SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON" -fi - -stillrunning () { - if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then - true - else - # if the daemon does not remove its own pidfile, we will - rm -f $PIDFILE $UPGRADEFILE - false - fi; -} - -case "$1" in - start) - log_action_begin_msg "Starting $DESC" - if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then - log_action_end_msg 0 - else - log_warning_msg "already running" - log_action_end_msg 0 - fi - ;; - - restart) - /etc/init.d/remotefpga-authserver stop - if [ -f $PIDFILE ]; then - if stillrunning; then - exit 1 - fi - fi - /etc/init.d/remotefpga-authserver start - ;; - - reload) - log_action_begin_msg "Reloading $DESC" - if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then - log_action_end_msg 0 - else - log_failure_msg "not running" - log_action_end_msg 1 - fi - ;; - - force-reload) - /etc/init.d/remotefpga-authserver reload - ;; - - stop) - log_action_begin_msg "Stopping $DESC" - if [ ! -f $PIDFILE ]; then - log_failure_msg "Not running ($PIDFILE not found)" - log_action_end_msg 0 - exit 0 - else - if start-stop-daemon --stop --quiet $SSD_ARGS; then - log_action_end_msg 0 - else - log_failure_msg "not running" - log_action_end_msg 1 - fi - fi - ;; - - *) - echo "Usage: /etc/init.d/remotefpga-authserver {start|stop|restart|reload|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/servers/auth_server_lin/debian/ulab-authserver.init b/servers/auth_server_lin/debian/ulab-authserver.init new file mode 100644 index 0000000..61f0b33 --- /dev/null +++ b/servers/auth_server_lin/debian/ulab-authserver.init @@ -0,0 +1,108 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ulab-authserver +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Should-Start: console-screen kbd acpid hal krb5-kdc nis +# Should-Stop: console-screen kbd +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: uLab Authentication Server +# Description: uLab Authentication Server +### END INIT INFO +# /etc/init.d/ulab-authserver: start or stop the uLab Authentication Server +# +# description: uLab Authentication Server +# + +. /lib/lsb/init-functions + +set -e + +PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin +DAEMON=/opt/trinity/bin/remotefpga_authserver +PIDFILE=/var/run/remotefpga_authserver.pid +UPGRADEFILE=/var/run/remotefpga_authserver.upgrade + +DESC="uLab Authentication Server" + +# If we upgraded the daemon, we can't use the --exec argument to +# start-stop-daemon since the inode will have changed. The risk here is that +# in a situation where the daemon died, its pidfile was not cleaned up, and +# some other process is now running under that pid, start-stop-daemon will send +# signals to an innocent process. However, this seems like a corner case. +# C'est la vie! +if [ -e $UPGRADEFILE ]; then + SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON" +else + SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON" +fi + +stillrunning () { + if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then + true + else + # if the daemon does not remove its own pidfile, we will + rm -f $PIDFILE $UPGRADEFILE + false + fi; +} + +case "$1" in + start) + log_action_begin_msg "Starting $DESC" + if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then + log_action_end_msg 0 + else + log_warning_msg "already running" + log_action_end_msg 0 + fi + ;; + + restart) + /etc/init.d/ulab-authserver stop + if [ -f $PIDFILE ]; then + if stillrunning; then + exit 1 + fi + fi + /etc/init.d/ulab-authserver start + ;; + + reload) + log_action_begin_msg "Reloading $DESC" + if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then + log_action_end_msg 0 + else + log_failure_msg "not running" + log_action_end_msg 1 + fi + ;; + + force-reload) + /etc/init.d/ulab-authserver reload + ;; + + stop) + log_action_begin_msg "Stopping $DESC" + if [ ! -f $PIDFILE ]; then + log_failure_msg "Not running ($PIDFILE not found)" + log_action_end_msg 0 + exit 0 + else + if start-stop-daemon --stop --quiet $SSD_ARGS; then + log_action_end_msg 0 + else + log_failure_msg "not running" + log_action_end_msg 1 + fi + fi + ;; + + *) + echo "Usage: /etc/init.d/ulab-authserver {start|stop|restart|reload|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/servers/auth_server_lin/src/main.cpp b/servers/auth_server_lin/src/main.cpp index e0183ee..33b6ccd 100644 --- a/servers/auth_server_lin/src/main.cpp +++ b/servers/auth_server_lin/src/main.cpp @@ -45,13 +45,13 @@ static const TDECmdLineOptions options[] = { 0, 0, 0 } }; -static const char description[] = I18N_NOOP("RemoteFPGA Kerberos Authentication Server"); +static const char description[] = I18N_NOOP("uLab Kerberos Authentication Server"); static const char version[] = "v0.0.1"; int main(int argc, char *argv[]) { - TDEAboutData aboutData( "remotefpga_auth_server", I18N_NOOP("RemoteFPGA AuthServer"), + TDEAboutData aboutData( "remotefpga_auth_server", I18N_NOOP("uLab AuthServer"), version, description, TDEAboutData::License_GPL, "(c) 2012-2013, Timothy Pearson"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); -- cgit v1.2.1