updated daemon patch

6 files changed, 34 insertions, 21 deletions

diff --git a/net-misc/rfb/ChangeLog b/net-misc/rfb/ChangeLog
index 893163460b91..479e58651fe4 100644
--- a/net-misc/rfb/ChangeLog
+++ b/net-misc/rfb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rfb
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/ChangeLog,v 1.6 2003/03/25 23:31:14 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/ChangeLog,v 1.7 2003/06/27 20:54:45 vapier Exp $
+
+*rfb-0.6.1-r2 (27 Jun 2003)
+
+  27 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Updated the daemon to be a real daemon ;)
+  This one actually unbinds std{in,out,err} and all that stuff.
+  THX WWOODS YOU MAST0R OF C
 
 *rfb-0.6.1-r1 (25 Mar 2003)
 
diff --git a/net-misc/rfb/Manifest b/net-misc/rfb/Manifest
index 15241eb14d03..f2ecbe75b2c1 100644
--- a/net-misc/rfb/Manifest
+++ b/net-misc/rfb/Manifest
@@ -1,7 +1,7 @@
-MD5 616743977283d3ac600604323ecc2f01 ChangeLog 676
-MD5 2f67c192bd2d4525bc25c082accd70ac rfb-0.6.1-r1.ebuild 1065
-MD5 c721e0f6bacb3f1426979722b08b08f2 rfb-0.6.1.ebuild 999
 MD5 193705142d6cc32a958886b33bed5257 files/digest-rfb-0.6.1 61
-MD5 193705142d6cc32a958886b33bed5257 files/digest-rfb-0.6.1-r1 61
-MD5 a0fda719b752c531dc612df730a67642 files/rfb-0.6.1-daemon.patch 6387
+MD5 193705142d6cc32a958886b33bed5257 files/digest-rfb-0.6.1-r2 61
+MD5 9a0937d122c4d19ed38529f120d3a6c1 files/rfb-0.6.1-daemon.patch 6506
 MD5 1234311e86d152ddf1d8fe05a6562bb6 files/rfb-0.6.1-gcc3.x.patch 5753
+MD5 f9cac7513084261e1dcc54388644f72c rfb-0.6.1-r2.ebuild 1066
+MD5 ba92e1c902e7e0ddd7ada509caac9aa3 rfb-0.6.1.ebuild 998
+MD5 96b63e8bf3e72e7b69b2f0289a2efdb3 ChangeLog 896
diff --git a/net-misc/rfb/files/digest-rfb-0.6.1-r1 b/net-misc/rfb/files/digest-rfb-0.6.1-r2
index f83cf7181f22..f83cf7181f22 100644
--- a/net-misc/rfb/files/digest-rfb-0.6.1-r1
+++ b/net-misc/rfb/files/digest-rfb-0.6.1-r2
diff --git a/net-misc/rfb/files/rfb-0.6.1-daemon.patch b/net-misc/rfb/files/rfb-0.6.1-daemon.patch
index b462d9f661f8..cdcebf51d4f7 100644
--- a/net-misc/rfb/files/rfb-0.6.1-daemon.patch
+++ b/net-misc/rfb/files/rfb-0.6.1-daemon.patch
@@ -1,5 +1,5 @@
---- lib/rfbServer.cc.orig	2003-01-18 02:35:37.000000000 -0500
-+++ lib/rfbServer.cc	2003-01-18 02:49:07.000000000 -0500
+--- lib/rfbServer.cc.orig	2003-06-27 16:39:09.000000000 -0400
++++ lib/rfbServer.cc	2003-06-27 16:39:58.000000000 -0400
 @@ -29,9 +29,11 @@
  using std::cout;
  using std::endl;
@@ -48,8 +48,8 @@
        cerr << "encoding: " << (int) encodings.encoding[encodings.count] << endl;
        encodings.count = encodings.count + 1;
        data = (unsigned char*) &(encodings.encoding[encodings.count]);
