[csw-devel] SF.net SVN: gar:[16901] csw/mgar/pkg/389-admin/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Tue Jan 24 13:48:29 CET 2012
Revision: 16901
http://gar.svn.sourceforge.net/gar/?rev=16901&view=rev
Author: cgrzemba
Date: 2012-01-24 12:48:29 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
389-admin/trunk: fix configuration
Modified Paths:
--------------
csw/mgar/pkg/389-admin/trunk/Makefile
csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
Added Paths:
-----------
csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove
Removed 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-24 11:46:55 UTC (rev 16900)
+++ csw/mgar/pkg/389-admin/trunk/Makefile 2012-01-24 12:48:29 UTC (rev 16901)
@@ -79,7 +79,12 @@
# remove -I/opt/csw/include
CPPFLAGS =
# no optimization
-CFLAGS =
+CFLAGS = -g
+FFLAGS=
+FCFLAGS=
+OPTFLAGS=
+CXXFLAGS=
+
EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
CONFIGURE_ARGS = $(DIRPATHS)
@@ -96,6 +101,7 @@
CONFIGURE_ARGS_OPT += --with-httpd=/opt/csw/apache2/sbin/httpd
CONFIGURE_ARGS_OPT += --with-modnss-lib=/opt/csw/apache2/libexec
CONFIGURE_ARGS_OPT += --with-modnss-bin=/opt/csw/apache2/sbin
+CONFIGURE_ARGS_OPT += --disable-threading
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
include gar/category.mk
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-24 11:46:55 UTC (rev 16900)
+++ csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch 2012-01-24 12:48:29 UTC (rev 16901)
@@ -4,14 +4,14 @@
Subject: [PATCH] correct initscript and http.conf.in
---
- admserv/cfgstuff/httpd.conf.in | 10 +++++-----
+ admserv/cfgstuff/httpd-2.2.conf.in | 10 +++++-----
wrappers/initscript.in | 6 ++++--
2 files changed, 9 insertions(+), 7 deletions(-)
-diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in
+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.conf.in
-+++ b/admserv/cfgstuff/httpd.conf.in
+--- 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
@@ -43,24 +43,27 @@
# Source function library.
if [ -f /etc/rc.d/init.d/functions ] ; then
-@@ -94,7 +96,7 @@ prog="@package_name@"
+@@ -94,7 +96,8 @@ prog="@package_name@"
piddir="@localstatedir@/run/@PACKAGE_BASE_NAME@"
# PID file
pidfile=$piddir/admin-serv.pid
-lockfile=/var/lock/subsys/@package_name@
+lockfile=@localstatedir@/lock/subsys/@package_name@
++lockdir=`dirname $lockfile`
[ -f $exec ] || exit 0
-@@ -163,7 +165,7 @@ start() {
+@@ -163,7 +166,8 @@ start() {
RETVAL=1
fi
fi
- [ $RETVAL -eq 0 -a -d /var/lock/subsys ] && touch $lockfile
-+ [ $RETVAL -eq 0 -a -d @localstatedir@/lock/subsys ] && touch $lockfile
++ [ ! -d $lockdir ] && mkdir -p $lockdir
++ [ $RETVAL -eq 0 -a -d $lockdir ] && touch $lockfile
}
stop() {
+
--
1.7.8.3
Deleted: 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 2012-01-24 11:46:55 UTC (rev 16900)
+++ csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch 2012-01-24 12:48:29 UTC (rev 16901)
@@ -1,25 +0,0 @@
-From fc16535d4003f8fc7df6f451b6c785e975ce9bc0 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at 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
-
Deleted: 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 2012-01-24 11:46:55 UTC (rev 16900)
+++ csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch 2012-01-24 12:48:29 UTC (rev 16901)
@@ -1,29 +0,0 @@
-From 0fde3ae66c2bbca4d211ad8a232b488ab3b389cc Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at 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
-
Added: csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove 2012-01-24 12:48:29 UTC (rev 16901)
@@ -0,0 +1,5 @@
+( cd /etc/opt/csw/dirsrv/adm-serv
+ cp -p console.conf console.conf.configured
+ cp -p httpd.conf httpd.conf.configured
+ cp -p admserv.conf admserv.conf.configured
+)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list