svn commit: r391592 - in head: . Mk security/libressl security/libressl/files

[Bernard Spil]

Author: brnrd
Date: Wed Jul  8 19:27:47 2015
New Revision: 391592
URL: https://svnweb.freebsd.org/changeset/ports/391592

Log:
  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

Modified:
  head/Mk/bsd.openssl.mk
  head/UPDATING
  head/security/libressl/Makefile
  head/security/libressl/distinfo
  head/security/libressl/files/patch-include_openssl_opensslv.h
  head/security/libressl/pkg-plist

Modified: head/Mk/bsd.openssl.mk
==============================================================================
--- head/Mk/bsd.openssl.mk	Wed Jul  8 19:05:44 2015	(r391591)
+++ head/Mk/bsd.openssl.mk	Wed Jul  8 19:27:47 2015	(r391592)
@@ -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

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Jul  8 19:05:44 2015	(r391591)
+++ head/UPDATING	Wed Jul  8 19:27:47 2015	(r391592)
@@ -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 at 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 at FreeBSD.org

Modified: head/security/libressl/Makefile
==============================================================================
--- head/security/libressl/Makefile	Wed Jul  8 19:05:44 2015	(r391591)
+++ head/security/libressl/Makefile	Wed Jul  8 19:27:47 2015	(r391592)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libressl
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	security devel
 MASTER_SITES=	OPENBSD/LibreSSL
 

Modified: head/security/libressl/distinfo
==============================================================================
--- head/security/libressl/distinfo	Wed Jul  8 19:05:44 2015	(r391591)
+++ head/security/libressl/distinfo	Wed Jul  8 19:27:47 2015	(r391592)
@@ -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

Modified: head/security/libressl/files/patch-include_openssl_opensslv.h
==============================================================================
--- head/security/libressl/files/patch-include_openssl_opensslv.h	Wed Jul  8 19:05:44 2015	(r391591)
+++ head/security/libressl/files/patch-include_openssl_opensslv.h	Wed Jul  8 19:27:47 2015	(r391592)
@@ -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
  

Modified: head/security/libressl/pkg-plist
==============================================================================
--- head/security/libressl/pkg-plist	Wed Jul  8 19:05:44 2015	(r391591)
+++ head/security/libressl/pkg-plist	Wed Jul  8 19:27:47 2015	(r391592)
@@ -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