network/freenx: Misc. cleaning up.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

7 files changed, 29 insertions, 10 deletions

diff --git a/network/freenx/README b/network/freenx/README
index 8598f1074d897..aa3b1092cd507 100644
--- a/network/freenx/README
+++ b/network/freenx/README
@@ -9,7 +9,13 @@ nxserver component.
 Because a nx user with some default settings is needed for the server to 
 build, a script, preinstall.sh, is provided to be executed (sh preinstall.sh) 
 before running the slackbuild: it's pretty straightforward in his functions, 
-have a look at it.  Also, after installation, you will need to run (as root)
-"nxsetup --install" to complete the setup process.
+have a look at it.
+
+The package installs the default nomachine key to protect the connection.
+run "nxsetup --purge --uninstall ; sh preinstall.sh ; nxsetup --install"
+to set some custom keys (for additional security).
 
 This requires nx.
+
+You need nxclient, also available at slackbuilds.org, on the connecting
+clients.
diff --git a/network/freenx/freenx.logrotate b/network/freenx/config/freenx.logrotate
index 3342cc437c8b7..3342cc437c8b7 100644
--- a/network/freenx/freenx.logrotate
+++ b/network/freenx/config/freenx.logrotate
diff --git a/network/freenx/nomachine.id_dsa.key b/network/freenx/config/nomachine.id_dsa.key
index 4aa1778801d45..4aa1778801d45 100644
--- a/network/freenx/nomachine.id_dsa.key
+++ b/network/freenx/config/nomachine.id_dsa.key
diff --git a/network/freenx/doinst.sh b/network/freenx/doinst.sh
index 440c22901fb21..451febba867b4 100644
--- a/network/freenx/doinst.sh
+++ b/network/freenx/doinst.sh
@@ -109,3 +109,11 @@ chown nx:root \${NX_LOGFILE}
 
 EOCR
 
+usr/bin/nxsetup --install --setup-nomachine-key --uid 243 --gid 243 --auto
+
+WARNI="\n- - - - -\n\n\
+The package installs the default nomachine key to protect the connection.\n\
+run \"nxsetup --purge --uninstall ; sh preinstall.sh ; nxsetup --install\"\n\
+from the build folder to set some custom keys (for additional security).\n\
+\n- - - - -\n"
+printf "%b\n" "$WARNI"
diff --git a/network/freenx/freenx.SlackBuild b/network/freenx/freenx.SlackBuild
index 99d62a49bab4d..b337b2d6a6279 100644
--- a/network/freenx/freenx.SlackBuild
+++ b/network/freenx/freenx.SlackBuild
@@ -21,12 +21,14 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
-# 24/sep/2010 by ponce <matteo.bernardini@sns.it>
+# 24/sep/2010 by ponce <matteo.bernardini@gmail.com>
 #   * ported to SBo.
+# 22/feb/2011 by ponce <matteo.bernardini@gmail.com>
+#   * setup server with nomachine key by default.
 
 PRGNAM=freenx
 VERSION=${VERSION:-0.7.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -57,7 +59,7 @@ else
 fi
 
 DOCS="AUTHORS COPYING ChangeLog CONTRIB nxcheckload.sample nxacl.sample \
-  $CWD/nomachine.id_dsa.key"
+  $CWD/config/nomachine.id_dsa.key"
 
 bailout() {
   printf "\n\tYou must have an \"nx\" user and group to run this script.\n"
@@ -73,6 +75,9 @@ fi
 
 set -e
 
+export CXXFLAGS="$SLKCFLAGS"
+export CFLAGS="$SLKCFLAGS"
+
 mkdir -p $TMP/tmp-$PRGNAM $PKG $OUTPUT
 rm -rf $TMP/tmp-$PRGNAM/* $PKG/*
 
@@ -116,7 +121,7 @@ cp -a $PKG/etc/nxserver/node.conf.{sample,new}
 install -m 0755 init.d/freenx-server $PKG/etc/rc.d/rc.freenx.new
 
 # Add a logrotate script:
-install -m 644 $CWD/freenx.logrotate $PKG/etc/logrotate.d/freenx-server.new
+install -m 644 $CWD/config/freenx.logrotate $PKG/etc/logrotate.d/freenx-server.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
diff --git a/network/freenx/freenx.info b/network/freenx/freenx.info
index b75eccc9797a0..b9bb7b1b008f7 100644
--- a/network/freenx/freenx.info
+++ b/network/freenx/freenx.info
@@ -6,5 +6,5 @@ MD5SUM="856f597e139018f7ed62713c9d6c9ed5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
-EMAIL="matteo.bernardini@sns.it"
-APPROVED="rworkman"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED="Niels Horn"
diff --git a/network/freenx/preinstall.sh b/network/freenx/preinstall.sh
index 00287a7e2b818..963e7bcd6713a 100644
--- a/network/freenx/preinstall.sh
+++ b/network/freenx/preinstall.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # freenx preinstall script
-# excerpted from alien bob's doinst.sh
-# mixed by ponce <matteo.bernardini@sns.it>
+# excerpted from alien bob's doinst.sh and
+# mixed by ponce <matteo.bernardini@gmail.com>
 
 set -e