svn commit: r468093 - in head/devel: . etcd33 etcd33/files

[Jimmy Olgeni]

Author: olgeni
Date: Mon Apr 23 14:58:02 2018
New Revision: 468093
URL: https://svnweb.freebsd.org/changeset/ports/468093

Log:
  Add devel/etcd33, tracking branch 3.3 of etcd.
  
  Document conflicts in devel/etcd, etcd31, and etcd32.

Added:
  head/devel/etcd33/
     - copied from r464191, head/devel/etcd32/
  head/devel/etcd33/files/
  head/devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go   (contents, props changed)
Modified:
  head/devel/Makefile
  head/devel/etcd33/Makefile
  head/devel/etcd33/distinfo

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Mon Apr 23 11:46:00 2018	(r468092)
+++ head/devel/Makefile	Mon Apr 23 14:58:02 2018	(r468093)
@@ -590,6 +590,7 @@
     SUBDIR += etcd
     SUBDIR += etcd31
     SUBDIR += etcd32
+    SUBDIR += etcd33
     SUBDIR += etl
     SUBDIR += euca2ools
     SUBDIR += evemu

Modified: head/devel/etcd33/Makefile
==============================================================================
--- head/devel/etcd32/Makefile	Sun Mar 11 18:00:43 2018	(r464191)
+++ head/devel/etcd33/Makefile	Mon Apr 23 14:58:02 2018	(r468093)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
-PORTVERSION=	3.2.15
+PORTVERSION=	3.3.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
-PKGNAMESUFFIX=	32
+PKGNAMESUFFIX=	33
 
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
@@ -13,7 +13,7 @@ COMMENT=	Highly-available key value store and service 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd31-*
+CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd31-* coreos-etcd32-*
 
 USES=		go
 GO_PKGNAME=	github.com/coreos/etcd

Modified: head/devel/etcd33/distinfo
==============================================================================
--- head/devel/etcd32/distinfo	Sun Mar 11 18:00:43 2018	(r464191)
+++ head/devel/etcd33/distinfo	Mon Apr 23 14:58:02 2018	(r468093)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516700370
-SHA256 (coreos-etcd-v3.2.15_GH0.tar.gz) = 7ea084fae29b7efad8ec21d7fa85adef6b468bd0b128dc97a2a6b5094bb37938
-SIZE (coreos-etcd-v3.2.15_GH0.tar.gz) = 3047626
+TIMESTAMP = 1522268674
+SHA256 (coreos-etcd-v3.3.3_GH0.tar.gz) = 6551878987f860d1b47fbf10ec34b910399f642c6541d86d835e1b5c29bc25ed
+SIZE (coreos-etcd-v3.3.3_GH0.tar.gz) = 3387223

Added: head/devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go	Mon Apr 23 14:58:02 2018	(r468093)
@@ -0,0 +1,11 @@
+--- ../src/github.com/coreos/go-systemd/util/util_cgo.go.orig
++++ ../src/github.com/coreos/go-systemd/util/util_cgo.go
+@@ -127,7 +127,7 @@
+ 	switch {
+ 	case errno >= 0:
+ 		ret = false
+-	case serrno == syscall.ENOENT, serrno == syscall.ENXIO, serrno == syscall.ENODATA:
++	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
+ 		// Since the implementation of sessions in systemd relies on
+ 		// the `pam_systemd` module, using the sd_pid_get_owner_uid
+ 		// heuristic alone can result in false positives if that module