summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2006-11-08 22:04:29 +0000
committerStuart Herbert <stuart@gentoo.org>2006-11-08 22:04:29 +0000
commit31091e30809559345bffad4455a9e1791762df36 (patch)
treea33c65506fce3dba652d7def57585f4c32283530 /net-misc/nxserver-freenx
parentAdded NX Server Free Edition (diff)
downloadnx-31091e30809559345bffad4455a9e1791762df36.tar.gz
nx-31091e30809559345bffad4455a9e1791762df36.tar.bz2
nx-31091e30809559345bffad4455a9e1791762df36.zip
Remove unneeded files; sync w/ Portage
svn path=/testing/; revision=115
Diffstat (limited to 'net-misc/nxserver-freenx')
-rw-r--r--net-misc/nxserver-freenx/Manifest32
-rw-r--r--net-misc/nxserver-freenx/files/50nxserver3
-rw-r--r--net-misc/nxserver-freenx/files/fixes.diff26
-rw-r--r--net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch16
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch18
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch18
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-path.diff11
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild23
8 files changed, 7 insertions, 140 deletions
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 075f175..bbc98d9 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,15 +1,3 @@
-AUX 50nxserver 80 RMD160 204c4cffc4832609451e69a78a75d0572b74b0f1 SHA1 02c98a293297819e1f28dab13c49f0aa30d27d4b SHA256 7572b8195b5b1ba83f429ddc11be44b3496810e05adbc1c233788085bcf8e365
-MD5 41f95f92c9e230d7cd356504a8e56269 files/50nxserver 80
-RMD160 204c4cffc4832609451e69a78a75d0572b74b0f1 files/50nxserver 80
-SHA256 7572b8195b5b1ba83f429ddc11be44b3496810e05adbc1c233788085bcf8e365 files/50nxserver 80
-AUX fixes.diff 1078 RMD160 780b0dd88789dc57c7ac7e412f5e17747f220dec SHA1 e0ce545cef2b9c1ff895286dcf74b47ef8b9adf1 SHA256 d611a7bb9065f6731f03fd59db52dfd72faef8d63219ac279f0764543d329b81
-MD5 8f0fb766970dd9dce29e468cec2e796e files/fixes.diff 1078
-RMD160 780b0dd88789dc57c7ac7e412f5e17747f220dec files/fixes.diff 1078
-SHA256 d611a7bb9065f6731f03fd59db52dfd72faef8d63219ac279f0764543d329b81 files/fixes.diff 1078
-AUX freenx-0.4.4-adduser-fix.patch 562 RMD160 a6dcc853d73cf13cf395cc346fa5da86a00ec4ec SHA1 3334d2bd2d5617891ed04481ea88472829a1f41d SHA256 f5cbff53a8fe403e7068b43bc4c3005132e578e14effcbd3063ccf5da112ed17
-MD5 925fd2cad3adceb556bf1de6cf866ed0 files/freenx-0.4.4-adduser-fix.patch 562
-RMD160 a6dcc853d73cf13cf395cc346fa5da86a00ec4ec files/freenx-0.4.4-adduser-fix.patch 562
-SHA256 f5cbff53a8fe403e7068b43bc4c3005132e578e14effcbd3063ccf5da112ed17 files/freenx-0.4.4-adduser-fix.patch 562
AUX freenx-0.5.0-fullscreen.patch 742 RMD160 051282cd14faa40a8dffed131aaaee7b9a786dde SHA1 982c4494dab50270c52ecb37ee82703dcf70e6d0 SHA256 5b207a3282fb5dee52f271668af306df82cd2f14593f48497a895fec397e0e45
MD5 46aacff8b2ed5e40ae9545fc51f7c72c files/freenx-0.5.0-fullscreen.patch 742
RMD160 051282cd14faa40a8dffed131aaaee7b9a786dde files/freenx-0.5.0-fullscreen.patch 742
@@ -18,23 +6,11 @@ AUX freenx-0.5.0-startup.patch 614 RMD160 77a71ec51e6cb781f927363dd21014b900a324
MD5 24ec695b0851ee0a329a0a3af5b3849f files/freenx-0.5.0-startup.patch 614
RMD160 77a71ec51e6cb781f927363dd21014b900a3247b files/freenx-0.5.0-startup.patch 614
SHA256 31f4bc50e63fd03eb48b6e90fc17062c0f45073b9578c0514ae7c209a1714042 files/freenx-0.5.0-startup.patch 614
-AUX nxserver-freenx-0.4.4-xorg7.patch 569 RMD160 b67f4245d974cc1ea632797832d68effd7a43c12 SHA1 89d6f214e91e5d0ae634309b283242c9613329b7 SHA256 2495be930c061b4389e5287979e78ada02c754d6252c33af5a2e6564d2df2dc5
-MD5 0fcfdb1adc7a94eece68cfd65a522b7f files/nxserver-freenx-0.4.4-xorg7.patch 569
-RMD160 b67f4245d974cc1ea632797832d68effd7a43c12 files/nxserver-freenx-0.4.4-xorg7.patch 569
-SHA256 2495be930c061b4389e5287979e78ada02c754d6252c33af5a2e6564d2df2dc5 files/nxserver-freenx-0.4.4-xorg7.patch 569
-AUX nxserver-freenx-xorg7.patch 590 RMD160 ad610f08f19fed4365903883e9ac58c8765566ba SHA1 21444d5e71e66f8cf24b9292d8aa35dec6c98c49 SHA256 f690fa88b718e47c9d545f185bfa88ce8cf2c96ed0de26cd2ca27118c711e225
-MD5 2a253055c0eef647a0a8b922f321842d files/nxserver-freenx-xorg7.patch 590
-RMD160 ad610f08f19fed4365903883e9ac58c8765566ba files/nxserver-freenx-xorg7.patch 590
-SHA256 f690fa88b718e47c9d545f185bfa88ce8cf2c96ed0de26cd2ca27118c711e225 files/nxserver-freenx-xorg7.patch 590
-AUX nxserver-path.diff 718 RMD160 6ddec39e9005fefd475e208f369b231e9501c5c7 SHA1 c84fc802a151bbc64a56548b9f49a095868b12e7 SHA256 7fd2616f3f9a3165fbd12a1a05ab1081d7da8c6efe139029b5d401b04bbe1985
-MD5 f58cf7014a645ce96afd27989a893c2f files/nxserver-path.diff 718
-RMD160 6ddec39e9005fefd475e208f369b231e9501c5c7 files/nxserver-path.diff 718
-SHA256 7fd2616f3f9a3165fbd12a1a05ab1081d7da8c6efe139029b5d401b04bbe1985 files/nxserver-path.diff 718
DIST freenx-0.5.0-5.fc5.i386.rpm 62859 RMD160 1c7bef90d5610ab265d9a66253d2bda1663e6e1a SHA1 b8845b592ee3818f028b3201b17912ce1820d45b SHA256 8d5224e825191d330e85996815f1b2ecb8b733853c24e7704cf0ea7b52237016
-EBUILD nxserver-freenx-0.5.0-r1.ebuild 4421 RMD160 868afaca8c2f8bb8e424133aeebc4ae636fdad66 SHA1 5cf0baba12671ec9fb84abe2c656425f83ab251c SHA256 07c6c4121eab30fa236adadd4f7f74182a460d3f6fc7271834f56c2b80147046
-MD5 5ab83defd1d9afad23511c86679d4729 nxserver-freenx-0.5.0-r1.ebuild 4421
-RMD160 868afaca8c2f8bb8e424133aeebc4ae636fdad66 nxserver-freenx-0.5.0-r1.ebuild 4421
-SHA256 07c6c4121eab30fa236adadd4f7f74182a460d3f6fc7271834f56c2b80147046 nxserver-freenx-0.5.0-r1.ebuild 4421
+EBUILD nxserver-freenx-0.5.0-r1.ebuild 3281 RMD160 da387b20eec64a774892491c812b02b938835cfd SHA1 bdc06a17c9eede06363d6641d8baee9a58594edf SHA256 007a69d29ee824849b1b2f50b15c65aa66910c4c3abb47cec9e90de62a296ff7
+MD5 e5ae77e91d1a3026f9f3a5ae9d188da1 nxserver-freenx-0.5.0-r1.ebuild 3281
+RMD160 da387b20eec64a774892491c812b02b938835cfd nxserver-freenx-0.5.0-r1.ebuild 3281
+SHA256 007a69d29ee824849b1b2f50b15c65aa66910c4c3abb47cec9e90de62a296ff7 nxserver-freenx-0.5.0-r1.ebuild 3281
MISC ChangeLog 4546 RMD160 f081e2d7f56201d4b35c27e5b23b9f22d5f0cf8f SHA1 7d607f526d861cb4c362bfc4424a512113f07a2c SHA256 0d07a96e80392326930e8338c311803cf40fe6224a22db3321f8037cf18937cd
MD5 b49057c3ec7febd008b3b4f81492ee5d ChangeLog 4546
RMD160 f081e2d7f56201d4b35c27e5b23b9f22d5f0cf8f ChangeLog 4546
diff --git a/net-misc/nxserver-freenx/files/50nxserver b/net-misc/nxserver-freenx/files/50nxserver
deleted file mode 100644
index a791ca2..0000000
--- a/net-misc/nxserver-freenx/files/50nxserver
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH=/usr/NX/bin
-ROOTPATH=/usr/NX/bin
-CONFIG_PROTECT="/usr/NX/etc /usr/NX/home"
diff --git a/net-misc/nxserver-freenx/files/fixes.diff b/net-misc/nxserver-freenx/files/fixes.diff
deleted file mode 100644
index b82e9ce..0000000
--- a/net-misc/nxserver-freenx/files/fixes.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u --recursive freenx-0.2.8-orig/nxclient freenx-0.2.8/nxclient
---- freenx-0.2.8-orig/nxclient 2005-02-17 20:03:15.000000000 +0000
-+++ freenx-0.2.8/nxclient 2005-02-18 18:59:20.843775240 +0000
-@@ -8,7 +8,9 @@
- # it does check it someday.
-
- # First check if the commercial nxclient is available and use it
--[ -x /usr/NX/bin/nxclient ] && exec /usr/NX/bin/nxclient "$@"
-+# but check that it isn't this script to prevent a loop!
-+NXCLIENT="/usr/NX/bin/nxclient"
-+[ -x ${NXCLIENT} -a "`file -bi ${NXCLIENT}`" != 'application/x-shellscript' ] && exec ${NXCLIENT} "$@"
-
- TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display: -n $(basename $0) -- "$@"`
-
-diff -u --recursive freenx-0.2.8-orig/nxserver freenx-0.2.8/nxserver
---- freenx-0.2.8-orig/nxserver 2005-02-17 20:03:15.000000000 +0000
-+++ freenx-0.2.8/nxserver 2005-02-18 19:01:54.465015048 +0000
-@@ -495,7 +495,7 @@
-
- server_nxnode_start_wait()
- {
-- server_nxnode_start $@ | while read CMD
-+ server_nxnode_start "$@" | while read CMD
- do
- case "$CMD" in
- "NX> 1006"*|"NX> 1005"*)
diff --git a/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch b/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch
deleted file mode 100644
index 773ef3a..0000000
--- a/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN freenx-0.4.4.org/nxsetup freenx-0.4.4.new/nxsetup
---- freenx-0.4.4.org/nxsetup 2005-08-02 12:29:59.000000000 -0500
-+++ freenx-0.4.4.new/nxsetup 2005-08-07 19:17:08.000000000 -0500
-@@ -116,7 +116,11 @@ useradd_nx()
- # no, its a "normal" useradd
- else
- USERADD_OPTIONS="-d $NX_HOME_DIR -s $PATH_BIN/nxserver"
-- [ -n $SETUP_GID ] && USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS"
-+ # gid specified?
-+ if [ -n "$SETUP_GID" ]
-+ then
-+ USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS"
-+ fi
- # uid specified?
- if [ -n "$SETUP_UID" ]
- then
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch
deleted file mode 100644
index 297befe..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- freenx-server/nxnode 2005-08-07 12:53:57.000000000 +0300
-+++ freenx-server/nxnode 2006-02-02 00:00:25.000000000 +0200
-@@ -22,6 +22,15 @@
-
- echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
-
-+### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
-+
-+if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
-+ then
-+ export XKEYSYMDB=/usr/share/X11/XKeysymDB
-+ fi
-+
-+### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
-+
- if [ "$1" != "--check" -a "$1" != "--setkey" ]
- then
- read CMDLINE
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch
deleted file mode 100644
index 9884756..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- freenx-server/nxnode 2005-08-07 12:53:57.000000000 +0300
-+++ freenx-server/nxnode 2006-02-02 00:00:25.000000000 +0200
-@@ -22,6 +22,15 @@
-
- echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
-
-+### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
-+
-+if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
-+ then
-+ export XKEYSYMDB=/usr/share/X11/XKeysymDB
-+ fi
-+
-+### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
-+
- if [ "$1" != "--check" -a "$1" != "--setkey" -a "$1" != "--agent" ]
- then
- read CMDLINE
diff --git a/net-misc/nxserver-freenx/files/nxserver-path.diff b/net-misc/nxserver-freenx/files/nxserver-path.diff
deleted file mode 100644
index 1e734c9..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-path.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nxserver.orig 2004-12-12 15:51:12.283474376 -0500
-+++ nxserver 2004-12-12 15:51:46.385290112 -0500
-@@ -487,7 +487,7 @@
- # Use nxnode-login?
- if [ "$PAM_LOGIN_METHOD" = "1" ]
- then
-- echo $PAM_PASS | nxnode-login "$USER" 127.0.0.1 "-p$SSHD_AUTH_PORT" "$CMD" "$@" 2>&1 | log_tee
-+ echo $PAM_PASS | $NX_DIR/bin/nxnode-login "$USER" 127.0.0.1 "-p$SSHD_AUTH_PORT" "$CMD" "$@" 2>&1 | log_tee
- else
- echo "$@" | ssh -l "$USER" 127.0.0.1 -p $SSHD_AUTH_PORT -x -2 -i $NX_ETC_DIR/users.id_dsa -o 'PubkeyAuthentication yes' -o 'RSAAuthentication yes' -o 'RhostsAuthentication no' -o 'PasswordAuthentication no' -o 'RhostsRSAAuthentication no' -o 'StrictHostKeyChecking no' $NX_DIR/bin/nxnode "$CMD" | log_tee
- fi
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
index 1044513..eb207cd 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild,v 1.1 2006/04/30 19:38:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild,v 1.1 2006/11/08 21:46:59 stuart Exp $
inherit multilib eutils rpm
@@ -9,7 +9,7 @@ HOMEPAGE="http://freenx.berlios.de/"
SRC_URI="ftp://ftp.pbone.net/mirror/download.fedora.redhat.com/pub/fedora/linux/extras/5/i386/freenx-0.5.0-5.fc5.i386.rpm"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~x86"
RESTRICT="strip"
IUSE="arts cups esd nxclient"
DEPEND="virtual/ssh
@@ -77,7 +77,7 @@ src_compile() {
src_install() {
NX_ETC_DIR=/etc/nxserver
NX_SESS_DIR=/var/lib/nxserver/db
-
+
dobin usr/bin/nxserver
dobin usr/bin/nxnode
dobin usr/bin/nxnode-login
@@ -98,27 +98,10 @@ src_install() {
dodir ${NX_HOME_DIR}
- # ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
for x in closed running failed ; do
keepdir ${NX_SESS_DIR}/$x
fperms 0700 ${NX_SESS_DIR}/$x
done
-
- #dodir ${NX_HOME_DIR}/.ssh
- #fperms 0700 ${NX_HOME_DIR}
- #fperms 0700 ${NX_HOME_DIR}/.ssh
-
- #cat << EOF >${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-#ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-#EOF
- #fperms 0600 ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
- #cp ${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ${D}${NX_HOME_DIR}/.ssh/authorized_keys2
- #fperms 0600 ${NX_HOME_DIR}/.ssh/authorized_keys2
-
- #echo -n "127.0.0.1" ${D}${NX_HOME_DIR}/.ssh/known_hosts
-
- #chown -R nx:root ${D}${NX_DIR}
}
pkg_postinst () {