From 55ffc6f40630ea827a29f79a2f26a37e687d55ec Mon Sep 17 00:00:00 2001
From: garga <garga@FreeBSD.org>
Date: Thu, 11 May 2017 17:03:08 +0000
Subject: Update security/sudo to 1.8.20

Sponsored by:	Rubicon Communications (Netgate)
---
 security/sudo/Makefile                                 |  2 +-
 security/sudo/distinfo                                 |  6 +++---
 security/sudo/files/patch-install-sh                   | 10 +++++-----
 security/sudo/files/patch-lib__util__strtoid.c         | 11 -----------
 security/sudo/files/patch-plugins__sudoers__sudoers.in |  2 +-
 security/sudo/pkg-plist                                |  1 +
 6 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 security/sudo/files/patch-lib__util__strtoid.c

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 9ebd495..8cc27df 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sudo
-PORTVERSION=	1.8.19p2
+PORTVERSION=	1.8.20
 CATEGORIES=	security
 MASTER_SITES=	SUDO
 
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index e7e5e30..8632569 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484415267
-SHA256 (sudo-1.8.19p2.tar.gz) = 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0
-SIZE (sudo-1.8.19p2.tar.gz) = 2861855
+TIMESTAMP = 1494521789
+SHA256 (sudo-1.8.20.tar.gz) = 9e97b8da859c6cc1b5b8c31db93002b750eae16af1bbda9140f8dd85b970e0e0
+SIZE (sudo-1.8.20.tar.gz) = 2930046
diff --git a/security/sudo/files/patch-install-sh b/security/sudo/files/patch-install-sh
index 935b263..99ae7ec 100644
--- a/security/sudo/files/patch-install-sh
+++ b/security/sudo/files/patch-install-sh
@@ -1,4 +1,4 @@
---- install-sh.orig	2015-07-15 18:38:05 UTC
+--- install-sh.orig	2017-01-14 04:30:15 UTC
 +++ install-sh
 @@ -171,12 +171,6 @@ if ${DIRMODE} ; then
  	if [ ! -d "${DEST}" ] ; then
@@ -13,16 +13,16 @@
  	if ${CHMODIT} ; then
  	    ${CHMOD} "${MODE}"  "${DEST}" || exit 1
  	fi
-@@ -227,12 +221,6 @@ fi
+@@ -226,12 +220,6 @@ fi
+ ##  Strip and set the owner/mode.
  if ${STRIPIT} ; then
      ${STRIP} "${DEST}" || exit 1
- fi
+-fi
 -if ${CHOWNIT} ; then
 -    ${CHOWN} "${OWNER}" "${DEST}" || exit 1
 -fi
 -if ${CHGROUPIT} ; then
 -    ${CHGRP} "${GROUP}" "${DEST}" || exit 1
--fi
+ fi
  if ${CHMODIT} ; then
      ${CHMOD} "${MODE}" "${DEST}" || exit 1
- fi
diff --git a/security/sudo/files/patch-lib__util__strtoid.c b/security/sudo/files/patch-lib__util__strtoid.c
deleted file mode 100644
index 7a1bdd2..0000000
--- a/security/sudo/files/patch-lib__util__strtoid.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/util/strtoid.c.orig	2016-12-18 05:52:23.000000000 -0800
-+++ ./lib/util/strtoid.c	2016-12-19 13:48:01.268725000 -0800
-@@ -80,7 +80,7 @@
-     }
-     if (errno == ERANGE) {
- 	if (errstr != NULL) {
--	    if (llval == LLONG_MAX)) {
-+	    if (llval == LLONG_MAX)
- 		*errstr = N_("value too large");
- 	    else
- 		*errstr = N_("value too small");
diff --git a/security/sudo/files/patch-plugins__sudoers__sudoers.in b/security/sudo/files/patch-plugins__sudoers__sudoers.in
index d981717..75f9440 100644
--- a/security/sudo/files/patch-plugins__sudoers__sudoers.in
+++ b/security/sudo/files/patch-plugins__sudoers__sudoers.in
@@ -1,4 +1,4 @@
---- plugins/sudoers/sudoers.in.orig	2015-07-15 18:44:07 UTC
+--- plugins/sudoers/sudoers.in.orig	2017-01-14 04:30:15 UTC
 +++ plugins/sudoers/sudoers.in
 @@ -32,6 +32,14 @@
  ##
diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist
index 01cd03e..32288e7 100644
--- a/security/sudo/pkg-plist
+++ b/security/sudo/pkg-plist
@@ -1,6 +1,7 @@
 bin/sudo
 bin/sudoedit
 bin/sudoreplay
+etc/sudoers.dist
 @sample etc/sudoers.sample
 @sample etc/pam.d/sudo.default etc/pam.d/sudo
 include/sudo_plugin.h
-- 
cgit v1.1