diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2007-06-21 20:21:30 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2007-06-21 20:21:30 +0000 |
| commit | 0017d22cdcf9f69e4bbccb5fcd2c019259ccda2c (patch) | |
| tree | 81508c3b646fed4c3d1c8e2b28ac943b6520a77c /net-misc/nxserver-freeedition/files | |
| parent | Version bump, thanks to Timo Gurr <psy@monsterserver.de> in bug #182779 (diff) | |
| download | gentoo-2-0017d22cdcf9f69e4bbccb5fcd2c019259ccda2c.tar.gz gentoo-2-0017d22cdcf9f69e4bbccb5fcd2c019259ccda2c.tar.bz2 gentoo-2-0017d22cdcf9f69e4bbccb5fcd2c019259ccda2c.zip | |
Version bump, thanks to Timo Gurr <psy@monsterserver.de> in bug #182779
(Portage version: 2.1.3_rc4)
Diffstat (limited to 'net-misc/nxserver-freeedition/files')
| -rw-r--r-- | net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0 | 6 | ||||
| -rw-r--r-- | net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch | 70 |
2 files changed, 76 insertions, 0 deletions
diff --git a/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0 b/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0 new file mode 100644 index 000000000000..5f4e00694ca6 --- /dev/null +++ b/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0 @@ -0,0 +1,6 @@ +MD5 8c5d93aa186d9b68aee4dcbb3fe2e309 nxserver-3.0.0-60.i386.tar.gz 6658532 +RMD160 d9a0b02c6cb04c40bff90927658cec5a7d6aeb4e nxserver-3.0.0-60.i386.tar.gz 6658532 +SHA256 aa1bd7242ecbe752088f8fa8ddf96ba0b3cc1ab8525beb0a6be5678cbcf97ea4 nxserver-3.0.0-60.i386.tar.gz 6658532 +MD5 850ff36f504ec945b295842d4ec96032 nxserver-3.0.0-60.x86_64.tar.gz 7701235 +RMD160 d9c9fb15430ca4c0410f440de908c4905ba62fd8 nxserver-3.0.0-60.x86_64.tar.gz 7701235 +SHA256 4c27e17149398154abff0a0bfa9ea9f4bee0e67f9cc77e2f96f9cc02a8b0a9a2 nxserver-3.0.0-60.x86_64.tar.gz 7701235 diff --git a/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch b/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch new file mode 100644 index 000000000000..ab4ce9b482f6 --- /dev/null +++ b/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch @@ -0,0 +1,70 @@ +--- scripts/setup/nxserver.orig 2007-06-20 13:25:18.000000000 +0200 ++++ scripts/setup/nxserver 2007-06-21 12:29:49.477230627 +0200 +@@ -535,6 +535,10 @@ + + removeNXinit () { + ++ if [ "$system" = "gentoo" ]; then ++ return ++ fi ++ + runCommand "$RMCOMMAND -f /etc/init.d/nxserver" "Unable to remove '/etc/init.d/nxserver'" "warn" + + if [ "$system" = "solaris" ]; +@@ -681,6 +685,10 @@ + + addNXinit () { + ++ if [ "$system" = "gentoo" ]; then ++ return ++ fi ++ + runCommand "cat $NODE_ROOT/scripts/init/nxserver > /etc/init.d/nxserver" "Unable to create: '/etc/init.d/nxserver'" "warn" + runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of '/etc/init.d/nxserver' file" "warn" + +@@ -796,6 +804,11 @@ + + addNXUserLinux () { + ++ # does the NX user already exist? ++ if id nx > /dev/null 2>&1 ; then ++ return ++ fi ++ + if [ "x$system" != "xdebian" ] + then + sysuser=`useradd --help 2>&1|grep "\-r"`; +@@ -2434,6 +2447,10 @@ + system=fedora + fi + ++if [ -d /usr/portage ]; then ++ system=gentoo ++fi ++ + if [ "x$system" = "x" -a -f /etc/release ]; + then + system=solaris +@@ -2468,6 +2485,7 @@ + "mandrake" ) ;; + "fedora" ) ;; + "debian" ) ;; ++ "gentoo" ) ;; + "solaris" ) ;; + "" ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;; + * ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;; +@@ -2614,14 +2632,6 @@ + procedureUpdateServer + return 0 + fi +- +- result=`id nx 2>&1` +- if [ $? = 0 ]; +- then +- printMsg "Cannot add user: nx. User: nx already exists" "error" +- printMsg "Please try to fix the problem by reinstalling the server" "error" +- exit 1 +- fi + + LOGFILE="$INSTALLOG" + createLogdirectory |