security/libressl-devel: Update to 2.4.0

  - Update to latest "unstable" release
  - Remove OPENSSL_VERSION_NUMBER patch
  - Update shlib-versions
  - Add UPDATING entry

6 files changed, 55 insertions, 25 deletions

diff --git a/UPDATING b/UPDATING
index bf2967491ae9..f25f9546aaf9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,36 @@ 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.
 
+20160601
+  AFFECTS: users of security/libressl-devel
+  AUTHOR: brnrd@FreeBSD.org
+
+  The port has been updated to the latest "unstable" version of LibreSSL.
+  The shared library versions of the libraries have been bumped.
+  With this update, the patch for the OPENSSL_VERSION_NUMBER has been
+  removed. This causes issues with a number of ports. Patches for many of
+  these issues can be found on 
+  https://wiki.freebsd.org/OpenSSL/Ports#OPENSSL_VERSION_NUMBER
+
+  After upgrading to 2.4.0, 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 info -r libressl-devel
+
+  Then you should rebuild all ports depending on libressl-devel to avoid
+  dangling shared library dependencies. Poudriere and pkg handle this
+  correctly, portmaster and portupgrade users can use the following to
+  rebuild all dependent ports.
+
+  Portmaster users:
+      portmaster -r libressl-devel
+  Portupgrade users:
+      portupgrade -fr security/libressl-devel
+
+
 20160527
   AFFECTS: Users of mail/opensmtpd-extras (any of them)
   AUTHOR: adamw@FreeBSD.org
diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile
index 7b40f4d8ce2e..0d87cb857fc6 100644
--- a/security/libressl-devel/Makefile
+++ b/security/libressl-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libressl
-PORTVERSION=	2.3.4
+PORTVERSION=	2.4.0
 CATEGORIES=	security devel
 MASTER_SITES=	OPENBSD/LibreSSL
 PKGNAMESUFFIX=	-devel
diff --git a/security/libressl-devel/distinfo b/security/libressl-devel/distinfo
index 36476adfcaad..1b4763a16a50 100644
--- a/security/libressl-devel/distinfo
+++ b/security/libressl-devel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libressl-2.3.4.tar.gz) = 7a1135b2620f78928e89538c211a4df1d9415994001d1e7c9178c6b6d72de6a9
-SIZE (libressl-2.3.4.tar.gz) = 3013286
+TIMESTAMP = 1464761954
+SHA256 (libressl-2.4.0.tar.gz) = 7e6000cfb9438fbfc7fe7fe0572af587e2f2a36bbdb95408e9874758d0c3382e
+SIZE (libressl-2.4.0.tar.gz) = 3024184
diff --git a/security/libressl-devel/files/patch-include_openssl_opensslv.h b/security/libressl-devel/files/patch-include_openssl_opensslv.h
deleted file mode 100644
index a222ab3477ad..000000000000
--- a/security/libressl-devel/files/patch-include_openssl_opensslv.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Many applications use checking of OPENSSL_VERSION to detect if
-a feature is available and thus fail to build when the version
-is set to 0x20000000L. This fixes the OPENSSL_VERSION to the
-time at which LibreSSL forked.
-
---- include/openssl/opensslv.h.orig	2015-09-11 22:35:14 UTC
-+++ include/openssl/opensslv.h
-@@ -7,7 +7,7 @@
- #define LIBRESSL_VERSION_TEXT	"LibreSSL 2.3.0"
- 
- /* These will never change */
--#define OPENSSL_VERSION_NUMBER	0x20000000L
-+#define OPENSSL_VERSION_NUMBER	0x1000107fL
- #define OPENSSL_VERSION_TEXT	LIBRESSL_VERSION_TEXT
- #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
- 
diff --git a/security/libressl-devel/pkg-message b/security/libressl-devel/pkg-message
new file mode 100644
index 000000000000..92ece11bb362
--- /dev/null
+++ b/security/libressl-devel/pkg-message
@@ -0,0 +1,15 @@
+
+****************************************************************************
+
+In version 2.4.0, the OPENSSL_VERSION_NUMBER patch has been removed.
+
+Before, the version for the FreeBSD ports was locked to the time of forking,
+which was 1.0.1f (0x1000107fL). Now the version is unmodified (0x20000000L).
+
+Ports that check e.g. >= 0x10002000 to determine features added in OpenSSL
+1.0.2 are likely to fail during build. Fixes for ports known to fail this
+way are collected in:
+
+   https://wiki.freebsd.org/LibreSSL/Ports#OPENSSL_VERSION_NUMBER
+
+****************************************************************************
diff --git a/security/libressl-devel/pkg-plist b/security/libressl-devel/pkg-plist
index 72fc52638a78..fa6697415566 100644
--- a/security/libressl-devel/pkg-plist
+++ b/security/libressl-devel/pkg-plist
@@ -75,16 +75,16 @@ include/openssl/x509v3.h
 include/tls.h
 lib/libcrypto.a
 lib/libcrypto.so
-lib/libcrypto.so.37
-lib/libcrypto.so.37.0.0
+lib/libcrypto.so.38
+lib/libcrypto.so.38.0.0
 lib/libssl.a
 lib/libssl.so
-lib/libssl.so.38
-lib/libssl.so.38.0.0
+lib/libssl.so.39
+lib/libssl.so.39.0.0
 lib/libtls.a
 lib/libtls.so
-lib/libtls.so.10
-lib/libtls.so.10.0.0
+lib/libtls.so.11
+lib/libtls.so.11.0.0
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/libtls.pc