SF.net SVN: gar:[25111] csw/mgar/pkg/openldap/trunk

janholzh at users.sourceforge.net janholzh at users.sourceforge.net
Mon Jun 22 14:40:09 CEST 2015


Revision: 25111
          http://sourceforge.net/p/gar/code/25111
Author:   janholzh
Date:     2015-06-22 12:40:09 +0000 (Mon, 22 Jun 2015)
Log Message:
-----------
openldap/trunk: update to 2.4.40, change start scripts

Modified Paths:
--------------
    csw/mgar/pkg/openldap/trunk/Makefile
    csw/mgar/pkg/openldap/trunk/files/cswopenldap
    csw/mgar/pkg/openldap/trunk/files/openldaprc

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2015-06-22 10:40:39 UTC (rev 25110)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2015-06-22 12:40:09 UTC (rev 25111)
@@ -21,6 +21,8 @@
 # This is the 32/64 exec wrapper
 DISTFILES += slapd
 
+GARCOMPILER += SOS12U3
+
 EXPANDVARS += CSWoldap.postinstall
 EXPANDVARS += cswopenldap
 EXPANDVARS += slapd
@@ -68,9 +70,9 @@
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibuuid1
-RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc51
-OBSOLETED_BY_CSWopenldap += CSWoldap
-CATALOGNAME_CSWoldap = openldap_stub
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc55
+#OBSOLETED_BY_CSWopenldap += CSWoldap
+#CATALOGNAME_CSWoldap = openldap_stub
 
 # Evaluate later
 CHECKPKG_OVERRIDES_CSWopenldap += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/slapd.8
@@ -85,8 +87,8 @@
 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2
-OBSOLETED_BY_CSWopenldap-client += CSWoldapclient
-CATALOGNAME_CSWoldapclient = openldap_client_stub
+#OBSOLETED_BY_CSWopenldap-client += CSWoldapclient
+#CATALOGNAME_CSWoldapclient = openldap_client_stub
 
 PACKAGES += CSWopenldap-dev
 SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.2, libldap_r-2.4.so.2 and liblber-2.4.so.2
@@ -95,8 +97,8 @@
 RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-2
 RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-2
-OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel
-CATALOGNAME_CSWoldapdevel = openldap_devel_stub
+#OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel
+#CATALOGNAME_CSWoldapdevel = openldap_devel_stub
 
 PACKAGES += CSWopenldap-back-perl
 SPKG_DESC_CSWopenldap-back-perl = OpenLDAP Perl backend
@@ -141,8 +143,8 @@
 PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2)
 RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibssl1-0-0
-OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt
-CATALOGNAME_CSWoldaprt = openldap_rt_stub
+#OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt
+#CATALOGNAME_CSWoldaprt = openldap_rt_stub
 
 PACKAGES += CSWlibldap2-4-2
 SPKG_DESC_CSWlibldap2-4-2 = OpenLDAP LDAP library, libldap-2.4.so.2
@@ -150,7 +152,7 @@
 PKGFILES_CSWlibldap2-4-2 += $(sysconfdir)/ldap.conf
 PKGFILES_CSWlibldap2-4-2 += $(mandir)/man5/ldap.conf.5
 RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWliblber2-4-2
-OBSOLETED_BY_CSWlibldap2-4-2 += CSWoldaprt
+#OBSOLETED_BY_CSWlibldap2-4-2 += CSWoldaprt
 
 # Evaluate later
 CHECKPKG_OVERRIDES_CSWlibldap2-4-2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5
@@ -161,7 +163,7 @@
 RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibssl1-0-0
-OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt
+#OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt
 
 EXTRA_DOCS = README.CSW openldaprc
 

Modified: csw/mgar/pkg/openldap/trunk/files/cswopenldap
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/cswopenldap	2015-06-22 10:40:39 UTC (rev 25110)
+++ csw/mgar/pkg/openldap/trunk/files/cswopenldap	2015-06-22 12:40:09 UTC (rev 25111)
@@ -35,6 +35,8 @@
 sbindir="@sbindir@"
 libexecdir="@libexecdir@"
 
+[ -r /etc/opt/csw/openldaprc ] && . /etc/opt/csw/openldaprc
+
 ### START OPENCSW ARCHITECTURE SELECTION
 # Source the configuration
 # This is used to define the binary architeture to run
@@ -109,7 +111,7 @@
        if [ -n "$SLAPD_SYSLOG_FACILITY" ] ; then START="$START -l $SLAPD_SYSLOG_FACILITY"; fi
        if [ -n "$SLAPD_SERVICE_NAME" ] ; then START="$START -n $SLAPD_SERVICE_NAME"; fi
        if [ -n "$SLAPD_DIRECTORY" ] ; then START="$START -r $SLAPD_DIRECTORY"; fi
-       if [ -n "$SLAPD_SYSLOG_LEVEL" ] ; then START="$START -s $SLAPD_SYSLOG_LEVEL"; fi
+       if [ -n "$SLAPD_SYSLOG_LEVEL" ] ; then START="$START -s $SLAPD_SYSLOG_LEVEL"; else START="$START -s 256"; fi
        if [ -n "$SLAPD_SYNTAX_CHECK" ] ; then START="$START -t"; fi
        if [ -n "$SLAPD_USER" ] ; then START="$START -u $SLAPD_USER"; fi
        if [ -n "$SLAPD_EXTRA" ] ; then START="$START $SLAPD_EXTRA"; fi

Modified: csw/mgar/pkg/openldap/trunk/files/openldaprc
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/openldaprc	2015-06-22 10:40:39 UTC (rev 25110)
+++ csw/mgar/pkg/openldap/trunk/files/openldaprc	2015-06-22 12:40:09 UTC (rev 25111)
@@ -33,6 +33,7 @@
 #SLAPD_URL_LIST=ldap:///
 
 # -l facility.  Selects the syslog(8) facility.
+# You need to configure syslog as it logs to *.debug
 #SLAPD_SYSLOG_FACILITY=LOCAL4
 
 # -n service-name.  Defaults to "slapd".
@@ -42,7 +43,10 @@
 #SLAPD_DIRECTORY=directory
 
 # -s syslog-level.  Enter only the number below.
-#SLAPD_SYSLOG_LEVEL=0
+# Define here the openldap debug level to log to syslog.
+# 256 = stats log connections/operations/results
+# If you don't want any logging change it to 0
+SLAPD_SYSLOG_LEVEL=256
 
 # -t. slapd will read the configuration file and check its syntax only.
 #SLAPD_SYNTAX_CHECK=true
@@ -73,3 +77,6 @@
 
 # -n service-name.  Defaults to "slurpd".
 #SLURPD_SERVICE_NAME=slurpd
+
+#Max Files desscriptos:
+#SLAPD_MAXFDS=1024

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