Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
18206446 The mediated link has unneed ".." in path which cause pkgdepend failure
authorMisaki Miyashita <Misaki.Miyashita@Oracle.COM>
Fri, 14 Feb 2014 13:40:20 -0800
changeset 1715 182a1cfcaeb3
parent 1714 9074d725010f
child 1716 e9bb1da953cb
18206446 The mediated link has unneed ".." in path which cause pkgdepend failure
components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m file | annotate | diff | comparison | revisions
components/openssl/openssl-1.0.1/openssl-1.0.1.p5m file | annotate | diff | comparison | revisions 
--- a/components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m	Fri Feb 14 13:32:25 2014 -0800
+++ b/components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m	Fri Feb 14 13:40:20 2014 -0800
@@ -49,11 +49,9 @@
 
 # Commands.
 file $(MACH64)/apps/openssl path=lib/openssl/fips-140/openssl owner=root \
-    group=bin mode=0555 \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:lib/openssl/fips-140/$(MACH64)
+    group=bin mode=0555
 file $(MACH32)/apps/openssl path=lib/openssl/fips-140/$(MACH32)/openssl \
-    owner=root group=bin mode=0555 \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:lib/openssl/fips-140
+    owner=root group=bin mode=0555
 
 # Mediator links for the commands
 link path=usr/bin/openssl target=../../lib/openssl/fips-140/openssl \
@@ -78,19 +76,18 @@
 
 # Mediator links for 32-bit libraries
 link path=lib/libcrypto.so.1.0.0 \
-    target=../../lib/openssl/fips-140/libcrypto.so.1.0.0 mediator=openssl \
+    target=openssl/fips-140/libcrypto.so.1.0.0 mediator=openssl \
     mediator-implementation=fips-140
 link path=lib/libssl.so.1.0.0 \
-    target=../../lib/openssl/fips-140/libssl.so.1.0.0 mediator=openssl \
+    target=openssl/fips-140/libssl.so.1.0.0 mediator=openssl \
     mediator-implementation=fips-140
-link path=lib/llib-lcrypto target=../../lib/openssl/fips-140/llib-lcrypto \
+link path=lib/llib-lcrypto target=openssl/fips-140/llib-lcrypto \
     mediator=openssl mediator-implementation=fips-140
-link path=lib/llib-lcrypto.ln \
-    target=../../lib/openssl/fips-140/llib-lcrypto.ln mediator=openssl \
-    mediator-implementation=fips-140
-link path=lib/llib-lssl target=../../lib/openssl/fips-140/llib-lssl \
+link path=lib/llib-lcrypto.ln target=openssl/fips-140/llib-lcrypto.ln \
     mediator=openssl mediator-implementation=fips-140
-link path=lib/llib-lssl.ln target=../../lib/openssl/fips-140/llib-lssl.ln \
+link path=lib/llib-lssl target=openssl/fips-140/llib-lssl \
+    mediator=openssl mediator-implementation=fips-140
+link path=lib/llib-lssl.ln target=openssl/fips-140/llib-lssl.ln \
     mediator=openssl mediator-implementation=fips-140
 link path=lib/openssl/engines/libpk11.so.1 \
     target=../fips-140/engines/libpk11.so.1 mediator=openssl \
--- a/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m	Fri Feb 14 13:32:25 2014 -0800
+++ b/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m	Fri Feb 14 13:40:20 2014 -0800
@@ -53,11 +53,9 @@
 
 # Commands.
 file $(MACH32)/apps/openssl path=lib/openssl/default/$(MACH32)/openssl \
-    owner=root group=bin mode=0555 \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:lib/openssl/default
+    owner=root group=bin mode=0555
 file $(MACH64)/apps/openssl path=lib/openssl/default/openssl owner=root \
-    group=bin mode=0555 \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:lib/openssl/default/$(MACH64)
+    group=bin mode=0555
 file etc/openssl/misc/CA.pl path=lib/openssl/default/CA.pl
 link path=usr/sfw/bin/$(MACH64)/openssl target=../../../bin/openssl
 link path=usr/sfw/bin/openssl target=../../bin/openssl
@@ -73,12 +71,10 @@
 
 # 32 bit libraries, lint libraries, and engines.
 file $(MACH32)/engines/libpk11.so \
