summaryrefslogtreecommitdiff
path: root/net/freenx/files
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-03-10 09:41:41 +0000
committerRene Ladan <rene@FreeBSD.org>2014-03-10 09:41:41 +0000
commit9a05af2f932e498aa16087eb79aae35b6b02902a (patch)
treec34e0702b10cea04278db87cd77698202e5db072 /net/freenx/files
parentRemove expired port with domain-squatted master site: (diff)
Remove expired port:
2014-03-10 net/freenx: Depends on expiring net/nxserver
Notes
Notes: svn path=/head/; revision=347730
Diffstat (limited to 'net/freenx/files')
-rw-r--r--net/freenx/files/patch-freenx-nxkeygen17
-rw-r--r--net/freenx/files/patch-freenx-nxloadconfig64
-rw-r--r--net/freenx/files/patch-freenx-nxnode18
-rw-r--r--net/freenx/files/patch-freenx-nxserver20
-rw-r--r--net/freenx/files/patch-freenx-nxsetup75
5 files changed, 0 insertions, 194 deletions
diff --git a/net/freenx/files/patch-freenx-nxkeygen b/net/freenx/files/patch-freenx-nxkeygen
deleted file mode 100644
index 48e32e1b00f4..000000000000
--- a/net/freenx/files/patch-freenx-nxkeygen
+++ /dev/null
@@ -1,17 +0,0 @@
---- nxkeygen.orig Mon Jan 22 19:22:49 2007
-+++ nxkeygen
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #
- # /usr/NX/bin/nxkeygen
- # Create a new client/server key pair
-@@ -48,7 +48,7 @@
-
- for x in ${NX_CLIENT_KEY} ${NX_SERVER_KEY} ; do
- chmod 600 $x
-- chown nx:root $x
-+ chown nx:nx $x
- done
-
- # copy the key to the authorized_keys2 file
diff --git a/net/freenx/files/patch-freenx-nxloadconfig b/net/freenx/files/patch-freenx-nxloadconfig
deleted file mode 100644
index eb1ed44cebd4..000000000000
--- a/net/freenx/files/patch-freenx-nxloadconfig
+++ /dev/null
@@ -1,64 +0,0 @@
---- nxloadconfig.orig Mon Jan 22 19:22:50 2007
-+++ nxloadconfig
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #
- # Copyright (c) 2005 by Fabian Franz <freenx@fabian-franz.de>
- # (c) 2005 by Jon Severinsson <jonno@users.berlios.de>
-@@ -56,12 +56,12 @@
- NX_LICENSE="OS (GPL)"
-
- # Where can different nx components be found
--NX_DIR=/usr
-+NX_DIR=/usr/NX
- PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
- PATH_LIB=$NX_DIR/lib
--NX_ETC_DIR=/etc/nxserver
--NX_SESS_DIR=/var/lib/nxserver/db
--NX_HOME_DIR=/var/lib/nxserver/home
-+NX_ETC_DIR=$NX_DIR/etc
-+NX_SESS_DIR=$NX_DIR/var/db
-+NX_HOME_DIR=$NX_DIR/home/nx
-
- # Advanced users ONLY
- AGENT_LIBRARY_PATH="" #Calculated
-@@ -144,7 +144,7 @@
-
- ENABLE_KDE_CUPS="0"
- KDE_PRINTRC="" # Calculated
--CUPS_ETC="/etc/cups/"
-+CUPS_ETC="/usr/local/etc/cups/"
-
- # Path directives
-
-@@ -162,16 +162,16 @@
- COMMAND_XAUTH=/usr/X11R6/bin/xauth
- COMMAND_SMBMOUNT=smbmount
- COMMAND_SMBUMOUNT=smbumount
--COMMAND_NETCAT=netcat
-+COMMAND_NETCAT=nc
- COMMAND_SSH=ssh
- COMMAND_SSH_KEYGEN=ssh-keygen
--COMMAND_CUPSD=/usr/sbin/cupsd
--COMMAND_MD5SUM=md5sum
-+COMMAND_CUPSD=/usr/local/sbin/cupsd
-+COMMAND_MD5SUM=md5
-
-
- # Misc directives
-
--ENABLE_2_0_0_BACKEND=""
-+ENABLE_2_0_0_BACKEND="1"
- ENABLE_AUTORECONNECT="0"
- ENABLE_AUTORECONNECT_BEFORE_140="1"
- EXPORT_USERIP="0"
-@@ -263,7 +263,7 @@
- [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
- [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
- [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
--[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
-+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- ENABLE_2_0_0_BACKEND="1"
diff --git a/net/freenx/files/patch-freenx-nxnode b/net/freenx/files/patch-freenx-nxnode
deleted file mode 100644
index 0123f834efa4..000000000000
--- a/net/freenx/files/patch-freenx-nxnode
+++ /dev/null
@@ -1,18 +0,0 @@
---- nxnode.orig Mon Jan 22 19:22:50 2007
-+++ nxnode
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
-
- # Free implementation of nxserver components
- #
-@@ -252,6 +252,9 @@
- #
-
- NODE_APPLICATION=$(node_find_application "$type")
-+
-+ # For rdesktop/VNC, there is no application to start
-+ [ -n "$NODE_APPLICATION" ] || return
-
- #
- # Check if we want to use a mediahelper
diff --git a/net/freenx/files/patch-freenx-nxserver b/net/freenx/files/patch-freenx-nxserver
deleted file mode 100644
index a1c1684759cb..000000000000
--- a/net/freenx/files/patch-freenx-nxserver
+++ /dev/null
@@ -1,20 +0,0 @@
---- nxserver.orig Mon Jan 22 19:22:50 2007
-+++ nxserver
-@@ -294,7 +294,7 @@
- echo
- echo "Display Username Remote IP Session ID Date Status"
- echo "------- --------------- --------------- -------------------------------- ------------------- -----------"
-- for j in $(ls --time-style +%s -la "$NX_SESS_DIR"/{closed,failed,running} | awk '/sessionId/ { print $6 " " $7 }' | sort -n | cut -d" " -f2)
-+ for j in $(gls --time-style +%s -la "$NX_SESS_DIR"/{closed,failed,running} | awk '/sessionId/ { print $6 " " $7 }' | sort -n | cut -d" " -f2)
- do
- if [ -n "$sessionId" ]
- then
-@@ -307,7 +307,7 @@
- then
- [ "$userName" = "$(getparam userName)" ] || continue
- fi
-- echo -e "$(getparam display)\t$(getparam userName)\t$(getparam foreignAddress)\t$(getparam sessionId)\t$(ls --time-style="+%F %X" -l $i | awk '/sessionId/ { print $6 " " $7 }')\t$(getparam status)"
-+ echo -e "$(getparam display)\t$(getparam userName)\t$(getparam foreignAddress)\t$(getparam sessionId)\t$(gls --time-style="+%F %X" -l $i | awk '/sessionId/ { print $6 " " $7 }')\t$(getparam status)"
- done
- }
-
diff --git a/net/freenx/files/patch-freenx-nxsetup b/net/freenx/files/patch-freenx-nxsetup
deleted file mode 100644
index b102358a6244..000000000000
--- a/net/freenx/files/patch-freenx-nxsetup
+++ /dev/null
@@ -1,75 +0,0 @@
---- nxsetup.unported Mon Jan 22 19:22:50 2007
-+++ nxsetup
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
-
- # Coypright (c) 2004-2005 by Fabian Franz <freenx@fabian-franz.de>.
- # 2005 by Jon Severinsson <jonno@users.berlios.de>.
-@@ -165,7 +165,16 @@
- # adduser needs a valid group to add the user to
- ! nx_group_exists && addgroup --system --quiet $GROUPADD_OPTIONS nx
- adduser $USERADD_OPTIONS nx
--
-+
-+ # FreeBSD?
-+ elif [ "$(uname)" = "FreeBSD" ]
-+ then
-+ USERADD_OPTIONS="-d $NX_HOME_DIR -s $PATH_BIN/nxserver"
-+ [ -n "$SETUP_UID" ] && USERADD_OPTIONS="-u $SETUP_UID $USERADD_OPTIONS"
-+ [ -n "$SETUP_GID" ] && USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS"
-+ [ -n "$SETUP_GID" ] && pw groupadd nx -g $SETUP_GID
-+ pw useradd nx $USERADD_OPTIONS
-+
- # no, its a "normal" useradd
- else
- USERADD_OPTIONS="-g nx -d $NX_HOME_DIR -s $PATH_BIN/nxserver"
-@@ -198,15 +207,16 @@
- install_nx()
- {
- set -e
--
-- if [ "$(pidof sshd 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
- [ -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
-
-@@ -319,13 +329,12 @@
- cat /etc/ssh/ssh_host_rsa_key.pub >> $NX_HOME_DIR/.ssh/known_hosts
- fi
-
-- echo "done"
--
- echo -n "Setting up permissions ..."
-- chown -R nx:root $NX_SESS_DIR
-- chown -R nx:root $NX_ETC_DIR
-- chown -R nx:root $NX_HOME_DIR
-- chown nx:root "$NX_LOGFILE"
-+ chown -R nx:nx $NX_SESS_DIR
-+ chown -R nx:nx $NX_ETC_DIR
-+ chown -R nx:nx $NX_HOME_DIR
-+ chown nx:nx "$NX_LOGFILE"
-+ chmod 0400 $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS
- echo "done"
- }
-
-@@ -389,7 +398,7 @@
- then
- luserdel nx
- else
-- userdel nx
-+ pw userdel nx
- fi
-
- echo "done"