svn commit: r450153 - in head: . security security/gnupg security/gnupg22

[Adam Weinberger]

Author: adamw
Date: Tue Sep 19 18:31:49 2017
New Revision: 450153
URL: https://svnweb.freebsd.org/changeset/ports/450153

Log:
  Update gnupg to 2.2.1, and remove the security/gnupg22 port
  
  I misjudged the timeline for 2.3, and had not processed that the
  intent of 2.3 is different from 2.1. Rather than 2.3 being a "modern"
  branch and 2.2 being purely "stable," 2.3 will be development and
  users are encouraged to remain on 2.2. Furthermore, upstream doesn't
  expent a 2.3 release for a year or so.
  
  Accordingly, I'm removing the gnupg22 port and updating security/gnupg
  to be 2.2. gnugp20 is still scheduled for deletion at the end of the
  year.

Deleted:
  head/security/gnupg22/
Modified:
  head/MOVED
  head/security/Makefile
  head/security/gnupg/Makefile
  head/security/gnupg/distinfo
  head/security/gnupg/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Sep 19 18:17:32 2017	(r450152)
+++ head/MOVED	Tue Sep 19 18:31:49 2017	(r450153)
@@ -9545,3 +9545,4 @@ security/clambc||2017-09-14|Has expired: Practically u
 devel/cmake-modules||2017-09-14|Deleted, merged into devel/cmake
 devel/cargo|lang/rust|2017-09-15|Merged with lang/rust
 sysutils/filelight-kde4|sysutils/filelight|2017-09-16|Renamed to sysutils/filelight
+security/gnupg22|security/gnupg|2017-09-19|Removed, security/gnupg is now gnupg22

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Tue Sep 19 18:17:32 2017	(r450152)
+++ head/security/Makefile	Tue Sep 19 18:31:49 2017	(r450153)
@@ -179,7 +179,6 @@
     SUBDIR += gnupg
     SUBDIR += gnupg1
     SUBDIR += gnupg20
-    SUBDIR += gnupg22
     SUBDIR += gnutls
     SUBDIR += go-cve-dictionary
     SUBDIR += go.crypto

Modified: head/security/gnupg/Makefile
==============================================================================
--- head/security/gnupg/Makefile	Tue Sep 19 18:17:32 2017	(r450152)
+++ head/security/gnupg/Makefile	Tue Sep 19 18:31:49 2017	(r450153)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.1.23
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
@@ -23,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.* gnupg-2.2.* dirmngr-[0-9]*
+CONFLICTS=	gnupg-2.0.* dirmngr-[0-9]*
 CPE_VENDOR=	gnupg
 
 USES=		compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2

Modified: head/security/gnupg/distinfo
==============================================================================
--- head/security/gnupg/distinfo	Tue Sep 19 18:17:32 2017	(r450152)
+++ head/security/gnupg/distinfo	Tue Sep 19 18:31:49 2017	(r450153)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502327530
-SHA256 (gnupg-2.1.23.tar.bz2) = a94476391595e9351f219188767a9d6ea128e83be5ed3226a7890f49aa2d0d77
-SIZE (gnupg-2.1.23.tar.bz2) = 6526734
+TIMESTAMP = 1505844954
+SHA256 (gnupg-2.2.1.tar.bz2) = 34d70cd65b9c95f3f2f90a9f5c1e0b6a0fe039a8d685e2d66d69c33d1cbf62fb
+SIZE (gnupg-2.2.1.tar.bz2) = 6537959

Modified: head/security/gnupg/pkg-descr
==============================================================================
--- head/security/gnupg/pkg-descr	Tue Sep 19 18:17:32 2017	(r450152)
+++ head/security/gnupg/pkg-descr	Tue Sep 19 18:31:49 2017	(r450153)
@@ -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