Revision: 16740
http://gar.svn.sourceforge.net/gar/?rev=16740&view=rev
Author: cgrzemba
Date: 2012-01-11 09:41:45 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add some patches
Modified Paths:
--------------
csw/mgar/pkg/389-ds-base/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
Removed Paths:
-------------
csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch
Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-01-10 14:22:37 UTC (rev
16739)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-01-11 09:41:45 UTC (rev
16740)
@@ -14,10 +14,15 @@
MASTER_SITES = http://port389.org/sources
DISTFILES = $(NAME)-$(VERSION).tar.bz2
# BUILD64 = 1
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
+LICENSE = LICENSE LICENSE.GPLv2
+
PATCHFILES += 0005-add-standard-path.patch
PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
-PATCHFILES += 0007-create-var-run-dirsrv.patch
+PATCHFILES += 0003-add-user-and-var-run-dirsrv.patch
+PATHCFILES += 0004-move-include-path.patch
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60
@@ -46,6 +51,9 @@
CHECKPKG_OVERRIDES_CSW389-ds-base +=
soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/dirsrv/plugins/libreplication-plugin.so
# GARCOMPILER = SOS12U2
+EXTRA_LIB = /opt/csw/bdb48/lib
+# remove -I/opt/csw/include
+CPPFLAGS =
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv
Added:
csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
(rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
2012-01-11 09:41:45 UTC (rev 16740)
@@ -0,0 +1,63 @@
+From 2a0b4df7c481f2f072d432e02389893516ed6007 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrze...@unstable10s.bo.opencsw.org>
+Date: Tue, 10 Jan 2012 15:52:22 +0100
+Subject: [PATCH] add user and var run dirsrv
+
+---
+ ldap/admin/src/initconfig.in | 20 ++++++++++++++++----
+ 1 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in
+index 7f9dd8f..f024586 100644
+--- a/ldap/admin/src/initconfig.in
++++ b/ldap/admin/src/initconfig.in
+@@ -1,9 +1,9 @@
+-# This file is sourced by @package_name@ upon startup to set
++# This file is sourced by dirsrv upon startup to set
+ # the default environment for all directory server instances.
+ # To set instance specific defaults, use the file in the same
+-# directory called @package_name@-instance where "instance"
++# directory called dirsrv-instance where "instance"
+ # is the name of your directory server instance e.g.
+-# @package_name@-localhost for the slapd-localhost instance.
++# dirsrv-localhost for the slapd-localhost instance.
+
+ # In order to make more file descriptors available
+ # to the directory server, first make sure the system
+@@ -26,13 +26,15 @@
+ # server needs to know where to find its keytab
+ # file - uncomment the following line and set
+ # the path and filename appropriately
+-# KRB5_KTNAME=@instconfigdir@/myname.keytab ; export KRB5_KTNAME
++# KRB5_KTNAME=/etc/opt/csw/dirsrv/myname.keytab ; export KRB5_KTNAME
+
+ # other environment settings can be added here too
+ OS=`uname -s`
+ # use the new mt slab memory allocator on Solaris
+ # this requires Solaris 9 update 3 or later
+ if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
++# UMEM_DEBUG=default
++# UMEM_LOGGING=transaction
+ LD_PRELOAD=/usr/lib/libumem.so
+ export LD_PRELOAD
+ fi
+@@ -41,6 +43,16 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
+ export LD_PRELOAD_64
+ fi
+
++USER=`/usr/xpg4/bin/id -u -n`
++export USER
++[ -d /var/run/dirsrv ] && mkdir -p /var/run/dirsrv
++if [ -f /etc/opt/csw/dirsrv/admin-serv/adm.conf ]; then
++ slapd-user=`grep SuiteSpotUserID /etc/opt/csw/dirsrv/admin-serv/adm.conf |
cut -d: -f2 | tr -d [:space:]`
++ slapd-group=`grep SuiteSpotGroup /etc/opt/csw/dirsrv/admin-serv/adm.conf |
cut -d: -f2 | tr -d [:space:]`
++ chown $slapd-user:$slapd-group /var/run/dirsrv
++fi
++chmod g+w /var/run/dirsrv
++
+ # how many seconds to wait for the startpid file to show
+ # up before we assume there is a problem and fail to start
+ #STARTPID_TIME=10 ; export STARTPID_TIME
+--
+1.7.8.2
+
Added: csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
(rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
2012-01-11 09:41:45 UTC (rev 16740)
@@ -0,0 +1,25 @@
+From 4087ee0524bc902f9bb3442c7ce8a35c112f1bbe Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrze...@opencsw.org>
+Date: Wed, 11 Jan 2012 10:15:19 +0100
+Subject: [PATCH] move include path
+
+---
+ Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4bf1966..a4a9fa0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -863,7 +863,7 @@ libcollation_plugin_la_SOURCES =
ldap/servers/plugins/collation/collate.c \
+ ldap/servers/plugins/collation/config.c \
+ ldap/servers/plugins/collation/orfilter.c
+
+-libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
++libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@
+ libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
$(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+ libcollation_plugin_la_LDFLAGS = -avoid-version
+ libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
+--
+1.7.8.2
+
Deleted: csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch
2012-01-10 14:22:37 UTC (rev 16739)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch
2012-01-11 09:41:45 UTC (rev 16740)
@@ -1,42 +0,0 @@
-From e2a18924e644ee93ef31bed2a18a83bfbe78cf62 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrze...@opencsw.org>
-Date: Tue, 10 Jan 2012 15:05:25 +0100
-Subject: [PATCH 7/7] create var run dirsrv
-
----
- ldap/admin/src/dirsrv | 12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/ldap/admin/src/dirsrv b/ldap/admin/src/dirsrv
-index 31753b3..f024586 100644
---- a/ldap/admin/src/dirsrv
-+++ b/ldap/admin/src/dirsrv
-@@ -33,6 +33,8 @@ OS=`uname -s`
- # use the new mt slab memory allocator on Solaris
- # this requires Solaris 9 update 3 or later
- if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
-+# UMEM_DEBUG=default
-+# UMEM_LOGGING=transaction
- LD_PRELOAD=/usr/lib/libumem.so
- export LD_PRELOAD
- fi
-@@ -41,6 +43,16 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
- export LD_PRELOAD_64
- fi
-
-+USER=`/usr/xpg4/bin/id -u -n`
-+export USER
-+[ -d /var/run/dirsrv ] && mkdir -p /var/run/dirsrv
-+if [ -f /etc/opt/csw/dirsrv/admin-serv/adm.conf ]; then
-+ slapd-user=`grep SuiteSpotUserID /etc/opt/csw/dirsrv/admin-serv/adm.conf |
cut -d: -f2 | tr -d [:space:]`
-+ slapd-group=`grep SuiteSpotGroup /etc/opt/csw/dirsrv/admin-serv/adm.conf |
cut -d: -f2 | tr -d [:space:]`
-+ chown $slapd-user:$slapd-group /var/run/dirsrv
-+fi
-+chmod g+w /var/run/dirsrv
-+
- # how many seconds to wait for the startpid file to show
- # up before we assume there is a problem and fail to start
- #STARTPID_TIME=10 ; export STARTPID_TIME
---
-1.7.6.1
-
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
