JBoss Native SVN: r1420 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-05 11:11:01 -0500 (Wed, 05 Mar 2008)
New Revision: 1420
Modified:
trunk/build/unix/util/buildroot.hpux.sh
Log:
Add missing dns related library.
Modified: trunk/build/unix/util/buildroot.hpux.sh
===================================================================
--- trunk/build/unix/util/buildroot.hpux.sh 2008-03-05 16:09:51 UTC (rev 1419)
+++ trunk/build/unix/util/buildroot.hpux.sh 2008-03-05 16:11:01 UTC (rev 1420)
@@ -23,7 +23,7 @@
#
# Build a chrootable environment.
# $1 : Directory where the chroot will takes place.
-tools="/bin/bash /etc/passwd /etc/group /etc/hosts /etc/netconfig /etc/resolv.conf /usr/lib/dld.sl /usr/lib/hpux32/uld.so /usr/lib/hpux32/dld.so /usr/lib/hpux32/libm.so.1 /usr/lib/hpux32/libpthread.so.1 /usr/lib/hpux32/libnss_dns.so.1 /usr/lib/libm.2 /usr/lib/libpthread.1 /usr/lib/libpq.sl.4"
+tools="/bin/bash /etc/passwd /etc/group /etc/hosts /etc/netconfig /etc/resolv.conf /usr/lib/dld.sl /usr/lib/hpux32/uld.so /usr/lib/hpux32/dld.so /usr/lib/hpux32/libm.so.1 /usr/lib/hpux32/libpthread.so.1 /usr/lib/hpux32/libnss_dns.so.1 /usr/lib/libm.2 /usr/lib/libpthread.1 /usr/lib/libpq.sl.4 /usr/lib/libnss_dns.1"
depfiles="/bin/sh /usr/bin/test /usr/bin/dirname /usr/bin/basename /usr/bin/uname /usr/bin/grep /usr/bin/sh /usr/bin/expr /usr/bin/false /usr/bin/true"
# tools are the tools we need for the tests.
# depfiles are files the packages needed (to be generated).
16 years, 2 months
JBoss Native SVN: r1419 - trunk/build/patch.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-05 11:09:51 -0500 (Wed, 05 Mar 2008)
New Revision: 1419
Modified:
trunk/build/patch/openssl-0.9.8b.rhel.patch
Log:
Use the right location.
Modified: trunk/build/patch/openssl-0.9.8b.rhel.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8b.rhel.patch 2008-03-05 15:50:32 UTC (rev 1418)
+++ trunk/build/patch/openssl-0.9.8b.rhel.patch 2008-03-05 16:09:51 UTC (rev 1419)
@@ -9,8 +9,8 @@
"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
+--- crypto/rand/rand_unix.c Wed Mar 5 09:02:06 2008
++++ crypto/rand/rand_unix.c Wed Mar 5 10:46:29 2008
@@ -205,6 +205,30 @@
do
16 years, 2 months
JBoss Native SVN: r1418 - trunk/build/patch.
by jbossnative-commits@lists.jboss.org
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);
16 years, 2 months
JBoss Native SVN: r1417 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 18:34:11 -0500 (Mon, 03 Mar 2008)
New Revision: 1417
Modified:
trunk/build/unix/util/buildroot.hpux.sh
Log:
Add urandom... random blocs on dev24 for example.
Modified: trunk/build/unix/util/buildroot.hpux.sh
===================================================================
--- trunk/build/unix/util/buildroot.hpux.sh 2008-03-03 23:03:32 UTC (rev 1416)
+++ trunk/build/unix/util/buildroot.hpux.sh 2008-03-03 23:34:11 UTC (rev 1417)
@@ -99,7 +99,7 @@
mkdir -p $root/proc
# Create needed devices
-devices="ip kmem null random rawip tcp tcp6 zero tcp tcp6 tlclts tlcotsod tlcots upd upd6"
+devices="ip kmem null random urandom rawip tcp tcp6 zero tcp tcp6 tlclts tlcotsod tlcots upd upd6"
mkdir -p $root/dev
sudo chown root $root/dev
16 years, 2 months
JBoss Native SVN: r1416 - trunk/httpd/httpd-2.2/modules/jk.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 18:03:32 -0500 (Mon, 03 Mar 2008)
New Revision: 1416
Modified:
trunk/httpd/httpd-2.2/modules/jk/config5.m4
Log:
Make it disable by default.
Modified: trunk/httpd/httpd-2.2/modules/jk/config5.m4
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/config5.m4 2008-03-03 23:01:31 UTC (rev 1415)
+++ trunk/httpd/httpd-2.2/modules/jk/config5.m4 2008-03-03 23:03:32 UTC (rev 1416)
@@ -4,7 +4,7 @@
jk_objects="mod_jk.lo jk_ajp12_worker.lo jk_ajp13.lo jk_ajp13_worker.lo jk_ajp14.lo jk_ajp14_worker.lo jk_ajp_common.lo jk_connect.lo jk_context.lo jk_lb_worker.lo jk_map.lo jk_md5.lo jk_msg_buff.lo jk_pool.lo jk_shm.lo jk_sockbuf.lo jk_status.lo jk_uri_worker_map.lo jk_url.lo jk_util.lo jk_worker.lo"
-APACHE_MODULE(jk, AJP protocol handling, $jk_objects, , $jk_enable)
+APACHE_MODULE(jk, AJP protocol handling, $jk_objects, , no)
if test "$jk_enable" != "no"; then
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/common])
16 years, 2 months
JBoss Native SVN: r1415 - trunk/httpd/httpd-2.2/modules/jk.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 18:01:31 -0500 (Mon, 03 Mar 2008)
New Revision: 1415
Modified:
trunk/httpd/httpd-2.2/modules/jk/config5.m4
Log:
Oops jk != dav.
Modified: trunk/httpd/httpd-2.2/modules/jk/config5.m4
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/config5.m4 2008-03-03 22:02:45 UTC (rev 1414)
+++ trunk/httpd/httpd-2.2/modules/jk/config5.m4 2008-03-03 23:01:31 UTC (rev 1415)
@@ -6,7 +6,7 @@
APACHE_MODULE(jk, AJP protocol handling, $jk_objects, , $jk_enable)
-if test "$dav_enable" != "no"; then
+if test "$jk_enable" != "no"; then
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/common])
fi
16 years, 2 months
JBoss Native SVN: r1414 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 17:02:45 -0500 (Mon, 03 Mar 2008)
New Revision: 1414
Modified:
trunk/build/unix/util/confssl.sh
Log:
another typo.
Modified: trunk/build/unix/util/confssl.sh
===================================================================
--- trunk/build/unix/util/confssl.sh 2008-03-03 21:54:51 UTC (rev 1413)
+++ trunk/build/unix/util/confssl.sh 2008-03-03 22:02:45 UTC (rev 1414)
@@ -38,7 +38,7 @@
# Add to httpd.conf
cat <<EOF >> ${base}/${root}/opt/jboss/httpd/httpd/conf/httpd.conf
-LoadModule jk_module /opt/jboss/httpd/lib/httpd/modules/mod_ssl.so
+LoadModule ssl_module /opt/jboss/httpd/lib/httpd/modules/mod_ssl.so
Listen ${IPLOCAL}:443
<VirtualHost ${IPLOCAL}:443>
SSLEngine on
16 years, 2 months
JBoss Native SVN: r1413 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 16:54:51 -0500 (Mon, 03 Mar 2008)
New Revision: 1413
Modified:
trunk/build/unix/util/jlibtool.c
Log:
Add -Wl,-E to export the httpd symbols.
Modified: trunk/build/unix/util/jlibtool.c
===================================================================
--- trunk/build/unix/util/jlibtool.c 2008-03-03 19:32:27 UTC (rev 1412)
+++ trunk/build/unix/util/jlibtool.c 2008-03-03 21:54:51 UTC (rev 1413)
@@ -175,7 +175,7 @@
# define RPATH "+b"
# define SHARED_OPTS "-b"
# define MODULE_OPTS "-b"
-# define DYNAMIC_LINK_OPTS "-Wl,+s"
+# define DYNAMIC_LINK_OPTS "-Wl,+s -Wl,-E"
# define LINKER_FLAG_PREFIX "-Wl,"
# define LD_LIBRARY_PATH "SHLIB_PATH"
# define ADD_MINUS_L
16 years, 2 months
JBoss Native SVN: r1412 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 14:32:27 -0500 (Mon, 03 Mar 2008)
New Revision: 1412
Modified:
trunk/build/unix/buildbin.rhel-httpd.sh
Log:
typos.
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2008-03-03 17:11:41 UTC (rev 1411)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2008-03-03 19:32:27 UTC (rev 1412)
@@ -140,13 +140,13 @@
add_conf_sys="$add_conf_sys --enable-pie"
;;
hpux*)
- add_conf_sys="--enable-experimental-libtool --enable-shared"
+ add_conf_sys="$add_conf_sys --enable-experimental-libtool --enable-shared"
;;
esac
case ${BUILD_CPU} in
ppc64)
# XXX: It is also in build.sh but not exported.
- add_conf_sys="CFLAGS=-m64"
+ add_conf_sys="$add_conf_sys CFLAGS=-m64"
;;
esac
echo "Building prefork and mpm with add_conf: $add_conf $add_conf_sys"
16 years, 2 months
JBoss Native SVN: r1411 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 12:11:41 -0500 (Mon, 03 Mar 2008)
New Revision: 1411
Modified:
trunk/build/unix/buildbin.rhel-httpd.sh
Log:
Add missing flags to worker build.
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2008-03-03 16:58:07 UTC (rev 1410)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2008-03-03 17:11:41 UTC (rev 1411)
@@ -118,12 +118,12 @@
#export LD_LIBRARY_PATH
fi
if $build_expat; then
- add_conf="$add_conf --with-expat=${build_common_dir}-static/"
+ add_conf_sys="--with-expat=${build_common_dir}-static/"
else
- add_conf="$add_conf --with-expat=builtin"
+ add_conf_sys="--with-expat=builtin"
fi
if $build_zlib; then
- add_conf="$add_conf --with-z=${build_common_dir}-static/"
+ add_conf_sys="$add_conf_sys --with-z=${build_common_dir}-static/"
fi
# Process mod_jk if needed.
native_sources=srclib/`ls srclib | grep httpd-`
@@ -135,14 +135,12 @@
fi
# Ajust some more platform dependent stuff.
-add_conf_sys=""
case ${BUILD_SYS} in
linux*)
- add_conf="$add_conf --enable-pie"
+ add_conf_sys="$add_conf_sys --enable-pie"
;;
hpux*)
- add_conf_sys="--enable-experimental-libtool"
- add_conf="$add_conf --enable-shared"
+ add_conf_sys="--enable-experimental-libtool --enable-shared"
;;
esac
case ${BUILD_CPU} in
@@ -151,7 +149,7 @@
add_conf_sys="CFLAGS=-m64"
;;
esac
-echo "Building prefork and mpm with add_conf: $add_conf"
+echo "Building prefork and mpm with add_conf: $add_conf $add_conf_sys"
# Build everything and the kitchen sink with the prefork build
# removed because of ldap dependencies.
16 years, 2 months