diff options
Diffstat (limited to 'main/openssl')
| -rw-r--r-- | main/openssl/0001-fix-manpages.patch | 626 | ||||
| -rw-r--r-- | main/openssl/APKBUILD | 16 |
2 files changed, 2 insertions, 640 deletions
diff --git a/main/openssl/0001-fix-manpages.patch b/main/openssl/0001-fix-manpages.patch deleted file mode 100644 index 61d5168d75..0000000000 --- a/main/openssl/0001-fix-manpages.patch +++ /dev/null @@ -1,626 +0,0 @@ -From c8eab9b8b6f10c7dcb80363f6bd2135a67abcf92 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Thu, 5 Feb 2015 08:39:04 +0200 -Subject: [PATCH] fix manpages - ---- - crypto/rand/md_rand.c | 4 ++-- - doc/apps/openssl.pod | 4 ++-- - doc/crypto/BN_generate_prime.pod | 2 +- - doc/crypto/BN_rand.pod | 2 +- - doc/crypto/DH_generate_key.pod | 2 +- - doc/crypto/DH_generate_parameters.pod | 2 +- - doc/crypto/DSA_do_sign.pod | 2 +- - doc/crypto/DSA_generate_key.pod | 2 +- - doc/crypto/DSA_sign.pod | 2 +- - doc/crypto/ERR_GET_LIB.pod | 2 +- - doc/crypto/ERR_clear_error.pod | 2 +- - doc/crypto/ERR_error_string.pod | 2 +- - doc/crypto/ERR_get_error.pod | 2 +- - doc/crypto/ERR_load_crypto_strings.pod | 2 +- - doc/crypto/ERR_load_strings.pod | 2 +- - doc/crypto/ERR_print_errors.pod | 2 +- - doc/crypto/ERR_put_error.pod | 2 +- - doc/crypto/ERR_remove_state.pod | 2 +- - doc/crypto/EVP_BytesToKey.pod | 2 +- - doc/crypto/EVP_OpenInit.pod | 2 +- - doc/crypto/EVP_SealInit.pod | 2 +- - doc/crypto/EVP_SignInit.pod | 2 +- - doc/crypto/EVP_VerifyInit.pod | 2 +- - doc/crypto/RAND_add.pod | 2 +- - doc/crypto/RAND_bytes.pod | 2 +- - doc/crypto/RAND_cleanup.pod | 2 +- - doc/crypto/RAND_egd.pod | 2 +- - doc/crypto/RAND_load_file.pod | 2 +- - doc/crypto/RAND_set_rand_method.pod | 2 +- - doc/crypto/RSA_blinding_on.pod | 2 +- - doc/crypto/RSA_generate_key.pod | 2 +- - doc/crypto/RSA_public_encrypt.pod | 2 +- - doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod | 2 +- - doc/crypto/bn.pod | 2 +- - doc/crypto/crypto.pod | 2 +- - doc/crypto/des.pod | 4 ++-- - doc/crypto/dh.pod | 4 ++-- - doc/crypto/dsa.pod | 2 +- - doc/crypto/engine.pod | 2 +- - doc/crypto/rsa.pod | 2 +- - doc/ssl/SSL_get_error.pod | 2 +- - doc/ssl/SSL_want.pod | 2 +- - 44 files changed, 48 insertions(+), 48 deletions(-) - - -diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c -index 5c13d57..fc697bb 100644 ---- a/crypto/rand/md_rand.c -+++ b/crypto/rand/md_rand.c -@@ -202,7 +202,7 @@ static void ssleay_rand_add(const void *buf, int num, double add) - return; - - /* -- * (Based on the rand(3) manpage) -+ * (Based on the openssl_rand(3) manpage) - * - * The input is chopped up into units of 20 bytes (or less for - * the last block). Each of these blocks is run through the hash -@@ -366,7 +366,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock) - (1 + (num - 1) / (MD_DIGEST_LENGTH / 2)) * (MD_DIGEST_LENGTH / 2); - - /* -- * (Based on the rand(3) manpage:) -+ * (Based on the openssl_rand(3) manpage:) - * - * For each group of 10 bytes (or less), we do the following: - * -diff --git a/doc/apps/openssl.pod b/doc/apps/openssl.pod -index 64a160c..aca45d4 100644 ---- a/doc/apps/openssl.pod -+++ b/doc/apps/openssl.pod -@@ -163,7 +163,7 @@ Create or examine a netscape certificate sequence - - Online Certificate Status Protocol utility. - --=item L<B<passwd>|passwd(1)> -+=item L<B<passwd>|openssl-passwd(1)> - - Generation of hashed passwords. - -@@ -401,7 +401,7 @@ L<crl(1)|crl(1)>, L<crl2pkcs7(1)|crl2pkcs7(1)>, L<dgst(1)|dgst(1)>, - L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>, - L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>, - L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>, --L<passwd(1)|passwd(1)>, -+L<openssl-passwd(1)|openssl-passwd(1)>, - L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>, - L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>, - L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>, -diff --git a/doc/crypto/BN_generate_prime.pod b/doc/crypto/BN_generate_prime.pod -index bf1b530..f887116 100644 ---- a/doc/crypto/BN_generate_prime.pod -+++ b/doc/crypto/BN_generate_prime.pod -@@ -138,7 +138,7 @@ The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. - - =head1 SEE ALSO - --L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)> -+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/BN_rand.pod b/doc/crypto/BN_rand.pod -index d6b975c..5928c21 100644 ---- a/doc/crypto/BN_rand.pod -+++ b/doc/crypto/BN_rand.pod -@@ -45,7 +45,7 @@ The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. - - =head1 SEE ALSO - --L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)> - - =head1 HISTORY -diff --git a/doc/crypto/DH_generate_key.pod b/doc/crypto/DH_generate_key.pod -index 81f09fd..0d9f1e5 100644 ---- a/doc/crypto/DH_generate_key.pod -+++ b/doc/crypto/DH_generate_key.pod -@@ -40,7 +40,7 @@ The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. - - =head1 SEE ALSO - --L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<DH_size(3)|DH_size(3)> -+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<DH_size(3)|DH_size(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/DH_generate_parameters.pod b/doc/crypto/DH_generate_parameters.pod -index 7f81a04..a49c6e2 100644 ---- a/doc/crypto/DH_generate_parameters.pod -+++ b/doc/crypto/DH_generate_parameters.pod -@@ -68,7 +68,7 @@ a usable generator. - - =head1 SEE ALSO - --L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DH_free(3)|DH_free(3)> - - =head1 HISTORY -diff --git a/doc/crypto/DSA_do_sign.pod b/doc/crypto/DSA_do_sign.pod -index 5dfc733..0a6d5f1 100644 ---- a/doc/crypto/DSA_do_sign.pod -+++ b/doc/crypto/DSA_do_sign.pod -@@ -36,7 +36,7 @@ L<ERR_get_error(3)|ERR_get_error(3)>. - - =head1 SEE ALSO - --L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DSA_SIG_new(3)|DSA_SIG_new(3)>, - L<DSA_sign(3)|DSA_sign(3)> - -diff --git a/doc/crypto/DSA_generate_key.pod b/doc/crypto/DSA_generate_key.pod -index af83ccf..95080eb 100644 ---- a/doc/crypto/DSA_generate_key.pod -+++ b/doc/crypto/DSA_generate_key.pod -@@ -24,7 +24,7 @@ The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. - - =head1 SEE ALSO - --L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DSA_generate_parameters(3)|DSA_generate_parameters(3)> - - =head1 HISTORY -diff --git a/doc/crypto/DSA_sign.pod b/doc/crypto/DSA_sign.pod -index 97389e8..2e6f6f3 100644 ---- a/doc/crypto/DSA_sign.pod -+++ b/doc/crypto/DSA_sign.pod -@@ -55,7 +55,7 @@ Standard, DSS), ANSI X9.30 - - =head1 SEE ALSO - --L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DSA_do_sign(3)|DSA_do_sign(3)> - - =head1 HISTORY -diff --git a/doc/crypto/ERR_GET_LIB.pod b/doc/crypto/ERR_GET_LIB.pod -index 2a129da..a881bdb 100644 ---- a/doc/crypto/ERR_GET_LIB.pod -+++ b/doc/crypto/ERR_GET_LIB.pod -@@ -41,7 +41,7 @@ The library number, function code and reason code respectively. - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/ERR_clear_error.pod b/doc/crypto/ERR_clear_error.pod -index 566e1f4..0f503e7 100644 ---- a/doc/crypto/ERR_clear_error.pod -+++ b/doc/crypto/ERR_clear_error.pod -@@ -20,7 +20,7 @@ ERR_clear_error() has no return value. - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/ERR_error_string.pod b/doc/crypto/ERR_error_string.pod -index cdfa7fe..d774ec1 100644 ---- a/doc/crypto/ERR_error_string.pod -+++ b/doc/crypto/ERR_error_string.pod -@@ -60,7 +60,7 @@ none is registered for the error code. - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, -+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, - L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, - L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> - L<ERR_print_errors(3)|ERR_print_errors(3)> -diff --git a/doc/crypto/ERR_get_error.pod b/doc/crypto/ERR_get_error.pod -index 01e196c..dd86c48 100644 ---- a/doc/crypto/ERR_get_error.pod -+++ b/doc/crypto/ERR_get_error.pod -@@ -64,7 +64,7 @@ The error code, or 0 if there is no error in the queue. - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, -+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, - L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> - - =head1 HISTORY -diff --git a/doc/crypto/ERR_load_crypto_strings.pod b/doc/crypto/ERR_load_crypto_strings.pod -index 9bdec75..9c1b991 100644 ---- a/doc/crypto/ERR_load_crypto_strings.pod -+++ b/doc/crypto/ERR_load_crypto_strings.pod -@@ -35,7 +35,7 @@ ERR_free_strings() return no values. - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/ERR_load_strings.pod b/doc/crypto/ERR_load_strings.pod -index 5acdd0e..261c87d 100644 ---- a/doc/crypto/ERR_load_strings.pod -+++ b/doc/crypto/ERR_load_strings.pod -@@ -43,7 +43,7 @@ ERR_get_next_error_library() returns a new library number. - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/ERR_print_errors.pod b/doc/crypto/ERR_print_errors.pod -index b100a5f..a8b34b7 100644 ---- a/doc/crypto/ERR_print_errors.pod -+++ b/doc/crypto/ERR_print_errors.pod -@@ -38,7 +38,7 @@ ERR_print_errors() and ERR_print_errors_fp() return no values. - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, -+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, - L<ERR_get_error(3)|ERR_get_error(3)>, - L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, - L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> -diff --git a/doc/crypto/ERR_put_error.pod b/doc/crypto/ERR_put_error.pod -index acd241f..9c0263a 100644 ---- a/doc/crypto/ERR_put_error.pod -+++ b/doc/crypto/ERR_put_error.pod -@@ -34,7 +34,7 @@ no values. - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/ERR_remove_state.pod b/doc/crypto/ERR_remove_state.pod -index a4d38c1..8bcb514 100644 ---- a/doc/crypto/ERR_remove_state.pod -+++ b/doc/crypto/ERR_remove_state.pod -@@ -34,7 +34,7 @@ ERR_remove_thread_state and ERR_remove_state() return no value. - - =head1 SEE ALSO - --L<err(3)|err(3)> -+L<openssl_err(3)|openssl_err(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/EVP_BytesToKey.pod b/doc/crypto/EVP_BytesToKey.pod -index 5d60595..d09f22d 100644 ---- a/doc/crypto/EVP_BytesToKey.pod -+++ b/doc/crypto/EVP_BytesToKey.pod -@@ -62,7 +62,7 @@ or 0 on error. - - =head1 SEE ALSO - --L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, -+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> - - =head1 HISTORY -diff --git a/doc/crypto/EVP_OpenInit.pod b/doc/crypto/EVP_OpenInit.pod -index 2e710da..31172e4 100644 ---- a/doc/crypto/EVP_OpenInit.pod -+++ b/doc/crypto/EVP_OpenInit.pod -@@ -54,7 +54,7 @@ EVP_OpenFinal() returns 0 if the decrypt failed or 1 for success. - - =head1 SEE ALSO - --L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, -+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, - L<EVP_SealInit(3)|EVP_SealInit(3)> - -diff --git a/doc/crypto/EVP_SealInit.pod b/doc/crypto/EVP_SealInit.pod -index 7d793e1..a37101f 100644 ---- a/doc/crypto/EVP_SealInit.pod -+++ b/doc/crypto/EVP_SealInit.pod -@@ -74,7 +74,7 @@ with B<type> set to NULL. - - =head1 SEE ALSO - --L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, -+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, - L<EVP_OpenInit(3)|EVP_OpenInit(3)> - -diff --git a/doc/crypto/EVP_SignInit.pod b/doc/crypto/EVP_SignInit.pod -index 14ecc77..45d8bda 100644 ---- a/doc/crypto/EVP_SignInit.pod -+++ b/doc/crypto/EVP_SignInit.pod -@@ -91,7 +91,7 @@ The previous two bugs are fixed in the newer EVP_SignDigest*() function. - =head1 SEE ALSO - - L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>, --L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, -+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>, - L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, - L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, - L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> -diff --git a/doc/crypto/EVP_VerifyInit.pod b/doc/crypto/EVP_VerifyInit.pod -index 9097f09..2a8d225 100644 ---- a/doc/crypto/EVP_VerifyInit.pod -+++ b/doc/crypto/EVP_VerifyInit.pod -@@ -80,7 +80,7 @@ The previous two bugs are fixed in the newer EVP_VerifyDigest*() function. - - L<evp(3)|evp(3)>, - L<EVP_SignInit(3)|EVP_SignInit(3)>, --L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, -+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>, - L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, - L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, - L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> -diff --git a/doc/crypto/RAND_add.pod b/doc/crypto/RAND_add.pod -index 67c66f3..a6fc28a 100644 ---- a/doc/crypto/RAND_add.pod -+++ b/doc/crypto/RAND_add.pod -@@ -65,7 +65,7 @@ The other functions do not return values. - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>, - L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> - - =head1 HISTORY -diff --git a/doc/crypto/RAND_bytes.pod b/doc/crypto/RAND_bytes.pod -index 1a9b91e..20c4110 100644 ---- a/doc/crypto/RAND_bytes.pod -+++ b/doc/crypto/RAND_bytes.pod -@@ -38,7 +38,7 @@ method. - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, - L<RAND_add(3)|RAND_add(3)> - - =head1 HISTORY -diff --git a/doc/crypto/RAND_cleanup.pod b/doc/crypto/RAND_cleanup.pod -index 3a8f074..c99537d 100644 ---- a/doc/crypto/RAND_cleanup.pod -+++ b/doc/crypto/RAND_cleanup.pod -@@ -20,7 +20,7 @@ RAND_cleanup() returns no value. - - =head1 SEE ALSO - --L<rand(3)|rand(3)> -+L<openssl_rand(3)|openssl_rand(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/RAND_egd.pod b/doc/crypto/RAND_egd.pod -index 80fa734..93b3b7a 100644 ---- a/doc/crypto/RAND_egd.pod -+++ b/doc/crypto/RAND_egd.pod -@@ -72,7 +72,7 @@ success, and -1 if the connection failed. The PRNG state is not considered. - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, - L<RAND_cleanup(3)|RAND_cleanup(3)> - - =head1 HISTORY -diff --git a/doc/crypto/RAND_load_file.pod b/doc/crypto/RAND_load_file.pod -index d8c134e..a079013 100644 ---- a/doc/crypto/RAND_load_file.pod -+++ b/doc/crypto/RAND_load_file.pod -@@ -43,7 +43,7 @@ error. - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> -+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/RAND_set_rand_method.pod b/doc/crypto/RAND_set_rand_method.pod -index e5b780f..7f3ad1b 100644 ---- a/doc/crypto/RAND_set_rand_method.pod -+++ b/doc/crypto/RAND_set_rand_method.pod -@@ -67,7 +67,7 @@ algorithms. - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<engine(3)|engine(3)> -+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/RSA_blinding_on.pod b/doc/crypto/RSA_blinding_on.pod -index fd2c69a..7b98614 100644 ---- a/doc/crypto/RSA_blinding_on.pod -+++ b/doc/crypto/RSA_blinding_on.pod -@@ -34,7 +34,7 @@ RSA_blinding_off() returns no value. - - =head1 SEE ALSO - --L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)> -+L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/RSA_generate_key.pod b/doc/crypto/RSA_generate_key.pod -index 881391a..01b7cd7 100644 ---- a/doc/crypto/RSA_generate_key.pod -+++ b/doc/crypto/RSA_generate_key.pod -@@ -70,7 +70,7 @@ RSA_generate_key() goes into an infinite loop for illegal input values. - - =head1 SEE ALSO - --L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, -+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, - L<RSA_free(3)|RSA_free(3)>, L<BN_generate_prime(3)|BN_generate_prime(3)> - - =head1 HISTORY -diff --git a/doc/crypto/RSA_public_encrypt.pod b/doc/crypto/RSA_public_encrypt.pod -index ab0fe3b..3b00daf 100644 ---- a/doc/crypto/RSA_public_encrypt.pod -+++ b/doc/crypto/RSA_public_encrypt.pod -@@ -73,7 +73,7 @@ SSL, PKCS #1 v2.0 - - =head1 SEE ALSO - --L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, -+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, - L<RSA_size(3)|RSA_size(3)> - - =head1 HISTORY -diff --git a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod b/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod -index e70380b..121f3df 100644 ---- a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod -+++ b/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod -@@ -48,7 +48,7 @@ These functions serve no recognizable purpose. - =head1 SEE ALSO - - L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>, --L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>, - L<RSA_verify(3)|RSA_verify(3)> - - =head1 HISTORY -diff --git a/doc/crypto/bn.pod b/doc/crypto/bn.pod -index cd2f8e5..a6f8c58 100644 ---- a/doc/crypto/bn.pod -+++ b/doc/crypto/bn.pod -@@ -167,7 +167,7 @@ of B<BIGNUM>s to external formats is described in L<BN_bn2bin(3)|BN_bn2bin(3)>. - =head1 SEE ALSO - - L<bn_internal(3)|bn_internal(3)>, --L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, -+L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, - L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>, - L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>, - L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>, -diff --git a/doc/crypto/crypto.pod b/doc/crypto/crypto.pod -index f18edfe..4b0c678 100644 ---- a/doc/crypto/crypto.pod -+++ b/doc/crypto/crypto.pod -@@ -46,7 +46,7 @@ L<sha(3)|sha(3)> - - =item AUXILIARY FUNCTIONS - --L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>, -+L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)> - - =item INPUT/OUTPUT, DATA ENCODING -diff --git a/doc/crypto/des.pod b/doc/crypto/des.pod -index e1add56..f7d8011 100644 ---- a/doc/crypto/des.pod -+++ b/doc/crypto/des.pod -@@ -115,7 +115,7 @@ each byte is the parity bit. The key schedule is an expanded form of - the key; it is used to speed the encryption process. - - DES_random_key() generates a random key. The PRNG must be seeded --prior to using this function (see L<rand(3)|rand(3)>). If the PRNG -+prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>). If the PRNG - could not generate a secure key, 0 is returned. - - Before a DES key can be used, it must be converted into the -@@ -316,7 +316,7 @@ the MIT Kerberos library. - - =head1 SEE ALSO - --crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)> -+crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)> - - =head1 HISTORY - -diff --git a/doc/crypto/dh.pod b/doc/crypto/dh.pod -index c3ccd06..28707bf 100644 ---- a/doc/crypto/dh.pod -+++ b/doc/crypto/dh.pod -@@ -67,8 +67,8 @@ modify keys. - - =head1 SEE ALSO - --L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>, --L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>, -+L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>, - L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>, - L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, - L<DH_generate_parameters(3)|DH_generate_parameters(3)>, -diff --git a/doc/crypto/dsa.pod b/doc/crypto/dsa.pod -index da07d2b..3187a73 100644 ---- a/doc/crypto/dsa.pod -+++ b/doc/crypto/dsa.pod -@@ -100,7 +100,7 @@ Standard, DSS), ANSI X9.30 - - =head1 SEE ALSO - --L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, -+L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>, - L<DSA_new(3)|DSA_new(3)>, - L<DSA_size(3)|DSA_size(3)>, -diff --git a/doc/crypto/engine.pod b/doc/crypto/engine.pod -index f5ab1c3..63f7ebc 100644 ---- a/doc/crypto/engine.pod -+++ b/doc/crypto/engine.pod -@@ -594,6 +594,6 @@ implementations. - - =head1 SEE ALSO - --L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)> -+L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)> - - =cut -diff --git a/doc/crypto/rsa.pod b/doc/crypto/rsa.pod -index 45ac53f..5fa0dcc 100644 ---- a/doc/crypto/rsa.pod -+++ b/doc/crypto/rsa.pod -@@ -108,7 +108,7 @@ RSA was covered by a US patent which expired in September 2000. - =head1 SEE ALSO - - L<rsa(1)|rsa(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, --L<rand(3)|rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>, - L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>, - L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>, - L<RSA_generate_key(3)|RSA_generate_key(3)>, -diff --git a/doc/ssl/SSL_get_error.pod b/doc/ssl/SSL_get_error.pod -index 48c6b15..5432293 100644 ---- a/doc/ssl/SSL_get_error.pod -+++ b/doc/ssl/SSL_get_error.pod -@@ -105,7 +105,7 @@ OpenSSL error queue contains more information on the error. - - =head1 SEE ALSO - --L<ssl(3)|ssl(3)>, L<err(3)|err(3)> -+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)> - - =head1 HISTORY - -diff --git a/doc/ssl/SSL_want.pod b/doc/ssl/SSL_want.pod -index c0059c0..2e51a75 100644 ---- a/doc/ssl/SSL_want.pod -+++ b/doc/ssl/SSL_want.pod -@@ -72,6 +72,6 @@ return 1, when the corresponding condition is true or 0 otherwise. - - =head1 SEE ALSO - --L<ssl(3)|ssl(3)>, L<err(3)|err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> -+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> - - =cut --- -2.2.2 diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 3bea81e391..2fb6ac03a1 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=openssl pkgver=1.0.2e -pkgrel=0 +pkgrel=1 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="http://openssl.org" depends= @@ -15,7 +15,6 @@ license="openssl" subpackages="$pkgname-dev $pkgname-doc libcrypto1.0:libcrypto libssl1.0:libssl" source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz - 0001-fix-manpages.patch 0002-busybox-basename.patch 0003-use-termios.patch 0004-fix-default-ca-path-for-apps.patch @@ -82,18 +81,10 @@ build() { package() { cd "$_builddir" - make INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man install || return 1 + make INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man MANSUFFIX=ssl install || return 1 # c_rehash compat link ln -sf openssl "$pkgdir"/usr/bin/c_rehash - - # rename man pages that conflict with man-pages - local m - for m in rand.3 err.3 threads.3 passwd.1; do - mv "$pkgdir"/usr/share/man/man${m/*.}/$m \ - "$pkgdir"/usr/share/man/man${m/*.}/openssl-$m \ - || return 1 - done } libcrypto() { @@ -118,7 +109,6 @@ libssl() { } md5sums="5262bfa25b60ed9de9f28d5d52d77fc5 openssl-1.0.2e.tar.gz -ca4b7eea03af14012ca2d4e7c092db23 0001-fix-manpages.patch 67bdfe450143a41042d2c318003e963a 0002-busybox-basename.patch 84c03f201f55ca7fbfde364cfdfc9cf4 0003-use-termios.patch 9bb9dffdd871eeccc945494771302cc3 0004-fix-default-ca-path-for-apps.patch @@ -133,7 +123,6 @@ aa16c89b283faf0fe546e3f897279c44 1002-backport-changes-from-upstream-padlock-mo 57cca845e22c178c3b317010be56edf0 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch 2ac874d1249f5f68d8c7cd58d157d29a 1004-crypto-engine-autoload-padlock-dynamic-engine.patch" sha256sums="e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff openssl-1.0.2e.tar.gz -d9c8d3b53a237e88bb333739e9a09d25e9fe647c4bc36acff74c7d49ce56484b 0001-fix-manpages.patch b449fb998b5f60a3a1779ac2f432b2c7f08ae52fc6dfa98bca37d735f863d400 0002-busybox-basename.patch c3e6a9710726dac72e3eeffd78961d3bae67a480f6bde7890e066547da25cdfd 0003-use-termios.patch 1f022ccab9b2e5850f32d2ac75cb617c8ce7b803a4548ce71e82776fe5b15b67 0004-fix-default-ca-path-for-apps.patch @@ -148,7 +137,6 @@ aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260 1002-backport- c10b8aaf56a4f4f79ca195fc587e0bb533f643e777d7a3e6fb0350399a6060ea 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch 2f7c850af078a3ae71b2dd38d5d0b3964ea4262e52673e36ff33498cc6223e6c 1004-crypto-engine-autoload-padlock-dynamic-engine.patch" sha512sums="b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f openssl-1.0.2e.tar.gz -80589e386fe57470818757a182f444a79050e1f19683650268d551d8aa436902b3bf565bb7a2aa8464013e50229c8bed5bb89fbd8387469cdfdcd3941eb3e5db 0001-fix-manpages.patch 2244f46cb18e6b98f075051dd2446c47f7590abccd108fbab707f168a20cad8d32220d704635973f09e3b2879f523be5160f1ffbc12ab3900f8a8891dc855c5c 0002-busybox-basename.patch 58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4 0003-use-termios.patch c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723ef1ceed092d36e3c15a9777daa844f59b9fa2b0a4f04fd9ae 0004-fix-default-ca-path-for-apps.patch |