[arch-commits] CVS update of extra/network/freenx (6 files)
Tobias Powalowski
tpowa at archlinux.org
Sat Oct 20 12:48:19 UTC 2007
Date: Saturday, October 20, 2007 @ 08:48:19
Author: tpowa
Path: /home/cvs-extra/extra/network/freenx
Added: nscd-fix.patch (1.1) nxdialog-fix.patch (1.1)
Modified: PKGBUILD (1.24 -> 1.25) kde-config.patch (1.1 -> 1.2)
Removed: nx3-support.patch (1.1) xcb-support.patch (1.1)
'upgpkg: update to new version'
--------------------+
PKGBUILD | 31 ++++++++++++-------------
kde-config.patch | 26 +++++++++++----------
nscd-fix.patch | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
nx3-support.patch | 24 -------------------
nxdialog-fix.patch | 29 +++++++++++++++++++++++
xcb-support.patch | 54 -------------------------------------------
6 files changed, 121 insertions(+), 106 deletions(-)
Index: extra/network/freenx/PKGBUILD
diff -u extra/network/freenx/PKGBUILD:1.24 extra/network/freenx/PKGBUILD:1.25
--- extra/network/freenx/PKGBUILD:1.24 Tue Oct 9 12:15:55 2007
+++ extra/network/freenx/PKGBUILD Sat Oct 20 08:48:19 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.24 2007/10/09 16:15:55 tpowa Exp $
+# $Id: PKGBUILD,v 1.25 2007/10/20 12:48:19 tpowa Exp $
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
#Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
pkgname=freenx
-pkgver=0.7.0
+pkgver=0.7.1
pkgrel=1
pkgdesc="Free Software (GPL) Implementation of the NX Server"
arch=(i686 x86_64)
@@ -11,26 +11,22 @@
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 nx3-support.patch xcb-support.patch \
- fix-tiny-fonts.patch kde-config.patch)
+source=(http://download.berlios.de/freenx/$pkgname-$pkgver.tar.gz kde-config.patch nscd-fix.patch nxdialog-fix.patch)
build() {
# patch and install nxserver
cd $startdir/src/$pkgname-$pkgver
# patch from inside nx
patch < gentoo-nomachine.diff || return 1
- # fixes from freenx svn
- patch -Np0 -i ../nx3-support.patch || return 1
- patch -Np0 -i ../xcb-support.patch || return 1
- patch -Np0 -i ../fix-tiny-fonts.patch || return 1
# fixed for archlinux
patch -Np0 -i ../kde-config.patch || return 1
- sed -i -e 's,/usr/NX/bin/nxclient,/opt/NX/bin/nxclient-nomachine,g' nxclient
+ patch -Np0 -i ../nscd-fix.patch || return 1
+ patch -Np0 -i ../nxdialog-fix.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 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig
- #sed -i 's,kde-config,/opt/kde/bin/kde-config,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
sed -i 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig
@@ -44,7 +40,11 @@
install -D -m755 nxkeygen $startdir/pkg/opt/NX/bin/nxkeygen
install -D -m755 nxnode-login $startdir/pkg/opt/NX/bin/nxnode-login
install -D -m755 nxloadconfig $startdir/pkg/opt/NX/bin/nxloadconfig
- install -D -m755 nxclient $startdir/pkg/opt/NX/bin/nxclient
+ install -D -m755 nxdialog $startdir/pkg/opt/NX/bin/nxdialog
+ install -D -m755 nxviewer_helper $startdir/pkg/opt/NX/bin/nxviever_helper
+ install -D -m755 nxcups-gethost $startdir/pkg/opt/NX/bin/nxcups-gethost
+ install -D -m755 nxdesktop_helper $startdir/pkg/opt/NX/bin/nxdesktop_helper
+ #install -D -m755 nxprint $startdir/pkg/opt/NX/bin/nxprint
install -D -m755 node.conf.sample $startdir/pkg/opt/NX/etc/node.conf
# install nxhelper
cd nxserver-helper
@@ -54,8 +54,7 @@
# create nxserver homedir
mkdir -p $startdir/pkg/opt/NX/home/nx
}
-md5sums=('9c21eb45b4193ad7184109f3274c9e33'
- '3571ecc3c7f14cc3a03109ef57fe4443'
- 'bf74504a131df1195519dbe33f557331'
- '2f46812eb50fbca6346132fbb64250f7'
- '48b4256d7c0d22be0e2ae597186b511e')
+md5sums=('80e7a57f787daabd0f80dfe8f58e67d3'
+ '70788a41f6c965ce117e9f5a8809df2a'
+ 'a8548982d5bfa2f528dcb1dd76e0234b'
+ '59e9822a3cf5af235393f6bd4e5b2ee9')
Index: extra/network/freenx/kde-config.patch
diff -u extra/network/freenx/kde-config.patch:1.1 extra/network/freenx/kde-config.patch:1.2
--- extra/network/freenx/kde-config.patch:1.1 Tue Oct 9 12:15:55 2007
+++ extra/network/freenx/kde-config.patch Sat Oct 20 08:48:19 2007
@@ -1,15 +1,17 @@
---- nxloadconfig~ 2007-07-07 07:59:03.000000000 +0200
-+++ nxloadconfig 2007-10-09 13:41:52.000000000 +0200
-@@ -281,9 +281,11 @@
- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
- fi
+--- nxloadconfig~ 2007-10-19 18:32:40.000000000 +0200
++++ nxloadconfig 2007-10-19 18:33:39.000000000 +0200
+@@ -306,9 +306,11 @@
-+if [ -f /opt/kde/bin/kde-config ]; then
- [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
--[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
-+[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(/opt/kde/bin/kde-config --localprefix)"/share/config/kdeprintrc"
- [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
-+fi
+ if [ "$ENABLE_KDE_CUPS" = "1" ]
+ then
+- [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
+- [ -z "$KDE_PRINTRC" ] && which kde-config >/dev/null 2>&1 && KDE_PRINTRC=$(kde-config --localprefix 2>/dev/null)"/share/config/kdeprintrc"
+- [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
++ if [ -f /opt/kde/bin/kde-config ]; then
++ [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
++ [ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(/opt/kde/bin/kde-config --localprefix)"/share/config/kdeprintrc"
++ [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
++ fi
+ fi
#########################################################################
- # Support for --check
Index: extra/network/freenx/nscd-fix.patch
diff -u /dev/null extra/network/freenx/nscd-fix.patch:1.1
--- /dev/null Sat Oct 20 08:48:19 2007
+++ extra/network/freenx/nscd-fix.patch Sat Oct 20 08:48:19 2007
@@ -0,0 +1,63 @@
+--- 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
Index: extra/network/freenx/nx3-support.patch
diff -u extra/network/freenx/nx3-support.patch:1.1 extra/network/freenx/nx3-support.patch:removed
--- extra/network/freenx/nx3-support.patch:1.1 Tue Oct 9 12:15:55 2007
+++ extra/network/freenx/nx3-support.patch Sat Oct 20 08:48:19 2007
@@ -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\""
Index: extra/network/freenx/nxdialog-fix.patch
diff -u /dev/null extra/network/freenx/nxdialog-fix.patch:1.1
--- /dev/null Sat Oct 20 08:48:19 2007
+++ extra/network/freenx/nxdialog-fix.patch Sat Oct 20 08:48:19 2007
@@ -0,0 +1,29 @@
+--- nxdialog~ 2007-10-15 00:25:14.000000000 +0200
++++ nxdialog 2007-10-20 14:35:18.000000000 +0200
+@@ -28,11 +28,15 @@
+
+ INPUTS=$(requote "$@") #JJK: Save input parameter line...
+
++NXCLIENT="/opt/NX/bin/nxclient-nomachine"
++[ -x "$NXCLIENT" -a "$DIALOG_TYPE" != "printer" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \
++ && exec ${NXCLIENT} "$@"
++
+ TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer:,parent: -n $(basename $0) -- "$@"`
+
+ if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+-# Note the quotes around `$TEMP': they are essential!
++# Note the quotes around '$TEMP': they are essential!
+ eval set -- "$TEMP"
+
+ DIALOG_TYPE="ok";
+@@ -72,9 +76,6 @@
+ #
+ # This seems to be because the used sorting algorithm scales in O(n^2).
+
+-NXCLIENT="/usr/NX/bin/nxclient"
+-[ -x "$NXCLIENT" -a "$DIALOG_TYPE" != "printer" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \
+- && exec ${NXCLIENT} "$@"
+
+ # FIXME: This should be COMMAND_XDIALOG, ...
+ if [ -x /usr/bin/Xdialog ]
Index: extra/network/freenx/xcb-support.patch
diff -u extra/network/freenx/xcb-support.patch:1.1 extra/network/freenx/xcb-support.patch:removed
--- extra/network/freenx/xcb-support.patch:1.1 Tue Oct 9 12:15:55 2007
+++ extra/network/freenx/xcb-support.patch Sat Oct 20 08:48:19 2007
@@ -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