Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openldap/openldap.p5m
changeset 5055 9daf220c1a9a
parent 4295 8e6a71e8754b
child 5682 94c0ca64c022 
--- a/components/openldap/openldap.p5m	Tue Nov 03 13:40:13 2015 -0800
+++ b/components/openldap/openldap.p5m	Tue Nov 03 14:27:41 2015 -0800
@@ -82,15 +82,26 @@
     path=lib/svc/manifest/network/ldap/ldap-olslapd.xml
 file Solaris/ldap-olslapd path=lib/svc/method/ldap-olslapd
 link path=usr/bin/openldapadd target=openldapmodify
-file usr/bin/$(MACH64)/ldapcompare path=usr/bin/openldapcompare
-file usr/bin/$(MACH64)/ldapdelete path=usr/bin/openldapdelete
-file usr/bin/$(MACH64)/ldapexop path=usr/bin/openldapexop
-file usr/bin/$(MACH64)/ldapmodify path=usr/bin/openldapmodify
-file usr/bin/$(MACH64)/ldapmodrdn path=usr/bin/openldapmodrdn
-file usr/bin/$(MACH64)/ldappasswd path=usr/bin/openldappasswd
-file usr/bin/$(MACH64)/ldapsearch path=usr/bin/openldapsearch
+# The bypasses (and manual dependency on libsasl at the end of the file)
+# are required for building with the cyrus-sasl proto area because of
+# libsasl version depency checks in openldap code.
+file usr/bin/$(MACH64)/ldapcompare path=usr/bin/openldapcompare \
+    pkg.depend.bypass-generate=libsasl2.so.3
+file usr/bin/$(MACH64)/ldapdelete path=usr/bin/openldapdelete \
+    pkg.depend.bypass-generate=libsasl2.so.3
+file usr/bin/$(MACH64)/ldapexop path=usr/bin/openldapexop \
+    pkg.depend.bypass-generate=libsasl2.so.3
+file usr/bin/$(MACH64)/ldapmodify path=usr/bin/openldapmodify \
+    pkg.depend.bypass-generate=libsasl2.so.3
+file usr/bin/$(MACH64)/ldapmodrdn path=usr/bin/openldapmodrdn \
+    pkg.depend.bypass-generate=libsasl2.so.3
+file usr/bin/$(MACH64)/ldappasswd path=usr/bin/openldappasswd \
+    pkg.depend.bypass-generate=libsasl2.so.3
+file usr/bin/$(MACH64)/ldapsearch path=usr/bin/openldapsearch \
+    pkg.depend.bypass-generate=libsasl2.so.3
 file usr/bin/$(MACH64)/ldapurl path=usr/bin/openldapurl
-file usr/bin/$(MACH64)/ldapwhoami path=usr/bin/openldapwhoami
+file usr/bin/$(MACH64)/ldapwhoami path=usr/bin/openldapwhoami \
+    pkg.depend.bypass-generate=libsasl2.so.3
 file path=usr/include/openldap/lber.h
 file path=usr/include/openldap/lber_types.h
 file path=usr/include/openldap/ldap.h
@@ -106,10 +117,12 @@
 link path=usr/lib/$(MACH64)/liblber.so target=liblber-2.4.so.2.8.3
 link path=usr/lib/$(MACH64)/libldap-2.4.so target=libldap-2.4.so.2.8.3
 link path=usr/lib/$(MACH64)/libldap-2.4.so.2 target=libldap-2.4.so.2.8.3
-file path=usr/lib/$(MACH64)/libldap-2.4.so.2.8.3
+file path=usr/lib/$(MACH64)/libldap-2.4.so.2.8.3 \
+    pkg.depend.bypass-generate=libsasl2.so.3
 link path=usr/lib/$(MACH64)/libldap_r-2.4.so target=libldap_r-2.4.so.2.8.3
 link path=usr/lib/$(MACH64)/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.8.3
-file path=usr/lib/$(MACH64)/libldap_r-2.4.so.2.8.3
+file path=usr/lib/$(MACH64)/libldap_r-2.4.so.2.8.3 \
+    pkg.depend.bypass-generate=libsasl2.so.3
 link path=usr/lib/$(MACH64)/libldap_r.so target=libldap_r-2.4.so.2.8.3
 link path=usr/lib/liblber-2.4.so target=liblber-2.4.so.2.8.3
 link path=usr/lib/liblber-2.4.so.2 target=liblber-2.4.so.2.8.3
@@ -117,10 +130,11 @@
 link path=usr/lib/liblber.so target=liblber-2.4.so.2.8.3
 link path=usr/lib/libldap-2.4.so target=libldap-2.4.so.2.8.3
 link path=usr/lib/libldap-2.4.so.2 target=libldap-2.4.so.2.8.3
-file path=usr/lib/libldap-2.4.so.2.8.3
+file path=usr/lib/libldap-2.4.so.2.8.3 pkg.depend.bypass-generate=libsasl2.so.3
 link path=usr/lib/libldap_r-2.4.so target=libldap_r-2.4.so.2.8.3
 link path=usr/lib/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.8.3
-file path=usr/lib/libldap_r-2.4.so.2.8.3
+file path=usr/lib/libldap_r-2.4.so.2.8.3 \
+    pkg.depend.bypass-generate=libsasl2.so.3
 link path=usr/lib/libldap_r.so target=libldap_r-2.4.so.2.8.3
 link path=usr/lib/openldap/bin/ldapadd target=../../../bin/openldapmodify
 link path=usr/lib/openldap/bin/ldapcompare target=../../../bin/openldapcompare
@@ -132,7 +146,8 @@
 link path=usr/lib/openldap/bin/ldapsearch target=../../../bin/openldapsearch
 link path=usr/lib/openldap/bin/ldapurl target=../../../bin/openldapurl
 link path=usr/lib/openldap/bin/ldapwhoami target=../../../bin/openldapwhoami
-file usr/lib/$(MACH64)/slapd path=usr/lib/slapd mode=0555
+file usr/lib/$(MACH64)/slapd path=usr/lib/slapd mode=0555 \
+    pkg.depend.bypass-generate=libsasl2.so.3
 link path=usr/sbin/slapacl target=../lib/slapd
 link path=usr/sbin/slapadd target=../lib/slapd
 link path=usr/sbin/slapauth target=../lib/slapd
@@ -497,3 +512,11 @@
 user username=openldap ftpuser=false gcos-field="OpenLDAP User" group=openldap \
     uid=75
 license openldap.license license="openldap license"
+# This dependency is because we are building against cyrus-sasl from its proto
+# area and bypassing the auto-generated dependency.  When libsasl is updated,
+# this version number really should be adjusted, but the userland-incorporation
+# will force the cyrus-sasl packaging and openldap packaging to be from the same
+# build and not just this version or later.
+# The strange version number is caused by historical versioning in ON and will
+# go away when the libsasl package name is changed to libsasl2
+depend type=require fmri=pkg:/system/library/security/[email protected]
upstream/oracle/userland-gate