Bug 177016 - [PATCH] net/openldap24-server: Fix local-modified schema being overwrite
Summary: [PATCH] net/openldap24-server: Fix local-modified schema being overwrite
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Xin LI
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-16 10:20 UTC by Po-Chien Lin
Modified: 2013-10-02 21:00 UTC (History)
1 user (show)

See Also:

Attachments
openldap-server-2.4.34.patch (1.46 KB, patch)
2013-03-16 10:20 UTC, Po-Chien Lin 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Po-Chien Lin freebsd_committer freebsd_triage 2013-03-16 10:20:00 UTC 
- 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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-16 10:20:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->delphij

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Xin LI freebsd_committer freebsd_triage 2013-10-02 20:51:17 UTC 
State Changed
From-To: open->closed

Committed, thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-10-02 20:51:18 UTC 
Author: delphij
Date: Wed Oct  2 19:51:11 2013
New Revision: 329102
URL: http://svnweb.freebsd.org/changeset/ports/329102

Log:
  Don't overwrite existing schema when they already do.
  
  PR:		ports/177016
  Submitted by:	pclin

Modified:
  head/net/openldap24-server/Makefile
  head/net/openldap24-server/files/patch-servers::slapd::Makefile.in

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Wed Oct  2 19:49:38 2013	(r329101)
+++ head/net/openldap24-server/Makefile	Wed Oct  2 19:51:11 2013	(r329102)
@@ -56,7 +56,7 @@ BROKEN=			incompatible OpenLDAP version:
 .endif
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	2
 OPENLDAP_SHLIB_MAJOR=	8
 
 OPTIONS_DEFINE=	FETCH

Modified: head/net/openldap24-server/files/patch-servers::slapd::Makefile.in
==============================================================================
--- head/net/openldap24-server/files/patch-servers::slapd::Makefile.in	Wed Oct  2 19:49:38 2013	(r329101)
+++ head/net/openldap24-server/files/patch-servers::slapd::Makefile.in	Wed Oct  2 19:51:11 2013	(r329102)
@@ -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 \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"