summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2009-04-20 15:23:16 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2009-04-20 15:23:16 +0000
commit9b8a44a3761169fb530f5d2c2e49037b4b2dee2b (patch)
treec4f4bd01ecb33b9e6d4fffc0f7a94e5774e3b566 /net-misc/nxserver-freenx/files
parentForgot new patch (diff)
downloadnx-9b8a44a3761169fb530f5d2c2e49037b4b2dee2b.tar.gz
nx-9b8a44a3761169fb530f5d2c2e49037b4b2dee2b.tar.bz2
nx-9b8a44a3761169fb530f5d2c2e49037b4b2dee2b.zip
In portage, it works fine
svn path=/testing/; revision=227
Diffstat (limited to 'net-misc/nxserver-freenx/files')
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch33
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-cflags.patch33
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch43
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch10
-rw-r--r--net-misc/nxserver-freenx/files/nxserver.init24
5 files changed, 0 insertions, 143 deletions
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch
deleted file mode 100644
index d64b302..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur freenx-0.7.1.orig/node.conf.sample freenx-0.7.1/node.conf.sample
---- freenx-0.7.1.orig/node.conf.sample 2007-10-31 13:47:45.000000000 +0100
-+++ freenx-0.7.1/node.conf.sample 2007-10-31 13:48:35.000000000 +0100
-@@ -319,12 +319,12 @@
- # of available ppd drivers via the $COMMAND_FOOMATIC command.
-
- #ENABLE_FOOMATIC="1"
--#COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
-+#COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile"
-
- # CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS
- # installation.
-
--#CUPS_BACKEND="/usr/lib/cups/backend"
-+#CUPS_BACKEND="/usr/libexec/cups/backend"
- #CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
- #CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
- #CUPS_ETC="/etc/cups"
-diff -Naur freenx-0.7.1.orig/nxloadconfig freenx-0.7.1/nxloadconfig
---- freenx-0.7.1.orig/nxloadconfig 2007-10-31 13:47:45.000000000 +0100
-+++ freenx-0.7.1/nxloadconfig 2007-10-31 13:48:43.000000000 +0100
-@@ -155,9 +155,9 @@
- ENABLE_CUPS_SEAMLESS="0"
- CUPS_SEAMLESS_DELAY="10"
- ENABLE_FOOMATIC="1"
--COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
-+COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile"
-
--CUPS_BACKEND="/usr/lib/cups/backend"
-+CUPS_BACKEND="/usr/libexec/cups/backend"
- CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
- CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
- CUPS_ETC="/etc/cups/"
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-cflags.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-cflags.patch
deleted file mode 100644
index e57cf84..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- nx-session-launcher/Makefile.orig 2008-12-19 16:34:02.000000000 +0100
-+++ nx-session-launcher/Makefile 2008-12-19 16:34:55.000000000 +0100
-@@ -1,7 +1,6 @@
- .PHONY: all install
-
--CC=gcc
--CFLAGS=-g -O2 -Wall -fPIC
-+CFLAGS+=-fPIC
-
- SOURCES = nx-session-launcher-suid.c
- PROGRAMS = nx-session-launcher-suid
---- nxredir/Makefile.orig 2008-12-19 16:33:53.000000000 +0100
-+++ nxredir/Makefile 2008-12-19 16:34:48.000000000 +0100
-@@ -1,7 +1,6 @@
- all: libnxredir.so
-
--CC=gcc
--CFLAGS=-g -O2 -Wall -fPIC
-+CFLAGS+=-fPIC
- LIBNAME=libnxredir.so
- VERSION=0
-
-@@ -14,8 +13,8 @@
- rm -f *.o
-
- ifneq ($(NX_VERSION),)
--install: all
-- install -m755 $(LIBNAME) $(DESTDIR)/$$PATH_LIB/
-+install:
-+ install -m755 $(LIBNAME).$(VERSION) $(DESTDIR)/$$PATH_LIB/
- install -m755 nxredir $(DESTDIR)/$$PATH_BIN/
- install -m755 nxsmb $(DESTDIR)/$$CUPS_BACKEND/
- perl -pi -e "s,PATH_LIB=.*,PATH_LIB=\"$$PATH_LIB\",g" $(DESTDIR)/$$PATH_BIN/nxredir
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch
deleted file mode 100644
index 21a3326..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- nxloadconfig.orig 2009-03-12 18:29:22.000000000 +0100
-+++ nxloadconfig 2009-03-12 18:29:53.000000000 +0100
-@@ -58,7 +58,7 @@
- # Where can different nx components be found
- NX_DIR=/usr
- PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
--PATH_LIB=$NX_DIR/lib
-+PATH_LIB=$NX_DIR/lib/NX/lib
- NX_ETC_DIR=/etc/nxserver
- NX_SESS_DIR=/var/lib/nxserver/db
- NX_HOME_DIR=/var/lib/nxserver/home
-@@ -194,11 +194,11 @@
- KILL_DEFAULT_X_WM="1"
- BOOTSTRAP_X_SESSION="0"
- USER_X_STARTUP_SCRIPT=.Xclients
--DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
-+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
- COMMAND_GDM_X_SESSION="/etc/gdm/Xsession custom"
- if [ ! -x "$COMMAND_GDM_X_SESSION" ]
- then
-- COMMAND_GDM_X_SESSION="/etc/X11/Xsession"
-+ COMMAND_GDM_X_SESSION="/etc/X11/Sessions/Xsession"
- fi
- COMMAND_START_KDE=startkde
- COMMAND_START_GNOME=gnome-session
-@@ -224,7 +224,7 @@
- COMMAND_NXSHADOWACL="$PATH_BIN/nxshadowacl"
- COMMAND_NXACL="$PATH_BIN/nxacl"
- COMMAND_NXCHECKLOAD="$PATH_BIN/nxcheckload"
--COMMAND_NXAGENT="$PATH_BIN/nxagent"
-+COMMAND_NXAGENT="REAL_PATH_LIB/nxagent"
-
- # Guest directives
- ENABLE_GUEST_LOGIN="0"
-@@ -357,7 +357,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:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
-+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
-
- NX_BACKEND_VERSION=$(strings $COMMAND_NXAGENT 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
-
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch
deleted file mode 100644
index 71a3177..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./nxnode-login 2009-04-20 16:54:24.000000000 +0200
-+++ /usr/bin/nxnode-login 2009-04-20 16:54:27.000000000 +0200
-@@ -73,6 +73,7 @@
- expect {
- "Are you sure you want to continue connecting (yes/no)?" { send "yes\r" }
- "assword*:" { sleep 0.3; send "$password\r" }
-+ "SSH passphrase:" { sleep 0.3; send "$password\r" }
- "Permission denied*" { exit 1 }
- "su: Authentication failure" { exit 1 }
- "NX> 1000 NXNODE - Version" {
diff --git a/net-misc/nxserver-freenx/files/nxserver.init b/net-misc/nxserver-freenx/files/nxserver.init
deleted file mode 100644
index 564d0d6..0000000
--- a/net-misc/nxserver-freenx/files/nxserver.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/files/nxserver.init,v 1.3 2008/04/07 14:45:19 voyageur Exp $
-
-depend() {
- before sshd
-}
-
-start() {
- ebegin "Starting FreeNX server"
- /usr/bin/nxserver --cleanup >/dev/null 2>&1
- /usr/bin/nxserver --start >/dev/null 2>&1
- eend $?
-}
-
-stop() {
- ebegin "Stopping FreeNX server"
- /usr/bin/nxserver --stop >/dev/null 2>&1
- /usr/bin/nxserver --cleanup >/dev/null 2>&1
- eend 0
-}
-
-# vim:ts=4