diff options
| author | vd <vd@FreeBSD.org> | 2006-03-27 18:06:23 +0800 |
|---|---|---|
| committer | vd <vd@FreeBSD.org> | 2006-03-27 18:06:23 +0800 |
| commit | b818c146affb5013f9f9d24521358dd99b5bee09 (patch) | |
| tree | 67b912d4d68f81400cd76d298b5d19756ba02c0f /net/freenx | |
| parent | c9a928b7d92f19ad28c13751da2b8d5b4af10d06 (diff) | |
| download | freebsd-ports-gnome-b818c146affb5013f9f9d24521358dd99b5bee09.tar.gz freebsd-ports-gnome-b818c146affb5013f9f9d24521358dd99b5bee09.tar.zst freebsd-ports-gnome-b818c146affb5013f9f9d24521358dd99b5bee09.zip | |
Fix interaction with sshd
PR: ports/92779
Submitted by: mato <gamato@pobox.sk>
Approved by: dewey hylton <freenx@deweyonline.com> (maintainer)
Diffstat (limited to 'net/freenx')
| -rw-r--r-- | net/freenx/Makefile | 2 | ||||
| -rw-r--r-- | net/freenx/files/patch-freenx-nxsetup | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/net/freenx/Makefile b/net/freenx/Makefile index 5f69e398cc89..9b9d0b9a4de1 100644 --- a/net/freenx/Makefile +++ b/net/freenx/Makefile @@ -7,7 +7,7 @@ PORTNAME= freenx PORTVERSION= 0.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.berlios.de/freenx/ \ http://debian.tu-bs.de/knoppix/nx/ diff --git a/net/freenx/files/patch-freenx-nxsetup b/net/freenx/files/patch-freenx-nxsetup index 299ba2dd9a76..d3c2b216a4a8 100644 --- a/net/freenx/files/patch-freenx-nxsetup +++ b/net/freenx/files/patch-freenx-nxsetup @@ -1,5 +1,5 @@ ---- freenx-0.4.4/nxsetup.orig Tue Aug 2 13:29:59 2005 -+++ freenx-0.4.4/nxsetup Tue Aug 9 17:04:45 2005 +--- freenx-0.4.4/nxsetup.unported Fri Feb 3 20:52:09 2006 ++++ freenx-0.4.4/nxsetup Fri Dec 30 18:29:50 2005 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash @@ -32,18 +32,28 @@ # no, its a "normal" useradd else USERADD_OPTIONS="-d $NX_HOME_DIR -s $PATH_BIN/nxserver" -@@ -143,7 +153,9 @@ +@@ -142,15 +152,16 @@ + install_nx() { set -e - +- - if [ "$(pidof sshd 2>/dev/null)" = "" ] -+ MAYBE_PID=`cat /var/run/sshd.pid 2>/dev/null` ++ ++ [ -f /var/run/sshd.pid ] && MAYBE_PID=`cat /var/run/sshd.pid 2>/dev/null` + if test -z "$MAYBE_PID" + then echo -n "Starting ssh service ..." # Generate Host keys if they are not available, yet -@@ -248,13 +260,12 @@ + [ -e /etc/ssh/ssh_host_rsa_key ] || $COMMAND_SSH_KEYGEN -q -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N '' + [ -e /etc/ssh/ssh_host_dsa_key ] || $COMMAND_SSH_KEYGEN -q -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N '' +- [ -x /etc/init.d/sshd ] && /etc/init.d/sshd start +- [ -x /etc/init.d/ssh ] && /etc/init.d/ssh start ++ [ -x /etc/rc.d/sshd ] && /etc/rc.d/sshd forcestart + echo "done" + fi + +@@ -248,13 +259,12 @@ cat /etc/ssh/ssh_host_rsa_key.pub >> $NX_HOME_DIR/.ssh/known_hosts fi @@ -62,7 +72,7 @@ echo "done" } -@@ -268,7 +279,7 @@ +@@ -268,7 +278,7 @@ then luserdel nx else |