[csw-devel] SF.net SVN: gar:[16915] csw/mgar/pkg/389-admin/trunk

[cgrzemba at users.sourceforge.net]

Revision: 16915
          http://gar.svn.sourceforge.net/gar/?rev=16915&view=rev
Author:   cgrzemba
Date:     2012-01-26 11:47:39 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
389-admin/trunk: recommit

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile
    csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-26 11:34:47 UTC (rev 16914)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
@@ -23,6 +23,8 @@
 
 LICENSE = LICENSE LICENSE.GPLv2
 
+# GARFLAVOR=DBG
+
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
 PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
@@ -47,7 +49,7 @@
 PACKAGES += CSW389admin
 SPKG_DESC_CSW389admin += $(DESCRIPTION)
 INITSMF = /etc/opt/csw/init.d/dirsrv-admin
-RUNTIME_DEP_PKGS_CSW389admin += CSWapache2
+RUNTIME_DEP_PKGS_CSW389admin += CSWap2worker
 RUNTIME_DEP_PKGS_CSW389admin += CSWap2modnss
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibprldap60
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibldif60
@@ -72,7 +74,7 @@
 RUNTIME_DEP_PKGS_CSW389admin += CSW389-admin-console
 RUNTIME_DEP_PKGS_CSW389admin += CSW389-ds-console
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2modnss
-CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2worker
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-admin-console
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-ds-console
 CHECKPKG_OVERRIDES_CSW389admin += unidentified-dependency|CSW389-admin-console
@@ -80,12 +82,6 @@
 
 # remove -I/opt/csw/include
 CPPFLAGS = 
-# no optimization
-CFLAGS = -g
-FFLAGS=
-FCFLAGS=
-OPTFLAGS=
-CXXFLAGS=
 
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 

Modified: csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch	2012-01-26 11:34:47 UTC (rev 16914)
+++ csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch	2012-01-26 11:47:39 UTC (rev 16915)
@@ -8,28 +8,6 @@
  wrappers/initscript.in         |    6 ++++--
  2 files changed, 9 insertions(+), 7 deletions(-)
 
-diff --git a/admserv/cfgstuff/httpd-2.2.conf.in b/admserv/cfgstuff/httpd-2.2.conf.in
-index a66eb21..b4098d9 100644
---- a/admserv/cfgstuff/httpd-2.2.conf.in
-+++ b/admserv/cfgstuff/httpd-2.2.conf.in
-@@ -99,12 +99,12 @@ ServerTokens Minor
- # start one server in multi threaded mode
- StartServers 1
- # mtm
--ServerLimit 1
-+ServerLimit 4
- 
--MaxClients 64
--MinSpareThreads 32
--MaxSpareThreads 64
--ThreadsPerChild 64
-+MaxClients 4
-+# MinSpareThreads 32
-+# MaxSpareThreads 64
-+# ThreadsPerChild 64
- 
- #
- # Dynamic Shared Object (DSO) Support
 diff --git a/wrappers/initscript.in b/wrappers/initscript.in
 index 82dd20e..8fd03da 100644
 --- a/wrappers/initscript.in

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.