[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf.in, 1.5, 1.6 httpd-2.2.conf.in, 1.5, 1.6 httpd.conf.in, 1.6, 1.7 start-ds-admin.in, 1.2, 1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/adminserver/admserv/cfgstuff

Modified Files:
	admserv.conf.in httpd-2.2.conf.in httpd.conf.in 
	start-ds-admin.in 
Log Message:
Resolves: bug 250324
Bug Description: adminserver: port to HP-UX
Reviewed by: nkinder, nhosoi (Thanks!)
Fix Description: 1) We need the same --enable-bundle option as ldapserver, so that adminserver knows where to find the shared libraries at runtime.  2) The adminserver Makefile constructs the LIBPATH for scripts to use.  Use this consistently
3) Need to use -lpthread before -lc
4) Use same --enable-debug as ldapserver
5) HP-UX has group "nogroup" instead of "nobody"
6) Use same libtool gcc hack as ldapserver uses
7) mod_deflate is not supported on HP-UX
Doing a DEBUG build caused breakage due to missing ereport.  Instead, just use PR_ASSERT for NS_ASSERT.
HAVE_STRFTIME is now defined in config.h.
Platforms tested: HP-UX 11.23 IPF 64bit, RHEL4
Flag Day: Yes - autotool file changes
Doc impact: no



Index: admserv.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admserv.conf.in	15 Jun 2007 22:35:24 -0000	1.5
+++ admserv.conf.in	1 Aug 2007 18:14:53 -0000	1.6
@@ -29,7 +29,7 @@
 ScriptAlias /dist/ "@cgibindir@/"
 ScriptAlias /manual/help/ "@cgibindir@/"
 
-SetEnv LD_LIBRARY_PATH @nss_libdir@:@nspr_libdir@
+SetEnv LD_LIBRARY_PATH @LIBPATH@
 
 # all access is explicitly denied by default in httpd.conf
 # the following Directory directives turn on access for specific


Index: httpd-2.2.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd-2.2.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpd-2.2.conf.in	21 May 2007 15:52:26 -0000	1.5
+++ httpd-2.2.conf.in	1 Aug 2007 18:14:53 -0000	1.6
@@ -124,7 +124,9 @@
 LoadModule env_module @moddir@/mod_env.so
 LoadModule mime_magic_module @moddir@/mod_mime_magic.so
 LoadModule expires_module @moddir@/mod_expires.so
+<IfDefine !OmitDeflate>
 LoadModule deflate_module @moddir@/mod_deflate.so
+</IfDefine>
 LoadModule headers_module @moddir@/mod_headers.so
 LoadModule unique_id_module @moddir@/mod_unique_id.so
 LoadModule setenvif_module @moddir@/mod_setenvif.so


Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- httpd.conf.in	31 Jul 2007 00:19:22 -0000	1.6
+++ httpd.conf.in	1 Aug 2007 18:14:53 -0000	1.7
@@ -123,7 +123,9 @@
 LoadModule env_module @moddir@/mod_env.so
 LoadModule mime_magic_module @moddir@/mod_mime_magic.so
 LoadModule expires_module @moddir@/mod_expires.so
+<IfDefine !OmitDeflate>
 LoadModule deflate_module @moddir@/mod_deflate.so
+</IfDefine>
 LoadModule headers_module @moddir@/mod_headers.so
 LoadModule unique_id_module @moddir@/mod_unique_id.so
 LoadModule setenvif_module @moddir@/mod_setenvif.so


Index: start-ds-admin.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-ds-admin.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- start-ds-admin.in	21 May 2007 15:52:26 -0000	1.2
+++ start-ds-admin.in	1 Aug 2007 18:14:53 -0000	1.3
@@ -51,4 +51,9 @@
     fi
 fi
 
-$HTTPD -k start -f @configdir@/httpd.conf "$@"
+# mod_deflate is not supported on HP-UX using the /opt/hpws apache
+if [ $OS = "HP-UX" ] ; then
+    OMIT_DEFLATE="-DOmitDeflate"
+fi
+
+$HTTPD $OMIT_DEFLATE -k start -f @configdir@/httpd.conf "$@"