ports/177016: [PATCH] net/openldap24-server: Fix local-modified schema being overwrite

[Po-Chien Lin]

>Number:         177016
>Category:       ports
>Synopsis:       [PATCH] net/openldap24-server: Fix local-modified schema being overwrite
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 16 10:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Po-Chien Lin
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dev.linpc.org 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Sat Jan  5 22:32:49 CST
>Description:
- When install from port, 'install-schema' target in openldap native "Makefile.in"
  will overwrite local-modified xxx.schema, whereas we check the existing of
  such files in TMPPLIST.
- Update patch line range while here

>How-To-Repeat:
>Fix:

--- openldap-server-2.4.34.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/openldap24-server/files/patch-servers::slapd::Makefile.in ./files/patch-servers::slapd::Makefile.in
--- /usr/ports/net/openldap24-server/files/patch-servers::slapd::Makefile.in	2013-01-06 11:40:31.997143412 +0800
+++ ./files/patch-servers::slapd::Makefile.in	2013-03-16 17:55:25.016033817 +0800
@@ -1,6 +1,6 @@
 --- 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
-@@ -374,7 +374,6 @@
+@@ -371,7 +371,6 @@
  
  install-slapd: FORCE
  	-$(MKDIR) $(DESTDIR)$(libexecdir)
@@ -8,7 +8,7 @@
  	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
  		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
  	@for i in $(SUBDIRS); do \
-@@ -405,16 +404,18 @@
+@@ -406,16 +405,18 @@
  	touch all-cffiles
  
  install-schema: FORCE
@@ -28,12 +28,12 @@
 +	files=`cd $(srcdir)/schema ; echo *.schema` ; \
 +	for i in $$files ; do \
 +		echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \
-+		$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \
++		[ -f $$SD/$$i ] || $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \
 +		$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i.default ; \
  	done
  
  install-conf: FORCE
-@@ -432,8 +433,6 @@
+@@ -441,8 +442,6 @@
  	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
  	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
  	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
--- openldap-server-2.4.34.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: