From 5acefa2f5a714fbb63d60e9841baac00d21519e1 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 11 Jul 2014 00:15:13 -0500 Subject: [PATCH] add manpages and links --- configure.ac | 1 + man/links | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++ update.sh | 26 +++++-- 3 files changed, 220 insertions(+), 7 deletions(-) create mode 100644 man/links diff --git a/configure.ac b/configure.ac index fa7ef6b..549f303 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ AC_PROG_CC AC_PROG_LIBTOOL AC_PROG_CC_STDC AM_PROG_CC_C_O +AC_PROG_LN_S AC_CHECK_FUNC(strlcpy,[AC_SEARCH_LIBS(strlcpy,, [NO_STRLCPY=], [NO_STRLCPY=yes])], [NO_STRLCPY=yes]) diff --git a/man/links b/man/links new file mode 100644 index 0000000..b739726 --- /dev/null +++ b/man/links @@ -0,0 +1,200 @@ +MANLINKS="BIO_f_ssl.3,BIO_do_handshake.3 + BIO_f_ssl.3,BIO_get_num_renegotiates.3 + BIO_f_ssl.3,BIO_get_ssl.3 + BIO_f_ssl.3,BIO_new_buffer_ssl_connect.3 + BIO_f_ssl.3,BIO_new_ssl.3 + BIO_f_ssl.3,BIO_new_ssl_connect.3 + BIO_f_ssl.3,BIO_set_ssl.3 + BIO_f_ssl.3,BIO_set_ssl_mode.3 + BIO_f_ssl.3,BIO_set_ssl_renegotiate_bytes.3 + BIO_f_ssl.3,BIO_set_ssl_renegotiate_timeout.3 + BIO_f_ssl.3,BIO_ssl_copy_session_id.3 + BIO_f_ssl.3,BIO_ssl_shutdown.3 + ERR_load_crypto_strings.3,SSL_load_error_strings.3 + SSL_CIPHER_get_name.3,SSL_CIPHER_description.3 + SSL_CIPHER_get_name.3,SSL_CIPHER_get_bits.3 + SSL_CIPHER_get_name.3,SSL_CIPHER_get_version.3 + SSL_CTX_add_session.3,SSL_CTX_remove_session.3 + SSL_CTX_add_session.3,SSL_add_session.3 + SSL_CTX_add_session.3,SSL_remove_session.3 + SSL_CTX_ctrl.3,SSL_CTX_callback_ctrl.3 + SSL_CTX_ctrl.3,SSL_callback_ctrl.3 + SSL_CTX_ctrl.3,SSL_ctrl.3 + SSL_CTX_flush_sessions.3,SSL_flush_sessions.3 + SSL_CTX_get_ex_new_index.3,SSL_CTX_get_ex_data.3 + SSL_CTX_get_ex_new_index.3,SSL_CTX_set_ex_data.3 + SSL_CTX_get_verify_mode.3,SSL_CTX_get_verify_callback.3 + SSL_CTX_get_verify_mode.3,SSL_CTX_get_verify_depth.3 + SSL_CTX_get_verify_mode.3,SSL_get_verify_callback.3 + SSL_CTX_get_verify_mode.3,SSL_get_verify_depth.3 + SSL_CTX_get_verify_mode.3,SSL_get_verify_mode.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_accept.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_accept_good.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_accept_renegotiate.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_cache_full.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_cb_hits.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_connect.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_connect_good.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_connect_renegotiate.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_hits.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_misses.3 + SSL_CTX_sess_number.3,SSL_CTX_sess_timeouts.3 + SSL_CTX_sess_set_cache_size.3,SSL_CTX_sess_get_cache_size.3 + SSL_CTX_sess_set_get_cb.3,SSL_CTX_sess_get_get_cb.3 + SSL_CTX_sess_set_get_cb.3,SSL_CTX_sess_get_new_cb.3 + SSL_CTX_sess_set_get_cb.3,SSL_CTX_sess_get_remove_cb.3 + SSL_CTX_sess_set_get_cb.3,SSL_CTX_sess_set_new_cb.3 + SSL_CTX_sess_set_get_cb.3,SSL_CTX_sess_set_remove.3 + SSL_CTX_set_cert_store.3,SSL_CTX_get_cert_store.3 + SSL_CTX_set_cipher_list.3,SSL_set_cipher_list.3 + SSL_CTX_set_client_CA_list.3,SSL_CTX_add_client_CA.3 + SSL_CTX_set_client_CA_list.3,SSL_add_client_CA.3 + SSL_CTX_set_client_CA_list.3,SSL_set_client_CA_list.3 + SSL_CTX_set_default_passwd_cb.3,\ + SSL_CTX_set_default_passwd_cb_userdata.3,\ + SSL_CTX_set_max_cert_list.3,SSL_CTX_get_max_cert_list.3 + SSL_CTX_set_max_cert_list.3,SSL_get_max_cert_list.3 + SSL_CTX_set_max_cert_list.3,SSL_set_max_cert_list.3 + SSL_CTX_set_mode.3,SSL_CTX_get_mode.3 + SSL_CTX_set_mode.3,SSL_get_mode.3 + SSL_CTX_set_mode.3,SSL_set_mode.3 + SSL_CTX_set_msg_callback.3,SSL_CTX_set_msg_callback_arg.3 + SSL_CTX_set_msg_callback.3,SSL_set_msg_callback.3 + SSL_CTX_set_msg_callback.3,SSL_set_msg_callback_arg.3 + SSL_CTX_set_options.3,SSL_CTX_get_options.3 + SSL_CTX_set_options.3,SSL_get_options.3 + SSL_CTX_set_options.3,SSL_set_options.3 + SSL_CTX_set_psk_client_callback.3,SSL_set_psk_client_callback.3 + SSL_CTX_set_quiet_shutdown.3,SSL_CTX_get_quiet_shutdown.3 + SSL_CTX_set_quiet_shutdown.3,SSL_get_quiet_shutdown.3 + SSL_CTX_set_quiet_shutdown.3,SSL_set_quiet_shutdown.3 + SSL_CTX_set_session_cache_mode.3,SSL_CTX_get_session_cache_mode.3 + SSL_CTX_set_session_id_context.3,SSL_set_session_id_context.3 + SSL_CTX_set_ssl_version.3,SSL_get_ssl_method.3 + SSL_CTX_set_ssl_version.3,SSL_set_ssl_method.3 + SSL_CTX_set_timeout.3,SSL_CTX_get_timeout.3 + SSL_CTX_set_tmp_dh_callback.3,SSL_CTX_set_tmp_dh.3 + SSL_CTX_set_tmp_dh_callback.3,SSL_set_tmp_dh.3 + SSL_CTX_set_tmp_dh_callback.3,SSL_set_tmp_dh_callback.3 + SSL_CTX_set_tmp_rsa_callback.3,SSL_CTX_need_tmp_rsa.3 + SSL_CTX_set_tmp_rsa_callback.3,SSL_CTX_set_tmp_rsa.3 + SSL_CTX_set_tmp_rsa_callback.3,SSL_need_tmp_rsa.3 + SSL_CTX_set_tmp_rsa_callback.3,SSL_set_tmp_rsa.3 + SSL_CTX_set_tmp_rsa_callback.3,SSL_set_tmp_rsa_callback.3 + SSL_CTX_set_verify.3,SSL_CTX_set_verify_depth.3 + SSL_CTX_set_verify.3,SSL_set_verify.3 + SSL_CTX_set_verify.3,SSL_set_verify_depth.3 + SSL_CTX_use_certificate.3,SSL_CTX_check_private_key.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_PrivateKey.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_PrivateKey_ASN1.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_PrivateKey_file.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_RSAPrivateKey.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_RSAPrivateKey_ASN1.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_RSAPrivateKey_file.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_certificate_ASN1.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_certificate_chain_file.3 + SSL_CTX_use_certificate.3,SSL_CTX_use_certificate_file.3 + SSL_CTX_use_certificate.3,SSL_check_private_key.3 + SSL_CTX_use_certificate.3,SSL_use_PrivateKey.3 + SSL_CTX_use_certificate.3,SSL_use_PrivateKey_ASN1.3 + SSL_CTX_use_certificate.3,SSL_use_PrivateKey_file.3 + ASN1_OBJECT_new.3,ASN1_OBJECT_free.3 + ASN1_STRING_length.3,ASN1_STRING_cmp.3 + ASN1_STRING_length.3,ASN1_STRING_data.3 + ASN1_STRING_length.3,ASN1_STRING_dup.3 + ASN1_STRING_length.3,ASN1_STRING_set.3 + ASN1_STRING_length.3,ASN1_STRING_to_UTF8.3 + ASN1_STRING_length.3,ASN1_STRING_type.3 + ASN1_STRING_new.3,ASN1_STRING_free.3 + ASN1_STRING_new.3,ASN1_STRING_type_new.3 + ASN1_STRING_print_ex.3,ASN1_STRING_print.3 + ASN1_STRING_print_ex.3,ASN1_STRING_print_ex_fp.3 + ASN1_generate_nconf.3,ASN1_generate_v3.3 + BF_set_key.3,BF_cbc_encrypt.3 + BF_set_key.3,BF_cfb64_encrypt.3 + BF_set_key.3,BF_decrypt.3 + BF_set_key.3,BF_ecb_encrypt.3 + BF_set_key.3,BF_encrypt.3 + BF_set_key.3,BF_ofb64_encrypt.3 + BF_set_key.3,BF_options.3 + BIO_ctrl.3,BIO_callback_ctrl.3 + BIO_ctrl.3,BIO_ctrl_pending.3 + BIO_ctrl.3,BIO_ctrl_wpending.3 + BIO_ctrl.3,BIO_eof.3 + BIO_ctrl.3,BIO_flush.3 + BIO_ctrl.3,BIO_get_close.3 + BIO_ctrl.3,BIO_get_info_callback.3 + BIO_ctrl.3,BIO_int_ctrl.3 + BIO_ctrl.3,BIO_pending.3 + BIO_ctrl.3,BIO_ptr_ctrl.3 + BIO_ctrl.3,BIO_reset.3 + BIO_ctrl.3,BIO_seek.3 + BIO_ctrl.3,BIO_set_close.3 + BIO_ctrl.3,BIO_set_info_callback.3 + BIO_ctrl.3,BIO_tell.3 + BIO_f_buffer.3,BIO_get_buffer_num_lines.3 + BIO_f_buffer.3,BIO_set_buffer_read_data.3 + BIO_f_buffer.3,BIO_set_buffer_size.3 + BIO_f_buffer.3,BIO_set_read_buffer_size.3 + BIO_f_buffer.3,BIO_set_write_buffer_size.3 + BIO_f_cipher.3,BIO_get_cipher_ctx.3 + BIO_f_cipher.3,BIO_get_cipher_status.3 + BIO_f_cipher.3,BIO_set_cipher.3 + BIO_f_md.3,BIO_get_md.3 + BIO_f_md.3,BIO_get_md_ctx.3 + BIO_f_md.3,BIO_set_md.3 + BIO_find_type.3,BIO_method_type.3 + BIO_find_type.3,BIO_next.3 + BIO_new.3,BIO_free.3 + BIO_new.3,BIO_free_all.3 + BIO_new.3,BIO_set.3 + BIO_new.3,BIO_vfree.3 + BIO_push.3,BIO_pop.3 + BIO_read.3,BIO_gets.3 + BIO_read.3,BIO_puts.3 + BIO_read.3,BIO_write.3 + BIO_s_accept.3,BIO_do_accept.3 + BIO_s_accept.3,BIO_get_accept_port.3 + BIO_s_accept.3,BIO_get_bind_mode.3 + BIO_s_accept.3,BIO_set_accept_bios.3 + BIO_s_accept.3,BIO_set_accept_port.3 + BIO_s_accept.3,BIO_set_bind_mode.3 + BIO_s_accept.3,BIO_set_nbio_accept.3 + BIO_s_bio.3,BIO_ctrl_get_read_request.3 + BIO_s_bio.3,BIO_ctrl_get_write_guarantee.3 + BIO_s_bio.3,BIO_ctrl_reset_read_request.3 + BIO_s_bio.3,BIO_destroy_bio_pair.3 + BIO_s_bio.3,BIO_get_read_request.3 + BIO_s_bio.3,BIO_get_write_buf_size.3 + BIO_s_bio.3,BIO_get_write_guarantee.3 + BIO_s_bio.3,BIO_make_bio_pair.3 + BIO_s_bio.3,BIO_new_bio_pair.3 + BIO_s_bio.3,BIO_set_write_buf_size.3 + BIO_s_bio.3,BIO_shutdown_wr.3 + BIO_s_connect.3,BIO_do_connect.3 + BIO_s_connect.3,BIO_get_conn_hostname.3 + BIO_s_connect.3,BIO_get_conn_int_port.3 + BIO_s_connect.3,BIO_get_conn_ip.3 + BIO_s_connect.3,BIO_get_conn_port.3 + BIO_s_connect.3,BIO_set_conn_hostname.3 + BIO_s_connect.3,BIO_set_conn_int_port.3 + BIO_s_connect.3,BIO_set_conn_ip.3 + BIO_s_connect.3,BIO_set_conn_port.3 + BIO_s_connect.3,BIO_set_nbio.3 + BIO_s_fd.3,BIO_get_fd.3 + BIO_s_fd.3,BIO_new_fd.3 + BIO_s_fd.3,BIO_set_fd.3 + BIO_s_file.3,BIO_append_filename.3 + BIO_s_file.3,BIO_get_fp.3 + BIO_s_file.3,BIO_new_file.3 + BIO_s_file.3,BIO_new_fp.3 + BIO_s_file.3,BIO_read_filename.3 + BIO_s_file.3,BIO_rw_filename.3 + BIO_s_file.3,BIO_set_fp.3 + BIO_s_file.3,BIO_write_filename.3 + BIO_s_mem.3,BIO_get_mem_data.3 + BIO_s_mem.3,BIO_get_mem_ptr.3 + BIO_s_mem.3,BIO_new_mem_buf.3 + BIO_s_mem.3,BIO_set_mem_buf.3 + BIO_s_mem.3,BIO_set_mem_eof_return.3 + BIO_s_socket.3,BIO_get_fd.3" diff --git a/update.sh b/update.sh index b7aef14..3826c97 100755 --- a/update.sh +++ b/update.sh @@ -19,6 +19,7 @@ libssl_regress=openbsd/src/regress/lib/libssl libc_src=openbsd/src/lib/libc libc_regress=openbsd/src/regress/lib/libc libcrypto_src=openbsd/src/lib/libcrypto +openssl_cmd_src=openbsd/src/usr.sbin/openssl libcrypto_regress=openbsd/src/regress/lib/libcrypto source $libssl_src/ssl/shlib_version @@ -384,11 +385,22 @@ crypto_excludes=( (cd man cp Makefile.am.tpl Makefile.am - for i in `ls -1 ../$libssl_src/src/doc/crypto/*.pod | sort`; do - BASE=`echo $i|sed -e "s/\.pod//"` - echo $BASE - NAME=`basename "$BASE"` - pod2man --official --release=LibreSSL --center=LibreSSL --section=3 --name=$NAME < $BASE.pod > $NAME.3 - echo "dist_man_MANS += $NAME.3" >> Makefile.am - done + for i in `ls -1 ../$libssl_src/src/doc/crypto/*.pod | sort`; do + BASE=`echo $i|sed -e "s/\.pod//"` + NAME=`basename "$BASE"` + echo processing $NAME + #pod2man --official --release=LibreSSL --center=LibreSSL --section=3 --name=$NAME < $BASE.pod > $NAME.3 + echo "dist_man_MANS += $NAME.3" >> Makefile.am + done + echo "dist_man_MANS += openssl.1" >> Makefile.am + echo "post-install-exec-hook:" >> Makefile.am + cp ../$openssl_cmd_src/openssl.1 . + echo " \$(LN_S) \$(DESTDIR)\$(mandir)/man1/$1 \$(DESTDIR)\$(mandir)/man1/$2" >> Makefile.am + source links + IFS="," + for i in $MANLINKS; do + set $i + echo " \$(LN_S) \$(DESTDIR)\$(mandir)/man3/$1 \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am + done + unset IFS )