diff options
author | pav <pav@FreeBSD.org> | 2005-09-09 23:45:26 +0000 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2005-09-09 23:45:26 +0000 |
commit | eaba28d9c073766f1838b0422b177aed11a94339 (patch) | |
tree | 6a1ba7eab199962b4f9959bca0213fd578f260c1 | |
parent | 7f33fe7177835eeaac0b40737331a2f9fcbd7c5f (diff) | |
download | FreeBSD-ports-eaba28d9c073766f1838b0422b177aed11a94339.zip FreeBSD-ports-eaba28d9c073766f1838b0422b177aed11a94339.tar.gz |
- Update to 0.4.4
PR: ports/85798
Submitted by: dewey hylton <freenx@deweyonline.com> (maintainer)
-rw-r--r-- | net/freenx/Makefile | 21 | ||||
-rw-r--r-- | net/freenx/distinfo | 4 | ||||
-rw-r--r-- | net/freenx/files/patch-freenx-nxclient | 4 | ||||
-rw-r--r-- | net/freenx/files/patch-freenx-nxkeygen | 4 | ||||
-rw-r--r-- | net/freenx/files/patch-freenx-nxloadconfig | 11 | ||||
-rw-r--r-- | net/freenx/files/patch-freenx-nxnode | 23 | ||||
-rw-r--r-- | net/freenx/files/patch-freenx-nxnode-login | 4 | ||||
-rw-r--r-- | net/freenx/files/patch-freenx-nxprint | 4 | ||||
-rw-r--r-- | net/freenx/files/patch-freenx-nxserver | 35 | ||||
-rw-r--r-- | net/freenx/files/patch-freenx-nxsetup | 78 |
10 files changed, 78 insertions, 110 deletions
diff --git a/net/freenx/Makefile b/net/freenx/Makefile index 45015e5..5cbf887 100644 --- a/net/freenx/Makefile +++ b/net/freenx/Makefile @@ -6,8 +6,7 @@ # PORTNAME= freenx -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.4.4 CATEGORIES= net MASTER_SITES= http://download.berlios.de/freenx/ \ http://debian.tu-bs.de/knoppix/nx/ @@ -28,15 +27,15 @@ WRKSRC= ${WRKDIR} do-install: ${MKDIR} ${NXPREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxclient ${NXPREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxnode ${NXPREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxnode-login ${NXPREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxserver ${NXPREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxsetup ${NXPREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxkeygen ${NXPREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxloadconfig ${NXPREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxprint ${NXPREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/nxclient ${NXPREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/nxnode ${NXPREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/nxnode-login ${NXPREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/nxserver ${NXPREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/nxsetup ${NXPREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/nxkeygen ${NXPREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/nxloadconfig ${NXPREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/nxprint ${NXPREFIX}/bin ${MKDIR} ${NXPREFIX}/etc/nxserver - ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/node.conf.sample ${NXPREFIX}/etc/nxserver + ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/node.conf.sample ${NXPREFIX}/etc/nxserver .include <bsd.port.mk> diff --git a/net/freenx/distinfo b/net/freenx/distinfo index 6372e4f..acd0a39 100644 --- a/net/freenx/distinfo +++ b/net/freenx/distinfo @@ -1,2 +1,2 @@ -MD5 (freenx-0.4.1.tar.gz) = 0196eb9642e77bae930f06f69beb18f2 -SIZE (freenx-0.4.1.tar.gz) = 42898 +MD5 (freenx-0.4.4.tar.gz) = 4d92f80718edbaacd875404bcb2850b6 +SIZE (freenx-0.4.4.tar.gz) = 46111 diff --git a/net/freenx/files/patch-freenx-nxclient b/net/freenx/files/patch-freenx-nxclient index adb5d75..2cd2c29 100644 --- a/net/freenx/files/patch-freenx-nxclient +++ b/net/freenx/files/patch-freenx-nxclient @@ -1,5 +1,5 @@ ---- freenx-0.4.1/nxclient.orig Fri Sep 10 10:04:51 2004 -+++ freenx-0.4.1/nxclient Fri Sep 17 12:24:22 2004 +--- freenx-0.4.4/nxclient.orig Fri Sep 10 10:04:51 2004 ++++ freenx-0.4.4/nxclient Fri Sep 17 12:24:22 2004 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash diff --git a/net/freenx/files/patch-freenx-nxkeygen b/net/freenx/files/patch-freenx-nxkeygen index dc24978..a6da97c 100644 --- a/net/freenx/files/patch-freenx-nxkeygen +++ b/net/freenx/files/patch-freenx-nxkeygen @@ -1,5 +1,5 @@ ---- freenx-0.4.1/nxkeygen.orig Sun Feb 13 20:52:08 2005 -+++ freenx-0.4.1/nxkeygen Mon Mar 28 15:26:50 2005 +--- freenx-0.4.4/nxkeygen.orig Sun Feb 13 20:52:08 2005 ++++ freenx-0.4.4/nxkeygen Mon Mar 28 15:26:50 2005 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash diff --git a/net/freenx/files/patch-freenx-nxloadconfig b/net/freenx/files/patch-freenx-nxloadconfig index 3cb829d..0eacc06 100644 --- a/net/freenx/files/patch-freenx-nxloadconfig +++ b/net/freenx/files/patch-freenx-nxloadconfig @@ -1,5 +1,5 @@ ---- freenx-0.4.1/nxloadconfig.orig Thu May 5 04:34:20 2005 -+++ freenx-0.4.1/nxloadconfig Mon Jun 27 13:55:28 2005 +--- freenx-0.4.4/nxloadconfig.orig Sat Aug 6 09:53:27 2005 ++++ freenx-0.4.4/nxloadconfig Tue Aug 9 15:15:01 2005 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash @@ -23,7 +23,7 @@ # Advanced users ONLY AGENT_LIBRARY_PATH="" #Calculated -@@ -152,7 +152,7 @@ +@@ -153,11 +153,11 @@ COMMAND_XAUTH=/usr/X11R6/bin/xauth COMMAND_SMBMOUNT=smbmount COMMAND_SMBUMOUNT=smbumount @@ -32,3 +32,8 @@ COMMAND_SSH=ssh COMMAND_SSH_KEYGEN=ssh-keygen COMMAND_CUPSD=/usr/sbin/cupsd +-COMMAND_MD5SUM=md5sum ++COMMAND_MD5SUM=md5 + + + # Misc directives diff --git a/net/freenx/files/patch-freenx-nxnode b/net/freenx/files/patch-freenx-nxnode index 1156eaf..bb131ca 100644 --- a/net/freenx/files/patch-freenx-nxnode +++ b/net/freenx/files/patch-freenx-nxnode @@ -1,27 +1,8 @@ ---- freenx-0.4.1/nxnode.orig Thu Jun 23 11:42:52 2005 -+++ freenx-0.4.1/nxnode Tue Jun 28 09:38:40 2005 +--- freenx-0.4.4/nxnode.orig Tue Aug 2 11:20:18 2005 ++++ freenx-0.4.4/nxnode Tue Aug 9 15:08:43 2005 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash # Free implementation of nxserver components # -@@ -42,7 +42,7 @@ - # Reread boot command line; echo last parameter's argument or return false. - getparam(){ - stringinstring "&$1=" "$CMDLINE" || return 1 --echo "$CMDLINE" | awk "/^$1=/"' { VAL=$2 } END { print VAL }' FS="=" RS="(&|\n)" -+echo "$CMDLINE" | tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }' - return 0 - } - -@@ -621,7 +621,7 @@ - # TODO: imagecompressionmethod ... - [ "$imagecompressionmethod" = "0" ] && PACK="pack=nopack," - -- proxy_cookie=$(echo $[$RANDOM*$RANDOM] | md5sum | cut -d" " -f1) -+ proxy_cookie=$(echo $[$RANDOM*$RANDOM] | md5 | cut -d" " -f1) - - # write options file - [ -z "$samba" ] && samba=0 - diff --git a/net/freenx/files/patch-freenx-nxnode-login b/net/freenx/files/patch-freenx-nxnode-login index a56fe5c..aabec5b 100644 --- a/net/freenx/files/patch-freenx-nxnode-login +++ b/net/freenx/files/patch-freenx-nxnode-login @@ -1,5 +1,5 @@ ---- freenx-0.4.1/nxnode-login.orig Tue Jun 28 12:15:43 2005 -+++ freenx-0.4.1/nxnode-login Tue Jun 28 11:53:16 2005 +--- freenx-0.4.4/nxnode-login.orig Tue Jun 28 12:15:43 2005 ++++ freenx-0.4.4/nxnode-login Tue Jun 28 11:53:16 2005 @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/local/bin/expect diff --git a/net/freenx/files/patch-freenx-nxprint b/net/freenx/files/patch-freenx-nxprint index 0c9eee3..ac7dced 100644 --- a/net/freenx/files/patch-freenx-nxprint +++ b/net/freenx/files/patch-freenx-nxprint @@ -1,5 +1,5 @@ ---- freenx-0.4.1/nxprint.orig Mon Jun 27 13:38:09 2005 -+++ freenx-0.4.1/nxprint Mon Jun 27 13:53:08 2005 +--- freenx-0.4.4/nxprint.orig Mon Jun 27 13:38:09 2005 ++++ freenx-0.4.4/nxprint Mon Jun 27 13:53:08 2005 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash diff --git a/net/freenx/files/patch-freenx-nxserver b/net/freenx/files/patch-freenx-nxserver index 79b5a23..e04d419 100644 --- a/net/freenx/files/patch-freenx-nxserver +++ b/net/freenx/files/patch-freenx-nxserver @@ -1,43 +1,16 @@ ---- freenx-0.4.1/nxserver.orig Sat Jun 25 08:26:22 2005 -+++ freenx-0.4.1/nxserver Tue Jun 28 09:38:25 2005 +--- freenx-0.4.4/nxserver.orig Fri Aug 5 12:38:44 2005 ++++ freenx-0.4.4/nxserver Tue Aug 9 15:24:19 2005 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash # Free implementation of nxserver components # -@@ -27,7 +27,7 @@ - # Reread boot command line; echo last parameter's argument or return false. - getparam(){ - stringinstring "&$1=" "$CMDLINE" || return 1 --echo "$CMDLINE" | awk "/^$1=/"' { VAL=$2 } END { print VAL }' FS="=" RS="(&|\n)" -+echo "$CMDLINE" | tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }' - return 0 - } - -@@ -46,7 +46,7 @@ - - passdb_get_crypt_pass() - { -- echo "$@" | md5sum | cut -d" " -f1 -+ echo "$@" | md5 | cut -d" " -f1 - } - - passdb_get_pass() -@@ -836,7 +836,7 @@ - - rm -f "$SESS_LOCKFILE" - -- uniqueid=$(echo $[$RANDOM*$RANDOM] | md5sum | cut -d" " -f1 | tr "[a-z]" "[A-Z]") -+ uniqueid=$(echo $[$RANDOM*$RANDOM] | md5 | cut -d" " -f1 | tr "[a-z]" "[A-Z]") - FULL_PARAMS="user=$USER&userip=$USERIP&uniqueid=$uniqueid&display=$SESS_DISPLAY&$PARAMS" - log 6 "$FULL_PARAMS" - -@@ -1091,7 +1091,7 @@ +@@ -1133,7 +1133,7 @@ [ ${#CMD_CHUSER} -ge 32 ] && cmd_abort "Error: User $CMD_CHUSER must be shorter than 32 characters." egrep -q "^$CMD_CHUSER:" $NX_ETC_DIR/passwords && cmd_abort "Error: User $CMD_CHUSER already in database." -- getent passwd | egrep -q "^$CMD_CHUSER:" || cmd_abort "Error: User $CMD_CHUSER not existing on local system. Can't add." +- getent passwd "$CMD_CHUSER" >/dev/null || cmd_abort "Error: User $CMD_CHUSER not existing on local system. Can't add." + cat /etc/passwd | egrep -q "^$CMD_CHUSER:" || cmd_abort "Error: User $CMD_CHUSER not existing on local system. Can't add." passdb_add_user "$CMD_CHUSER" } diff --git a/net/freenx/files/patch-freenx-nxsetup b/net/freenx/files/patch-freenx-nxsetup index 0483fbc..90140e2 100644 --- a/net/freenx/files/patch-freenx-nxsetup +++ b/net/freenx/files/patch-freenx-nxsetup @@ -1,40 +1,54 @@ ---- freenx-0.4.1/nxsetup.orig Tue Feb 15 19:00:31 2005 -+++ freenx-0.4.1/nxsetup Mon Mar 28 15:53:10 2005 +--- 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 @@ -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>. -@@ -97,7 +97,9 @@ +@@ -96,7 +96,7 @@ + then + egrep "^nx:" /etc/passwd >/dev/null + else +- getent passwd nx >/dev/null ++ cat /etc/passwd |egrep -q "^nx:" >/dev/null + fi + } + +@@ -113,6 +113,16 @@ + USERADD_OPTIONS="--system --home $NX_HOME_DIR --shell $PATH_BIN/nxserver" + [ -n "$SETUP_GID" ] && USERADD_OPTIONS="--gid $SETUP_GID $USERADD_OPTIONS" + 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="-d $NX_HOME_DIR -s $PATH_BIN/nxserver" +@@ -143,7 +153,9 @@ { set -e -- if [ "$(pidof sshd)" = "" ] -+ #if [ "$(pidof sshd)" = "" ] -+ MAYBE_PID=`cat /var/run/sshd.pid` +- if [ "$(pidof sshd 2>/dev/null)" = "" ] ++ 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 -@@ -129,10 +131,12 @@ - chmod 600 "$NX_LOGFILE" - echo "done" - -- if ! { getent passwd | egrep -q "^nx:"; } -+ #if ! { getent passwd | egrep -q "^nx:"; } -+ if ! { cat /etc/passwd |egrep -q "^nx:"; } - then - echo -n "Setting up user nx ..." -- useradd_nx -+ #useradd_nx -+ pw useradd nx -d $NX_HOME_DIR -s $PATH_BIN/nxserver - echo "done" +@@ -248,13 +260,12 @@ + cat /etc/ssh/ssh_host_rsa_key.pub >> $NX_HOME_DIR/.ssh/known_hosts fi -@@ -173,19 +177,22 @@ - echo "done" - +- echo "done" +- echo -n "Setting up permissions ..." - chown -R nx:root $NX_SESS_DIR - chown -R nx:root $NX_ETC_DIR @@ -48,16 +62,12 @@ echo "done" } - uninstall_nx() - { -- if { getent passwd | egrep -q "^nx:"; } -+ #if { getent passwd | egrep -q "^nx:"; } -+ if { cat /etc/passwd | egrep -q "^nx:"; } - then - echo -n "Removing user nx ..." -- userdel nx -+ #userdel nx -+ pw userdel nx +@@ -268,7 +279,7 @@ + then + luserdel nx + else +- userdel nx ++ pw userdel nx + fi + echo "done" - fi - |