[jbossnative-commits] JBoss Native SVN: r1418 - trunk/build/patch.
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-05 10:50:32 -0500 (Wed, 05 Mar 2008)
New Revision: 1418
Modified:
trunk/build/patch/openssl-0.9.8b.rhel.patch
Log:
Fix the entropy collection problem.
Modified: trunk/build/patch/openssl-0.9.8b.rhel.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8b.rhel.patch 2008-03-03 23:34:11 UTC (rev 1417)
+++ trunk/build/patch/openssl-0.9.8b.rhel.patch 2008-03-05 15:50:32 UTC (rev 1418)
@@ -9,3 +9,44 @@
"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -Wall
\$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+--- rand_unix.c Wed Mar 5 09:02:06 2008
++++ rand_unix.c Wed Mar 5 10:46:29 2008
+@@ -205,6 +205,30 @@
+
+ do
+ {
++#if defined(__hpux)
++ /* use select() */
++ int usec = 10*1000; /* spend 10ms on each file */
++ fd_set fset;
++ struct timeval t;
++
++ t.tv_sec = 0;
++ t.tv_usec = usec;
++
++ FD_ZERO(&fset);
++ FD_SET(fd, &fset);
++
++ if (select(fd+1,&fset,NULL,NULL,&t) >= 0)
++ {
++ usec = t.tv_usec;
++ if (FD_ISSET(fd, &fset))
++ r=read(fd,(unsigned char *)tmpbuf+n, ENTROPY_NEEDED-n);
++ if (r > 0)
++ n += r;
++ }
++ else
++ usec = 0;
++
++#else
+ pfd.fd = fd;
+ pfd.events = POLLIN;
+ pfd.revents = 0;
+@@ -221,6 +245,7 @@
+ /* we don't know how big part of the timeout elapsed
+ wait half the original timeout next time */
+ t >>= 1;
++#endif
+ }
+ while ((r > 0 || (errno == EINTR || errno == EAGAIN))
+ && t != 0 && n < ENTROPY_NEEDED);