aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrnrd <brnrd@FreeBSD.org>2015-07-09 03:27:47 +0800
committerbrnrd <brnrd@FreeBSD.org>2015-07-09 03:27:47 +0800
commitdeb4b56d3bd192eb2c42ad863f9b33bb243f4c67 (patch)
tree4aaad54c10497f5780465eadd01b1309f14bc90e
parente4ee59456cab0b24672646784c95145340a716f8 (diff)
downloadfreebsd-ports-gnome-deb4b56d3bd192eb2c42ad863f9b33bb243f4c67.tar.gz
freebsd-ports-gnome-deb4b56d3bd192eb2c42ad863f9b33bb243f4c67.tar.zst
freebsd-ports-gnome-deb4b56d3bd192eb2c42ad863f9b33bb243f4c67.zip
security/libressl: Update to 2.2.1
* Minor update from OpenBSD LibreSSL-portable * Bumps all SHLIB versions * Bumps OPENSSL_SHLIBVER in bsd.openssl.mk * Adds UPDATING entry for SHLIB version bump * MFH as 2.2.0 already closes several vulns Changes: ftp://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.2.1-relnotes.txt Differential revision: https://reviews.freebsd.org/D2963 Reviewed by: vsevolod (maintainer/mentor), koobs (mentor) Approved by: vsevolod (maintainer/mentor), koobs (mentor) MFH: 2015Q3
-rw-r--r--Mk/bsd.openssl.mk2
-rw-r--r--UPDATING15
-rw-r--r--security/libressl/Makefile2
-rw-r--r--security/libressl/distinfo4
-rw-r--r--security/libressl/files/patch-include_openssl_opensslv.h2
-rw-r--r--security/libressl/pkg-plist12
6 files changed, 26 insertions, 11 deletions
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk
index 8196c1d202ae..e4cec22c2cb1 100644
--- a/Mk/bsd.openssl.mk
+++ b/Mk/bsd.openssl.mk
@@ -107,7 +107,7 @@ OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E}
# try to guess SHLIBVER for libressl
.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
-OPENSSL_SHLIBVER?= 33
+OPENSSL_SHLIBVER?= 34
.endif
# default
diff --git a/UPDATING b/UPDATING
index a7343e3574ca..b11387e8b586 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20150708:
+ AFFECTS: users of security/libressl
+ AUTHOR: brnrd@FreeBSD.org
+
+ After upgrading to 2.2.1, manually update all packages that depend on
+ any of the libraries provided by LibreSSL (libssl, libcrypto and
+ libtls) since the versions of these libraries have changed. Normally,
+ you can obtain the list of dependent software by running the following
+ command:
+
+ pkg query -e '%n = libressl' %ro
+
+ Then you should rebuild all ports depending on libressl to avoid dangling
+ shared library dependencies.
+
20150707:
AFFECTS: users of net-mgmt/netmagis-*
AUTHOR: pgollucci@FreeBSD.org
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index 14499bdb6f12..69dbdaefa4a3 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libressl
-PORTVERSION= 2.2.0
+PORTVERSION= 2.2.1
CATEGORIES= security devel
MASTER_SITES= OPENBSD/LibreSSL
diff --git a/security/libressl/distinfo b/security/libressl/distinfo
index da5d9695d029..72f96dace247 100644
--- a/security/libressl/distinfo
+++ b/security/libressl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libressl-2.2.0.tar.gz) = 9690d8f38a5d48425395452eeb305b05bb0f560cd96e0ee30f370d4f16563040
-SIZE (libressl-2.2.0.tar.gz) = 2862547
+SHA256 (libressl-2.2.1.tar.gz) = 4f331750abfc3b605b02eeca1e8994fa0d2629985bc3f62924378197fbfe572d
+SIZE (libressl-2.2.1.tar.gz) = 2855917
diff --git a/security/libressl/files/patch-include_openssl_opensslv.h b/security/libressl/files/patch-include_openssl_opensslv.h
index a8a1a61df77b..08386624c151 100644
--- a/security/libressl/files/patch-include_openssl_opensslv.h
+++ b/security/libressl/files/patch-include_openssl_opensslv.h
@@ -6,6 +6,6 @@
#define LIBRESSL_VERSION_NUMBER 0x20000000L
-#define OPENSSL_VERSION_NUMBER 0x20000000L
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
- #define OPENSSL_VERSION_TEXT "LibreSSL 2.2.0"
+ #define OPENSSL_VERSION_TEXT "LibreSSL 2.2.1"
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/security/libressl/pkg-plist b/security/libressl/pkg-plist
index 69fec0918079..7b28950d718f 100644
--- a/security/libressl/pkg-plist
+++ b/security/libressl/pkg-plist
@@ -74,16 +74,16 @@ include/openssl/x509v3.h
include/tls.h
lib/libcrypto.a
lib/libcrypto.so
-lib/libcrypto.so.33
-lib/libcrypto.so.33.0.0
+lib/libcrypto.so.34
+lib/libcrypto.so.34.0.0
lib/libssl.a
lib/libssl.so
-lib/libssl.so.32
-lib/libssl.so.32.0.0
+lib/libssl.so.33
+lib/libssl.so.33.0.0
lib/libtls.a
lib/libtls.so
-lib/libtls.so.3
-lib/libtls.so.3.0.1
+lib/libtls.so.4
+lib/libtls.so.4.0.0
libdata/pkgconfig/libcrypto.pc
libdata/pkgconfig/libssl.pc
libdata/pkgconfig/libtls.pc