From e59e22391a311997a35cfc8cc2ddd4bd002789be Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Wed, 4 Nov 2015 19:46:21 +0100
Subject: sudo: update to latest stable version

---
 package/sudo/Makefile                              |  4 ++--
 package/sudo/patches/patch-lib_util_Makefile_in    | 10 +++++-----
 package/sudo/patches/patch-plugins_sudoers_match_c | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'package')

diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index 4b76fb1d6..93d57db09 100644
--- a/package/sudo/Makefile
+++ b/package/sudo/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		sudo
-PKG_VERSION:=		1.8.13
+PKG_VERSION:=		1.8.15
 PKG_RELEASE:=		1
-PKG_HASH:=		e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25
+PKG_HASH:=		4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308
 PKG_DESCR:=		su do
 PKG_SECTION:=		sys/misc
 PKG_URL:=		http://www.sudo.ws/sudo/
diff --git a/package/sudo/patches/patch-lib_util_Makefile_in b/package/sudo/patches/patch-lib_util_Makefile_in
index 9a16390d9..a05b6676e 100644
--- a/package/sudo/patches/patch-lib_util_Makefile_in
+++ b/package/sudo/patches/patch-lib_util_Makefile_in
@@ -1,14 +1,14 @@
---- sudo-1.8.12.orig/lib/util/Makefile.in	2015-02-04 16:23:38.000000000 -0600
-+++ sudo-1.8.12/lib/util/Makefile.in	2015-02-17 14:31:25.681362973 -0600
-@@ -146,10 +146,10 @@ signame.c: mksigname
+--- sudo-1.8.15.orig/lib/util/Makefile.in	2015-11-01 00:35:24.000000000 +0100
++++ sudo-1.8.15/lib/util/Makefile.in	2015-11-03 16:29:33.000000000 +0100
+@@ -160,10 +160,10 @@ signame.c: mksigname
  	./mksigname > $@
  
  mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@
 +	$(CC_FOR_BUILD) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(incdir) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(DEFS) $(srcdir)/mksiglist.c -o $@
  
  mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksigname.c -o $@
 +	$(CC_FOR_BUILD) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(incdir) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(DEFS) $(srcdir)/mksigname.c -o $@
  
  $(srcdir)/mksiglist.h: $(srcdir)/siglist.in
diff --git a/package/sudo/patches/patch-plugins_sudoers_match_c b/package/sudo/patches/patch-plugins_sudoers_match_c
index b2ebabb64..01e2ef79a 100644
--- a/package/sudo/patches/patch-plugins_sudoers_match_c
+++ b/package/sudo/patches/patch-plugins_sudoers_match_c
@@ -1,6 +1,6 @@
---- sudo-1.8.12.orig/plugins/sudoers/match.c	2015-02-09 12:53:54.000000000 -0600
-+++ sudo-1.8.12/plugins/sudoers/match.c	2015-02-17 14:16:18.961371274 -0600
-@@ -129,10 +129,12 @@ userlist_matches(const struct passwd *pw
+--- sudo-1.8.15.orig/plugins/sudoers/match.c	2015-11-01 00:35:25.000000000 +0100
++++ sudo-1.8.15/plugins/sudoers/match.c	2015-11-03 16:24:34.000000000 +0100
+@@ -105,10 +105,12 @@ userlist_matches(const struct passwd *pw
  	    case ALL:
  		matched = !m->negated;
  		break;
@@ -13,7 +13,7 @@
  	    case USERGROUP:
  		if (usergr_matches(m->name, pw->pw_name, pw))
  		    matched = !m->negated;
-@@ -185,10 +187,12 @@ runaslist_matches(const struct member_li
+@@ -161,10 +163,12 @@ runaslist_matches(const struct member_li
  		    case ALL:
  			user_matched = !m->negated;
  			break;
@@ -26,7 +26,7 @@
  		    case USERGROUP:
  			if (usergr_matches(m->name, runas_pw->pw_name, runas_pw))
  			    user_matched = !m->negated;
-@@ -285,10 +289,12 @@ hostlist_matches(const struct member_lis
+@@ -261,10 +265,12 @@ hostlist_matches(const struct member_lis
  	    case ALL:
  		matched = !m->negated;
  		break;
@@ -39,7 +39,7 @@
  	    case NTWKADDR:
  		if (addr_matches(m->name))
  		    matched = !m->negated;
-@@ -951,6 +957,7 @@ sudo_getdomainname(void)
+@@ -962,6 +968,7 @@ sudo_getdomainname(void)
   * else return false.  Either of "lhost", "shost" or "user" may be NULL
   * in which case that argument is not checked...
   */
@@ -47,7 +47,7 @@
  bool
  netgr_matches(const char *netgr, const char *lhost, const char *shost, const char *user)
  {
-@@ -989,3 +996,4 @@ netgr_matches(const char *netgr, const c
+@@ -1000,3 +1007,4 @@ netgr_matches(const char *netgr, const c
  
      debug_return_bool(rc);
  }
-- 
cgit v1.2.3