ports/113423: Update for ports net/freenx to version 0.6.0
Matthias Fechner
idefix at fechner.net
Wed Jun 6 17:00:10 UTC 2007
>Number: 113423
>Category: ports
>Synopsis: Update for ports net/freenx to version 0.6.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 06 17:00:09 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Matthias Fechner
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD server.idefix.lan 6.2-STABLE FreeBSD 6.2-STABLE #21: Tue Apr 24 15:48:46 CEST 2007 root at server.idefix.lan:/usr/obj/usr/src/sys/SERVER2 i386
>Description:
Update of freenx to version 0.6.0, someone need to update net/nxserver too.
>How-To-Repeat:
>Fix:
--- update-freenx-0.6.0.patch begins here ---
diff -r -u freenx.orig/Makefile freenx/Makefile
--- freenx.orig/Makefile Sat May 19 22:18:20 2007
+++ freenx/Makefile Wed Jun 6 17:50:57 2007
@@ -6,8 +6,8 @@
#
PORTNAME= freenx
-PORTVERSION= 0.4.4
-PORTREVISION= 3
+PORTVERSION= 0.6.0
+#PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.iem.pw.edu.pl/ftp/distfiles/
@@ -27,15 +27,15 @@
do-install:
${MKDIR} ${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
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/nxclient ${NXPREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/nxnode ${NXPREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/nxnode-login ${NXPREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/nxserver ${NXPREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/nxsetup ${NXPREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/nxkeygen ${NXPREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/nxloadconfig ${NXPREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/nxprint ${NXPREFIX}/bin
${MKDIR} ${NXPREFIX}/etc/nxserver
- ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.4/node.conf.sample ${NXPREFIX}/etc/nxserver
+ ${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.6.0/node.conf.sample ${NXPREFIX}/etc/nxserver
.include <bsd.port.mk>
diff -r -u freenx.orig/distinfo freenx/distinfo
--- freenx.orig/distinfo Sun Jan 22 22:23:02 2006
+++ freenx/distinfo Wed Jun 6 17:51:58 2007
@@ -1,3 +1,3 @@
-MD5 (freenx-0.4.4.tar.gz) = 4d92f80718edbaacd875404bcb2850b6
-SHA256 (freenx-0.4.4.tar.gz) = 8f661edbf9137e31df4c5e6134cabc89921c0e9a742943264f3d7e9dbeae8674
-SIZE (freenx-0.4.4.tar.gz) = 46111
+MD5 (freenx-0.6.0.tar.gz) = 504aaa2c3c93c36eefab74e2b8a6506e
+SHA256 (freenx-0.6.0.tar.gz) = 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca
+SIZE (freenx-0.6.0.tar.gz) = 110758
diff -r -u freenx.orig/files/patch-freenx-nxclient freenx/files/patch-freenx-nxclient
--- freenx.orig/files/patch-freenx-nxclient Sat Sep 10 01:45:26 2005
+++ freenx/files/patch-freenx-nxclient Wed Jun 6 17:54:44 2007
@@ -1,5 +1,5 @@
---- 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
+--- freenx-0.6.0/nxclient.orig Fri Sep 10 10:04:51 2004
++++ freenx-0.6.0/nxclient Fri Sep 17 12:24:22 2004
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
diff -r -u freenx.orig/files/patch-freenx-nxkeygen freenx/files/patch-freenx-nxkeygen
--- freenx.orig/files/patch-freenx-nxkeygen Sat Sep 10 01:45:26 2005
+++ freenx/files/patch-freenx-nxkeygen Wed Jun 6 17:54:37 2007
@@ -1,5 +1,5 @@
---- 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
+--- freenx-0.6.0/nxkeygen.orig Sun Feb 13 20:52:08 2005
++++ freenx-0.6.0/nxkeygen Mon Mar 28 15:26:50 2005
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
diff -r -u freenx.orig/files/patch-freenx-nxloadconfig freenx/files/patch-freenx-nxloadconfig
--- freenx.orig/files/patch-freenx-nxloadconfig Sat Sep 10 01:45:26 2005
+++ freenx/files/patch-freenx-nxloadconfig Wed Jun 6 17:54:27 2007
@@ -1,5 +1,5 @@
---- 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
+--- freenx-0.6.0/nxloadconfig.orig Sat Aug 6 09:53:27 2005
++++ freenx-0.6.0/nxloadconfig Tue Aug 9 15:15:01 2005
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
diff -r -u freenx.orig/files/patch-freenx-nxnode freenx/files/patch-freenx-nxnode
--- freenx.orig/files/patch-freenx-nxnode Sat Sep 10 01:45:26 2005
+++ freenx/files/patch-freenx-nxnode Wed Jun 6 17:53:35 2007
@@ -1,5 +1,5 @@
---- 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
+--- freenx-0.6.0/nxnode.orig Tue Aug 2 11:20:18 2005
++++ freenx-0.6.0/nxnode Tue Aug 9 15:08:43 2005
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
diff -r -u freenx.orig/files/patch-freenx-nxnode-login freenx/files/patch-freenx-nxnode-login
--- freenx.orig/files/patch-freenx-nxnode-login Sat Sep 10 01:45:26 2005
+++ freenx/files/patch-freenx-nxnode-login Wed Jun 6 17:53:28 2007
@@ -1,5 +1,5 @@
---- 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
+--- freenx-0.6.0/nxnode-login.orig Tue Jun 28 12:15:43 2005
++++ freenx-0.6.0/nxnode-login Tue Jun 28 11:53:16 2005
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/local/bin/expect
diff -r -u freenx.orig/files/patch-freenx-nxprint freenx/files/patch-freenx-nxprint
--- freenx.orig/files/patch-freenx-nxprint Sat Sep 10 01:45:26 2005
+++ freenx/files/patch-freenx-nxprint Wed Jun 6 17:53:18 2007
@@ -1,5 +1,5 @@
---- 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
+--- freenx-0.6.0/nxprint.orig Mon Jun 27 13:38:09 2005
++++ freenx-0.6.0/nxprint Mon Jun 27 13:53:08 2005
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
diff -r -u freenx.orig/files/patch-freenx-nxserver freenx/files/patch-freenx-nxserver
--- freenx.orig/files/patch-freenx-nxserver Sat Sep 10 01:45:26 2005
+++ freenx/files/patch-freenx-nxserver Wed Jun 6 17:53:09 2007
@@ -1,5 +1,5 @@
---- 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
+--- freenx-0.6.0/nxserver.orig Fri Aug 5 12:38:44 2005
++++ freenx-0.6.0/nxserver Tue Aug 9 15:24:19 2005
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
diff -r -u freenx.orig/files/patch-freenx-nxsetup freenx/files/patch-freenx-nxsetup
--- freenx.orig/files/patch-freenx-nxsetup Mon Mar 27 12:06:23 2006
+++ freenx/files/patch-freenx-nxsetup Wed Jun 6 18:27:02 2007
@@ -1,47 +1,51 @@
---- 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
+--- freenx-0.6.0/nxsetup.orig Tue Jan 23 04:22:50 2007
++++ freenx-0.6.0/nxsetup Wed Jun 6 18:25:57 2007
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
# Coypright (c) 2004-2005 by Fabian Franz <freenx at fabian-franz.de>.
# 2005 by Jon Severinsson <jonno at users.berlios.de>.
-@@ -96,7 +96,7 @@
+@@ -135,7 +135,7 @@
then
egrep "^nx:" /etc/passwd >/dev/null
else
- getent passwd nx >/dev/null
-+ cat /etc/passwd |egrep -q "^nx:" >/dev/null
++ cat /etc/passwd |egrep -q "^nx:" >/dev/nullOB
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"
+ nx_group_exists()
+@@ -166,6 +166,15 @@
+ ! nx_group_exists && addgroup --system --quiet $GROUPADD_OPTIONS nx
adduser $USERADD_OPTIONS nx
-+
-+ # FreeBSD?
+
++ # 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
-+
++ 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"
-@@ -142,15 +152,16 @@
- install_nx()
+ USERADD_OPTIONS="-g nx -d $NX_HOME_DIR -s $PATH_BIN/nxserver"
+@@ -191,7 +200,6 @@
+ useradd $USERADD_OPTIONS nx
+ fi
+
+-
+ fi
+ }
+
+@@ -199,14 +207,14 @@
{
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
@@ -53,12 +57,9 @@
echo "done"
fi
-@@ -248,13 +259,12 @@
- cat /etc/ssh/ssh_host_rsa_key.pub >> $NX_HOME_DIR/.ssh/known_hosts
- fi
+@@ -322,10 +330,11 @@
+ echo "done"
-- echo "done"
--
echo -n "Setting up permissions ..."
- chown -R nx:root $NX_SESS_DIR
- chown -R nx:root $NX_ETC_DIR
@@ -72,7 +73,7 @@
echo "done"
}
-@@ -268,7 +278,7 @@
+@@ -389,7 +398,7 @@
then
luserdel nx
else
--- update-freenx-0.6.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list