From f9782f85a5031623828707b251e23db4d142285a Mon Sep 17 00:00:00 2001 From: Alex Landau Date: Sun, 31 Jan 2010 14:27:04 +0000 Subject: * call /sbin/rapidbox instead of "rapidbox" on centos - this fixes the GUI problem * properly excape error messages in the makefile * do install the bash completion (makefile) * bump version to 1.02 (debian version unchanged, only spec) git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@7727 283159da-0705-0410-b60c-f2062b4bb6ad --- Makefile | 4 ++-- debian/changelog | 6 ++++++ rapid-tunneling | 2 +- rapid-tunneling.spec | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c888ea8..e49ccc4 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PACKAGE = rapid-tunneling SPEC = rapid-tunneling.spec SCRIPTS = rapid-tunneling rapid-tunneling-status rtadm rt-from-remote -CONFIGS = rtadm.config sshd_support_config support_env rapid-tunneling.conf gui.htpasswd +CONFIGS = rtadm.config sshd_support_config support_env rapid-tunneling.conf gui.htpasswd rtadm.bash_completion INIT_D = sshd_support GUI = gui SOURCES = Makefile $(SPEC) $(SCRIPTS) $(CONFIGS) $(INIT_D) $(GUI) \ @@ -41,7 +41,7 @@ SOURCES/$(PACKAGE)-$(VER).tar.gz: $(SOURCES) checkver: ifneq ($(VER),$(DEB_VER)) - @echo Version in $(SPEC) ($(VER)) conflicts with version in debian/changelog ($(DEB_VER)); exit 1 + @echo "Version in $(SPEC) ($(VER)) conflicts with version in debian/changelog ($(DEB_VER))"; exit 1 endif install: diff --git a/debian/changelog b/debian/changelog index 935d518..0d28cca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rapid-tunneling (1.02) unstable; urgency=low + + * Fixed busybox path in rapid-recovery script under Centos + + -- Diego Iastrubni Sun, 01 Jan 2010, 15:51:00 +0200 + rapid-tunneling (1.01) unstable; urgency=low * Initial release diff --git a/rapid-tunneling b/rapid-tunneling index acc9552..c79b844 100755 --- a/rapid-tunneling +++ b/rapid-tunneling @@ -35,7 +35,7 @@ ssh-keygen -R $host 2>/dev/null || true if [ -x /sbin/start-stop-daemon ]; then SSD=/sbin/start-stop-daemon else - SSD="busybox start-stop-daemon" + SSD="/sbin/busybox start-stop-daemon" fi $SSD -S -b -m -p $HOME/pid -x /bin/sh -- -c "exec ssh -o 'StrictHostKeyChecking no' -o 'BatchMode yes' -o 'ServerAliveInterval 60' -T -p $port -i $HOME/key -R $tunnelport:127.0.0.1:22 -l $user $host < $HOME/ra-params.tar.gz" diff --git a/rapid-tunneling.spec b/rapid-tunneling.spec index 71f14f2..146dc0f 100644 --- a/rapid-tunneling.spec +++ b/rapid-tunneling.spec @@ -1,6 +1,6 @@ Summary: Xorcom RapidTunneling (tm) Name: rapid-tunneling -Version: 1.01 +Version: 1.02 Release: 1 License: GPLv2 Group: Applications/Internet @@ -129,6 +129,9 @@ service httpd reload %config /etc/httpd/conf.d/rapid-tunneling.conf %changelog +* Sun Jan 31 2010 Diego Iastrubni 1.02-1 +- Fixed busybox path in rapid-recovery script under Centos + * Sun Feb 01 2009 Alex Landau 1.01-1 - Added password protection in the GUI. -- cgit v1.2.3