SF.net SVN: gar:[23118] csw/mgar/pkg/389-ds-base/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Mon Mar 3 13:45:46 CET 2014
Revision: 23118
http://sourceforge.net/p/gar/code/23118
Author: cgrzemba
Date: 2014-03-03 12:45:44 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
389-ds-base/trunk: update version
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/0008-mntent-daemon.c.patch
Added Paths:
-----------
csw/mgar/pkg/389-ds-base/trunk/files/0013-use-posix-threads-configure.ac.patch
csw/mgar/pkg/389-ds-base/trunk/files/0014-ldap-include-Makefile.am.patch
Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile 2014-03-03 11:42:57 UTC (rev 23117)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2014-03-03 12:45:44 UTC (rev 23118)
@@ -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.2.13
GARTYPE = v2
DESCRIPTION = The enterprise-class Open Source LDAP server
@@ -33,12 +33,14 @@
# 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 += 0009-mozldap-pw.c.patch
-PATCHFILES += 0010-mntent-config.ac.patch
-PATCHFILES += 0011-Makefile.am.patch
-PATCHFILES += 0009-fix-for-550-memberuid-not-created.patch
-PATCHFILES += 0012-fix-for-47327.patch
+# PATCHFILES += 0008-mntent-daemon.c.patch
+# PATCHFILES += 0009-mozldap-pw.c.patch
+# PATCHFILES += 0010-mntent-config.ac.patch
+# 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
BUILD_DEP_PKGS += CSWautoconf
@@ -56,11 +58,8 @@
BUILD_DEP_PKGS += CSWlibkrb5-dev
INITSMF = /etc/opt/csw/init.d/dirsrv
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWperl
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpython
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldif60
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsvrcore0
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnspr4
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap60
@@ -70,12 +69,9 @@
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplds4
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnss3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplc4
-# RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicudata49
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWbdb48
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibcom-err3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n51
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc51
# RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-mozldap
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssl3
@@ -84,6 +80,14 @@
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnssdbm3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre1
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-netaddr-ip
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n52
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibintl8
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc52
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap-r2-4-2
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicudata52
CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm
@@ -104,23 +108,25 @@
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-inc=$(includedir)/dirsrv
+# CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir)
## CONFIGURE_ARGS += --with-ldapsdk-bin=$(abspath $(prefix)/dirsrv/bin/$(MM_BINDIR))
-CONFIGURE_ARGS += --with-ldapsdk-bin=$(bindir)
-CONFIGURE_ARGS += --with-db-inc=/opt/csw/bdb48/include
+# CONFIGURE_ARGS += --with-ldapsdk-bin=$(bindir)
+CONFIGURE_ARGS += --with-openldap=$(prefix)
+CONFIGURE_ARGS += --with-openldap-inc=$(includedir)
+CONFIGURE_ARGS += --with-db-inc=$(prefix)/bdb48/include
CONFIGURE_ARGS += --with-db-lib=$(abspath $(prefix)/bdb48/lib/$(MM_LIBDIR))
-CONFIGURE_ARGS += --with-icu-inc=/opt/csw/include
+CONFIGURE_ARGS += --with-icu-inc=$(includedir)
CONFIGURE_ARGS += --with-icu-lib=$(libdir)
-CONFIGURE_ARGS += --with-icu-bin=/opt/csw/bin
-CONFIGURE_ARGS += --with-netsnmp-inc=/opt/csw/include
+CONFIGURE_ARGS += --with-icu-bin=$(bindir)
+CONFIGURE_ARGS += --with-netsnmp-inc=$(includedir)
CONFIGURE_ARGS += --with-netsnmp-lib=$(libdir)
-CONFIGURE_ARGS += --with-sasl-inc=/opt/csw/include/sasl
+CONFIGURE_ARGS += --with-sasl-inc=$(includedir)/sasl
CONFIGURE_ARGS += --with-sasl-lib=$(libdir)
CONFIGURE_ARGS += --with-nss-lib=$(libdir)
-CONFIGURE_ARGS += --with-nss-inc=/opt/csw/include/nss
+CONFIGURE_ARGS += --with-nss-inc=$(includedir)/nss
CONFIGURE_ARGS += --with-nspr-lib=$(libdir)
-CONFIGURE_ARGS += --with-nspr-inc=/opt/csw/include/nspr
+CONFIGURE_ARGS += --with-nspr-inc=$(includedir)/nspr
include gar/category.mk
Modified: csw/mgar/pkg/389-ds-base/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/checksums 2014-03-03 11:42:57 UTC (rev 23117)
+++ csw/mgar/pkg/389-ds-base/trunk/checksums 2014-03-03 12:45:44 UTC (rev 23118)
@@ -1 +1 @@
-ae6bc25834728bcd9dd96ef82094c2bd 389-ds-base-1.2.11.15.tar.bz2
+8950764771081291117ade801b49ec04 389-ds-base-1.3.2.13.tar.bz2
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-03 11:42:57 UTC (rev 23117)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch 2014-03-03 12:45:44 UTC (rev 23118)
@@ -1,38 +1,11 @@
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
-@@ -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"
+@@ -498,7 +498,7 @@ disk_mon_get_mount_point(char *dir)
- #if defined(ENABLE_LDAPI)
-@@ -495,7 +497,7 @@ disk_mon_get_mount_point(char *dir)
-
dev_id = s.st_dev;
-- while((mnt = getmntent(fp))){
-+ while(0 == getmntent(fp,mnt)){
- if (stat(mnt->mnt_mountp, &s) != 0) {
+- 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/trunk/files/0013-use-posix-threads-configure.ac.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0013-use-posix-threads-configure.ac.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0013-use-posix-threads-configure.ac.patch 2014-03-03 12:45:44 UTC (rev 23118)
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -588,6 +588,7 @@ dnl includes some assembler stuff in counter.o
+ TARGET='SPARC'
+ ;;
+ esac
++ AC_DEFINE([USE_POSIX_RWLOCKS], [1], [POSIX rwlocks])
+ ;;
+ *)
+ platform=""
Added: csw/mgar/pkg/389-ds-base/trunk/files/0014-ldap-include-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0014-ldap-include-Makefile.am.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0014-ldap-include-Makefile.am.patch 2014-03-03 12:45:44 UTC (rev 23118)
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -31,7 +31,7 @@ PATH_DEFINES = -DLOCALSTATEDIR="\"$(localstatedir)\"" -DSYSCONFDIR="\"$(sysconfd
+ -DSBINDIR="\"$(sbindir)\"" -DPLUGINDIR="\"$(serverplugindir)\"" -DTEMPLATEDIR="\"$(sampledatadir)\""
+
+ AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
+-PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
++PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+ # We need to make sure that libpthread is linked before libc on HP-UX.
+ if HPUX
+ AM_LDFLAGS = -lpthread
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