[csw-devel] SF.net SVN: gar:[20210] csw/mgar/pkg/389-ds-base/branches/fromgit

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Thu Jan 24 13:41:03 CET 2013


Revision: 20210
          http://gar.svn.sourceforge.net/gar/?rev=20210&view=rev
Author:   cgrzemba
Date:     2013-01-24 12:41:03 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
389-ds-base/branches/fromgit: add use_openldap

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/branches/fromgit/Makefile
    csw/mgar/pkg/389-ds-base/branches/fromgit/checksums

Added Paths:
-----------
    csw/mgar/pkg/389-ds-base/branches/fromgit/files/0010-daemon.c.patch
    csw/mgar/pkg/389-ds-base/branches/fromgit/files/0011-Makefile.am.patch

Modified: csw/mgar/pkg/389-ds-base/branches/fromgit/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/fromgit/Makefile	2013-01-24 10:37:09 UTC (rev 20209)
+++ csw/mgar/pkg/389-ds-base/branches/fromgit/Makefile	2013-01-24 12:41:03 UTC (rev 20210)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = 389-ds-base
-VERSION = 1.2.11.15
+VERSION = 1.3.0
 GARTYPE = v2
 
 DESCRIPTION = The enterprise-class Open Source LDAP server
@@ -12,8 +12,9 @@
 
 BUNDLE = 389-ds
 
-MASTER_SITES = http://port389.org/sources/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+# MASTER_SITES = http://port389.org/sources/
+GIT_REPOS = git://git.fedorahosted.org/389/ds.git
+# DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 DISTFILES += CSW389-ds-base.postinstall
 DISTFILES += CSW389-ds-base.postremove
 
@@ -24,6 +25,7 @@
 LICENSE = LICENSE
 
 GARCOMPILER = SOS12U3
+USE_OPENLDAP = 1
 
 PATCHFILES += 0005-add-standard-path.patch
 PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
@@ -33,9 +35,11 @@
 # PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch
 PATCHFILES += 0007-fixup-Makefile.am.patch
 # PATCHFILES += 0007-fixup-plugin_syntax.c.patch
-PATCHFILES += 0008-mntent-daemon.c.patch
+# PATCHFILES += 0008-mntent-daemon.c.patch
 PATCHFILES += 0009-mozldap-pw.c.patch
 PATCHFILES += 0010-mntent-config.ac.patch
+PATCHFILES += 0010-daemon.c.patch
+PATCHFILES += 0011-Makefile.am.patch
 
 BUILD_DEP_PKGS += CSWautoconf
 BUILD_DEP_PKGS += CSWautomake
@@ -43,8 +47,12 @@
 BUILD_DEP_PKGS += CSWnspr-dev
 BUILD_DEP_PKGS += CSWlibnss-dev
 BUILD_DEP_PKGS += CSWnetsnmp-dev
-BUILD_DEP_PKGS += CSWmozldap-dev
-BUILD_DEP_PKGS += CSWmozldap-tools
+ifeq ($(USE_OPENLDAP),1)
+ BUILD_DEP_PKGS += CSWopenldap-dev
+else
+ BUILD_DEP_PKGS += CSWmozldap-dev
+ BUILD_DEP_PKGS += CSWmozldap-tools
+endif
 BUILD_DEP_PKGS += CSWsasl-dev
 BUILD_DEP_PKGS += CSWlibicu-dev
 BUILD_DEP_PKGS += CSWlibsvrcore0-dev
@@ -94,14 +102,20 @@
 
 EXTRA_LIB = /opt/csw/bdb48/lib
 # remove -I/opt/csw/include
-CPPFLAGS = 
+# CPPFLAGS = 
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
 
+
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
-CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir)
-## CONFIGURE_ARGS += --with-ldapsdk-bin=$(abspath $(prefix)/dirsrv/bin/$(MM_BINDIR))
-CONFIGURE_ARGS += --with-ldapsdk-bin=$(bindir)
+ifeq ($(USE_OPENLDAP),1)
+  CONFIGURE_ARGS += --with-openldap-inc=/opt/csw/include
+  CONFIGURE_ARGS += --with-openldap-lib=$(libdir)
+  CONFIGURE_ARGS += --with-openldap-bin=$(bindir)
+else
+  CONFIGURE_ARGS += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
+  CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir)
+  CONFIGURE_ARGS += --with-ldapsdk-bin=$(bindir)
+endif
 CONFIGURE_ARGS += --with-db-inc=/opt/csw/bdb48/include 
 CONFIGURE_ARGS += --with-db-lib=$(abspath $(prefix)/bdb48/lib/$(MM_LIBDIR))
 CONFIGURE_ARGS += --with-icu-inc=/opt/csw/include 

Modified: csw/mgar/pkg/389-ds-base/branches/fromgit/checksums
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/fromgit/checksums	2013-01-24 10:37:09 UTC (rev 20209)
+++ csw/mgar/pkg/389-ds-base/branches/fromgit/checksums	2013-01-24 12:41:03 UTC (rev 20210)
@@ -1 +0,0 @@
-ae6bc25834728bcd9dd96ef82094c2bd  389-ds-base-1.2.11.15.tar.bz2

Added: csw/mgar/pkg/389-ds-base/branches/fromgit/files/0010-daemon.c.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/fromgit/files/0010-daemon.c.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/branches/fromgit/files/0010-daemon.c.patch	2013-01-24 12:41:03 UTC (rev 20210)
@@ -0,0 +1,11 @@
+--- a/ldap/servers/slapd/daemon.c
++++ b/ldap/servers/slapd/daemon.c
+@@ -497,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) {
+             continue;
+         }

Added: csw/mgar/pkg/389-ds-base/branches/fromgit/files/0011-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/fromgit/files/0011-Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/branches/fromgit/files/0011-Makefile.am.patch	2013-01-24 12:41:03 UTC (rev 20210)
@@ -0,0 +1,12 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1037,8 +1037,7 @@ libposix_winsync_plugin_la_SOURCES = ldap/servers/plugins/posix-winsync/posix-wi
+ 	ldap/servers/plugins/posix-winsync/posix-group-task.c \
+ 	ldap/servers/plugins/posix-winsync/posix-winsync-config.c
+ 
+-libposix_winsync_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) -DWINSYNC_TEST_POSIX \
+-	-I$(srcdir)/ldap/servers/plugins/replication
++libposix_winsync_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/replication $(PLUGIN_CPPFLAGS) -DWINSYNC_TEST_POSIX
+ libposix_winsync_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
+ libposix_winsync_plugin_la_LDFLAGS = -avoid-version
+ 

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