summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristophe.ravel.bugs%sun.com <devnull@localhost>2004-06-10 18:28:23 +0000
committerchristophe.ravel.bugs%sun.com <devnull@localhost>2004-06-10 18:28:23 +0000
commit1dcbf3dbb85b5556558338c34a8d6feeb9af1385 (patch)
tree0d76b350230a7525a92019fec5ae61f2ed27df27
parentff81da389e939786d3346d2f9f0f60c9d0465a6c (diff)
downloadnss-hg-1dcbf3dbb85b5556558338c34a8d6feeb9af1385.tar.gz
238319: Sun packages changes.
-rw-r--r--security/nss/pkg/solaris/Makefile11
-rw-r--r--security/nss/pkg/solaris/SUNWtls/prototype_com18
-rw-r--r--security/nss/pkg/solaris/SUNWtls/prototype_sparc12
-rw-r--r--security/nss/pkg/solaris/SUNWtlsx/prototype_sparc20
4 files changed, 39 insertions, 22 deletions
diff --git a/security/nss/pkg/solaris/Makefile b/security/nss/pkg/solaris/Makefile
index 231aa0516..6b45179d4 100644
--- a/security/nss/pkg/solaris/Makefile
+++ b/security/nss/pkg/solaris/Makefile
@@ -30,7 +30,6 @@ PROTO = \
$(ROOT)/usr \
$(ROOT)/usr/lib \
$(ROOT)/usr/lib/mps \
- $(ROOT)/usr/lib/mps/secv1 \
$(ROOT)/usr/include \
$(ROOT)/usr/include/mps \
$(ROOT)/usr/sfw \
@@ -38,7 +37,7 @@ PROTO = \
ifdef USE_64
-PROTO += $(ROOT)/usr/lib/mps/secv1/sparcv9 \
+PROTO += $(ROOT)/usr/lib/mps/sparcv9 \
$(ROOT)/usr/include/mps/sparcv9 \
$(ROOT)/usr/sfw/bin/sparcv9
@@ -61,15 +60,15 @@ $(ROOT) $(ROOT)/%:
mkdir -p $@
ifdef USE_64
-$(ROOT)/usr/lib/mps/secv1/sparcv9: $(ROOT)/usr/lib/mps
- $(LN) -sf ../../../../../$(DIST)/lib $@
+$(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib/mps
+ $(LN) -sf ../../../../$(DIST)/lib $@
$(ROOT)/usr/sfw/bin/sparcv9: $(ROOT)/usr/sfw/bin
$(LN) -sf ../../../../$(DIST)/bin $@
$(ROOT)/usr/include/mps/sparcv9: $(ROOT)/usr/include
$(LN) -sf ../../../../$(SOURCE_PREFIX)/$(HEADER_DIR) $@
else
-$(ROOT)/usr/lib/mps/secv1: $(ROOT)/usr/lib
- $(LN) -sf ../../../../$(DIST)/lib $@
+$(ROOT)/usr/lib/mps: $(ROOT)/usr/lib
+ $(LN) -sf ../../../$(DIST)/lib $@
$(ROOT)/usr/sfw/bin: $(ROOT)/usr/sfw
$(LN) -sf ../../../$(DIST)/bin $@
$(ROOT)/usr/include/mps: $(ROOT)/usr/include
diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_com b/security/nss/pkg/solaris/SUNWtls/prototype_com
index d446e3338..db1aeb907 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_com
+++ b/security/nss/pkg/solaris/SUNWtls/prototype_com
@@ -27,9 +27,15 @@ d none usr 755 root sys
d none usr/lib 755 root bin
d none usr/lib/mps 755 root bin
d none usr/lib/mps/secv1 755 root bin
-f none usr/lib/mps/secv1/libnss3.so 755 root bin
-f none usr/lib/mps/secv1/libsmime3.so 755 root bin
-f none usr/lib/mps/secv1/libssl3.so 755 root bin
-f none usr/lib/mps/secv1/libnssckbi.so 755 root bin
-f none usr/lib/mps/secv1/libsoftokn3.chk 755 root bin
-f none usr/lib/mps/secv1/libsoftokn3.so 755 root bin
+f none usr/lib/mps/libnss3.so 755 root bin
+f none usr/lib/mps/libsmime3.so 755 root bin
+f none usr/lib/mps/libssl3.so 755 root bin
+f none usr/lib/mps/libnssckbi.so 755 root bin
+f none usr/lib/mps/libsoftokn3.chk 755 root bin
+f none usr/lib/mps/libsoftokn3.so 755 root bin
+s none usr/lib/mps/secv1/libnss3.so=../libnss3.so
+s none usr/lib/mps/secv1/libsmime3.so=../libsmime3.so
+s none usr/lib/mps/secv1/libssl3.so=../libssl3.so
+s none usr/lib/mps/secv1/libnssckbi.so=../libnssckbi.so
+s none usr/lib/mps/secv1/libsoftokn3.chk=../libsoftokn3.chk
+s none usr/lib/mps/secv1/libsoftokn3.so=../libsoftokn3.so
diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_sparc b/security/nss/pkg/solaris/SUNWtls/prototype_sparc
index a0c6f9cd3..e7821ae42 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_sparc
+++ b/security/nss/pkg/solaris/SUNWtls/prototype_sparc
@@ -28,7 +28,11 @@
#
# SUNWtls
#
-f none usr/lib/mps/secv1/libfreebl_hybrid_3.chk 755 root bin
-f none usr/lib/mps/secv1/libfreebl_hybrid_3.so 755 root bin
-f none usr/lib/mps/secv1/libfreebl_pure32_3.chk 755 root bin
-f none usr/lib/mps/secv1/libfreebl_pure32_3.so 755 root bin
+f none usr/lib/mps/libfreebl_hybrid_3.chk 755 root bin
+f none usr/lib/mps/libfreebl_hybrid_3.so 755 root bin
+f none usr/lib/mps/libfreebl_pure32_3.chk 755 root bin
+f none usr/lib/mps/libfreebl_pure32_3.so 755 root bin
+s none usr/lib/mps/secv1/libfreebl_hybrid_3.chk=../libfreebl_hybrid_3.chk
+s none usr/lib/mps/secv1/libfreebl_hybrid_3.so=../libfreebl_hybrid_3.so
+s none usr/lib/mps/secv1/libfreebl_pure32_3.chk=../libfreebl_pure32_3.chk
+s none usr/lib/mps/secv1/libfreebl_pure32_3.so=../libfreebl_pure32_3.so
diff --git a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc b/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
index a5ab3eefc..4022986a4 100644
--- a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
+++ b/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
@@ -28,11 +28,19 @@
#
# SUNWtlsx
#
+s none usr/lib/mps/64=sparcv9
s none usr/lib/mps/secv1/64=sparcv9
+d none usr/lib/mps/sparcv9 755 root bin
d none usr/lib/mps/secv1/sparcv9 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libnss3.so 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libsmime3.so 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libssl3.so 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libnssckbi.so 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libsoftokn3.chk 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libsoftokn3.so 755 root bin
+f none usr/lib/mps/sparcv9/libnss3.so 755 root bin
+f none usr/lib/mps/sparcv9/libsmime3.so 755 root bin
+f none usr/lib/mps/sparcv9/libssl3.so 755 root bin
+f none usr/lib/mps/sparcv9/libnssckbi.so 755 root bin
+f none usr/lib/mps/sparcv9/libsoftokn3.chk 755 root bin
+f none usr/lib/mps/sparcv9/libsoftokn3.so 755 root bin
+s none usr/lib/mps/secv1/sparcv9/libnss3.so=../../libnss3.so
+s none usr/lib/mps/secv1/sparcv9/libsmime3.so=../../libsmime3.so
+s none usr/lib/mps/secv1/sparcv9/libssl3.so=../../libssl3.so
+s none usr/lib/mps/secv1/sparcv9/libnssckbi.so=../../libnssckbi.so
+s none usr/lib/mps/secv1/sparcv9/libsoftokn3.chk=../../libsoftokn3.chk
+s none usr/lib/mps/secv1/sparcv9/libsoftokn3.so=../../libsoftokn3.so