From cf170fc06cee7b670cc5ccf1fe83dce33fb2592b Mon Sep 17 00:00:00 2001 From: johnz Date: Fri, 1 Aug 2008 22:40:33 -0700 Subject: 6449514 move OpenSSL from /usr/sfw to /usr, /lib 6686002 move /usr/lib/libkmf and plugins to /lib - PSARC 2007/674 6686004 move libcryptoutil and libelfsign from /usr/lib to /lib - PSARC 2007/674 6700122 cryptosvc should be able to start before filesystem/usr --- usr/src/Targetdirs | 121 +- usr/src/cmd/Makefile.cmd | 7 +- usr/src/cmd/cmd-crypto/cryptoadm/Makefile | 4 +- usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h | 4 +- usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml | 15 +- usr/src/cmd/openssl/Makefile | 677 +++---- usr/src/cmd/openssl/Makefile.com | 4 +- usr/src/common/openssl/apps/CA.pl | 2 +- usr/src/lib/libcryptoutil/Makefile.com | 1 + usr/src/lib/libelfsign/Makefile.com | 3 +- usr/src/lib/libkmf/ber_der/Makefile.com | 3 +- usr/src/lib/libkmf/include/kmfapiP.h | 8 +- usr/src/lib/libkmf/libkmf/Makefile.com | 1 + usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com | 7 +- .../lib/libkmf/plugins/kmf_openssl/Makefile.com | 4 +- usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com | 6 +- usr/src/lib/openssl/Makefile.com | 12 +- usr/src/lib/openssl/Makefile.openssl | 15 +- usr/src/pkgdefs/SUNWarc/prototype_com | 4 +- usr/src/pkgdefs/SUNWarc/prototype_i386 | 4 +- usr/src/pkgdefs/SUNWarc/prototype_sparc | 4 +- usr/src/pkgdefs/SUNWarcr/prototype_com | 2 + usr/src/pkgdefs/SUNWarcr/prototype_i386 | 2 + usr/src/pkgdefs/SUNWarcr/prototype_sparc | 2 + usr/src/pkgdefs/SUNWcsl/prototype_com | 20 +- usr/src/pkgdefs/SUNWcsl/prototype_i386 | 18 +- usr/src/pkgdefs/SUNWcsl/prototype_sparc | 18 +- usr/src/pkgdefs/SUNWcslr/prototype_com | 13 + usr/src/pkgdefs/SUNWcslr/prototype_i386 | 15 +- usr/src/pkgdefs/SUNWcslr/prototype_sparc | 11 + usr/src/pkgdefs/SUNWcsr/prototype_com | 3 + usr/src/pkgdefs/SUNWcsu/prototype_com | 3 +- usr/src/pkgdefs/SUNWopenssl-commands/prototype_com | 7 +- .../pkgdefs/SUNWopenssl-commands/prototype_i386 | 11 +- .../pkgdefs/SUNWopenssl-commands/prototype_sparc | 11 +- usr/src/pkgdefs/SUNWopenssl-libraries/depend | 8 +- .../pkgdefs/SUNWopenssl-libraries/prototype_com | 16 +- .../pkgdefs/SUNWopenssl-libraries/prototype_i386 | 12 +- .../pkgdefs/SUNWopenssl-libraries/prototype_sparc | 14 +- usr/src/pkgdefs/SUNWopenssl-man/prototype_com | 2028 ++++++++++---------- usr/src/pkgdefs/SUNWopensslr/prototype_com | 18 +- usr/src/pkgdefs/SUNWopensslr/prototype_i386 | 18 +- usr/src/pkgdefs/SUNWopensslr/prototype_sparc | 16 +- usr/src/pkgdefs/etc/exception_list_i386 | 10 +- usr/src/pkgdefs/etc/exception_list_sparc | 10 +- usr/src/uts/common/sys/crypto/elfsign.h | 4 +- 46 files changed, 1679 insertions(+), 1517 deletions(-) (limited to 'usr/src') diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index 65435d166e..740b9673d2 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -40,8 +40,8 @@ SYMLINKS= $(SYM.ROOT.SYS) $(SYM.ROOT.BIN) $(SYM.OTHERS) TARGETDIRS= $(ROOT.SYS) $(ROOT.BIN) $(ROOT.SYS2) \ - $(UUCP.UUCP) $(OTHERS) $(SYM.USRCCSLIB) $(SYM.USRLIB) \ - $(ROOT.SFW) + $(UUCP.UUCP) $(OTHERS) $(ROOT.SFW) \ + $(SYM.USRCCSLIB) $(SYM.USRLIB) $(BUILD64) TARGETDIRS += $(ROOT.SYS64.2) $(ROOT.BIN64) \ $(SYM.USRCCSLIB64) $(SYM.USRLIB64) $(ROOT.SFW64) @@ -193,9 +193,9 @@ ROOT.SYS= \ # EXPORT DELETE START XROOT.BIN= \ - /etc/sfw/openssl \ - /etc/sfw/openssl/certs \ - /etc/sfw/openssl/private \ + /etc/openssl \ + /etc/openssl/certs \ + /etc/openssl/private \ /usr/lib/inet/wanboot # EXPORT DELETE END @@ -215,6 +215,7 @@ ROOT.BIN= \ /etc/sma \ /etc/sma/snmp \ /lib \ + /lib/crypto \ /lib/inet \ /lib/secure \ /lib/svc \ @@ -346,6 +347,7 @@ amd64_ROOT.BIN64= \ ROOT.BIN64= \ $($(MACH64)_ROOT.BIN64) \ /lib/$(MACH64) \ + /lib/crypto/$(MACH64) \ /lib/secure/$(MACH64) \ /usr/bin/$(MACH64) \ /usr/ccs/bin/$(MACH64) \ @@ -415,8 +417,7 @@ UUCP.UUCP= \ ROOT.SFW= \ /usr/sfw/bin \ /usr/sfw/include \ - /usr/sfw/lib \ - /usr/sfw/share + /usr/sfw/lib ROOT.SFW64= \ /usr/sfw/lib/$(MACH64) @@ -468,6 +469,7 @@ SYM.ROOT.SYS= \ SYM.ROOT.BIN= \ /bin \ /lib/32 \ + /lib/crypto/32 \ /lib/secure/32 \ /etc/lib/ld.so.1 \ /etc/lib/libdl.so.1 \ @@ -497,6 +499,7 @@ sparc_SYM.ROOT.BIN64= SYM.ROOT.BIN64= \ $($(MACH)_SYM.ROOT.BIN64) \ /lib/64 \ + /lib/crypto/64 \ /lib/secure/64 \ /usr/lib/64 \ /usr/lib/elfedit/64 \ @@ -514,6 +517,7 @@ SYM.ROOT.SFW64= \ SYM.OTHERS= \ /etc/log \ + /etc/sfw/openssl \ /usr/mail \ /usr/tmp @@ -596,7 +600,7 @@ $(ROOT)/root:= DIRMODE= 700 $(ROOT)/var/krb5/rcache/root:= DIRMODE= 700 -$(ROOT)/etc/sfw/openssl/private:= DIRMODE= 700 +$(ROOT)/etc/openssl/private:= DIRMODE= 700 # # These permissions must match the ones set @@ -621,6 +625,7 @@ $(ROOT)/system/object:= DIRMODE= 555 $(ROOT)/usr/lib/cron:= LINKDEST=../../etc/cron.d $(ROOT)/bin:= LINKDEST=usr/bin $(ROOT)/lib/32:= LINKDEST=. +$(ROOT)/lib/crypto/32:= LINKDEST=. $(ROOT)/lib/secure/32:= LINKDEST=. $(ROOT)/dev/stdin:= LINKDEST=fd/0 $(ROOT)/dev/stdout:= LINKDEST=fd/1 @@ -633,6 +638,7 @@ $(ROOT)/etc/lib/ld.so.1:= LINKDEST=../../lib/ld.so.1 $(ROOT)/etc/lib/libdl.so.1:= LINKDEST=../../lib/libdl.so.1 $(ROOT)/etc/lib/nss_files.so.1:= LINKDEST=../../lib/nss_files.so.1 $(ROOT)/etc/log:= LINKDEST=../var/adm/log +$(ROOT)/etc/sfw/openssl:= LINKDEST=../openssl $(ROOT)/usr/mail:= LINKDEST=../var/mail $(ROOT)/usr/news:= LINKDEST=../var/news $(ROOT)/usr/preserve:= LINKDEST=../var/preserve @@ -652,6 +658,7 @@ $(ROOT)/usr/ucblib/32:= LINKDEST=. $(BUILD64) $(ROOT)/lib/64:= LINKDEST=$(MACH64) +$(BUILD64) $(ROOT)/lib/crypto/64:= LINKDEST=$(MACH64) $(BUILD64) $(ROOT)/lib/secure/64:= LINKDEST=$(MACH64) $(BUILD64) $(ROOT)/usr/lib/64:= LINKDEST=$(MACH64) $(BUILD64) $(ROOT)/usr/lib/elfedit/64:= LINKDEST=$(MACH64) @@ -872,6 +879,8 @@ $(ROOT)/usr/lib/libcmdutils.so.1:= REALPATH=../../lib/libcmdutils.so.1 $(ROOT)/usr/lib/libcmdutils.so:= REALPATH=../../lib/libcmdutils.so.1 $(ROOT)/usr/lib/libcontract.so.1:= REALPATH=../../lib/libcontract.so.1 $(ROOT)/usr/lib/libcontract.so:= REALPATH=../../lib/libcontract.so.1 +$(ROOT)/usr/lib/libcryptoutil.so.1:= REALPATH=../../lib/libcryptoutil.so.1 +$(ROOT)/usr/lib/libcryptoutil.so:= REALPATH=../../lib/libcryptoutil.so.1 $(ROOT)/usr/lib/libctf.so.1:= REALPATH=../../lib/libctf.so.1 $(ROOT)/usr/lib/libctf.so:= REALPATH=../../lib/libctf.so.1 $(ROOT)/usr/lib/libcurses.so.1:= REALPATH=../../lib/libcurses.so.1 @@ -906,6 +915,10 @@ $(ROOT)/usr/lib/libintl.so.1:= REALPATH=../../lib/libintl.so.1 $(ROOT)/usr/lib/libintl.so:= REALPATH=../../lib/libintl.so.1 $(ROOT)/usr/lib/libiscsitgt.so.1:= REALPATH=../../lib/libiscsitgt.so.1 $(ROOT)/usr/lib/libiscsitgt.so:= REALPATH=../../lib/libiscsitgt.so.1 +$(ROOT)/usr/lib/libkmf.so.1:= REALPATH=../../lib/libkmf.so.1 +$(ROOT)/usr/lib/libkmf.so:= REALPATH=../../lib/libkmf.so.1 +$(ROOT)/usr/lib/libkmfberder.so.1:= REALPATH=../../lib/libkmfberder.so.1 +$(ROOT)/usr/lib/libkmfberder.so:= REALPATH=../../lib/libkmfberder.so.1 $(ROOT)/usr/lib/libkstat.so.1:= REALPATH=../../lib/libkstat.so.1 $(ROOT)/usr/lib/libkstat.so:= REALPATH=../../lib/libkstat.so.1 $(ROOT)/usr/lib/liblddbg.so.4:= REALPATH=../../lib/liblddbg.so.4 @@ -1024,6 +1037,8 @@ $(ROOT)/usr/lib/llib-linetutil.ln:= REALPATH=../../lib/llib-linetutil.ln $(ROOT)/usr/lib/llib-linetutil:= REALPATH=../../lib/llib-linetutil $(ROOT)/usr/lib/llib-lintl.ln:= REALPATH=../../lib/llib-lintl.ln $(ROOT)/usr/lib/llib-lintl:= REALPATH=../../lib/llib-lintl +$(ROOT)/usr/lib/llib-lkmf.ln:= REALPATH=../../lib/llib-lkmf.ln +$(ROOT)/usr/lib/llib-lkmfberder.ln:= REALPATH=../../lib/llib-lkmfberder.ln $(ROOT)/usr/lib/llib-lkstat.ln:= REALPATH=../../lib/llib-lkstat.ln $(ROOT)/usr/lib/llib-lkstat:= REALPATH=../../lib/llib-lkstat $(ROOT)/usr/lib/llib-lmd5.ln:= REALPATH=../../lib/llib-lmd5.ln @@ -1086,6 +1101,22 @@ $(ROOT)/usr/lib/nss_files.so.1:= REALPATH=../../lib/nss_files.so.1 $(ROOT)/usr/lib/nss_nis.so.1:= REALPATH=../../lib/nss_nis.so.1 $(ROOT)/usr/lib/nss_nisplus.so.1:= REALPATH=../../lib/nss_nisplus.so.1 $(ROOT)/usr/lib/nss_user.so.1:= REALPATH=../../lib/nss_user.so.1 +$(ROOT)/usr/lib/security/kmf_nss.so.1:= \ + REALPATH=../../../lib/crypto/kmf_nss.so.1 +$(ROOT)/usr/lib/security/kmf_openssl.so.1:= \ + REALPATH=../../../lib/crypto/kmf_openssl.so.1 +$(ROOT)/usr/lib/security/kmf_pkcs11.so.1:= \ + REALPATH=../../../lib/crypto/kmf_pkcs11.so.1 +$(ROOT)/usr/sfw/lib/libcrypto.so.0.9.8:= \ + REALPATH=../../../lib/libcrypto.so.0.9.8 +$(ROOT)/usr/sfw/lib/libcrypto.so:= \ + REALPATH=../../../lib/libcrypto.so.0.9.8 +$(ROOT)/usr/sfw/lib/libssl.so.0.9.8:= REALPATH=../../../lib/libssl.so.0.9.8 +$(ROOT)/usr/sfw/lib/libssl.so:= REALPATH=../../../lib/libssl.so.0.9.8 +$(ROOT)/usr/sfw/lib/llib-lcrypto.ln:= REALPATH=../../../lib/llib-lcrypto.ln +$(ROOT)/usr/sfw/lib/llib-lcrypto:= REALPATH=../../../lib/llib-lcrypto +$(ROOT)/usr/sfw/lib/llib-lssl.ln:= REALPATH=../../../lib/llib-lssl.ln +$(ROOT)/usr/sfw/lib/llib-lssl:= REALPATH=../../../lib/llib-lssl $(ROOT)/lib/$(MACH64)/libposix4.so.1:= \ REALPATH=librt.so.1 @@ -1131,6 +1162,10 @@ $(ROOT)/usr/lib/$(MACH64)/libcontract.so.1:= \ REALPATH=../../../lib/$(MACH64)/libcontract.so.1 $(ROOT)/usr/lib/$(MACH64)/libcontract.so:= \ REALPATH=../../../lib/$(MACH64)/libcontract.so.1 +$(ROOT)/usr/lib/$(MACH64)/libcryptoutil.so.1:= \ + REALPATH=../../../lib/$(MACH64)/libcryptoutil.so.1 +$(ROOT)/usr/lib/$(MACH64)/libcryptoutil.so:= \ + REALPATH=../../../lib/$(MACH64)/libcryptoutil.so.1 $(ROOT)/usr/lib/$(MACH64)/libctf.so.1:= \ REALPATH=../../../lib/$(MACH64)/libctf.so.1 $(ROOT)/usr/lib/$(MACH64)/libctf.so:= \ @@ -1187,6 +1222,14 @@ $(ROOT)/usr/lib/$(MACH64)/libiscsitgt.so.1:= \ REALPATH=../../../lib/$(MACH64)/libiscsitgt.so.1 $(ROOT)/usr/lib/$(MACH64)/libiscsitgt.so:= \ REALPATH=../../../lib/$(MACH64)/libiscsitgt.so.1 +$(ROOT)/usr/lib/$(MACH64)/libkmf.so.1:= \ + REALPATH=../../../lib/$(MACH64)/libkmf.so.1 +$(ROOT)/usr/lib/$(MACH64)/libkmf.so:= \ + REALPATH=../../../lib/$(MACH64)/libkmf.so.1 +$(ROOT)/usr/lib/$(MACH64)/libkmfberder.so.1:= \ + REALPATH=../../../lib/$(MACH64)/libkmfberder.so.1 +$(ROOT)/usr/lib/$(MACH64)/libkmfberder.so:= \ + REALPATH=../../../lib/$(MACH64)/libkmfberder.so.1 $(ROOT)/usr/lib/$(MACH64)/libkstat.so.1:= \ REALPATH=../../../lib/$(MACH64)/libkstat.so.1 $(ROOT)/usr/lib/$(MACH64)/libkstat.so:= \ @@ -1367,6 +1410,10 @@ $(ROOT)/usr/lib/$(MACH64)/llib-linetutil.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-linetutil.ln $(ROOT)/usr/lib/$(MACH64)/llib-lintl.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-lintl.ln +$(ROOT)/usr/lib/$(MACH64)/llib-lkmf.ln:= \ + REALPATH=../../../lib/$(MACH64)/llib-lkmf.ln +$(ROOT)/usr/lib/$(MACH64)/llib-lkmfberder.ln:= \ + REALPATH=../../../lib/$(MACH64)/llib-lkmfberder.ln $(ROOT)/usr/lib/$(MACH64)/llib-lkstat.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-lkstat.ln $(ROOT)/usr/lib/$(MACH64)/llib-lmd5.ln:= \ @@ -1437,6 +1484,24 @@ $(ROOT)/usr/lib/$(MACH64)/nss_nisplus.so.1:= \ REALPATH=../../../lib/$(MACH64)/nss_nisplus.so.1 $(ROOT)/usr/lib/$(MACH64)/nss_user.so.1:= \ REALPATH=../../../lib/$(MACH64)/nss_user.so.1 +$(ROOT)/usr/lib/security/$(MACH64)/kmf_nss.so.1:= \ + REALPATH=../../../../lib/crypto/$(MACH64)/kmf_nss.so.1 +$(ROOT)/usr/lib/security/$(MACH64)/kmf_openssl.so.1:= \ + REALPATH=../../../../lib/crypto/$(MACH64)/kmf_openssl.so.1 +$(ROOT)/usr/lib/security/$(MACH64)/kmf_pkcs11.so.1:= \ + REALPATH=../../../../lib/crypto/$(MACH64)/kmf_pkcs11.so.1 +$(ROOT)/usr/sfw/lib/$(MACH64)/libcrypto.so.0.9.8:= \ + REALPATH=../../../../lib/$(MACH64)/libcrypto.so.0.9.8 +$(ROOT)/usr/sfw/lib/$(MACH64)/libcrypto.so:= \ + REALPATH=../../../../lib/$(MACH64)/libcrypto.so.0.9.8 +$(ROOT)/usr/sfw/lib/$(MACH64)/libssl.so.0.9.8:= \ + REALPATH=../../../../lib/$(MACH64)/libssl.so.0.9.8 +$(ROOT)/usr/sfw/lib/$(MACH64)/libssl.so:= \ + REALPATH=../../../../lib/$(MACH64)/libssl.so.0.9.8 +$(ROOT)/usr/sfw/lib/$(MACH64)/llib-lcrypto.ln:= \ + REALPATH=../../../../lib/$(MACH64)/llib-lcrypto.ln +$(ROOT)/usr/sfw/lib/$(MACH64)/llib-lssl.ln:= \ + REALPATH=../../../../lib/$(MACH64)/llib-lssl.ln SYM.USRLIB= \ /lib/libposix4.so \ @@ -1462,6 +1527,8 @@ SYM.USRLIB= \ /usr/lib/libcmdutils.so.1 \ /usr/lib/libcontract.so \ /usr/lib/libcontract.so.1 \ + /usr/lib/libcryptoutil.so \ + /usr/lib/libcryptoutil.so.1 \ /usr/lib/libctf.so \ /usr/lib/libctf.so.1 \ /usr/lib/libcurses.so \ @@ -1496,6 +1563,10 @@ SYM.USRLIB= \ /usr/lib/libintl.so.1 \ /usr/lib/libiscsitgt.so \ /usr/lib/libiscsitgt.so.1 \ + /usr/lib/libkmf.so \ + /usr/lib/libkmf.so.1 \ + /usr/lib/libkmfberder.so \ + /usr/lib/libkmfberder.so.1 \ /usr/lib/libkstat.so \ /usr/lib/libkstat.so.1 \ /usr/lib/liblddbg.so.4 \ @@ -1614,6 +1685,8 @@ SYM.USRLIB= \ /usr/lib/llib-linetutil.ln \ /usr/lib/llib-lintl \ /usr/lib/llib-lintl.ln \ + /usr/lib/llib-lkmf.ln \ + /usr/lib/llib-lkmfberder.ln \ /usr/lib/llib-lkstat \ /usr/lib/llib-lkstat.ln \ /usr/lib/llib-lmd5 \ @@ -1675,7 +1748,18 @@ SYM.USRLIB= \ /usr/lib/nss_files.so.1 \ /usr/lib/nss_nis.so.1 \ /usr/lib/nss_nisplus.so.1 \ - /usr/lib/nss_user.so.1 + /usr/lib/nss_user.so.1 \ + /usr/lib/security/kmf_nss.so.1 \ + /usr/lib/security/kmf_openssl.so.1 \ + /usr/lib/security/kmf_pkcs11.so.1 \ + /usr/sfw/lib/libcrypto.so \ + /usr/sfw/lib/libcrypto.so.0.9.8 \ + /usr/sfw/lib/libssl.so \ + /usr/sfw/lib/libssl.so.0.9.8 \ + /usr/sfw/lib/llib-lcrypto.ln \ + /usr/sfw/lib/llib-lcrypto \ + /usr/sfw/lib/llib-lssl \ + /usr/sfw/lib/llib-lssl.ln sparcv9_SYM.USRLIB64= @@ -1705,6 +1789,8 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/libcmdutils.so.1 \ /usr/lib/$(MACH64)/libcontract.so \ /usr/lib/$(MACH64)/libcontract.so.1 \ + /usr/lib/$(MACH64)/libcryptoutil.so \ + /usr/lib/$(MACH64)/libcryptoutil.so.1 \ /usr/lib/$(MACH64)/libctf.so \ /usr/lib/$(MACH64)/libctf.so.1 \ /usr/lib/$(MACH64)/libcurses.so \ @@ -1733,6 +1819,10 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/libintl.so.1 \ /usr/lib/$(MACH64)/libiscsitgt.so \ /usr/lib/$(MACH64)/libiscsitgt.so.1 \ + /usr/lib/$(MACH64)/libkmf.so \ + /usr/lib/$(MACH64)/libkmf.so.1 \ + /usr/lib/$(MACH64)/libkmfberder.so \ + /usr/lib/$(MACH64)/libkmfberder.so.1 \ /usr/lib/$(MACH64)/libkstat.so \ /usr/lib/$(MACH64)/libkstat.so.1 \ /usr/lib/$(MACH64)/liblddbg.so.4 \ @@ -1823,6 +1913,8 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/llib-lgen.ln \ /usr/lib/$(MACH64)/llib-linetutil.ln \ /usr/lib/$(MACH64)/llib-lintl.ln \ + /usr/lib/$(MACH64)/llib-lkmf.ln \ + /usr/lib/$(MACH64)/llib-lkmfberder.ln \ /usr/lib/$(MACH64)/llib-lkstat.ln \ /usr/lib/$(MACH64)/llib-lmd5.ln \ /usr/lib/$(MACH64)/llib-lnsl.ln \ @@ -1857,7 +1949,16 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/nss_files.so.1 \ /usr/lib/$(MACH64)/nss_nis.so.1 \ /usr/lib/$(MACH64)/nss_nisplus.so.1 \ - /usr/lib/$(MACH64)/nss_user.so.1 + /usr/lib/$(MACH64)/nss_user.so.1 \ + /usr/lib/security/$(MACH64)/kmf_nss.so.1 \ + /usr/lib/security/$(MACH64)/kmf_openssl.so.1 \ + /usr/lib/security/$(MACH64)/kmf_pkcs11.so.1 \ + /usr/sfw/lib/$(MACH64)/libcrypto.so \ + /usr/sfw/lib/$(MACH64)/libcrypto.so.0.9.8 \ + /usr/sfw/lib/$(MACH64)/llib-lcrypto.ln \ + /usr/sfw/lib/$(MACH64)/libssl.so \ + /usr/sfw/lib/$(MACH64)/libssl.so.0.9.8 \ + /usr/sfw/lib/$(MACH64)/llib-lssl.ln $(SYM.USRLIB:%=$(ROOT)%):= \ INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@; \ diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd index 50c82357b1..99dc608751 100644 --- a/usr/src/cmd/Makefile.cmd +++ b/usr/src/cmd/Makefile.cmd @@ -89,9 +89,10 @@ ROOTCMDDIR64= $(ROOTCMDDIR)/$(MACH64) ROOTLIB64= $(ROOTLIB)/$(MACH64) ROOTUSRSBIN32= $(ROOTUSRSBIN)/$(MACH32) ROOTUSRSBIN64= $(ROOTUSRSBIN)/$(MACH64) -ROOTMAN1= $(ROOT)/usr/share/man/man1 -ROOTMAN1M= $(ROOT)/usr/share/man/man1m -ROOTMAN3= $(ROOT)/usr/share/man/man3 +ROOTMAN= $(ROOT)/usr/share/man +ROOTMAN1= $(ROOTMAN)/man1 +ROOTMAN1M= $(ROOTMAN)/man1m +ROOTMAN3= $(ROOTMAN)/man3 ROOTVARSMB= $(ROOT)/var/smb # diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile index 9ff966839b..0b2d346dc7 100644 --- a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile +++ b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile @@ -58,7 +58,9 @@ $(PROG): $(OBJS) $(POFILE): $(POFILES) $(RM) $@; cat $(POFILES) > $@ -install: all $(ROOTUSRSBINPROG) +install: all $(ROOTSBINPROG) + $(RM) $(ROOTUSRSBINPROG) + -$(SYMLINK) ../../sbin/$(PROG) $(ROOTUSRSBINPROG) clean: $(RM) -f $(OBJS) $(PROG) diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h index 0bbf82101c..d1891d4b0f 100644 --- a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h +++ b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -37,7 +37,7 @@ extern "C" { #endif #define _PATH_KCF_CONF "/etc/crypto/kcf.conf" -#define _PATH_KCFD "/usr/lib/crypto/kcfd" +#define _PATH_KCFD "/lib/crypto/kcfd" #define TMPFILE_TEMPLATE "/etc/crypto/admXXXXXX" #define ERROR_USAGE 2 diff --git a/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml b/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml index 330f48033b..ef1b24360b 100644 --- a/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml +++ b/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml @@ -1,15 +1,14 @@