From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 6 17:00:10 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4F77F16A421 for ; Wed, 6 Jun 2007 17:00:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 2AD2E13C487 for ; Wed, 6 Jun 2007 17:00:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l56H0ArZ005251 for ; Wed, 6 Jun 2007 17:00:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l56H09Eh005250; Wed, 6 Jun 2007 17:00:09 GMT (envelope-from gnats) Resent-Date: Wed, 6 Jun 2007 17:00:09 GMT Resent-Message-Id: <200706061700.l56H09Eh005250@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Fechner Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2517816A41F for ; Wed, 6 Jun 2007 16:55:14 +0000 (UTC) (envelope-from root@fechner.net) Received: from michelle.lostinspace.de (michelle.lostinspace.de [62.146.248.226]) by mx1.freebsd.org (Postfix) with ESMTP id 5C0C313C44B for ; Wed, 6 Jun 2007 16:55:13 +0000 (UTC) (envelope-from root@fechner.net) Received: from server.idefix.lan (cl-70.muc-02.de.sixxs.net [IPv6:2001:a60:f000:45::2]) (authenticated bits=0) by michelle.lostinspace.de (8.13.8/8.13.8) with ESMTP id l56GflbD065724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Jun 2007 18:41:52 +0200 (CEST) (envelope-from root@fechner.net) Received: from root by server.idefix.lan with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1HvyWM-000MNa-9s for FreeBSD-gnats-submit@freebsd.org; Wed, 06 Jun 2007 18:38:06 +0200 Message-Id: Date: Wed, 06 Jun 2007 18:38:06 +0200 From: Matthias Fechner To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/113423: Update for ports net/freenx to version 0.6.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Matthias Fechner List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 17:00:10 -0000 >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@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 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 . # 2005 by Jon Severinsson . -@@ -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: