SF.net SVN: gar:[23145] csw/mgar/pkg/389-ds-base/trunk

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Thu Mar 6 16:44:05 CET 2014


Revision: 23145
          http://sourceforge.net/p/gar/code/23145
Author:   cgrzemba
Date:     2014-03-06 15:44:03 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
389-ds-base/trunk: version 1.2.11.25

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile
    csw/mgar/pkg/389-ds-base/trunk/checksums
    csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch
    csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch
    csw/mgar/pkg/389-ds-base/trunk/files/0011-use-logname.patch

Added Paths:
-----------
    csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-template-initconfig.in.patch

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2014-03-05 21:56:18 UTC (rev 23144)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2014-03-06 15:44:03 UTC (rev 23145)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = 389-ds-base
-VERSION = 1.3.2.13
+VERSION = 1.2.11.25
 GARTYPE = v2
 
 DESCRIPTION = The enterprise-class Open Source LDAP server
@@ -27,8 +27,10 @@
 
 PATCHFILES += 0005-add-standard-path.patch
 PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
+# PATCHFILES += 0006-remove-bashism-in-shell-templates.patch
 PATCHFILES += 0005-smf-autoenable-no.patch
 PATCHFILES += 0005-add-var-run-create-initconfig.in.patch
+PATCHFILES += 0005-add-var-run-create-template-initconfig.in.patch
 # until Red Hat Bugzilla Bug 773617 is open do it yourself
 # PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch
 PATCHFILES += 0007-fixup-Makefile.am.patch
@@ -39,7 +41,6 @@
 # PATCHFILES += 0011-Makefile.am.patch
 # PATCHFILES += 0009-fix-for-550-memberuid-not-created.patch
 # PATCHFILES += 0012-fix-for-47327.patch
-PATCHFILES += 0013-use-posix-threads-configure.ac.patch
 PATCHFILES += 0014-ldap-include-Makefile.am.patch
 
 
@@ -49,7 +50,7 @@
 BUILD_DEP_PKGS += CSWnspr-dev
 BUILD_DEP_PKGS += CSWlibnss-dev
 BUILD_DEP_PKGS += CSWnetsnmp-dev
-BUILD_DEP_PKGS += CSWmozldap-dev
+# BUILD_DEP_PKGS += CSWmozldap-dev
 BUILD_DEP_PKGS += CSWmozldap-tools
 BUILD_DEP_PKGS += CSWsasl-dev
 BUILD_DEP_PKGS += CSWlibicu-dev

Modified: csw/mgar/pkg/389-ds-base/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/checksums	2014-03-05 21:56:18 UTC (rev 23144)
+++ csw/mgar/pkg/389-ds-base/trunk/checksums	2014-03-06 15:44:03 UTC (rev 23145)
@@ -1 +1 @@
-8950764771081291117ade801b49ec04  389-ds-base-1.3.2.13.tar.bz2
+adb6ac765fe2b766f06ee920126a06d2  389-ds-base-1.2.11.25.tar.bz2

Modified: csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch	2014-03-05 21:56:18 UTC (rev 23144)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-initconfig.in.patch	2014-03-06 15:44:03 UTC (rev 23145)
@@ -1,17 +1,6 @@
-From 02d3fc96b22f79ca5562949790b53ce7ae63f019 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Mon, 27 Feb 2012 10:16:15 +0100
-Subject: [PATCH] add var run create initconfig.in
-
----
- ldap/admin/src/initconfig.in |   15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in
-index 134e82c..8a73573 100644
 --- a/ldap/admin/src/initconfig.in
 +++ b/ldap/admin/src/initconfig.in
-@@ -4,9 +4,22 @@ OS=`uname -s`
+@@ -4,7 +4,9 @@ OS=`uname -s`
  # this requires Solaris 9 update 3 or later
  if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
      LD_PRELOAD=/usr/lib/libumem.so
@@ -22,19 +11,3 @@
  fi
  if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
      LD_PRELOAD_64=/usr/lib/64/libumem.so
-     export LD_PRELOAD_64
- fi
-+
-+USER=`/usr/xpg4/bin/id -u -n`
-+export USER
-+[ ! -d @localstatedir@/run/dirsrv ] && mkdir -p @localstatedir@/run/dirsrv
-+if [ -f @instconfigdir@/admin-serv/adm.conf ]; then
-+  slapduser=`grep SuiteSpotUserID @instconfigdir@/admin-serv/adm.conf | cut -d: -f2 | tr -d ' '`
-+  slapdgroup=`grep SuiteSpotGroup @instconfigdir@/admin-serv/adm.conf | cut -d: -f2 | tr -d ' '`
-+  chown $slapduser:$slapdgroup @localstatedir@/run/dirsrv
-+fi
-+chmod g+w @localstatedir@/run/dirsrv
-+chmod +rx @localstatedir@/run
--- 
-1.7.9
-

