Revision: 16893 http://gar.svn.sourceforge.net/gar/?rev=16893&view=rev Author: cgrzemba Date: 2012-01-23 14:09:44 +0000 (Mon, 23 Jan 2012) Log Message: ----------- 389-admin/trunk: disable SMF and optimization
Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2012-01-23 13:43:55 UTC (rev 16892) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2012-01-23 14:09:44 UTC (rev 16893) @@ -23,6 +23,8 @@ PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch +PATCHFILES += 0004-disable-SMF-service-at-install.patch +PATCHFILES += 0005-comment-out-httpd-thread-options-in-httpd.conf.patch PACKAGES += CSWlibds-admin-serv0 CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0 @@ -66,11 +68,17 @@ RUNTIME_DEP_PKGS_CSW389admin += CSWlibiconv2 RUNTIME_DEP_PKGS_CSW389admin += CSWlibssl3 RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss3 +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|CSW389-admin-console +CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-ds-console # remove -I/opt/csw/include CPPFLAGS = +# no optimization +CFLAGS = EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv CONFIGURE_ARGS = $(DIRPATHS) Added: csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch =================================================================== --- csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch (rev 0) +++ csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch 2012-01-23 14:09:44 UTC (rev 16893) @@ -0,0 +1,25 @@ +From fc16535d4003f8fc7df6f451b6c785e975ce9bc0 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba <cgrze...@opencsw.org> +Date: Mon, 23 Jan 2012 14:27:18 +0100 +Subject: [PATCH 4/5] disable SMF service at install + +--- + wrappers/initscript.in | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/wrappers/initscript.in b/wrappers/initscript.in +index 82dd20e..2971c35 100644 +--- a/wrappers/initscript.in ++++ b/wrappers/initscript.in +@@ -7,6 +7,8 @@ + # processname: @sbindir@/httpd + # piddir: @localstatedir@/run/@PACKAGE_BASE_NAME@ + # ++#AUTOENABLE no # no CSW SMF enable at install! ++# + + # Source function library. + if [ -f /etc/rc.d/init.d/functions ] ; then +-- +1.7.8.3 + Added: csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch =================================================================== --- csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch (rev 0) +++ csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch 2012-01-23 14:09:44 UTC (rev 16893) @@ -0,0 +1,29 @@ +From 0fde3ae66c2bbca4d211ad8a232b488ab3b389cc Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba <cgrze...@opencsw.org> +Date: Mon, 23 Jan 2012 14:29:10 +0100 +Subject: [PATCH 5/5] comment out httpd thread options in httpd.conf + +--- + admserv/cfgstuff/httpd.conf.in | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in +index a66eb21..ea12a56 100644 +--- a/admserv/cfgstuff/httpd.conf.in ++++ b/admserv/cfgstuff/httpd.conf.in +@@ -102,9 +102,9 @@ StartServers 1 + ServerLimit 1 + + MaxClients 64 +-MinSpareThreads 32 +-MaxSpareThreads 64 +-ThreadsPerChild 64 ++# MinSpareThreads 32 ++# MaxSpareThreads 64 ++# ThreadsPerChild 64 + + # + # Dynamic Shared Object (DSO) Support +-- +1.7.8.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel