Index: trunk/server/common/patches/389-ds-base-fix-changelog-paths.patch =================================================================== --- trunk/server/common/patches/389-ds-base-fix-changelog-paths.patch (revision 1814) +++ (revision ) @@ -1,67 +1,0 @@ -diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c -index b7c7229..59ef8be 100644 ---- a/ldap/servers/plugins/replication/cl5_api.c -+++ b/ldap/servers/plugins/replication/cl5_api.c -@@ -657,7 +657,7 @@ int cl5DeleteDBSync (Object *replica) - file = (CL5DBFile*)object_get_data (obj); - PR_ASSERT (file); - -- PR_snprintf (fName, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, file->name); -+ PR_snprintf (fName, MAXPATHLEN, "%s", file->name); - - _cl5DBDeleteFile (obj); - -@@ -1894,6 +1894,7 @@ static int _cl5DBOpen () - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBOpen: " - "file %s has no matching replica; removing\n", entry->name); - -+ PR_snprintf(fullpathname, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, entry->name); - rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, - 0, fullpathname, 0, 0); - if (rc != 0) -@@ -5528,7 +5529,6 @@ done: - static void _cl5DBCloseFile (void **data) - { - CL5DBFile *file; -- char fullpathname[MAXPATHLEN]; - - PR_ASSERT (data); - -@@ -5537,7 +5537,7 @@ static void _cl5DBCloseFile (void **data) - PR_ASSERT (file); - - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " -- "Closing database %s/%s\n", s_cl5Desc.dbDir, file->name); -+ "Closing database %s\n", file->name); - - /* close the file */ - /* if this is normal close or close after import, update entry count */ -@@ -5553,7 +5553,7 @@ static void _cl5DBCloseFile (void **data) - if (file->db) { - file->db->close(file->db, 0); - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " -- "Closed the changelog database handle for %s/%s\n", s_cl5Desc.dbDir, file->name); -+ "Closed the changelog database handle for %s\n", file->name); - file->db = NULL; - } - -@@ -5562,16 +5562,15 @@ static void _cl5DBCloseFile (void **data) - int rc = 0; - /* We need to use the libdb API to delete the files, otherwise we'll - * run into problems when we try to checkpoint transactions later. */ -- PR_snprintf(fullpathname, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, file->name); -- rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, 0, fullpathname, 0, 0); -+ rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, 0, file->name, 0, 0); - if (rc != 0) - { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " - "failed to remove (%s) file; libdb error - %d (%s)\n", -- fullpathname, rc, db_strerror(rc)); -+ file->name, rc, db_strerror(rc)); - } else { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " -- "Deleted the changelog database file %s/%s\n", s_cl5Desc.dbDir, file->name); -+ "Deleted the changelog database file %s\n", file->name); - - } - } Index: trunk/server/fedora/Makefile =================================================================== --- trunk/server/fedora/Makefile (revision 1814) +++ trunk/server/fedora/Makefile (revision 1815) @@ -19,5 +19,5 @@ # See /COPYRIGHT in this repository for more information. -upstream_yum = krb5 krb5.i686 httpd openssh 389-ds-base +upstream_yum = krb5 krb5.i686 httpd openssh hackage = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle Index: trunk/server/fedora/specs/389-ds-base.spec.patch =================================================================== --- trunk/server/fedora/specs/389-ds-base.spec.patch (revision 1814) +++ (revision ) @@ -1,45 +1,0 @@ ---- 389-ds-base.spec.orig 2010-12-16 12:22:05.000000000 -0500 -+++ 389-ds-base.spec 2010-12-23 21:19:49.000000000 -0500 -@@ -13,7 +13,7 @@ - Summary: 389 Directory Server (base) - Name: 389-ds-base - Version: 1.2.7.5 --Release: %{?relprefix}1%{?prerel}%{?dist} -+Release: %{?relprefix}1%{?prerel}.scripts.%{scriptsversion}%{?dist} - License: GPLv2 with exceptions - URL: http://port389.org/ - Group: System Environment/Daemons -@@ -83,11 +83,15 @@ - Requires(preun): /sbin/chkconfig - Requires(preun): /sbin/service - -+Provides: scripts-389-ds -+ - Source0: http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2 - # 389-ds-git.sh should be used to generate the source tarball from git - Source1: %{name}-git.sh - Source2: %{name}-devel.README - -+Patch0: 389-ds-base-fix-changelog-paths.patch -+ - %description - 389 Directory Server is an LDAPv3 compliant server. The base package includes - the LDAP server and command line utilities for server administration. -@@ -109,6 +113,7 @@ - - %prep - %setup -q -n %{name}-%{version}%{?prerel} -+%patch0 -p1 -b .fix-changelog-paths - cp %{SOURCE2} README.devel - - %build -@@ -300,6 +305,9 @@ - %{_libdir}/%{pkgname}/*.so - - %changelog -+* Thu Dec 23 2010 Mitchell E Berger - 1.2.7.5-1.scripts -+- Correct changelog path logic in MMR plugin -+ - * Thu Dec 16 2010 Rich Megginson - 1.2.7.5-1 - - 1.2.7.5 release - git tag 389-ds-base-1.2.7.5 - - Bug 663597 - Memory leaks in normalization code Index: trunk/server/fedora/specs/scripts-base.spec =================================================================== --- trunk/server/fedora/specs/scripts-base.spec (revision 1814) +++ trunk/server/fedora/specs/scripts-base.spec (revision 1815) @@ -31,5 +31,4 @@ Requires: httpdmods Requires: %{all_archs nss_nonlocal} -Requires: scripts-389-ds %define debug_package %{nil}