diff options
| author | John.Zolnowsky@Sun.COM <none@none> | 2008-11-21 14:27:44 -0800 |
|---|---|---|
| committer | John.Zolnowsky@Sun.COM <none@none> | 2008-11-21 14:27:44 -0800 |
| commit | 257873cfc1dd3337766407f80397db60a56f2f5a (patch) | |
| tree | dfb294ef67b02d6e6ea724b82beb009a32006d57 /usr/src/cmd | |
| parent | 3a0fa635e8519965a7acdaf4d6645dfb14835a53 (diff) | |
| download | illumos-joyent-257873cfc1dd3337766407f80397db60a56f2f5a.tar.gz | |
6449514 move OpenSSL from /usr/sfw to /usr, /lib
6457487 clean up Makefile for cmd/openssl
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
Diffstat (limited to 'usr/src/cmd')
26 files changed, 439 insertions, 537 deletions
diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd index ca394186ff..44364753b2 100644 --- a/usr/src/cmd/Makefile.cmd +++ b/usr/src/cmd/Makefile.cmd @@ -87,9 +87,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 # @@ -106,29 +107,6 @@ ROOTSHAUDIO= $(ROOT)/usr/share/audio ROOTAUDIOSAMP= $(ROOTSHAUDIO)/samples ROOTAUDIOSAMPAU=$(ROOTAUDIOSAMP)/au -# -# Begin /usr/sfw freeware rules for freeware that has "External" -# taxonomy stability level. -# -ROOTSFW= $(ROOT)/usr/sfw -ROOTSFWBIN= $(ROOT)/usr/sfw/bin -ROOTSFWSHARE= $(ROOT)/usr/sfw/share -ROOTSFWSHSRC= $(ROOT)/usr/sfw/share/src -ROOTSFWINFO= $(ROOT)/usr/sfw/share/info -ROOTSFWINCLUDE= $(ROOT)/usr/sfw/include -ROOTSFWLIB= $(ROOT)/usr/sfw/lib -ROOTLIBEXEC= $(ROOT)/usr/sfw/libexec -ROOTSFWMAN= $(ROOT)/usr/sfw/share/man -ROOTSFWMANN= $(ROOT)/usr/sfw/share/mann -ROOTSFWMAN1= $(ROOT)/usr/sfw/share/man/man1 -ROOTSFWMAN1M= $(ROOT)/usr/sfw/share/man/man1m -ROOTSFWMAN3= $(ROOT)/usr/sfw/share/man/man3 -ROOTSFWMAN5= $(ROOT)/usr/sfw/share/man/man5 -ROOTSFWMAN7= $(ROOT)/usr/sfw/share/man/man7 -# -# End /usr/sfw freeware rules -# - ISAEXEC= $(ROOT)/usr/lib/isaexec PLATEXEC= $(ROOT)/usr/lib/platexec diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile index 9ff966839b..4f9d7ed977 100644 --- a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile +++ b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile @@ -18,12 +18,9 @@ # # CDDL HEADER END # -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = cryptoadm @@ -58,7 +55,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 9a090d2518..bbaa6587a4 100644 --- a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h +++ b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h @@ -36,7 +36,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..4a7681b56d 100644 --- a/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml +++ b/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml @@ -1,15 +1,14 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- - Copyright 2005 Sun Microsystems, Inc. All rights reserved. + Copyright 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. CDDL HEADER START The contents of this file are subject to the terms of the - Common Development and Distribution License, Version 1.0 only - (the "License"). You may not use this file except in compliance - with the License. + Common Development and Distribution License (the "License"). + You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. @@ -24,8 +23,6 @@ CDDL HEADER END - ident "%Z%%M% %I% %E% SMI" - NOTE: This service manifest is not editable; its contents may be overwritten by package or patch operations, including operating system upgrade. Make customizations in a different @@ -47,7 +44,7 @@ restart_on='none' type='service'> <service_fmri - value='svc:/system/filesystem/minimal:default'/> + value='svc:/system/filesystem/root:default'/> </dependency> <dependent @@ -61,19 +58,19 @@ <exec_method type='method' name='start' - exec='/usr/sbin/cryptoadm %m' + exec='/sbin/cryptoadm %m' timeout_seconds='60' /> <exec_method type='method' name='stop' - exec='/usr/sbin/cryptoadm %m' + exec='/sbin/cryptoadm %m' timeout_seconds='60' /> <exec_method type='method' name='refresh' - exec='/usr/sbin/cryptoadm %m' + exec='/sbin/cryptoadm %m' timeout_seconds='60' /> <instance name='default' enabled='false' /> diff --git a/usr/src/cmd/cmd-inet/usr.lib/wanboot/netbootinfo/Makefile b/usr/src/cmd/cmd-inet/usr.lib/wanboot/netbootinfo/Makefile index bf63ad605f..3ffe02e27e 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wanboot/netbootinfo/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/wanboot/netbootinfo/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,12 +18,9 @@ # # CDDL HEADER END # -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/openssl/Makefile.openssl @@ -33,7 +29,7 @@ PROG = netbootinfo # The OpenSSL libraries need to be linked against in order to resolve # references made to them by libwanboot. -LDLIBS += -lwanbootutil -lwanboot $(OPENSSL_LDFLAGS) +LDLIBS += -lwanbootutil -lwanboot CPPFLAGS += -I$(CMNCRYPTDIR) all: $(PROG) diff --git a/usr/src/cmd/cmd-inet/usr.lib/wanboot/p12split/Makefile b/usr/src/cmd/cmd-inet/usr.lib/wanboot/p12split/Makefile index cc3689e88d..dd91c6112e 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wanboot/p12split/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/wanboot/p12split/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,20 +18,16 @@ # # CDDL HEADER END # -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/openssl/Makefile.openssl PROG= p12split -LDLIBS += -lwanboot -linetutil -lwanbootutil $(OPENSSL_LDFLAGS) -lcrypto -LDFLAGS += $(OPENSSL_DYNFLAGS) -CPPFLAGS = $(OPENSSL_CPPFLAGS) -I$(CMNCRYPTDIR) $(CPPFLAGS.master) +LDLIBS += -lwanboot -linetutil -lwanbootutil -lcrypto +CPPFLAGS += -I$(CMNCRYPTDIR) all: $(PROG) diff --git a/usr/src/cmd/cmd-inet/usr.lib/wanboot/wanboot-cgi/Makefile b/usr/src/cmd/cmd-inet/usr.lib/wanboot/wanboot-cgi/Makefile index 0a5c292ea3..0cf5e7d349 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wanboot/wanboot-cgi/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/wanboot/wanboot-cgi/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,16 @@ # # CDDL HEADER END # -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/openssl/Makefile.openssl PROG = wanboot-cgi -LDLIBS += -lgen -lnsl -lwanbootutil -lnvpair -lwanboot \ - $(OPENSSL_LDFLAGS) -lcrypto -LDFLAGS += $(OPENSSL_DYNFLAGS) -CPPFLAGS = $(OPENSSL_CPPFLAGS) -I$(CMNCRYPTDIR) $(CPPFLAGS.master) +LDLIBS += -lgen -lnsl -lwanbootutil -lnvpair -lwanboot -lcrypto +CPPFLAGS += -I$(CMNCRYPTDIR) all: $(PROG) diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile index 7aec89d375..1b82adef80 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile @@ -18,12 +18,9 @@ # # CDDL HEADER END # -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = wpad MANIFEST = wpa.xml @@ -35,11 +32,9 @@ include ../../../Makefile.cmd ROOTMANIFESTDIR = $(ROOTSVCNETWORK) -LDFLAGS += -L/usr/sfw/lib -R/usr/sfw/lib LDLIBS += -ldladm -ldlpi all install := LDLIBS += -lcrypto -CPPFLAGS += -I/usr/sfw/include LINTFLAGS += -u .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.sbin/bootconfchk/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/bootconfchk/Makefile index 5a1f86f2b5..792f235c2b 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/bootconfchk/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/bootconfchk/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,16 @@ # # CDDL HEADER END # -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../../Makefile.cmd include $(SRC)/lib/openssl/Makefile.openssl PROG = bootconfchk -# Need to be told where the OpenSSL libraries are because libwanboot is -# linked to them and they are in a non standard place. -LDLIBS += -lwanbootutil -lwanboot $(OPENSSL_LDFLAGS) +LDLIBS += -lwanbootutil -lwanboot CPPFLAGS += -I$(SRC)/common/net/wanboot/crypt diff --git a/usr/src/cmd/hal/hald/Makefile b/usr/src/cmd/hal/hald/Makefile index fbc557b482..3182c00408 100644 --- a/usr/src/cmd/hal/hald/Makefile +++ b/usr/src/cmd/hal/hald/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# SUBDIRS = solaris @@ -48,7 +46,6 @@ LDLIBS += -lc -lm -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lgobject-2.0 \ all install $(PROG) := LDLIBS += -lexpat CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -CPPFLAGS += -I/usr/sfw/include C99MODE = $(C99_ENABLE) all := TARGET= all diff --git a/usr/src/cmd/hal/hald/solaris/Makefile b/usr/src/cmd/hal/hald/solaris/Makefile index 842488233f..f4513b315b 100644 --- a/usr/src/cmd/hal/hald/solaris/Makefile +++ b/usr/src/cmd/hal/hald/solaris/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# OBJS = devinfo.o devinfo_ieee1394.o devinfo_misc.o devinfo_pci.o \ devinfo_storage.o devinfo_usb.o hotplug.o osspec.o sysevent.o \ @@ -42,7 +40,6 @@ $(ROOTMANIFEST) := FILEMODE = 444 $(ROOTLIBSVCMETHOD)/svc-hal:= FILEMODE = 555 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -CPPFLAGS += -I/usr/sfw/include C99MODE = $(C99_ENABLE) .KEEP_STATE: diff --git a/usr/src/cmd/mms/mm/common/mmsssl.sh b/usr/src/cmd/mms/mm/common/mmsssl.sh index d600c6c11b..0772a8699b 100644 --- a/usr/src/cmd/mms/mm/common/mmsssl.sh +++ b/usr/src/cmd/mms/mm/common/mmsssl.sh @@ -27,7 +27,7 @@ # MMS SSL Self-Signed Certificate Authority # -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/sadm/bin:/usr/sfw/bin:$PATH +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/sadm/bin:$PATH LD_LIBRARY_PATH=/lib:/usr/lib:$LD_LIBRARY_PATH umask 066 diff --git a/usr/src/cmd/openssl/Makefile b/usr/src/cmd/openssl/Makefile index c1f013a6ff..10003108a7 100644 --- a/usr/src/cmd/openssl/Makefile +++ b/usr/src/cmd/openssl/Makefile @@ -23,330 +23,328 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# we need this for OPENSSL_SRC (src/common directory location) +# we need this for OPENSSL_VERSION, OPENSSL_DATE, +# and for OPENSSL_SRC (src/common directory location) include $(SRC)/lib/openssl/Makefile.openssl -# we need this for VERS (OpenSSL version) -include $(SRC)/lib/openssl/Makefile.com SUBDIRS = $(MACH) $(BUILD64) SUBDIRS += $(MACH64) -ROOTOPENSSL = $(ROOT)/etc/sfw/openssl -MANDIRS = man1 man3 man5 man7 -ROOTSFWMANDIRS = $(MANDIRS:%=$(ROOTSFWMAN)/%) +ROOTOPENSSL = $(ROOT)/etc/openssl +MS1 = 1openssl +MS3 = 3openssl +MS5 = 5openssl +MS7 = 7openssl +MANDIRS = man$(MS1) man$(MS3) man$(MS5) man$(MS7) +ROOTMANDIRS = $(MANDIRS:%=$(ROOTMAN)/%) POD2MAN = /usr/perl5/bin/pod2man -OPENSSL_VERSION = $(VERS:.%=%) -# official release date of OpenSSL 0.9.8a -DATE = "Oct 11 2005" EXTRACT_NAMES= $(OPENSSL_SRC)/doc/extract-names.pl # we need to explicitly specify these 3 manual pages since their sections # cannot be read from their location in common/openssl/doc. All other manual # pages follow this rule according to the directory they reside in: apps=1, # crypto=3, ssl=3 -SPECMANPAGES = man7/des_modes.7 -CONFIGMANPAGES = man5/x509v3_config.5 man5/config.5 - -CRYPTOMANPAGES = man3/ASN1_OBJECT_new.3 \ - man3/ASN1_STRING_length.3 \ - man3/ASN1_STRING_new.3 \ - man3/ASN1_STRING_print_ex.3 \ - man3/ASN1_generate_nconf.3 \ - man3/BIO_ctrl.3 \ - man3/BIO_f_base64.3 \ - man3/BIO_f_buffer.3 \ - man3/BIO_f_cipher.3 \ - man3/BIO_f_md.3 \ - man3/BIO_f_null.3 \ - man3/BIO_f_ssl.3 \ - man3/BIO_find_type.3 \ - man3/BIO_new.3 \ - man3/BIO_push.3 \ - man3/BIO_read.3 \ - man3/BIO_s_accept.3 \ - man3/BIO_s_bio.3 \ - man3/BIO_s_connect.3 \ - man3/BIO_s_fd.3 \ - man3/BIO_s_file.3 \ - man3/BIO_s_mem.3 \ - man3/BIO_s_null.3 \ - man3/BIO_s_socket.3 \ - man3/BIO_set_callback.3 \ - man3/BIO_should_retry.3 \ - man3/BN_BLINDING_new.3 \ - man3/BN_CTX_new.3 \ - man3/BN_CTX_start.3 \ - man3/BN_add.3 \ - man3/BN_add_word.3 \ - man3/BN_bn2bin.3 \ - man3/BN_cmp.3 \ - man3/BN_copy.3 \ - man3/BN_generate_prime.3 \ - man3/BN_mod_inverse.3 \ - man3/BN_mod_mul_montgomery.3 \ - man3/BN_mod_mul_reciprocal.3 \ - man3/BN_new.3 \ - man3/BN_num_bytes.3 \ - man3/BN_rand.3 \ - man3/BN_set_bit.3 \ - man3/BN_swap.3 \ - man3/BN_zero.3 \ - man3/CONF_modules_free.3 \ - man3/CONF_modules_load_file.3 \ - man3/CRYPTO_set_ex_data.3 \ - man3/DH_generate_key.3 \ - man3/DH_generate_parameters.3 \ - man3/DH_get_ex_new_index.3 \ - man3/DH_new.3 \ - man3/DH_set_method.3 \ - man3/DH_size.3 \ - man3/DSA_SIG_new.3 \ - man3/DSA_do_sign.3 \ - man3/DSA_dup_DH.3 \ - man3/DSA_generate_key.3 \ - man3/DSA_generate_parameters.3 \ - man3/DSA_get_ex_new_index.3 \ - man3/DSA_new.3 \ - man3/DSA_set_method.3 \ - man3/DSA_sign.3 \ - man3/DSA_size.3 \ - man3/ERR_GET_LIB.3 \ - man3/ERR_clear_error.3 \ - man3/ERR_error_string.3 \ - man3/ERR_get_error.3 \ - man3/ERR_load_crypto_strings.3 \ - man3/ERR_load_strings.3 \ - man3/ERR_print_errors.3 \ - man3/ERR_put_error.3 \ - man3/ERR_remove_state.3 \ - man3/ERR_set_mark.3 \ - man3/EVP_BytesToKey.3 \ - man3/EVP_DigestInit.3 \ - man3/EVP_EncryptInit.3 \ - man3/EVP_OpenInit.3 \ - man3/EVP_PKEY_new.3 \ - man3/EVP_PKEY_set1_RSA.3 \ - man3/EVP_SealInit.3 \ - man3/EVP_SignInit.3 \ - man3/EVP_VerifyInit.3 \ - man3/OBJ_nid2obj.3 \ - man3/OPENSSL_Applink.3 \ - man3/OPENSSL_VERSION_NUMBER.3 \ - man3/OPENSSL_config.3 \ - man3/OPENSSL_ia32cap.3 \ - man3/OPENSSL_load_builtin_modules.3 \ - man3/OpenSSL_add_all_algorithms.3 \ - man3/PKCS12_create.3 \ - man3/PKCS12_parse.3 \ - man3/PKCS7_decrypt.3 \ - man3/PKCS7_encrypt.3 \ - man3/PKCS7_sign.3 \ - man3/PKCS7_verify.3 \ - man3/RAND_add.3 \ - man3/RAND_bytes.3 \ - man3/RAND_cleanup.3 \ - man3/RAND_egd.3 \ - man3/RAND_load_file.3 \ - man3/RAND_set_rand_method.3 \ - man3/RSA_blinding_on.3 \ - man3/RSA_check_key.3 \ - man3/RSA_generate_key.3 \ - man3/RSA_get_ex_new_index.3 \ - man3/RSA_new.3 \ - man3/RSA_padding_add_PKCS1_type_1.3 \ - man3/RSA_print.3 \ - man3/RSA_private_encrypt.3 \ - man3/RSA_public_encrypt.3 \ - man3/RSA_set_method.3 \ - man3/RSA_sign.3 \ - man3/RSA_sign_ASN1_OCTET_STRING.3 \ - man3/RSA_size.3 \ - man3/SMIME_read_PKCS7.3 \ - man3/SMIME_write_PKCS7.3 \ - man3/X509_NAME_ENTRY_get_object.3 \ - man3/X509_NAME_add_entry_by_txt.3 \ - man3/X509_NAME_get_index_by_NID.3 \ - man3/X509_NAME_print_ex.3 \ - man3/X509_new.3 \ - man3/bio.3 \ - man3/blowfish.3 \ - man3/bn.3 \ - man3/bn_internal.3 \ - man3/buffer.3 \ - man3/crypto.3 \ - man3/d2i_ASN1_OBJECT.3 \ - man3/d2i_DHparams.3 \ - man3/d2i_DSAPublicKey.3 \ - man3/d2i_PKCS8PrivateKey.3 \ - man3/d2i_RSAPublicKey.3 \ - man3/d2i_X509.3 \ - man3/d2i_X509_ALGOR.3 \ - man3/d2i_X509_CRL.3 \ - man3/d2i_X509_NAME.3 \ - man3/d2i_X509_REQ.3 \ - man3/d2i_X509_SIG.3 \ - man3/des.3 \ - man3/dh.3 \ - man3/dsa.3 \ - man3/ecdsa.3 \ - man3/engine.3 \ - man3/err.3 \ - man3/evp.3 \ - man3/hmac.3 \ - man3/lh_stats.3 \ - man3/lhash.3 \ - man3/md5.3 \ - man3/mdc2.3 \ - man3/pem.3 \ - man3/rand.3 \ - man3/rc4.3 \ - man3/ripemd.3 \ - man3/rsa.3 \ - man3/sha.3 \ - man3/threads.3 \ - man3/ui.3 \ - man3/ui_compat.3 \ - man3/x509.3 - -APPSMANPAGES = man1/CA.pl.1 \ - man1/asn1parse.1 \ - man1/ca.1 \ - man1/ciphers.1 \ - man1/crl.1 \ - man1/crl2pkcs7.1 \ - man1/dgst.1 \ - man1/dhparam.1 \ - man1/dsa.1 \ - man1/dsaparam.1 \ - man1/ec.1 \ - man1/ecparam.1 \ - man1/enc.1 \ - man1/errstr.1 \ - man1/gendsa.1 \ - man1/genrsa.1 \ - man1/nseq.1 \ - man1/ocsp.1 \ - man1/openssl.1 \ - man1/passwd.1 \ - man1/pkcs12.1 \ - man1/pkcs7.1 \ - man1/pkcs8.1 \ - man1/rand.1 \ - man1/req.1 \ - man1/rsa.1 \ - man1/rsautl.1 \ - man1/s_client.1 \ - man1/s_server.1 \ - man1/s_time.1 \ - man1/sess_id.1 \ - man1/smime.1 \ - man1/speed.1 \ - man1/spkac.1 \ - man1/verify.1 \ - man1/version.1 \ - man1/x509.1 - -SSLMANPAGES = man3/SSL_CIPHER_get_name.3 \ - man3/SSL_COMP_add_compression_method.3 \ - man3/SSL_CTX_add_extra_chain_cert.3 \ - man3/SSL_CTX_add_session.3 \ - man3/SSL_CTX_ctrl.3 \ - man3/SSL_CTX_flush_sessions.3 \ - man3/SSL_CTX_free.3 \ - man3/SSL_CTX_get_ex_new_index.3 \ - man3/SSL_CTX_get_verify_mode.3 \ - man3/SSL_CTX_load_verify_locations.3 \ - man3/SSL_CTX_new.3 \ - man3/SSL_CTX_sess_number.3 \ - man3/SSL_CTX_sess_set_cache_size.3 \ - man3/SSL_CTX_sess_set_get_cb.3 \ - man3/SSL_CTX_sessions.3 \ - man3/SSL_CTX_set_cert_store.3 \ - man3/SSL_CTX_set_cert_verify_callback.3 \ - man3/SSL_CTX_set_cipher_list.3 \ - man3/SSL_CTX_set_client_CA_list.3 \ - man3/SSL_CTX_set_client_cert_cb.3 \ - man3/SSL_CTX_set_default_passwd_cb.3 \ - man3/SSL_CTX_set_generate_session_id.3 \ - man3/SSL_CTX_set_info_callback.3 \ - man3/SSL_CTX_set_max_cert_list.3 \ - man3/SSL_CTX_set_mode.3 \ - man3/SSL_CTX_set_msg_callback.3 \ - man3/SSL_CTX_set_options.3 \ - man3/SSL_CTX_set_quiet_shutdown.3 \ - man3/SSL_CTX_set_session_cache_mode.3 \ - man3/SSL_CTX_set_session_id_context.3 \ - man3/SSL_CTX_set_ssl_version.3 \ - man3/SSL_CTX_set_timeout.3 \ - man3/SSL_CTX_set_tmp_dh_callback.3 \ - man3/SSL_CTX_set_tmp_rsa_callback.3 \ - man3/SSL_CTX_set_verify.3 \ - man3/SSL_CTX_use_certificate.3 \ - man3/SSL_SESSION_free.3 \ - man3/SSL_SESSION_get_ex_new_index.3 \ - man3/SSL_SESSION_get_time.3 \ - man3/SSL_accept.3 \ - man3/SSL_alert_type_string.3 \ - man3/SSL_clear.3 \ - man3/SSL_connect.3 \ - man3/SSL_do_handshake.3 \ - man3/SSL_free.3 \ - man3/SSL_get_SSL_CTX.3 \ - man3/SSL_get_ciphers.3 \ - man3/SSL_get_client_CA_list.3 \ - man3/SSL_get_current_cipher.3 \ - man3/SSL_get_default_timeout.3 \ - man3/SSL_get_error.3 \ - man3/SSL_get_ex_data_X509_STORE_CTX_idx.3 \ - man3/SSL_get_ex_new_index.3 \ - man3/SSL_get_fd.3 \ - man3/SSL_get_peer_cert_chain.3 \ - man3/SSL_get_peer_certificate.3 \ - man3/SSL_get_rbio.3 \ - man3/SSL_get_session.3 \ - man3/SSL_get_verify_result.3 \ - man3/SSL_get_version.3 \ - man3/SSL_library_init.3 \ - man3/SSL_load_client_CA_file.3 \ - man3/SSL_new.3 \ - man3/SSL_pending.3 \ - man3/SSL_read.3 \ - man3/SSL_rstate_string.3 \ - man3/SSL_session_reused.3 \ - man3/SSL_set_bio.3 \ - man3/SSL_set_connect_state.3 \ - man3/SSL_set_fd.3 \ - man3/SSL_set_session.3 \ - man3/SSL_set_shutdown.3 \ - man3/SSL_set_verify_result.3 \ - man3/SSL_shutdown.3 \ - man3/SSL_state_string.3 \ - man3/SSL_want.3 \ - man3/SSL_write.3 \ - man3/d2i_SSL_SESSION.3 \ - man3/ssl.3 - -ROOTSFWSPECMANPAGES = $(SPECMANPAGES:%=$(ROOTSFWMAN)/%) -ROOTSFWCONFIGMANPAGES = $(CONFIGMANPAGES:%=$(ROOTSFWMAN)/%) -ROOTSFWAPPSMANPAGES = $(APPSMANPAGES:%=$(ROOTSFWMAN)/%) -ROOTSFWCRYPTOMANPAGES = $(CRYPTOMANPAGES:%=$(ROOTSFWMAN)/%) -ROOTSFWSSLMANPAGES = $(SSLMANPAGES:%=$(ROOTSFWMAN)/%) - -ROOTSFWMANPAGES = $(ROOTSFWSPECMANPAGES) \ - $(ROOTSFWCONFIGMANPAGES) \ - $(ROOTSFWAPPSMANPAGES) \ - $(ROOTSFWCRYPTOMANPAGES) \ - $(ROOTSFWSSLMANPAGES) - -CONFIGSUNPAGES = $(CONFIGMANPAGES:man5%.5=sunman%.5) -SPECSUNPAGES = $(SPECMANPAGES:man7%.7=sunman%.7) -APPSSUNPAGES = $(APPSMANPAGES:man1%.1=sunman%.1) -CRYPTOSUNPAGES = $(CRYPTOMANPAGES:man3%.3=sunman%.3) -SSLSUNPAGES = $(SSLMANPAGES:man3%.3=sunman%.3) +SPECMANPAGES = man$(MS7)/des_modes.$(MS7) +CONFIGMANPAGES = man$(MS5)/x509v3_config.$(MS5) man$(MS5)/config.$(MS5) + +CRYPTOMANPAGES = man$(MS3)/ASN1_OBJECT_new.$(MS3) \ + man$(MS3)/ASN1_STRING_length.$(MS3) \ + man$(MS3)/ASN1_STRING_new.$(MS3) \ + man$(MS3)/ASN1_STRING_print_ex.$(MS3) \ + man$(MS3)/ASN1_generate_nconf.$(MS3) \ + man$(MS3)/BIO_ctrl.$(MS3) \ + man$(MS3)/BIO_f_base64.$(MS3) \ + man$(MS3)/BIO_f_buffer.$(MS3) \ + man$(MS3)/BIO_f_cipher.$(MS3) \ + man$(MS3)/BIO_f_md.$(MS3) \ + man$(MS3)/BIO_f_null.$(MS3) \ + man$(MS3)/BIO_f_ssl.$(MS3) \ + man$(MS3)/BIO_find_type.$(MS3) \ + man$(MS3)/BIO_new.$(MS3) \ + man$(MS3)/BIO_push.$(MS3) \ + man$(MS3)/BIO_read.$(MS3) \ + man$(MS3)/BIO_s_accept.$(MS3) \ + man$(MS3)/BIO_s_bio.$(MS3) \ + man$(MS3)/BIO_s_connect.$(MS3) \ + man$(MS3)/BIO_s_fd.$(MS3) \ + man$(MS3)/BIO_s_file.$(MS3) \ + man$(MS3)/BIO_s_mem.$(MS3) \ + man$(MS3)/BIO_s_null.$(MS3) \ + man$(MS3)/BIO_s_socket.$(MS3) \ + man$(MS3)/BIO_set_callback.$(MS3) \ + man$(MS3)/BIO_should_retry.$(MS3) \ + man$(MS3)/BN_BLINDING_new.$(MS3) \ + man$(MS3)/BN_CTX_new.$(MS3) \ + man$(MS3)/BN_CTX_start.$(MS3) \ + man$(MS3)/BN_add.$(MS3) \ + man$(MS3)/BN_add_word.$(MS3) \ + man$(MS3)/BN_bn2bin.$(MS3) \ + man$(MS3)/BN_cmp.$(MS3) \ + man$(MS3)/BN_copy.$(MS3) \ + man$(MS3)/BN_generate_prime.$(MS3) \ + man$(MS3)/BN_mod_inverse.$(MS3) \ + man$(MS3)/BN_mod_mul_montgomery.$(MS3) \ + man$(MS3)/BN_mod_mul_reciprocal.$(MS3) \ + man$(MS3)/BN_new.$(MS3) \ + man$(MS3)/BN_num_bytes.$(MS3) \ + man$(MS3)/BN_rand.$(MS3) \ + man$(MS3)/BN_set_bit.$(MS3) \ + man$(MS3)/BN_swap.$(MS3) \ + man$(MS3)/BN_zero.$(MS3) \ + man$(MS3)/CONF_modules_free.$(MS3) \ + man$(MS3)/CONF_modules_load_file.$(MS3) \ + man$(MS3)/CRYPTO_set_ex_data.$(MS3) \ + man$(MS3)/DH_generate_key.$(MS3) \ + man$(MS3)/DH_generate_parameters.$(MS3) \ + man$(MS3)/DH_get_ex_new_index.$(MS3) \ + man$(MS3)/DH_new.$(MS3) \ + man$(MS3)/DH_set_method.$(MS3) \ + man$(MS3)/DH_size.$(MS3) \ + man$(MS3)/DSA_SIG_new.$(MS3) \ + man$(MS3)/DSA_do_sign.$(MS3) \ + man$(MS3)/DSA_dup_DH.$(MS3) \ + man$(MS3)/DSA_generate_key.$(MS3) \ + man$(MS3)/DSA_generate_parameters.$(MS3) \ + man$(MS3)/DSA_get_ex_new_index.$(MS3) \ + man$(MS3)/DSA_new.$(MS3) \ + man$(MS3)/DSA_set_method.$(MS3) \ + man$(MS3)/DSA_sign.$(MS3) \ + man$(MS3)/DSA_size.$(MS3) \ + man$(MS3)/ERR_GET_LIB.$(MS3) \ + man$(MS3)/ERR_clear_error.$(MS3) \ + man$(MS3)/ERR_error_string.$(MS3) \ + man$(MS3)/ERR_get_error.$(MS3) \ + man$(MS3)/ERR_load_crypto_strings.$(MS3) \ + man$(MS3)/ERR_load_strings.$(MS3) \ + man$(MS3)/ERR_print_errors.$(MS3) \ + man$(MS3)/ERR_put_error.$(MS3) \ + man$(MS3)/ERR_remove_state.$(MS3) \ + man$(MS3)/ERR_set_mark.$(MS3) \ + man$(MS3)/EVP_BytesToKey.$(MS3) \ + man$(MS3)/EVP_DigestInit.$(MS3) \ + man$(MS3)/EVP_EncryptInit.$(MS3) \ + man$(MS3)/EVP_OpenInit.$(MS3) \ + man$(MS3)/EVP_PKEY_new.$(MS3) \ + man$(MS3)/EVP_PKEY_set1_RSA.$(MS3) \ + man$(MS3)/EVP_SealInit.$(MS3) \ + man$(MS3)/EVP_SignInit.$(MS3) \ + man$(MS3)/EVP_VerifyInit.$(MS3) \ + man$(MS3)/OBJ_nid2obj.$(MS3) \ + man$(MS3)/OPENSSL_Applink.$(MS3) \ + man$(MS3)/OPENSSL_VERSION_NUMBER.$(MS3) \ + man$(MS3)/OPENSSL_config.$(MS3) \ + man$(MS3)/OPENSSL_ia32cap.$(MS3) \ + man$(MS3)/OPENSSL_load_builtin_modules.$(MS3) \ + man$(MS3)/OpenSSL_add_all_algorithms.$(MS3) \ + man$(MS3)/PKCS12_create.$(MS3) \ + man$(MS3)/PKCS12_parse.$(MS3) \ + man$(MS3)/PKCS7_decrypt.$(MS3) \ + man$(MS3)/PKCS7_encrypt.$(MS3) \ + man$(MS3)/PKCS7_sign.$(MS3) \ + man$(MS3)/PKCS7_verify.$(MS3) \ + man$(MS3)/RAND_add.$(MS3) \ + man$(MS3)/RAND_bytes.$(MS3) \ + man$(MS3)/RAND_cleanup.$(MS3) \ + man$(MS3)/RAND_egd.$(MS3) \ + man$(MS3)/RAND_load_file.$(MS3) \ + man$(MS3)/RAND_set_rand_method.$(MS3) \ + man$(MS3)/RSA_blinding_on.$(MS3) \ + man$(MS3)/RSA_check_key.$(MS3) \ + man$(MS3)/RSA_generate_key.$(MS3) \ + man$(MS3)/RSA_get_ex_new_index.$(MS3) \ + man$(MS3)/RSA_new.$(MS3) \ + man$(MS3)/RSA_padding_add_PKCS1_type_1.$(MS3) \ + man$(MS3)/RSA_print.$(MS3) \ + man$(MS3)/RSA_private_encrypt.$(MS3) \ + man$(MS3)/RSA_public_encrypt.$(MS3) \ + man$(MS3)/RSA_set_method.$(MS3) \ + man$(MS3)/RSA_sign.$(MS3) \ + man$(MS3)/RSA_sign_ASN1_OCTET_STRING.$(MS3) \ + man$(MS3)/RSA_size.$(MS3) \ + man$(MS3)/SMIME_read_PKCS7.$(MS3) \ + man$(MS3)/SMIME_write_PKCS7.$(MS3) \ + man$(MS3)/X509_NAME_ENTRY_get_object.$(MS3) \ + man$(MS3)/X509_NAME_add_entry_by_txt.$(MS3) \ + man$(MS3)/X509_NAME_get_index_by_NID.$(MS3) \ + man$(MS3)/X509_NAME_print_ex.$(MS3) \ + man$(MS3)/X509_new.$(MS3) \ + man$(MS3)/bio.$(MS3) \ + man$(MS3)/blowfish.$(MS3) \ + man$(MS3)/bn.$(MS3) \ + man$(MS3)/bn_internal.$(MS3) \ + man$(MS3)/buffer.$(MS3) \ + man$(MS3)/crypto.$(MS3) \ + man$(MS3)/d2i_ASN1_OBJECT.$(MS3) \ + man$(MS3)/d2i_DHparams.$(MS3) \ + man$(MS3)/d2i_DSAPublicKey.$(MS3) \ + man$(MS3)/d2i_PKCS8PrivateKey.$(MS3) \ + man$(MS3)/d2i_RSAPublicKey.$(MS3) \ + man$(MS3)/d2i_X509.$(MS3) \ + man$(MS3)/d2i_X509_ALGOR.$(MS3) \ + man$(MS3)/d2i_X509_CRL.$(MS3) \ + man$(MS3)/d2i_X509_NAME.$(MS3) \ + man$(MS3)/d2i_X509_REQ.$(MS3) \ + man$(MS3)/d2i_X509_SIG.$(MS3) \ + man$(MS3)/des.$(MS3) \ + man$(MS3)/dh.$(MS3) \ + man$(MS3)/dsa.$(MS3) \ + man$(MS3)/ecdsa.$(MS3) \ + man$(MS3)/engine.$(MS3) \ + man$(MS3)/err.$(MS3) \ + man$(MS3)/evp.$(MS3) \ + man$(MS3)/hmac.$(MS3) \ + man$(MS3)/lh_stats.$(MS3) \ + man$(MS3)/lhash.$(MS3) \ + man$(MS3)/md5.$(MS3) \ + man$(MS3)/mdc2.$(MS3) \ + man$(MS3)/pem.$(MS3) \ + man$(MS3)/rand.$(MS3) \ + man$(MS3)/rc4.$(MS3) \ + man$(MS3)/ripemd.$(MS3) \ + man$(MS3)/rsa.$(MS3) \ + man$(MS3)/sha.$(MS3) \ + man$(MS3)/threads.$(MS3) \ + man$(MS3)/ui.$(MS3) \ + man$(MS3)/ui_compat.$(MS3) \ + man$(MS3)/x509.$(MS3) + +APPSMANPAGES = man$(MS1)/CA.pl.$(MS1) \ + man$(MS1)/asn1parse.$(MS1) \ + man$(MS1)/ca.$(MS1) \ + man$(MS1)/ciphers.$(MS1) \ + man$(MS1)/crl.$(MS1) \ + man$(MS1)/crl2pkcs7.$(MS1) \ + man$(MS1)/dgst.$(MS1) \ + man$(MS1)/dhparam.$(MS1) \ + man$(MS1)/dsa.$(MS1) \ + man$(MS1)/dsaparam.$(MS1) \ + man$(MS1)/ec.$(MS1) \ + man$(MS1)/ecparam.$(MS1) \ + man$(MS1)/enc.$(MS1) \ + man$(MS1)/errstr.$(MS1) \ + man$(MS1)/gendsa.$(MS1) \ + man$(MS1)/genrsa.$(MS1) \ + man$(MS1)/nseq.$(MS1) \ + man$(MS1)/ocsp.$(MS1) \ + man$(MS1)/openssl.$(MS1) \ + man$(MS1)/passwd.$(MS1) \ + man$(MS1)/pkcs12.$(MS1) \ + man$(MS1)/pkcs7.$(MS1) \ + man$(MS1)/pkcs8.$(MS1) \ + man$(MS1)/rand.$(MS1) \ + man$(MS1)/req.$(MS1) \ + man$(MS1)/rsa.$(MS1) \ + man$(MS1)/rsautl.$(MS1) \ + man$(MS1)/s_client.$(MS1) \ + man$(MS1)/s_server.$(MS1) \ + man$(MS1)/s_time.$(MS1) \ + man$(MS1)/sess_id.$(MS1) \ + man$(MS1)/smime.$(MS1) \ + man$(MS1)/speed.$(MS1) \ + man$(MS1)/spkac.$(MS1) \ + man$(MS1)/verify.$(MS1) \ + man$(MS1)/version.$(MS1) \ + man$(MS1)/x509.$(MS1) + +SSLMANPAGES = man$(MS3)/SSL_CIPHER_get_name.$(MS3) \ + man$(MS3)/SSL_COMP_add_compression_method.$(MS3) \ + man$(MS3)/SSL_CTX_add_extra_chain_cert.$(MS3) \ + man$(MS3)/SSL_CTX_add_session.$(MS3) \ + man$(MS3)/SSL_CTX_ctrl.$(MS3) \ + man$(MS3)/SSL_CTX_flush_sessions.$(MS3) \ + man$(MS3)/SSL_CTX_free.$(MS3) \ + man$(MS3)/SSL_CTX_get_ex_new_index.$(MS3) \ + man$(MS3)/SSL_CTX_get_verify_mode.$(MS3) \ + man$(MS3)/SSL_CTX_load_verify_locations.$(MS3) \ + man$(MS3)/SSL_CTX_new.$(MS3) \ + man$(MS3)/SSL_CTX_sess_number.$(MS3) \ + man$(MS3)/SSL_CTX_sess_set_cache_size.$(MS3) \ + man$(MS3)/SSL_CTX_sess_set_get_cb.$(MS3) \ + man$(MS3)/SSL_CTX_sessions.$(MS3) \ + man$(MS3)/SSL_CTX_set_cert_store.$(MS3) \ + man$(MS3)/SSL_CTX_set_cert_verify_callback.$(MS3) \ + man$(MS3)/SSL_CTX_set_cipher_list.$(MS3) \ + man$(MS3)/SSL_CTX_set_client_CA_list.$(MS3) \ + man$(MS3)/SSL_CTX_set_client_cert_cb.$(MS3) \ + man$(MS3)/SSL_CTX_set_default_passwd_cb.$(MS3) \ + man$(MS3)/SSL_CTX_set_generate_session_id.$(MS3) \ + man$(MS3)/SSL_CTX_set_info_callback.$(MS3) \ + man$(MS3)/SSL_CTX_set_max_cert_list.$(MS3) \ + man$(MS3)/SSL_CTX_set_mode.$(MS3) \ + man$(MS3)/SSL_CTX_set_msg_callback.$(MS3) \ + man$(MS3)/SSL_CTX_set_options.$(MS3) \ + man$(MS3)/SSL_CTX_set_quiet_shutdown.$(MS3) \ + man$(MS3)/SSL_CTX_set_session_cache_mode.$(MS3) \ + man$(MS3)/SSL_CTX_set_session_id_context.$(MS3) \ + man$(MS3)/SSL_CTX_set_ssl_version.$(MS3) \ + man$(MS3)/SSL_CTX_set_timeout.$(MS3) \ + man$(MS3)/SSL_CTX_set_tmp_dh_callback.$(MS3) \ + man$(MS3)/SSL_CTX_set_tmp_rsa_callback.$(MS3) \ + man$(MS3)/SSL_CTX_set_verify.$(MS3) \ + man$(MS3)/SSL_CTX_use_certificate.$(MS3) \ + man$(MS3)/SSL_SESSION_free.$(MS3) \ + man$(MS3)/SSL_SESSION_get_ex_new_index.$(MS3) \ + man$(MS3)/SSL_SESSION_get_time.$(MS3) \ + man$(MS3)/SSL_accept.$(MS3) \ + man$(MS3)/SSL_alert_type_string.$(MS3) \ + man$(MS3)/SSL_clear.$(MS3) \ + man$(MS3)/SSL_connect.$(MS3) \ + man$(MS3)/SSL_do_handshake.$(MS3) \ + man$(MS3)/SSL_free.$(MS3) \ + man$(MS3)/SSL_get_SSL_CTX.$(MS3) \ + man$(MS3)/SSL_get_ciphers.$(MS3) \ + man$(MS3)/SSL_get_client_CA_list.$(MS3) \ + man$(MS3)/SSL_get_current_cipher.$(MS3) \ + man$(MS3)/SSL_get_default_timeout.$(MS3) \ + man$(MS3)/SSL_get_error.$(MS3) \ + man$(MS3)/SSL_get_ex_data_X509_STORE_CTX_idx.$(MS3) \ + man$(MS3)/SSL_get_ex_new_index.$(MS3) \ + man$(MS3)/SSL_get_fd.$(MS3) \ + man$(MS3)/SSL_get_peer_cert_chain.$(MS3) \ + man$(MS3)/SSL_get_peer_certificate.$(MS3) \ + man$(MS3)/SSL_get_rbio.$(MS3) \ + man$(MS3)/SSL_get_session.$(MS3) \ + man$(MS3)/SSL_get_verify_result.$(MS3) \ + man$(MS3)/SSL_get_version.$(MS3) \ + man$(MS3)/SSL_library_init.$(MS3) \ + man$(MS3)/SSL_load_client_CA_file.$(MS3) \ + man$(MS3)/SSL_new.$(MS3) \ + man$(MS3)/SSL_pending.$(MS3) \ + man$(MS3)/SSL_read.$(MS3) \ + man$(MS3)/SSL_rstate_string.$(MS3) \ + man$(MS3)/SSL_session_reused.$(MS3) \ + man$(MS3)/SSL_set_bio.$(MS3) \ + man$(MS3)/SSL_set_connect_state.$(MS3) \ + man$(MS3)/SSL_set_fd.$(MS3) \ + man$(MS3)/SSL_set_session.$(MS3) \ + man$(MS3)/SSL_set_shutdown.$(MS3) \ + man$(MS3)/SSL_set_verify_result.$(MS3) \ + man$(MS3)/SSL_shutdown.$(MS3) \ + man$(MS3)/SSL_state_string.$(MS3) \ + man$(MS3)/SSL_want.$(MS3) \ + man$(MS3)/SSL_write.$(MS3) \ + man$(MS3)/d2i_SSL_SESSION.$(MS3) \ + man$(MS3)/ssl.$(MS3) + +ROOTSPECMANPAGES = $(SPECMANPAGES:%=$(ROOTMAN)/%) +ROOTCONFIGMANPAGES = $(CONFIGMANPAGES:%=$(ROOTMAN)/%) +ROOTAPPSMANPAGES = $(APPSMANPAGES:%=$(ROOTMAN)/%) +ROOTCRYPTOMANPAGES = $(CRYPTOMANPAGES:%=$(ROOTMAN)/%) +ROOTSSLMANPAGES = $(SSLMANPAGES:%=$(ROOTMAN)/%) + +ROOTMANPAGES = $(ROOTSPECMANPAGES) \ + $(ROOTCONFIGMANPAGES) \ + $(ROOTAPPSMANPAGES) \ + $(ROOTCRYPTOMANPAGES) \ + $(ROOTSSLMANPAGES) + +CONFIGSUNPAGES = $(CONFIGMANPAGES:man$(MS5)%.$(MS5)=sunman%.$(MS5)) +SPECSUNPAGES = $(SPECMANPAGES:man$(MS7)%.$(MS7)=sunman%.$(MS7)) +APPSSUNPAGES = $(APPSMANPAGES:man$(MS1)%.$(MS1)=sunman%.$(MS1)) +CRYPTOSUNPAGES = $(CRYPTOMANPAGES:man$(MS3)%.$(MS3)=sunman%.$(MS3)) +SSLSUNPAGES = $(SSLMANPAGES:man$(MS3)%.$(MS3)=sunman%.$(MS3)) # we don't want to explicitly define what symlinks to existing man pages to # create. This can be easily extracted from manual pages in POD format. @@ -354,11 +352,11 @@ SSLSUNPAGES = $(SSLMANPAGES:man3%.3=sunman%.3) # actual location in common/openssl/doc. Note that we don't use ':' as a # separator for the section/dir/pod_page triplet because ':' generally denotes # "noise" in the nightly build log. -CONFIGPODPAGES = $(CONFIGMANPAGES:man5/%.5=5,apps,%) -SPECPODPAGES = $(SPECMANPAGES:man7/%.7=7,crypto,%) -APPSPODPAGES = $(APPSMANPAGES:man1/%.1=1,apps,%) -CRYPTOPODPAGES = $(CRYPTOMANPAGES:man3/%.3=3,crypto,%) -SSLPODPAGES = $(SSLMANPAGES:man3/%.3=3,ssl,%) +CONFIGPODPAGES = $(CONFIGMANPAGES:man$(MS5)/%.$(MS5)=$(MS5),apps,%) +SPECPODPAGES = $(SPECMANPAGES:man$(MS7)/%.$(MS7)=$(MS7),crypto,%) +APPSPODPAGES = $(APPSMANPAGES:man$(MS1)/%.$(MS1)=$(MS1),apps,%) +CRYPTOPODPAGES = $(CRYPTOMANPAGES:man$(MS3)/%.$(MS3)=$(MS3),crypto,%) +SSLPODPAGES = $(SSLMANPAGES:man$(MS3)/%.$(MS3)=$(MS3),ssl,%) ALLPODPAGES = $(CONFIGPODPAGES) \ $(SPECPODPAGES) \ @@ -366,6 +364,10 @@ ALLPODPAGES = $(CONFIGPODPAGES) \ $(CRYPTOPODPAGES) \ $(SSLPODPAGES) +ROOTUSRSFWBIN = $(ROOT)/usr/sfw/bin +SFWBINLINKS = openssl $(BUILD64) $(MACH64)/openssl +ROOTUSRSFWBINLINKS = $(SFWBINLINKS:%=$(ROOTUSRSFWBIN)/%) + include ../Makefile.cmd all := TARGET = all @@ -373,6 +375,8 @@ clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install +.KEEP_STATE: + .PARALLEL: $(SUBDIRS) all clobber: $(SUBDIRS) @@ -380,15 +384,15 @@ all clobber: $(SUBDIRS) clean clobber: $(SUBDIRS) $(RM) -r sunman -install: $(SUBDIRS) $(ROOTOPENSSL)/openssl.cnf man +install: $(SUBDIRS) $(ROOTOPENSSL)/openssl.cnf man binsymlinks # (1) convert man pages in POD format into NROFF format and store them in # ./sunman directory # (2) install them into their respective manX directories in the proto area # (3) create symlinks according to NAME section of each manual page man: mansymlinks -mansymlinks: $(ROOTSFWMANPAGES) -$(ROOTSFWMANPAGES): sunman +mansymlinks: $(ROOTMANPAGES) +$(ROOTMANPAGES): sunman # We do NOT attempt to place 3rd Party code under the ON gate lint rules. lint: @@ -408,52 +412,48 @@ $(ROOTOPENSSL): $(INS.dir) $(ROOTOPENSSL)/certs $(INS.dir) $(ROOTOPENSSL)/private -$(ROOTSFWMANPAGES) := FILEMODE = 0444 -$(ROOTSFWMANPAGES): $(ROOTSFWMANDIRS) - -$(ROOTSFWMANDIRS): $(ROOTSFWMAN) $(ROOTSFW)/man - $(INS.dir) - -$(ROOTSFWMAN): $(ROOTSFW)/share - $(INS.dir) - -$(ROOTSFW)/man: $(ROOTSFW) - $(RM) $@ - $(SYMLINK) share/man $@ +$(ROOTMANPAGES) := FILEMODE = 0444 +$(ROOTMANPAGES): $(ROOTMANDIRS) -$(ROOTSFW)/share: $(ROOTSFW) +$(ROOTMANDIRS): $(ROOTMAN) $(INS.dir) -$(ROOTSFW): - $(INS.dir) - -$(ROOTSFWMAN)/man1/% $(ROOTSFWMAN)/man3/% $(ROOTSFWMAN)/man5/% $(ROOTSFWMAN)/man7/%: sunman/% +$(ROOTMAN)/man$(MS1)/% \ +$(ROOTMAN)/man$(MS3)/% \ +$(ROOTMAN)/man$(MS5)/% \ +$(ROOTMAN)/man$(MS7)/% \ + : sunman/% $(INS.file) $(SPECSUNPAGES): - @$(POD2MAN) --date=$(DATE) --center=OpenSSL --section=7 \ + @$(POD2MAN) --date=$(OPENSSL_DATE) --center=OpenSSL --section=$(MS7) \ --quotes=none --release "OpenSSL-$(OPENSSL_VERSION)" \ - --name=`basename $@ .7` $(OPENSSL_SRC)/doc/crypto/`basename $@ .7`.pod $@ + --name=`basename $@ .$(MS7)` \ + $(OPENSSL_SRC)/doc/crypto/`basename $@ .$(MS7)`.pod $@ $(CONFIGSUNPAGES): - @$(POD2MAN) --date=$(DATE) --center=OpenSSL --section=5 \ + @$(POD2MAN) --date=$(OPENSSL_DATE) --center=OpenSSL --section=$(MS5) \ --quotes=none --release "OpenSSL-$(OPENSSL_VERSION)" \ - --name=`basename $@ .5` $(OPENSSL_SRC)/doc/apps/`basename $@ .5`.pod $@ + --name=`basename $@ .$(MS5)` \ + $(OPENSSL_SRC)/doc/apps/`basename $@ .$(MS5)`.pod $@ $(APPSSUNPAGES): - @$(POD2MAN) --date=$(DATE) --center=OpenSSL --section=1 \ + @$(POD2MAN) --date=$(OPENSSL_DATE) --center=OpenSSL --section=$(MS1) \ --quotes=none --release "OpenSSL-$(OPENSSL_VERSION)" \ - --name=`basename $@ .1` $(OPENSSL_SRC)/doc/apps/`basename $@ .1`.pod $@ + --name=`basename $@ .$(MS1)` \ + $(OPENSSL_SRC)/doc/apps/`basename $@ .$(MS1)`.pod $@ $(SSLSUNPAGES): - @$(POD2MAN) --date=$(DATE) --center=OpenSSL --section=3 \ + @$(POD2MAN) --date=$(OPENSSL_DATE) --center=OpenSSL --section=$(MS3) \ --quotes=none --release "OpenSSL-$(OPENSSL_VERSION)" \ - --name=`basename $@ .3` $(OPENSSL_SRC)/doc/ssl/`basename $@ .3`.pod $@ + --name=`basename $@ .$(MS3)` \ + $(OPENSSL_SRC)/doc/ssl/`basename $@ .$(MS3)`.pod $@ $(CRYPTOSUNPAGES): - @$(POD2MAN) --date=$(DATE) --center=OpenSSL --section=3 \ + @$(POD2MAN) --date=$(OPENSSL_DATE) --center=OpenSSL --section=$(MS3) \ --quotes=none --release "OpenSSL-$(OPENSSL_VERSION)" \ - --name=`basename $@ .3` $(OPENSSL_SRC)/doc/crypto/`basename $@ .3`.pod $@ + --name=`basename $@ .$(MS3)` \ + $(OPENSSL_SRC)/doc/crypto/`basename $@ .$(MS3)`.pod $@ mansymlinks: @for i in $(ALLPODPAGES); do \ @@ -463,10 +463,26 @@ mansymlinks: $(EXTRACT_NAMES) <$(OPENSSL_SRC)/doc/$$dir/$$base.pod | \ grep -v "^$$base$$" | \ while read j; do \ - $(RM) -f $(ROOTSFWMAN)/man$$section/$$j.$$section; \ - $(SYMLINK) $$base.$$section $(ROOTSFWMAN)/man$$section/$$j.$$section ; \ + $(RM) -f $(ROOTMAN)/man$$section/$$j.$$section; \ + $(SYMLINK) $$base.$$section \ + $(ROOTMAN)/man$$section/$$j.$$section; \ done; \ done sunman: - mkdir sunman + $(MKDIR) -p sunman + +binsymlinks: $(ROOTUSRSFWBIN) .WAIT $(ROOTUSRSFWBINLINKS) + +$(ROOTUSRSFWBIN): + $(INS.dir) + $(INS.dir) $@/$(MACH64) + +$(ROOTUSRSFWBIN)/openssl:= \ + REALPATH=../../bin/openssl +$(ROOTUSRSFWBIN)/$(MACH64)/openssl:= \ + REALPATH=../../../bin/$(MACH64)/openssl + +$(ROOTUSRSFWBINLINKS): + $(RM) $@ + $(SYMLINK) $(REALPATH) $@ diff --git a/usr/src/cmd/openssl/Makefile.com b/usr/src/cmd/openssl/Makefile.com index 6aaf9b3e0b..5fc4e11810 100644 --- a/usr/src/cmd/openssl/Makefile.com +++ b/usr/src/cmd/openssl/Makefile.com @@ -18,11 +18,8 @@ # # 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. -# -# ident "%Z%%M% %I% %E% SMI" PROG = openssl @@ -73,19 +70,19 @@ OBJS = \ version.o \ x509.o -SRCDIR = $(OPENSSL_SRC)/apps +SRCDIR = $(OPENSSL_SRC)/apps -ROOTCMDDIR = $(ROOTSFWBIN) +ROOTCMDDIR = $(ROOTBIN) -CFLAGS += $(CCVERBOSE) \ +CFLAGS += $(CCVERBOSE) \ -erroff=E_END_OF_LOOP_CODE_NOT_REACHED,E_CONST_PROMOTED_UNSIGNED_LONG -CFLAGS64 += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED +CFLAGS64 += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED -CPPFLAGS = $(OPENSSL_BUILD_CPPFLAGS) -I$(SRCDIR) -DMONOLITH $(CPPFLAGS.master) +CPPFLAGS = \ + $(OPENSSL_BUILD_CPPFLAGS) -I$(SRCDIR) -DMONOLITH $(CPPFLAGS.master) -LDLIBS += $(OPENSSL_LDFLAGS) -lcrypto -lssl -lnsl -lsocket -lc -DYNFLAGS += $(OPENSSL_DYNFLAGS) +LDLIBS += -lcrypto -lssl -lnsl -lsocket -lc .KEEP_STATE: diff --git a/usr/src/cmd/sendmail/src/Makefile b/usr/src/cmd/sendmail/src/Makefile index fe552e9f47..ee9a1dd368 100644 --- a/usr/src/cmd/sendmail/src/Makefile +++ b/usr/src/cmd/sendmail/src/Makefile @@ -23,8 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/sendmail/src/Makefile # @@ -49,9 +47,9 @@ CRYPTOLIBS= -lssl -lcrypto # EXPORT DELETE END LDLIBS += ../libsmutil/libsmutil.a ../libsm/libsm.a -lresolv -lsocket \ -lnsl ../db/libdb.a -lldap -lsldap -lwrap -lumem \ - -L$(ROOTSFWLIB) $(CRYPTOLIBS) + $(CRYPTOLIBS) -INCPATH= -I. -I../include -I../db -I$(ROOTSFWINCLUDE) +INCPATH= -I. -I../include -I../db # EXPORT DELETE START CRYPTOENVDEF= -DSTARTTLS diff --git a/usr/src/cmd/ssh/Makefile.ssh-common b/usr/src/cmd/ssh/Makefile.ssh-common index 566d923ad5..e26b33bdfd 100644 --- a/usr/src/cmd/ssh/Makefile.ssh-common +++ b/usr/src/cmd/ssh/Makefile.ssh-common @@ -18,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # Common definitions for all of usr/src/cmd/ssh subdirs # @@ -41,7 +39,7 @@ CPPFLAGS = -DSSH_VERSION=$(SSH_VERSION) \ -I../include -I../../include \ -D_FILE_OFFSET_BITS=64 \ -erroff=E_STATEMENT_NOT_REACHED \ - $(OPENSSL_CPPFLAGS) $(CPPFLAGS.master) + $(CPPFLAGS.master) SSH_COMMON_LDLIBS = \ -L../libssh/$(MACH) -lssh \ diff --git a/usr/src/cmd/ssh/libssh/Makefile.com b/usr/src/cmd/ssh/libssh/Makefile.com index ad8e0c8676..990c704732 100644 --- a/usr/src/cmd/ssh/libssh/Makefile.com +++ b/usr/src/cmd/ssh/libssh/Makefile.com @@ -21,8 +21,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)Makefile.com 1.19 08/08/12 SMI" -# LIBRARY = libssh.a VERS = .1 @@ -94,8 +92,8 @@ LIBS = $(LIBRARY) $(LINTLIB) # definitions for lint # Until libz is compiled against unsigned uid/gid ON bits. -#LINTFLAGS += $(OPENSSL_LDFLAGS) -lcrypto -lz -lsocket -lnsl -lc -LINTFLAGS += $(OPENSSL_LDFLAGS) -lcrypto -lsocket -lnsl -lc +#LINTFLAGS += -lcrypto -lz -lsocket -lnsl -lc +LINTFLAGS += -lcrypto -lsocket -lnsl -lc $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) POFILE_DIR = ../.. diff --git a/usr/src/cmd/ssh/sftp-server/Makefile b/usr/src/cmd/ssh/sftp-server/Makefile index 4743387ab4..3becbe23a2 100644 --- a/usr/src/cmd/ssh/sftp-server/Makefile +++ b/usr/src/cmd/ssh/sftp-server/Makefile @@ -18,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/sftp-server/Makefile PROG = sftp-server @@ -33,9 +31,7 @@ SRCS = $(OBJS:.o=.c) include ../../Makefile.cmd include ../Makefile.ssh-common -LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket $(OPENSSL_LDFLAGS) -lcrypto - -DYNFLAGS += $(OPENSSL_DYNFLAGS) +LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lcrypto POFILE_DIR = .. diff --git a/usr/src/cmd/ssh/sftp/Makefile b/usr/src/cmd/ssh/sftp/Makefile index f99b2b7c03..47ffc3a963 100644 --- a/usr/src/cmd/ssh/sftp/Makefile +++ b/usr/src/cmd/ssh/sftp/Makefile @@ -18,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/sftp/Makefile PROG = sftp @@ -37,9 +35,7 @@ SRCS = $(OBJS:.o=.c) include ../../Makefile.cmd include ../Makefile.ssh-common -LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket $(OPENSSL_LDFLAGS) -lcrypto - -DYNFLAGS += $(OPENSSL_DYNFLAGS) +LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lcrypto POFILE_DIR = .. diff --git a/usr/src/cmd/ssh/ssh-add/Makefile b/usr/src/cmd/ssh/ssh-add/Makefile index 67e1c132bb..1fb132f741 100644 --- a/usr/src/cmd/ssh/ssh-add/Makefile +++ b/usr/src/cmd/ssh/ssh-add/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/ssh-add/Makefile PROG= ssh-add @@ -35,10 +32,7 @@ SRCS = $(OBJS:.o=.c) include ../../Makefile.cmd include ../Makefile.ssh-common -LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket \ - $(OPENSSL_LDFLAGS) -lcrypto - -DYNFLAGS += $(OPENSSL_DYNFLAGS) +LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lcrypto POFILE_DIR= .. diff --git a/usr/src/cmd/ssh/ssh-agent/Makefile b/usr/src/cmd/ssh/ssh-agent/Makefile index 842dbfacda..3d4a366c17 100644 --- a/usr/src/cmd/ssh/ssh-agent/Makefile +++ b/usr/src/cmd/ssh/ssh-agent/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/ssh-agent/Makefile PROG= ssh-agent @@ -35,9 +32,7 @@ SRCS = $(OBJS:.o=.c) include ../../Makefile.cmd include ../Makefile.ssh-common -LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket $(OPENSSL_LDFLAGS) -lcrypto - -DYNFLAGS += $(OPENSSL_DYNFLAGS) +LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lcrypto POFILE_DIR= .. diff --git a/usr/src/cmd/ssh/ssh-keygen/Makefile b/usr/src/cmd/ssh/ssh-keygen/Makefile index 339fa7019d..f92c437045 100644 --- a/usr/src/cmd/ssh/ssh-keygen/Makefile +++ b/usr/src/cmd/ssh/ssh-keygen/Makefile @@ -18,11 +18,9 @@ # # 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. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/ssh-keygen/Makefile PROG= ssh-keygen @@ -34,9 +32,7 @@ SRCS = $(OBJS:.o=.c) include ../../Makefile.cmd include ../Makefile.ssh-common -LDLIBS += $(SSH_COMMON_LDLIBS) $(OPENSSL_LDFLAGS) -lcrypto -lsocket - -DYNFLAGS += $(OPENSSL_DYNFLAGS) +LDLIBS += $(SSH_COMMON_LDLIBS) -lcrypto -lsocket POFILE_DIR= .. diff --git a/usr/src/cmd/ssh/ssh-keyscan/Makefile b/usr/src/cmd/ssh/ssh-keyscan/Makefile index 0c0e964709..9e2fd17160 100644 --- a/usr/src/cmd/ssh/ssh-keyscan/Makefile +++ b/usr/src/cmd/ssh/ssh-keyscan/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/ssh-keyscan/Makefile PROG= ssh-keyscan @@ -35,9 +32,7 @@ SRCS = $(OBJS:.o=.c) include ../../Makefile.cmd include ../Makefile.ssh-common -LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lnsl -lz $(OPENSSL_LDFLAGS) -lcrypto - -DYNFLAGS += $(OPENSSL_DYNFLAGS) +LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lnsl -lz -lcrypto POFILE_DIR= .. @@ -60,5 +55,3 @@ include ../Makefile.msg.targ include ../../Makefile.targ install: all $(ROOTPROG) - -#pragma ident "%Z%%M% %I% %E% SMI" diff --git a/usr/src/cmd/ssh/ssh-keysign/Makefile b/usr/src/cmd/ssh/ssh-keysign/Makefile index 3511d0250d..e31ae681a1 100644 --- a/usr/src/cmd/ssh/ssh-keysign/Makefile +++ b/usr/src/cmd/ssh/ssh-keysign/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/ssh-keysign/Makefile PROG= ssh-keysign @@ -39,9 +36,7 @@ include ../Makefile.ssh-common FILEMODE= 04555 -LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lnsl -lz $(OPENSSL_LDFLAGS) -lcrypto - -DYNFLAGS += $(OPENSSL_DYNFLAGS) +LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket -lnsl -lz -lcrypto POFILE_DIR= .. @@ -71,5 +66,3 @@ $(ROOTLIBSSHPROG)/%: % $(DIRS): $(INS.dir) - -#pragma ident "%Z%%M% %I% %E% SMI" diff --git a/usr/src/cmd/ssh/ssh/Makefile b/usr/src/cmd/ssh/ssh/Makefile index feffadfbfe..7bdd4f6be5 100644 --- a/usr/src/cmd/ssh/ssh/Makefile +++ b/usr/src/cmd/ssh/ssh/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/ssh/Makefile PROG= ssh @@ -43,11 +40,9 @@ include ../Makefile.ssh-common LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket \ -lnsl \ -lz \ - $(OPENSSL_LDFLAGS) -lcrypto \ + -lcrypto \ -lgss -DYNFLAGS += $(OPENSSL_DYNFLAGS) - POFILE_DIR= .. .KEEP_STATE: diff --git a/usr/src/cmd/ssh/sshd/Makefile b/usr/src/cmd/ssh/sshd/Makefile index 9c249347bc..263b0ed83f 100644 --- a/usr/src/cmd/ssh/sshd/Makefile +++ b/usr/src/cmd/ssh/sshd/Makefile @@ -18,12 +18,9 @@ # # CDDL HEADER END # -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # cmd/ssh/sshd/Makefile PROG= sshd @@ -76,14 +73,12 @@ LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket \ -lpam \ -lbsm \ -lwrap \ - $(OPENSSL_LDFLAGS) -lcrypto \ + -lcrypto \ -lgss \ -lcontract MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB) LDFLAGS += $(MAPFILES:%=-M%) -DYNFLAGS += $(OPENSSL_DYNFLAGS) $(C99_DISABLE) - POFILE_DIR= .. .KEEP_STATE: |