[csw-devel] SF.net SVN: gar:[19204] csw/mgar/pkg/389-ds-base/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Fri Sep 14 11:36:23 CEST 2012
Revision: 19204
http://gar.svn.sourceforge.net/gar/?rev=19204&view=rev
Author: cgrzemba
Date: 2012-09-14 09:36:23 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
389-ds-base/trunk: bump version 1.2.11.14
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/0007-fixup-Makefile.am.patch
Added Paths:
-----------
csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch
csw/mgar/pkg/389-ds-base/trunk/files/0009-mozldap-pw.c.patch
csw/mgar/pkg/389-ds-base/trunk/files/0010-mntent-config.ac.patch
Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-09-14 07:56:28 UTC (rev 19203)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-09-14 09:36:23 UTC (rev 19204)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = 389-ds-base
-VERSION = 1.2.10.7
+VERSION = 1.2.11.14
GARTYPE = v2
CATEGORIES = server
@@ -28,9 +28,12 @@
PATCHFILES += 0005-smf-autoenable-no.patch
PATCHFILES += 0005-add-var-run-create-initconfig.in.patch
# until Red Hat Bugzilla Bug 773617 is open do it yourself
-PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch
+# 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
BUILD_DEP_PKGS += CSWautoconf
BUILD_DEP_PKGS += CSWautomake
Modified: csw/mgar/pkg/389-ds-base/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/checksums 2012-09-14 07:56:28 UTC (rev 19203)
+++ csw/mgar/pkg/389-ds-base/trunk/checksums 2012-09-14 09:36:23 UTC (rev 19204)
@@ -1 +1 @@
-7971e67278785a824cfb41f95a0dbab5 389-ds-base-1.2.10.7.tar.bz2
+d7e7969be34e18e5c8e1e40f3b9d5124 389-ds-base-1.2.11.14.tar.bz2
Modified: csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch 2012-09-14 07:56:28 UTC (rev 19203)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch 2012-09-14 09:36:23 UTC (rev 19204)
@@ -20,25 +20,7 @@
# We need to make sure that libpthread is linked before libc on HP-UX.
if HPUX
AM_LDFLAGS = -lpthread
-@@ -696,7 +696,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
- $(libavl_a_SOURCES)
-
- libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@ @kerberos_inc@ @pcre_inc@
--if SOLARIS
-+if SPARC
- libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S
- endif
-
-@@ -886,7 +886,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
-@@ -1439,7 +1439,7 @@ fixupcmd = sed \
+@@ -1475,7 +1475,7 @@ fixupcmd = sed \
-e 's, at systemdsystemconfdir\@,$(systemdsystemconfdir),g' \
-e 's, at systemdgroupname\@,$(systemdgroupname),g'
else
@@ -47,7 +29,7 @@
-e 's, at bindir\@,$(bindir),g' \
-e 's, at sbindir\@,$(sbindir),g' \
-e 's, at libdir\@,$(libdir),g' \
-@@ -1519,7 +1519,7 @@ endif
+@@ -1564,7 +1564,7 @@ endif
if SYSTEMD
$(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@
else
@@ -56,7 +38,7 @@
$(fixupcmd) $(srcdir)/ldap/admin/src/initconfig.in >> $@
endif
-@@ -1528,7 +1528,7 @@ endif
+@@ -1555,7 +1555,7 @@ endif
if SYSTEMD
$(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@
else
Added: 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 (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch 2012-09-14 09:36:23 UTC (rev 19204)
@@ -0,0 +1,38 @@
+--- 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"
+
+ #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) {
+ continue;
+ }
Added: csw/mgar/pkg/389-ds-base/trunk/files/0009-mozldap-pw.c.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0009-mozldap-pw.c.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0009-mozldap-pw.c.patch 2012-09-14 09:36:23 UTC (rev 19204)
@@ -0,0 +1,12 @@
+--- a/ldap/servers/slapd/pw.c
++++ b/ldap/servers/slapd/pw.c
+@@ -61,6 +61,9 @@
+ #if defined( _WIN32 )
+ #undef LDAPDebug
+ #endif /* _WIN32 */
++#if defined( USE_MOZLDAP )
++#define LDAP_MOD_OP (0x0007)
++#endif /* USE_MOZLDAP */
+
+ #include "slap.h"
+
Added: csw/mgar/pkg/389-ds-base/trunk/files/0010-mntent-config.ac.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0010-mntent-config.ac.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0010-mntent-config.ac.patch 2012-09-14 09:36:23 UTC (rev 19204)
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,7 +34,7 @@ AC_PROG_LIBTOOL
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/socket.h sys/time.h unistd.h inttypes.h])
++AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/socket.h sys/time.h unistd.h inttypes.h mntent.h])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STAT
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