1 |
voyageur 07/10/31 19:49:55 |
2 |
|
3 |
Added: nxserver-freenx-0.7.1-nscd.patch |
4 |
digest-nxserver-freenx-0.7.1 |
5 |
nxserver-freenx-0.7.1-cups.patch |
6 |
nxserver-freenx-0.7.1-nxdialog.patch |
7 |
nxserver-freenx-0.7.1-nxloadconfig.patch |
8 |
Log: |
9 |
Version bump, closes bug #197505. Also fix some quoting |
10 |
(Portage version: 2.1.3.16) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nscd.patch |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nscd.patch?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nscd.patch?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: nxserver-freenx-0.7.1-nscd.patch |
19 |
=================================================================== |
20 |
--- nxsetup~ 2007-10-15 00:25:14.000000000 +0200 |
21 |
+++ nxsetup 2007-10-19 18:36:45.000000000 +0200 |
22 |
@@ -164,11 +164,15 @@ |
23 |
|
24 |
# adduser needs a valid group to add the user to |
25 |
! nx_group_exists && addgroup --system --quiet $GROUPADD_OPTIONS nx |
26 |
- [ -f /etc/nscd.conf ] && { nscd --invalidate group; } |
27 |
+ if [ -f /var/run/nscd/nscd.pid ]; then |
28 |
+ [ -f /etc/nscd.conf ] && { nscd --invalidate group; } |
29 |
+ fi |
30 |
|
31 |
adduser $USERADD_OPTIONS nx |
32 |
- [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; } |
33 |
- |
34 |
+ if [ -f /var/run/nscd/nscd.pid ]; then |
35 |
+ [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; } |
36 |
+ fi |
37 |
+ |
38 |
# no, its a "normal" useradd |
39 |
else |
40 |
USERADD_OPTIONS="-g nx -d $NX_HOME_DIR -s $PATH_BIN/nxserver" |
41 |
@@ -187,17 +191,25 @@ |
42 |
|
43 |
if [ "$SETUP_LOCAL_USER" = "yes" ] |
44 |
then |
45 |
- ! nx_group_exists && lgroupadd $GROUPADD_OPTIONS nx |
46 |
- [ -f /etc/nscd.conf ] && { nscd --invalidate group; } |
47 |
+ ! nx_group_exists && lgroupadd $GROUPADD_OPTIONS nx |
48 |
+ if [ -f /var/run/nscd/nscd.pid ]; then |
49 |
+ [ -f /etc/nscd.conf ] && { nscd --invalidate group; } |
50 |
+ fi |
51 |
|
52 |
luseradd $USERADD_OPTIONS nx |
53 |
- [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; } |
54 |
+ if [ -f /var/run/nscd/nscd.pid ]; then |
55 |
+ [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; } |
56 |
+ fi |
57 |
else |
58 |
! nx_group_exists && groupadd $GROUPADD_OPTIONS nx |
59 |
- [ -f /etc/nscd.conf ] && { nscd --invalidate group; } |
60 |
+ if [ -f /var/run/nscd/nscd.pid ]; then |
61 |
+ [ -f /etc/nscd.conf ] && { nscd --invalidate group; } |
62 |
+ fi |
63 |
|
64 |
useradd $USERADD_OPTIONS nx |
65 |
- [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; } |
66 |
+ if [ -f /var/run/nscd/nscd.pid ]; then |
67 |
+ [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; } |
68 |
+ fi |
69 |
fi |
70 |
|
71 |
|
72 |
@@ -457,7 +469,9 @@ |
73 |
#Perform cleanup? |
74 |
[ "$CLEAN" = "yes" ] && uninstall_nx |
75 |
|
76 |
- [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; nscd --invalidate group; } |
77 |
+ if [ -f /var/run/nscd/nscd.pid ]; then |
78 |
+ [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; nscd --invalidate group; } |
79 |
+ fi |
80 |
install_nx |
81 |
|
82 |
[ "$AUTOMATIC" = "no" ] && test_nx |
83 |
|
84 |
|
85 |
|
86 |
1.1 net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1 |
87 |
|
88 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1?rev=1.1&view=markup |
89 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1?rev=1.1&content-type=text/plain |
90 |
|
91 |
Index: digest-nxserver-freenx-0.7.1 |
92 |
=================================================================== |
93 |
MD5 80e7a57f787daabd0f80dfe8f58e67d3 freenx-0.7.1.tar.gz 63637 |
94 |
RMD160 853380a482243ccf7c5a4a2f51739248b6a382db freenx-0.7.1.tar.gz 63637 |
95 |
SHA256 7e846a288506353a78c2535d2b66b93ffe2f70c9c2868365f83c29ab71150cb6 freenx-0.7.1.tar.gz 63637 |
96 |
|
97 |
|
98 |
|
99 |
1.1 net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-cups.patch |
100 |
|
101 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-cups.patch?rev=1.1&view=markup |
102 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-cups.patch?rev=1.1&content-type=text/plain |
103 |
|
104 |
Index: nxserver-freenx-0.7.1-cups.patch |
105 |
=================================================================== |
106 |
diff -Naur freenx-0.7.1.orig/node.conf freenx-0.7.1/node.conf |
107 |
--- freenx-0.7.1.orig/node.conf 2007-10-31 13:47:45.000000000 +0100 |
108 |
+++ freenx-0.7.1/node.conf 2007-10-31 13:48:35.000000000 +0100 |
109 |
@@ -319,12 +319,12 @@ |
110 |
# of available ppd drivers via the $COMMAND_FOOMATIC command. |
111 |
|
112 |
#ENABLE_FOOMATIC="1" |
113 |
-#COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile" |
114 |
+#COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile" |
115 |
|
116 |
# CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS |
117 |
# installation. |
118 |
|
119 |
-#CUPS_BACKEND="/usr/lib/cups/backend" |
120 |
+#CUPS_BACKEND="/usr/libexec/cups/backend" |
121 |
#CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp" |
122 |
#CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock" |
123 |
#CUPS_ETC="/etc/cups" |
124 |
diff -Naur freenx-0.7.1.orig/nxloadconfig freenx-0.7.1/nxloadconfig |
125 |
--- freenx-0.7.1.orig/nxloadconfig 2007-10-31 13:47:45.000000000 +0100 |
126 |
+++ freenx-0.7.1/nxloadconfig 2007-10-31 13:48:43.000000000 +0100 |
127 |
@@ -155,9 +155,9 @@ |
128 |
ENABLE_CUPS_SEAMLESS="0" |
129 |
CUPS_SEAMLESS_DELAY="10" |
130 |
ENABLE_FOOMATIC="1" |
131 |
-COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile" |
132 |
+COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile" |
133 |
|
134 |
-CUPS_BACKEND="/usr/lib/cups/backend" |
135 |
+CUPS_BACKEND="/usr/libexec/cups/backend" |
136 |
CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp" |
137 |
CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock" |
138 |
CUPS_ETC="/etc/cups/" |
139 |
|
140 |
|
141 |
|
142 |
1.1 net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxdialog.patch |
143 |
|
144 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxdialog.patch?rev=1.1&view=markup |
145 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxdialog.patch?rev=1.1&content-type=text/plain |
146 |
|
147 |
Index: nxserver-freenx-0.7.1-nxdialog.patch |
148 |
=================================================================== |
149 |
Index: nxdialog |
150 |
=================================================================== |
151 |
--- nxdialog (révision 405) |
152 |
+++ nxdialog (révision 413) |
153 |
@@ -26,6 +26,7 @@ |
154 |
done |
155 |
} |
156 |
|
157 |
+PARAMS=( "$@" ) |
158 |
INPUTS=$(requote "$@") #JJK: Save input parameter line... |
159 |
|
160 |
TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer:,parent: -n $(basename $0) -- "$@"` |
161 |
@@ -71,10 +72,13 @@ |
162 |
# client does not like large databases like used when ENABLE_FOOMATIC=1. |
163 |
# |
164 |
# This seems to be because the used sorting algorithm scales in O(n^2). |
165 |
+# |
166 |
+# This is now fixed in NXClient 3.0.0, but still people sometimes use |
167 |
+# older clients. |
168 |
|
169 |
NXCLIENT="/usr/NX/bin/nxclient" |
170 |
[ -x "$NXCLIENT" -a "$DIALOG_TYPE" != "printer" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \ |
171 |
- && exec ${NXCLIENT} "$@" |
172 |
+ && exec ${NXCLIENT} "${PARAMS[@]}" |
173 |
|
174 |
# FIXME: This should be COMMAND_XDIALOG, ... |
175 |
if [ -x /usr/bin/Xdialog ] |
176 |
|
177 |
|
178 |
|
179 |
1.1 net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch |
180 |
|
181 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch?rev=1.1&view=markup |
182 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch?rev=1.1&content-type=text/plain |
183 |
|
184 |
Index: nxserver-freenx-0.7.1-nxloadconfig.patch |
185 |
=================================================================== |
186 |
--- freenx-0.7.1.orig/nxloadconfig 2007-10-31 13:17:10.000000000 +0100 |
187 |
+++ freenx-0.7.1/nxloadconfig 2007-10-31 13:20:33.000000000 +0100 |
188 |
@@ -58,7 +58,8 @@ |
189 |
# Where can different nx components be found |
190 |
NX_DIR=/usr |
191 |
PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys |
192 |
-PATH_LIB=$NX_DIR/lib |
193 |
+REAL_PATH_BIN=$NX_DIR/lib/NX/bin |
194 |
+PATH_LIB=$NX_DIR/lib/NX/lib |
195 |
NX_ETC_DIR=/etc/nxserver |
196 |
NX_SESS_DIR=/var/lib/nxserver/db |
197 |
NX_HOME_DIR=/var/lib/nxserver/home |
198 |
@@ -171,7 +172,7 @@ |
199 |
DEFAULT_X_WM="" |
200 |
KILL_DEFAULT_X_WM="1" |
201 |
USER_X_STARTUP_SCRIPT=.Xclients |
202 |
-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession |
203 |
+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession |
204 |
COMMAND_START_KDE=startkde |
205 |
COMMAND_START_GNOME=gnome-session |
206 |
COMMAND_START_CDE=cdwm |
207 |
@@ -297,7 +298,7 @@ |
208 |
[ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB |
209 |
[ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB |
210 |
[ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB |
211 |
-[ -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" |
212 |
+[ -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" |
213 |
if [ -z "$ENABLE_2_0_0_BACKEND" ] |
214 |
then |
215 |
ENABLE_2_0_0_BACKEND="1" |
216 |
@@ -326,7 +327,7 @@ |
217 |
ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\"" |
218 |
# Check for NX agents ... |
219 |
|
220 |
- [ ! -x "$PATH_BIN/nxagent" ] && \ |
221 |
+ [ ! -x "$REAL_PATH_BIN/nxagent" ] && \ |
222 |
ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components." |
223 |
|
224 |
if [ "ENABLE_EXTERNAL_NXDESKTOP" = "1" ] |
225 |
@@ -578,7 +579,7 @@ |
226 |
[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \ |
227 |
ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\"" |
228 |
|
229 |
- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \ |
230 |
+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \ |
231 |
ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.0.0 backend is needed for this version of FreeNX." |
232 |
|
233 |
[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ |
234 |
|
235 |
|
236 |
|
237 |
-- |
238 |
gentoo-commits@g.o mailing list |