summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorFredrik Rinnestam <fredrik@crux.nu>2016-09-22 22:03:10 +0200
committerFredrik Rinnestam <fredrik@crux.nu>2016-09-22 22:03:10 +0200
commitbfb087bbff16382223a478180b4d724a98adb1d7 (patch)
tree753d2e122c6abc70611c76e8332ac2a32e80adca /openssl
parent3967d993b3b050d8817b4cf06a1f0ee79c8b27ed (diff)
parent5f0151ef41df86a94eb7ef5baab7d0c988515439 (diff)
downloadcore-bfb087bbff16382223a478180b4d724a98adb1d7.tar.gz
core-bfb087bbff16382223a478180b4d724a98adb1d7.tar.xz
Merge branch '3.2' into 3.3
Diffstat (limited to 'openssl')
-rw-r--r--openssl/.footprint4
-rw-r--r--openssl/.md5sum2
-rw-r--r--openssl/Pkgfile2
3 files changed, 6 insertions, 2 deletions
diff --git a/openssl/.footprint b/openssl/.footprint
index ed9cbcaa..e6d6a48f 100644
--- a/openssl/.footprint
+++ b/openssl/.footprint
@@ -1603,6 +1603,7 @@ lrwxrwxrwx root/root usr/share/man/man3/bn_wexpand.3ssl.gz -> bn_internal.3ssl.g
-rw-r--r-- root/root usr/share/man/man3/buffer.3ssl.gz
-rw-r--r-- root/root usr/share/man/man3/crypto.3ssl.gz
-rw-r--r-- root/root usr/share/man/man3/d2i_ASN1_OBJECT.3ssl.gz
+lrwxrwxrwx root/root usr/share/man/man3/d2i_AutoPrivateKey.3ssl.gz -> d2i_PrivateKey.3ssl.gz
-rw-r--r-- root/root usr/share/man/man3/d2i_CMS_ContentInfo.3ssl.gz
-rw-r--r-- root/root usr/share/man/man3/d2i_DHparams.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/d2i_DSAPrivateKey.3ssl.gz -> d2i_DSAPublicKey.3ssl.gz
@@ -1620,6 +1621,8 @@ lrwxrwxrwx root/root usr/share/man/man3/d2i_Netscape_RSA.3ssl.gz -> d2i_RSAPubli
-rw-r--r-- root/root usr/share/man/man3/d2i_PKCS8PrivateKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/d2i_PKCS8PrivateKey_bio.3ssl.gz -> d2i_PKCS8PrivateKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/d2i_PKCS8PrivateKey_fp.3ssl.gz -> d2i_PKCS8PrivateKey.3ssl.gz
+-rw-r--r-- root/root usr/share/man/man3/d2i_PrivateKey.3ssl.gz
+lrwxrwxrwx root/root usr/share/man/man3/d2i_Private_key.3ssl.gz -> d2i_PrivateKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/d2i_RSAPrivateKey.3ssl.gz -> d2i_RSAPublicKey.3ssl.gz
-rw-r--r-- root/root usr/share/man/man3/d2i_RSAPublicKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/d2i_RSA_PUBKEY.3ssl.gz -> d2i_RSAPublicKey.3ssl.gz
@@ -1669,6 +1672,7 @@ lrwxrwxrwx root/root usr/share/man/man3/i2d_PKCS8PrivateKey_bio.3ssl.gz -> d2i_P
lrwxrwxrwx root/root usr/share/man/man3/i2d_PKCS8PrivateKey_fp.3ssl.gz -> d2i_PKCS8PrivateKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/i2d_PKCS8PrivateKey_nid_bio.3ssl.gz -> d2i_PKCS8PrivateKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/i2d_PKCS8PrivateKey_nid_fp.3ssl.gz -> d2i_PKCS8PrivateKey.3ssl.gz
+lrwxrwxrwx root/root usr/share/man/man3/i2d_PrivateKey.3ssl.gz -> d2i_PrivateKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/i2d_RSAPrivateKey.3ssl.gz -> d2i_RSAPublicKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/i2d_RSAPublicKey.3ssl.gz -> d2i_RSAPublicKey.3ssl.gz
lrwxrwxrwx root/root usr/share/man/man3/i2d_RSA_PUBKEY.3ssl.gz -> d2i_RSAPublicKey.3ssl.gz
diff --git a/openssl/.md5sum b/openssl/.md5sum
index e3c94458..a5be911f 100644
--- a/openssl/.md5sum
+++ b/openssl/.md5sum
@@ -1,2 +1,2 @@
91f85842d2118003ee465c34259047e6 mksslcert.sh
-9392e65072ce4b614c1392eefc1f23d0 openssl-1.0.2h.tar.gz
+678374e63f8df456a697d3e5e5a931fb openssl-1.0.2i.tar.gz
diff --git a/openssl/Pkgfile b/openssl/Pkgfile
index 1f2414a0..625185d0 100644
--- a/openssl/Pkgfile
+++ b/openssl/Pkgfile
@@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=openssl
-version=1.0.2h
+version=1.0.2i
release=1
source=(http://www.openssl.org/source/$name-$version.tar.gz \
mksslcert.sh)

Generated by cgit