FreeBSD Port: openldap-server-2.4.10

[Mikhail Goriachev]

Xin LI wrote:
> 

[...]

> I have committed these changes as part of OpenLDAP 2.4.11, thanks for
> your submission!

A line that isn't supposed to exist is still present in 2.4.11. When 
compiling from ports the DATABASEDIR is still created.

The line:

@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data



The working patch:

--- patch-servers::slapd::Makefile.in.orig      2008-07-22 
19:29:17.000000000 +0000
+++ patch-servers::slapd::Makefile.in   2008-07-22 19:34:37.000000000 +0000
@@ -1,5 +1,5 @@
---- servers/slapd/Makefile.in.orig     2008-02-11 15:26:43.000000000 -0800
-+++ servers/slapd/Makefile.in  2008-07-19 20:10:16.023473779 -0700
+--- servers/slapd/Makefile.in.orig     2008-02-11 23:26:43.000000000 +0000
++++ servers/slapd/Makefile.in  2008-07-22 19:25:03.000000000 +0000
  @@ -374,7 +374,6 @@

   install-slapd: FORCE
@@ -33,12 +33,13 @@
         done

   install-conf: FORCE
-@@ -432,8 +433,6 @@
+@@ -430,9 +431,6 @@
+
+ install-db-config: FORCE
         @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
-       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
-       $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
--              $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+-      @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
  -      $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+-              $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+       $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
                 $(DESTDIR)$(sysconfdir)/DB_CONFIG.example

- install-tools: FORCE





Once again, thanks!


Regards,
Mikhail.

-- 
Mikhail Goriachev
Webanoide