svn commit: r448867 - in head: . security security/gnupg security/gnupg20 security/gnupg22

[Adam Weinberger]

Author: adamw
Date: Mon Aug 28 13:02:24 2017
New Revision: 448867
URL: https://svnweb.freebsd.org/changeset/ports/448867

Log:
  Add gnupg22 port. GnuPG 2.2 is the new LTS stable version. gnupg20 is
  now marked for deprecation at the end of the year (when upstream support
  for it will end). Users of gnupg20 should migrate to gnupg22.
  
  The gnupg port is remaining at 2.1.x for now, as it's essentially the
  same thing as 2.2.0. It will become 2.3 soon-ish.

Added:
  head/security/gnupg22/
     - copied from r448846, head/security/gnupg/
Modified:
  head/UPDATING
  head/security/Makefile
  head/security/gnupg/Makefile
  head/security/gnupg20/Makefile
  head/security/gnupg22/Makefile
  head/security/gnupg22/distinfo
  head/security/gnupg22/pkg-descr

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Aug 28 12:57:31 2017	(r448866)
+++ head/UPDATING	Mon Aug 28 13:02:24 2017	(r448867)
@@ -5,6 +5,19 @@ 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.
 
+20170828
+  AFFECTS: users of security/gnupg
+  AUTHOR: adamw at FreeBSD.org
+
+  security/gnupg22 has become the new stable version of GnuPG. This is
+  an LTS branch, and is directly analogous to security/gnupg20. gnupg20
+  will reach EOL at the end of the year, and all gnupg20 users should
+  migrate to gnupg22.
+
+  See https://gnupg.org/faq/whats-new-in-2.1.html for important changes.
+
+  The security/gnupg port will become GnuPG 2.3.x soon.
+
 20170820:
   AFFECTS: users of www/uwsgi
   AUTHOR: ultima at FreeBSD.org

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Mon Aug 28 12:57:31 2017	(r448866)
+++ head/security/Makefile	Mon Aug 28 13:02:24 2017	(r448867)
@@ -179,6 +179,7 @@
     SUBDIR += gnupg
     SUBDIR += gnupg1
     SUBDIR += gnupg20
+    SUBDIR += gnupg22
     SUBDIR += gnutls
     SUBDIR += go.crypto
     SUBDIR += go-cve-dictionary

Modified: head/security/gnupg/Makefile
==============================================================================
--- head/security/gnupg/Makefile	Mon Aug 28 12:57:31 2017	(r448866)
+++ head/security/gnupg/Makefile	Mon Aug 28 13:02:24 2017	(r448867)
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	libassuan>=2.4.3:security/libassuan \
 		libgpg-error>=1.16:security/libgpg-error
 RUN_DEPENDS=	pinentry:security/pinentry
 
-CONFLICTS=	gnupg-2.0.* dirmngr-[0-9]*
+CONFLICTS=	gnupg-2.0.* gnupg-2.2.* dirmngr-[0-9]*
 CPE_VENDOR=	gnupg
 
 USES=		compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2

Modified: head/security/gnupg20/Makefile
==============================================================================
--- head/security/gnupg20/Makefile	Mon Aug 28 12:57:31 2017	(r448866)
+++ head/security/gnupg20/Makefile	Mon Aug 28 13:02:24 2017	(r448867)
@@ -23,8 +23,11 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 BUILD_DEPENDS=	libgpg-error>=1.11:security/libgpg-error
 RUN_DEPENDS=	pinentry:security/pinentry
 
-CONFLICTS=	gnupg-2.1.*
+CONFLICTS=	gnupg-2.1.* gnupg-2.2.*
 CPE_VENDOR=	gnupg
+
+DEPRECATED=	Will reach EOL upstream on 2017-12-31
+EXPIRATION_DATE=2017-12-31
 
 USES=		cpe gmake iconv readline tar:bzip2
 USE_LDCONFIG=	yes

Modified: head/security/gnupg22/Makefile
==============================================================================
--- head/security/gnupg/Makefile	Sun Aug 27 21:53:01 2017	(r448846)
+++ head/security/gnupg22/Makefile	Mon Aug 28 13:02:24 2017	(r448867)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.1.23
+PORTVERSION=	2.2.0
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	libassuan>=2.4.3:security/libassuan \
 		libgpg-error>=1.16:security/libgpg-error
 RUN_DEPENDS=	pinentry:security/pinentry
 
-CONFLICTS=	gnupg-2.0.* dirmngr-[0-9]*
+CONFLICTS=	gnupg-2.0.* gnupg-2.1.* dirmngr-[0-9]*
 CPE_VENDOR=	gnupg
 
 USES=		compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2

Modified: head/security/gnupg22/distinfo
==============================================================================
--- head/security/gnupg/distinfo	Sun Aug 27 21:53:01 2017	(r448846)
+++ head/security/gnupg22/distinfo	Mon Aug 28 13:02:24 2017	(r448867)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502327530
-SHA256 (gnupg-2.1.23.tar.bz2) = a94476391595e9351f219188767a9d6ea128e83be5ed3226a7890f49aa2d0d77
-SIZE (gnupg-2.1.23.tar.bz2) = 6526734
+TIMESTAMP = 1503924513
+SHA256 (gnupg-2.2.0.tar.bz2) = d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6
+SIZE (gnupg-2.2.0.tar.bz2) = 6532475

Modified: head/security/gnupg22/pkg-descr
==============================================================================
--- head/security/gnupg/pkg-descr	Sun Aug 27 21:53:01 2017	(r448846)
+++ head/security/gnupg22/pkg-descr	Mon Aug 28 13:02:24 2017	(r448867)
@@ -1,4 +1,4 @@
-GnuPG is a complete and free replacement for PGP. This is the "modern"
+GnuPG is a complete and free replacement for PGP. This is the "stable"
 version.
 
 GnuPG allows encrypting and signing your data and communication, and