From ea609a8124ecdf710a2dda0ac873c3c7b1678934 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 17 Feb 2015 23:04:17 -0600 Subject: update to latest stable version --- package/sudo/patches/patch-Makefile_in | 11 +++++++++ package/sudo/patches/patch-doc_Makefile_in | 27 ---------------------- package/sudo/patches/patch-lib_util_Makefile_in | 6 ++--- .../sudo/patches/patch-plugins_sudoers_Makefile_in | 8 +++---- package/sudo/patches/patch-plugins_sudoers_match_c | 14 +++++------ 5 files changed, 25 insertions(+), 41 deletions(-) create mode 100644 package/sudo/patches/patch-Makefile_in delete mode 100644 package/sudo/patches/patch-doc_Makefile_in (limited to 'package/sudo/patches') diff --git a/package/sudo/patches/patch-Makefile_in b/package/sudo/patches/patch-Makefile_in new file mode 100644 index 000000000..db7f2d624 --- /dev/null +++ b/package/sudo/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- sudo-1.8.12.orig/Makefile.in 2015-02-09 12:53:54.000000000 -0600 ++++ sudo-1.8.12/Makefile.in 2015-02-17 14:32:12.001362549 -0600 +@@ -49,7 +49,7 @@ sudoers_mode = @SUDOERS_MODE@ + shlib_mode = @SHLIB_MODE@ + + SUBDIRS = lib/util @ZLIB_SRC@ plugins/group_file plugins/sudoers \ +- plugins/system_group src include doc examples ++ plugins/system_group src include + + SAMPLES = plugins/sample + diff --git a/package/sudo/patches/patch-doc_Makefile_in b/package/sudo/patches/patch-doc_Makefile_in deleted file mode 100644 index 32fca89be..000000000 --- a/package/sudo/patches/patch-doc_Makefile_in +++ /dev/null @@ -1,27 +0,0 @@ ---- sudo-1.8.11p2.orig/doc/Makefile.in 2014-09-23 18:40:15.000000000 +0200 -+++ sudo-1.8.11p2/doc/Makefile.in 2014-12-15 13:42:40.626160940 +0100 -@@ -291,15 +291,15 @@ install-binaries: - install-includes: - - install-doc: install-dirs -- for f in $(OTHER_DOCS); do $(INSTALL) $(INSTALL_OWNER) -m 0644 $$f $(DESTDIR)$(docdir); done -- @LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) $(INSTALL_OWNER) -m 0644 $$f $(DESTDIR)$(docdir); done -- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) -- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudo_plugin.$(mantype) $(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu) -- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) -- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) -- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudo.conf.$(mantype) $(DESTDIR)$(mandirform)/sudo.conf.$(mansectform) -- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) -- @LDAP@$(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) -+ for f in $(OTHER_DOCS); do $(INSTALL) -m 0644 $$f $(DESTDIR)$(docdir); done -+ @LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) -m 0644 $$f $(DESTDIR)$(docdir); done -+ $(INSTALL) -m 0644 $(mansrcdir)/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) -+ $(INSTALL) -m 0644 $(mansrcdir)/sudo_plugin.$(mantype) $(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu) -+ $(INSTALL) -m 0644 $(mansrcdir)/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) -+ $(INSTALL) -m 0644 $(mansrcdir)/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) -+ $(INSTALL) -m 0644 $(mansrcdir)/sudo.conf.$(mantype) $(DESTDIR)$(mandirform)/sudo.conf.$(mansectform) -+ $(INSTALL) -m 0644 $(mansrcdir)/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) -+ @LDAP@$(INSTALL) -m 0644 $(mansrcdir)/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) - @if test -n "$(MANCOMPRESS)"; then \ - for f in $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/sudo_plugin.$(mansectsu) $(mandirsu)/sudoreplay.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudo.conf.$(mansectform) $(mandirform)/sudoers.$(mansectform) $(mandirform)/sudoers.ldap.$(mansectform); do \ - if test -f $(DESTDIR)$$f; then \ diff --git a/package/sudo/patches/patch-lib_util_Makefile_in b/package/sudo/patches/patch-lib_util_Makefile_in index 696e40b48..9a16390d9 100644 --- a/package/sudo/patches/patch-lib_util_Makefile_in +++ b/package/sudo/patches/patch-lib_util_Makefile_in @@ -1,6 +1,6 @@ ---- sudo-1.8.11p2.orig/lib/util/Makefile.in 2014-10-07 22:26:20.000000000 +0200 -+++ sudo-1.8.11p2/lib/util/Makefile.in 2014-12-15 11:39:13.098206188 +0100 -@@ -148,10 +148,10 @@ signame.c: mksigname +--- 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 ./mksigname > $@ mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h diff --git a/package/sudo/patches/patch-plugins_sudoers_Makefile_in b/package/sudo/patches/patch-plugins_sudoers_Makefile_in index b2067ef04..8b78f4b94 100644 --- a/package/sudo/patches/patch-plugins_sudoers_Makefile_in +++ b/package/sudo/patches/patch-plugins_sudoers_Makefile_in @@ -1,6 +1,6 @@ ---- sudo-1.8.11p2.orig/plugins/sudoers/Makefile.in 2014-10-07 22:26:20.000000000 +0200 -+++ sudo-1.8.11p2/plugins/sudoers/Makefile.in 2014-12-15 12:59:33.342176744 +0100 -@@ -301,12 +301,12 @@ install-dirs: +--- sudo-1.8.12.orig/plugins/sudoers/Makefile.in 2015-01-30 13:53:59.000000000 -0600 ++++ sudo-1.8.12/plugins/sudoers/Makefile.in 2015-02-17 14:31:25.685362973 -0600 +@@ -305,12 +305,12 @@ install-dirs: $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \ `echo $(DESTDIR)$(rundir)|$(SED) 's,/[^/]*$$,,'` \ `echo $(DESTDIR)$(vardir)|$(SED) 's,/[^/]*$$,,'` @@ -17,7 +17,7 @@ install-includes: -@@ -322,9 +322,9 @@ install-plugin: sudoers.la install-dirs +@@ -326,9 +326,9 @@ install-plugin: sudoers.la install-dirs esac install-sudoers: install-dirs diff --git a/package/sudo/patches/patch-plugins_sudoers_match_c b/package/sudo/patches/patch-plugins_sudoers_match_c index 88fe5986c..b2ebabb64 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.11p2.orig/plugins/sudoers/match.c 2014-09-23 18:56:04.000000000 +0200 -+++ sudo-1.8.11p2/plugins/sudoers/match.c 2014-12-15 10:26:02.230233008 +0100 -@@ -126,10 +126,12 @@ userlist_matches(const struct passwd *pw +--- 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 case ALL: matched = !m->negated; break; @@ -13,7 +13,7 @@ case USERGROUP: if (usergr_matches(m->name, pw->pw_name, pw)) matched = !m->negated; -@@ -182,10 +184,12 @@ runaslist_matches(const struct member_li +@@ -185,10 +187,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; -@@ -282,10 +286,12 @@ hostlist_matches(const struct member_lis +@@ -285,10 +289,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; -@@ -939,6 +945,7 @@ sudo_getdomainname(void) +@@ -951,6 +957,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) { -@@ -981,3 +988,4 @@ netgr_matches(const char *netgr, const c +@@ -989,3 +996,4 @@ netgr_matches(const char *netgr, const c debug_return_bool(rc); } -- cgit v1.2.3