[arch-commits] Commit in freenx/trunk (8 files)
Tobias Powalowski
tpowa at archlinux.org
Sun Sep 28 21:21:59 UTC 2008
Date: Sunday, September 28, 2008 @ 17:21:59
Author: tpowa
Revision: 13810
upgpkg: freenx 0.7.3-1
Modified:
freenx/trunk/PKGBUILD
Deleted:
freenx/trunk/fullscreen.patch
freenx/trunk/nscd-fix.patch
freenx/trunk/nx3-support.patch
freenx/trunk/nxclient-fix.patch
freenx/trunk/nxdialog-fix.patch
freenx/trunk/vnc-startup-fix.patch
freenx/trunk/xcb-support.patch
-----------------------+
PKGBUILD | 22 ++++++----------
fullscreen.patch | 23 -----------------
nscd-fix.patch | 63 ------------------------------------------------
nx3-support.patch | 24 ------------------
nxclient-fix.patch | 11 --------
nxdialog-fix.patch | 30 ----------------------
vnc-startup-fix.patch | 11 --------
xcb-support.patch | 54 -----------------------------------------
8 files changed, 9 insertions(+), 229 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-09-28 21:21:25 UTC (rev 13809)
+++ PKGBUILD 2008-09-28 21:21:59 UTC (rev 13810)
@@ -2,8 +2,8 @@
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
#Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
pkgname=freenx
-pkgver=0.7.1
-pkgrel=3
+pkgver=0.7.3
+pkgrel=1
pkgdesc="Free Software (GPL) Implementation of the NX Server"
arch=(i686 x86_64)
url="http://freenx.berlios.de"
@@ -11,22 +11,21 @@
depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-apps' 'xorg-fonts-misc' 'coreutils')
backup=(opt/NX/etc/node.conf)
install=freenx.install
-source=(http://download.berlios.de/freenx/$pkgname-$pkgver.tar.gz kde-config.patch nscd-fix.patch nxdialog-fix.patch vnc-startup-fix.patch)
+source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz kde-config.patch)
build() {
# patch and install nxserver
- cd $startdir/src/$pkgname-$pkgver
+ cd $startdir/src/$pkgname-server-$pkgver
# patch from inside nx
patch < gentoo-nomachine.diff || return 1
# fixed for archlinux
- patch -Np0 -i ../kde-config.patch || return 1
- patch -Np0 -i ../nscd-fix.patch || return 1
- patch -Np0 -i ../nxdialog-fix.patch || return 1
- patch -Np0 -i ../vnc-startup-fix.patch || return 1
+ ### Broken by kde4 at the moment!
+ #patch -Np0 -i ../kde-config.patch || return 1
#sed -i -e 's,/usr/NX/bin/nxclient,/opt/NX/bin/nxclient-nomachine,g' nxdialog
sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig
sed -i -e 's,/usr/NX,/opt/NX,g' nxloadconfig
sed -i 's,netcat,nc,g' nxloadconfig
+ sed -i -e 's/utmp/nx/g' nxsetup
sed -i 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig
#sed -i 's,COMMAND_MD5SUM=openssl md5,COMMAND_MD5SUM=md5sum,g' nxloadconfig
sed -i 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig
@@ -55,8 +54,5 @@
# create nxserver homedir
mkdir -p $startdir/pkg/opt/NX/home/nx
}
-md5sums=('80e7a57f787daabd0f80dfe8f58e67d3'
- '70788a41f6c965ce117e9f5a8809df2a'
- 'a8548982d5bfa2f528dcb1dd76e0234b'
- '89476103e9795be3d6b7298317c0ce90'
- 'bb999d23aa2005619385d0e8662e8967')
+md5sums=('856f597e139018f7ed62713c9d6c9ed5'
+ '70788a41f6c965ce117e9f5a8809df2a')
Deleted: fullscreen.patch
===================================================================
--- fullscreen.patch 2008-09-28 21:21:25 UTC (rev 13809)
+++ fullscreen.patch 2008-09-28 21:21:59 UTC (rev 13810)
@@ -1,23 +0,0 @@
---- nxnode 2006-10-05 21:24:20.000000000 +0200
-+++ nxnode 2006-10-05 21:21:11.000000000 +0200
-@@ -629,6 +629,10 @@
- imagecompressionmethod=$(getparam imagecompressionmethod)
- imagecompressionlevel=$(getparam imagecompressionlevel)
- geometry=$(getparam geometry)
-+
-+ # fullscreen variable added to fix fullscreen on client login
-+ fullscreen=$(getparam fullscreen)
-+
- keyboard=$(getparam keyboard)
- kbtype=$(getparam kbtype)
- media=$(getparam media)
-@@ -664,7 +668,8 @@
- status=$(getparam status)
- host=$(getparam host)
-
-- fullscreen=""
-+# commented out to fix fullscreen on client login
-+# fullscreen=""
- [ "$geometry" = "fullscreen" ] && fullscreen="1"
-
- [ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
Deleted: nscd-fix.patch
===================================================================
--- nscd-fix.patch 2008-09-28 21:21:25 UTC (rev 13809)
+++ nscd-fix.patch 2008-09-28 21:21:59 UTC (rev 13810)
@@ -1,63 +0,0 @@
---- nxsetup~ 2007-10-15 00:25:14.000000000 +0200
-+++ nxsetup 2007-10-19 18:36:45.000000000 +0200
-@@ -164,11 +164,15 @@
-
- # adduser needs a valid group to add the user to
- ! nx_group_exists && addgroup --system --quiet $GROUPADD_OPTIONS nx
-- [ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+ if [ -f /var/run/nscd/nscd.pid ]; then
-+ [ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+ fi
-
- adduser $USERADD_OPTIONS nx
-- [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
--
-+ if [ -f /var/run/nscd/nscd.pid ]; then
-+ [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+ fi
-+
- # no, its a "normal" useradd
- else
- USERADD_OPTIONS="-g nx -d $NX_HOME_DIR -s $PATH_BIN/nxserver"
-@@ -187,17 +191,25 @@
-
- if [ "$SETUP_LOCAL_USER" = "yes" ]
- then
-- ! nx_group_exists && lgroupadd $GROUPADD_OPTIONS nx
-- [ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+ ! nx_group_exists && lgroupadd $GROUPADD_OPTIONS nx
-+ if [ -f /var/run/nscd/nscd.pid ]; then
-+ [ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+ fi
-
- luseradd $USERADD_OPTIONS nx
-- [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+ if [ -f /var/run/nscd/nscd.pid ]; then
-+ [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+ fi
- else
- ! nx_group_exists && groupadd $GROUPADD_OPTIONS nx
-- [ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+ if [ -f /var/run/nscd/nscd.pid ]; then
-+ [ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+ fi
-
- useradd $USERADD_OPTIONS nx
-- [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+ if [ -f /var/run/nscd/nscd.pid ]; then
-+ [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+ fi
- fi
-
-
-@@ -457,7 +469,9 @@
- #Perform cleanup?
- [ "$CLEAN" = "yes" ] && uninstall_nx
-
-- [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; nscd --invalidate group; }
-+ if [ -f /var/run/nscd/nscd.pid ]; then
-+ [ -f /etc/nscd.conf ] && { nscd --invalidate passwd; nscd --invalidate group; }
-+ fi
- install_nx
-
- [ "$AUTOMATIC" = "no" ] && test_nx
Deleted: nx3-support.patch
===================================================================
--- nx3-support.patch 2008-09-28 21:21:25 UTC (rev 13809)
+++ nx3-support.patch 2008-09-28 21:21:59 UTC (rev 13810)
@@ -1,24 +0,0 @@
-Index: nxloadconfig
-===================================================================
---- nxloadconfig (Revision 391)
-+++ nxloadconfig (Arbeitskopie)
-@@ -289,7 +289,7 @@
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- ENABLE_2_0_0_BACKEND="1"
-- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
-+ [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0"
- fi
-
- if [ "$ENABLE_KDE_CUPS" = "1" ]
-@@ -549,8 +549,8 @@
- [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
- ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
-
-- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
-- ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
-+ [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
-+ 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."
-
- [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
- ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
Deleted: nxclient-fix.patch
===================================================================
--- nxclient-fix.patch 2008-09-28 21:21:25 UTC (rev 13809)
+++ nxclient-fix.patch 2008-09-28 21:21:59 UTC (rev 13810)
@@ -1,11 +0,0 @@
---- nxclient~ 2005-08-02 19:49:08.000000000 +0200
-+++ nxclient 2006-07-03 15:14:43.000000000 +0200
-@@ -21,7 +21,7 @@
-
- TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer: -n $(basename $0) -- "$@"`
-
--if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-+if [ $? = 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-
- # Note the quotes around `$TEMP': they are essential!
- eval set -- "$TEMP"
Deleted: nxdialog-fix.patch
===================================================================
--- nxdialog-fix.patch 2008-09-28 21:21:25 UTC (rev 13809)
+++ nxdialog-fix.patch 2008-09-28 21:21:59 UTC (rev 13810)
@@ -1,30 +0,0 @@
---- nxdialog.old 2007-10-15 00:25:14.000000000 +0200
-+++ nxdialog 2007-10-31 18:38:57.000000000 +0100
-@@ -26,6 +26,7 @@
- done
- }
-
-+PARAMS=( "$@" )
- INPUTS=$(requote "$@") #JJK: Save input parameter line...
-
- TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer:,parent: -n $(basename $0) -- "$@"`
-@@ -71,10 +72,13 @@
- # client does not like large databases like used when ENABLE_FOOMATIC=1.
- #
- # This seems to be because the used sorting algorithm scales in O(n^2).
-+#
-+# This is now fixed in NXClient 3.0.0, but still people sometimes use
-+# older clients.
-
- NXCLIENT="/usr/NX/bin/nxclient"
- [ -x "$NXCLIENT" -a "$DIALOG_TYPE" != "printer" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \
-- && exec ${NXCLIENT} "$@"
-+ && exec ${NXCLIENT} "${PARAMS[@]}"
-
- # FIXME: This should be COMMAND_XDIALOG, ...
- if [ -x /usr/bin/Xdialog ]
-@@ -444,3 +448,4 @@
- [ $RC -eq 2 ] && kill -TERM $DIALOG_PARENT
- [ $RC -eq 3 ] && kill -HUP $DIALOG_PARENT
- exit 0
-+
Deleted: vnc-startup-fix.patch
===================================================================
--- vnc-startup-fix.patch 2008-09-28 21:21:25 UTC (rev 13809)
+++ vnc-startup-fix.patch 2008-09-28 21:21:59 UTC (rev 13810)
@@ -1,11 +0,0 @@
---- nxserver~ 2007-10-15 00:25:14.000000000 +0200
-+++ nxserver 2007-10-22 07:17:46.000000000 +0200
-@@ -267,7 +267,7 @@
- egrep -q "^userName=$1$" $i && let SESSION_COUNT_USER=$SESSION_COUNT_USER+1
- done
-
-- if [ "$ENABLE_DESKTOP_SHARING" = "1" ]
-+ if [ "$4" = "vnc" -a "$ENABLE_DESKTOP_SHARING" = "1" ]
- then
- export DESKTOP_SHARING_IDS=""
- for i in $(LC_ALL=C netstat -ln --protocol=unix | egrep 'X11-unix/X[0-9]$' | sed 's/.*X\(.*\)/\1/g')
Deleted: xcb-support.patch
===================================================================
--- xcb-support.patch 2008-09-28 21:21:25 UTC (rev 13809)
+++ xcb-support.patch 2008-09-28 21:21:59 UTC (rev 13810)
@@ -1,54 +0,0 @@
---- nxnode.old 2007-04-20 19:59:07.000000000 +0200
-+++ nxnode 2007-10-09 08:10:50.000000000 +0200
-@@ -300,7 +300,7 @@
-
- if [ "$virtualdesktop" = "1" -a "$type" = "unix-application" -a "$DEFAULT_X_WM" != "" -a -x "$(find_app $DEFAULT_X_WM)" ]
- then
-- DISPLAY=unix:$display $DEFAULT_X_WM >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
-+ DISPLAY=:$display $DEFAULT_X_WM >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
- NODE_WM_PID=$!
- fi
-
-@@ -308,7 +308,7 @@
- # Startup the application
- #
-
-- DISPLAY=unix:$display $NODE_APPLICATION >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
-+ DISPLAY=:$display $NODE_APPLICATION >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
- NODE_APP_PID=$!
-
- mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/pids/"
-@@ -1087,13 +1087,13 @@
-
- $COMMAND_XAUTH >/dev/null 2>&1 <<EOF
- add localhost:$display MIT-MAGIC-COOKIE-1 $cookie
--add unix:$display MIT-MAGIC-COOKIE-1 $cookie
-+add :$display MIT-MAGIC-COOKIE-1 $cookie
- exit
- EOF
-
- $COMMAND_XAUTH -f "$USER_FAKE_HOME/.nx/C-$sess_id/authority" >/dev/null 2>&1 <<EOF
- add localhost:$display MIT-MAGIC-COOKIE-1 $cookie
--add unix:$display MIT-MAGIC-COOKIE-1 $cookie
-+add :$display MIT-MAGIC-COOKIE-1 $cookie
- exit
- EOF
-
-@@ -1101,7 +1101,7 @@
-
- cat << EOF >$USER_FAKE_HOME/.nx/C-$sess_id/scripts/authority
- remove localhost:$display
--remove unix:$display
-+remove :$display
- exit
- EOF
-
-@@ -1126,7 +1126,7 @@
- then
- sess_id="$SERVER_NAME-$display-$uniqueid"
- # go into background immediately
-- NXSESSIONID="$sess_id" DISPLAY=unix:$display "$NODE_AUTOSTART" "$1" >/dev/null 2>&1 &
-+ NXSESSIONID="$sess_id" DISPLAY=:$display "$NODE_AUTOSTART" "$1" >/dev/null 2>&1 &
- # dont't wait for this child!
- disown $!
- fi
More information about the arch-commits
mailing list