---- include/rfbServer.h.orig	2003-01-18 02:39:38.000000000 -0500
-+++ include/rfbServer.h	2003-01-18 02:57:31.000000000 -0500
+--- include/rfbServer.h.orig	2003-06-27 16:39:19.000000000 -0400
++++ include/rfbServer.h	2003-06-27 16:39:58.000000000 -0400
 @@ -342,6 +342,7 @@
    void ResetBlocks();
    void DeleteBlocks();
@@ -58,8 +58,8 @@
  
    Block *blocks;
    unsigned int blockWidth, blockHeight;
---- x0rfbserver/x0rfbserver.cc.orig	2003-01-18 01:15:47.000000000 -0500
-+++ x0rfbserver/x0rfbserver.cc	2003-01-18 02:59:23.000000000 -0500
+--- x0rfbserver/x0rfbserver.cc.orig	2003-06-27 16:39:25.000000000 -0400
++++ x0rfbserver/x0rfbserver.cc	2003-06-27 16:43:54.000000000 -0400
 @@ -72,6 +72,7 @@
  OXClient *clientX;
  const OXWindow *root;
@@ -193,12 +193,18 @@
      } else printHelp_x0rfbserver();
    }
  
-@@ -920,6 +943,15 @@
+@@ -920,6 +943,21 @@
      break;
  
      
 +    case DAEMON: {
 +      if (fork()) { return; }
++      setsid();
++      if (fork()) { exit(0); }
++      chdir("/");
++      close(0);
++      close(1);
++      close(2);
 +      clientX = new OXClient;
 +      root = clientX->GetRoot();
 +      dpy = root->GetDisplay();
@@ -209,8 +215,8 @@
        
      case STDIO: {
        clientX = new OXClient;
---- x0rfbserver/XUpdateScanner.cc.orig	2003-01-18 02:07:02.000000000 -0500
-+++ x0rfbserver/XUpdateScanner.cc	2003-01-18 02:34:14.000000000 -0500
+--- x0rfbserver/XUpdateScanner.cc.orig	2003-06-27 16:39:30.000000000 -0400
++++ x0rfbserver/XUpdateScanner.cc	2003-06-27 16:39:58.000000000 -0400
 @@ -386,6 +386,7 @@
      }
    }
@@ -219,13 +225,13 @@
    cerr << "TILES: " << tilec << endl;
    
    if ( properties.showMousePointer ) {
---- x0rfbserver/XUpdateScanner.h.orig	2003-01-18 02:34:33.000000000 -0500
-+++ x0rfbserver/XUpdateScanner.h	2003-01-18 02:33:56.000000000 -0500
+--- x0rfbserver/XUpdateScanner.h.orig	2002-02-12 18:57:01.000000000 -0500
++++ x0rfbserver/XUpdateScanner.h	2003-06-27 16:39:58.000000000 -0400
 @@ -23,6 +23,7 @@
  
  
  #include "rfbServer.h"
 +extern bool isdaemon;
  
- namespace rfb {
  
+ namespace rfb {
diff --git a/net-misc/rfb/rfb-0.6.1-r1.ebuild b/net-misc/rfb/rfb-0.6.1-r2.ebuild
index 64d2354c7890..b40e7ff56124 100644
--- a/net-misc/rfb/rfb-0.6.1-r1.ebuild
+++ b/net-misc/rfb/rfb-0.6.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1-r1.ebuild,v 1.3 2003/03/25 23:31:14 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1-r2.ebuild,v 1.1 2003/06/27 20:54:45 vapier Exp $
 
 inherit eutils
 
diff --git a/net-misc/rfb/rfb-0.6.1.ebuild b/net-misc/rfb/rfb-0.6.1.ebuild
index cf314bef5c0d..b400ceb77d36 100644
--- a/net-misc/rfb/rfb-0.6.1.ebuild
+++ b/net-misc/rfb/rfb-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1.ebuild,v 1.6 2003/03/25 23:31:14 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1.ebuild,v 1.7 2003/06/27 20:54:45 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.hexonet.com/software/rfb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc ~sparc ~alpha"
 
 DEPEND="x11-libs/xclass"