update to 4.1.5

change: Incoming SSL connections can time out waiting for SSL_accept to
 complete

pkgsrc change: remove the patch which did daemonize omniNames in
 the code -- this was bad because it sent all diagnostic output
 to /dev/null. send it to background in the rc.d script instead, and
 set a reasonable logfile location

5 files changed, 18 insertions, 79 deletions

diff --git a/net/omniORB/Makefile b/net/omniORB/Makefile
index 169a7d4f055..d36b091db2c 100644
--- a/net/omniORB/Makefile
+++ b/net/omniORB/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/09/25 12:24:02 obache Exp $
+# $NetBSD: Makefile,v 1.3 2011/04/21 16:34:17 drochner Exp $
 #
 
-DISTNAME=		omniORB-4.1.4
+DISTNAME=		omniORB-4.1.5
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=omniorb/}
+EXTRACT_SUFX+=		.tar.bz2
 
 MAINTAINER=		ianzag@mail.ru
 HOMEPAGE=		http://omniorb.sourceforge.net/
diff --git a/net/omniORB/PLIST b/net/omniORB/PLIST
index a18bc0a52b3..83fa7372755 100644
--- a/net/omniORB/PLIST
+++ b/net/omniORB/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/04/21 16:34:17 drochner Exp $
 bin/catior
 bin/convertior
 bin/genior
@@ -193,27 +193,27 @@ include/omnithread/solaris.h
 lib/libCOS4.a
 lib/libCOS4.so
 lib/libCOS4.so.1
-lib/libCOS4.so.1.4
+lib/libCOS4.so.1.5
 lib/libCOSDynamic4.a
 lib/libCOSDynamic4.so
 lib/libCOSDynamic4.so.1
-lib/libCOSDynamic4.so.1.4
+lib/libCOSDynamic4.so.1.5
 lib/libomniCodeSets4.a
 lib/libomniCodeSets4.so
 lib/libomniCodeSets4.so.1
-lib/libomniCodeSets4.so.1.4
+lib/libomniCodeSets4.so.1.5
 lib/libomniConnectionMgmt4.a
 lib/libomniConnectionMgmt4.so
 lib/libomniConnectionMgmt4.so.1
-lib/libomniConnectionMgmt4.so.1.4
+lib/libomniConnectionMgmt4.so.1.5
 lib/libomniDynamic4.a
 lib/libomniDynamic4.so
 lib/libomniDynamic4.so.1
-lib/libomniDynamic4.so.1.4
+lib/libomniDynamic4.so.1.5
 lib/libomniORB4.a
 lib/libomniORB4.so
 lib/libomniORB4.so.1
-lib/libomniORB4.so.1.4
+lib/libomniORB4.so.1.5
 lib/libomnithread.a
 lib/libomnithread.so
 lib/libomnithread.so.3
diff --git a/net/omniORB/distinfo b/net/omniORB/distinfo
index dde842eac91..2f2707c53da 100644
--- a/net/omniORB/distinfo
+++ b/net/omniORB/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.2 2011/01/01 05:43:28 obache Exp $
+$NetBSD: distinfo,v 1.3 2011/04/21 16:34:17 drochner Exp $
 
-SHA1 (omniORB-4.1.4.tar.gz) = 7150d999bcef10c6c3cb24725386497c3f338aa1
-RMD160 (omniORB-4.1.4.tar.gz) = b84131230c59b1cef8f714ff1545e44f6779ade1
-Size (omniORB-4.1.4.tar.gz) = 3093814 bytes
+SHA1 (omniORB-4.1.5.tar.bz2) = 6114f0f11dfb059324fae9401faeac67d2adf792
+RMD160 (omniORB-4.1.5.tar.bz2) = b71bde35fe45ca1b64d9a78d4b152a7d962dee67
+Size (omniORB-4.1.5.tar.bz2) = 2605348 bytes
 SHA1 (patch-aa) = 679f8f8da61c1e5106ae40067c7d8f5dcc1576d4
 SHA1 (patch-ab) = 4b20f8c5a4d34259d9a5810c7642a71822626c2c
 SHA1 (patch-ac) = 797e6fb2dba6b96a2f55008196f84c95101367ed
 SHA1 (patch-ad) = 8678d9e3aebafdd41cba62bb980e89c020feab80
 SHA1 (patch-ae) = 6249b22ce41528e42672f8159eb50dc01999256a
-SHA1 (patch-af) = feb5c3c52290181f6bcf990622fa7911e73127c8
diff --git a/net/omniORB/files/omninames.sh b/net/omniORB/files/omninames.sh
index 5ac7a0e96d9..fc64adc7988 100644
--- a/net/omniORB/files/omninames.sh
+++ b/net/omniORB/files/omninames.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: omninames.sh,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $
+# $NetBSD: omninames.sh,v 1.2 2011/04/21 16:34:18 drochner Exp $
 #
 # omniORB NameService rc.d control script
 #
@@ -24,7 +24,9 @@ $_rc_subr_loaded . /etc/rc.subr
 name="omniNames"
 rcvar=$name
 command="@PREFIX@/bin/${name}"
-pidfile="/var/run/${name}.pid"
+logdir="/var/db"
+errlogfile="/var/log/${name}.log"
+command_args="-start -always -logdir ${logdir} -errlog ${errlogfile} &"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/net/omniORB/patches/patch-af b/net/omniORB/patches/patch-af
deleted file mode 100644
index c4faf397c75..00000000000
--- a/net/omniORB/patches/patch-af
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $
-
---- src/appl/omniNames/omniNames.cc.orig	2008-02-05 17:44:52.000000000 +0100
-+++ src/appl/omniNames/omniNames.cc
-@@ -105,7 +105,9 @@ usage()
- int
- main(int argc, char **argv)
- {
-+  int            devnull    = -1;
-   int            port       = 0;
-+  pid_t          proc       = 0;
-   const char* 	 logdir     = 0;
-   const char* 	 errlog     = 0;
-   CORBA::Boolean ignoreport = 0;
-@@ -122,6 +124,48 @@ main(int argc, char **argv)
-   int    new_argc = 1;
-   char** new_argv = new char*[argc];
- 
-+  /* Daemonize part 1: Close all file descriptors */
-+  devnull = open("/dev/null", O_RDWR);
-+  if (devnull == -1)
-+  {
-+    perror("/dev/null");
-+    exit(EXIT_FAILURE);
-+  }
-+
-+  close(STDIN_FILENO);
-+  if (dup2(devnull, STDIN_FILENO) == -1)
-+  {
-+    perror("dup2 (STDIN)");
-+    exit(EXIT_FAILURE);
-+  }
-+
-+  close(STDOUT_FILENO);
-+  if (dup2(devnull, STDOUT_FILENO) == -1)
-+  {
-+    perror("dup2 (STDOUT)");
-+    exit(EXIT_FAILURE);
-+  }
-+
-+  close(STDERR_FILENO);
-+  if (dup2(devnull, STDERR_FILENO) == -1)
-+  {
-+    perror("dup2 (STDERR)");
-+    exit(EXIT_FAILURE);
-+  }
-+
-+  /* Daemonize part 1: Close all file descriptors */
-+  proc = fork();
-+  if (proc == -1)
-+  {
-+    perror("fork");
-+    exit(EXIT_FAILURE);
-+  }
-+  else if (proc != 0)
-+  {
-+    /* Parent process */
-+    exit(EXIT_SUCCESS);
-+  }
-+
-   new_argv[0] = argv[0];
- 
-   // Process command line arguments