-    path=lib/openssl/default/engines/libpk11.so.1 owner=root group=bin \
-    mode=0555 pkg.depend.runpath=$PKGDEPEND_RUNPATH:lib/openssl/default
+    path=lib/openssl/default/engines/libpk11.so.1 owner=root group=bin
 file $(MACH32)/libcrypto.so.1.0.0 path=lib/openssl/default/libcrypto.so.1.0.0
 file $(MACH32)/libssl.so.1.0.0 path=lib/openssl/default/libssl.so.1.0.0 \
-    owner=root group=bin mode=0555 \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:lib/openssl/default
+    owner=root group=bin mode=0555
 file llib-lcrypto path=lib/openssl/default/llib-lcrypto
 file llib-lssl path=lib/openssl/default/llib-lssl
 file $(MACH32)/llib-lcrypto.ln path=lib/openssl/default/llib-lcrypto.ln
@@ -96,17 +92,17 @@
 
 # Mediator links for 32-bit libraries
 link path=lib/libcrypto.so.1.0.0 \
-    target=../../lib/openssl/default/libcrypto.so.1.0.0 mediator=openssl \
+    target=openssl/default/libcrypto.so.1.0.0 mediator=openssl \
     mediator-implementation=default mediator-priority=vendor
-link path=lib/libssl.so.1.0.0 target=../../lib/openssl/default/libssl.so.1.0.0 \
+link path=lib/libssl.so.1.0.0 target=openssl/default/libssl.so.1.0.0 \
     mediator=openssl mediator-implementation=default mediator-priority=vendor
-link path=lib/llib-lcrypto target=../../lib/openssl/default/llib-lcrypto \
+link path=lib/llib-lcrypto target=openssl/default/llib-lcrypto \
     mediator=openssl mediator-implementation=default mediator-priority=vendor
-link path=lib/llib-lcrypto.ln target=../../lib/openssl/default/llib-lcrypto.ln \
+link path=lib/llib-lcrypto.ln target=openssl/default/llib-lcrypto.ln \
     mediator=openssl mediator-implementation=default mediator-priority=vendor
-link path=lib/llib-lssl target=../../lib/openssl/default/llib-lssl \
+link path=lib/llib-lssl target=openssl/default/llib-lssl \
     mediator=openssl mediator-implementation=default mediator-priority=vendor
-link path=lib/llib-lssl.ln target=../../lib/openssl/default/llib-lssl.ln \
+link path=lib/llib-lssl.ln target=openssl/default/llib-lssl.ln \
     mediator=openssl mediator-implementation=default mediator-priority=vendor
 link path=lib/openssl/engines/libpk11.so.1 \
     target=../default/engines/libpk11.so.1 mediator=openssl \
@@ -115,14 +111,12 @@
 # 64 bit libraries, lint libraries, and engines.
 file $(MACH64)/engines/libpk11.so \
     path=lib/openssl/default/engines/$(MACH64)/libpk11.so.1 owner=root \
-    group=bin mode=0555 \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:lib/openssl/default/$(MACH64)
+    group=bin mode=0555
 file $(MACH64)/libcrypto.so.1.0.0 \
     path=lib/openssl/default/$(MACH64)/libcrypto.so.1.0.0
 file $(MACH64)/libssl.so.1.0.0 \
     path=lib/openssl/default/$(MACH64)/libssl.so.1.0.0 owner=root group=bin \
-    mode=0555 \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:lib/openssl/default/$(MACH64)
+    mode=0555
 file llib-lcrypto path=lib/openssl/default/$(MACH64)/llib-lcrypto
 file llib-lssl path=lib/openssl/default/$(MACH64)/llib-lssl
 file $(MACH64)/llib-lcrypto.ln \
@@ -159,7 +153,7 @@
     target=../openssl/default/$(MACH64)/llib-lssl mediator=openssl \
     mediator-implementation=default mediator-priority=vendor
 link path=lib/$(MACH64)/llib-lssl.ln \
-    target=../../lib/openssl/default/$(MACH64)/llib-lssl.ln mediator=openssl \
+    target=../openssl/default/$(MACH64)/llib-lssl.ln mediator=openssl \
     mediator-implementation=default mediator-priority=vendor
 link path=lib/openssl/engines/$(MACH64)/libpk11.so.1 \
     target=../../default/engines/$(MACH64)/libpk11.so.1 mediator=openssl \
upstream/oracle/userland-gate