Added: csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-template-initconfig.in.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-template-initconfig.in.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0005-add-var-run-create-template-initconfig.in.patch	2014-03-06 15:44:03 UTC (rev 23145)
@@ -0,0 +1,15 @@
+--- a/ldap/admin/src/template-initconfig.in
++++ b/ldap/admin/src/template-initconfig.in
+@@ -20,3 +20,12 @@ PRODUCT_NAME={{PRODUCT-NAME}}
+ 
+ # Put custom instance specific settings below here.
+ # if using systemd, omit the "; export VARNAME" at the end
++[ ! -d $RUN_DIR ] && mkdir -p $RUN_DIR
++if [ -f $CONFIG_DIR/dse.ldif ]; then
++  slapduser=`grep nsslapd-localuser: $CONFIG_DIR/dse.ldif | cut -d: -f2 | tr -d ' '`
++  slapdgroup=`getent passwd ldap | cut -d: -f4`
++  chown $slapduser:$slapdgroup $RUN_DIR
++fi
++chmod g+w $RUN_DIR
++chmod +rx `dirname $RUNDIR`
++

Modified: csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch	2014-03-05 21:56:18 UTC (rev 23144)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch	2014-03-06 15:44:03 UTC (rev 23145)
@@ -1,11 +1,38 @@
 --- a/ldap/servers/slapd/daemon.c
 +++ b/ldap/servers/slapd/daemon.c
-@@ -498,7 +498,7 @@ disk_mon_get_mount_point(char *dir)
+@@ -59,7 +59,9 @@
+ #include <sys/time.h>
+ #include <sys/wait.h>
+ #include <pthread.h>
+-#include <mntent.h>
++#if defined(HAVE_MNTENT_H)
++# include <mntent.h>
++# endif
+ #endif
+ #include <time.h>
+ #include <signal.h>
+@@ -80,6 +82,7 @@
+ #endif /* NEED_FILIO */
+ #endif /* !defined( _WIN32 ) */
+ /* for some reason, linux tty stuff defines CTIME */
++#include <stdio.h>
+ #ifdef LINUX
+ #undef CTIME
+ #include <sys/statfs.h>
+@@ -92,7 +95,6 @@
+ #include "snmp_collator.h"
+ #include <private/pprio.h>
+ #include <ssl.h>
+-#include <stdio.h>
+ #include "fe.h"
  
+ #if defined(ENABLE_LDAPI)
+@@ -495,7 +497,7 @@ disk_mon_get_mount_point(char *dir)
+ 
      dev_id = s.st_dev;
  
--    while((0 = getmntent(fp, &mnt))){
-+    while(0 == getmntent(fp, &mnt)){
-         if (stat(mnt.mnt_mountp, &s) != 0) {
+-    while((mnt = getmntent(fp))){
++    while(0 == getmntent(fp,mnt)){
+         if (stat(mnt->mnt_mountp, &s) != 0) {
              continue;
          }

Modified: csw/mgar/pkg/389-ds-base/trunk/files/0011-use-logname.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0011-use-logname.patch	2014-03-05 21:56:18 UTC (rev 23144)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0011-use-logname.patch	2014-03-06 15:44:03 UTC (rev 23145)
@@ -37,3 +37,16 @@
          initconfig_dir=@initconfigdir@
      else
          initconfig_dir=$HOME/. at package_name@
+diff --git a/ldap/admin/src/scripts/DSUtil.pm.in b/ldap/admin/src/scripts/DSUtil.pm.in
+index cc64a2d..df63e63 100644
+--- a/ldap/admin/src/scripts/DSUtil.pm.in
++++ b/ldap/admin/src/scripts/DSUtil.pm.in
+@@ -146,7 +146,7 @@ sub isValidServerID {
+ # use confess here because if we cannot determine the user, something is really,
+ # really wrong and we need to abort immediately
+ sub getLogin {
+-    return (getpwuid($>))[0] || $ENV{USER} || confess "Error: could not determine the current user ID: $!";
++    return (getpwuid($>))[0] || $ENV{LOGNAME} || confess "Error: could not determine the current user ID: $!";
+ }
+ 
+ # Look up the primary group name for the supplied user

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