From a0f7ca4f59735d1cc8f040aeb68d44b5e64e0b5e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 29 Mar 2015 11:09:12 +0200 Subject: update to latest stable upstream version, reduce patches by using overwriting INSTALL_OWNER --- package/sudo/Makefile | 8 +++--- package/sudo/patches/patch-include_Makefile_in | 11 -------- .../sudo/patches/patch-plugins_sudoers_Makefile_in | 31 ---------------------- package/sudo/patches/patch-src_Makefile_in | 23 ---------------- 4 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 package/sudo/patches/patch-include_Makefile_in delete mode 100644 package/sudo/patches/patch-plugins_sudoers_Makefile_in delete mode 100644 package/sudo/patches/patch-src_Makefile_in (limited to 'package/sudo') diff --git a/package/sudo/Makefile b/package/sudo/Makefile index 8eda38fec..5cfc938cf 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.12 +PKG_VERSION:= 1.8.13 PKG_RELEASE:= 1 -PKG_HASH:= 163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0 +PKG_HASH:= e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25 PKG_DESCR:= su do PKG_SECTION:= sys/misc PKG_URL:= http://www.sudo.ws/sudo/ @@ -18,8 +18,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,SUDO,sudo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf HOST_CPPFLAGS+= -I../ -I../include + TARGET_LDFLAGS+= -ldl CONFIGURE_ARGS+= --without-pam \ --without-sendmail \ @@ -34,6 +34,8 @@ else CONFIGURE_ARGS+= --disable-hardening endif +XAKE_FLAGS+= INSTALL_OWNER="" + sudo-install: $(INSTALL_DIR) $(IDIR_SUDO)/usr/bin $(INSTALL_DIR) $(IDIR_SUDO)/usr/sbin diff --git a/package/sudo/patches/patch-include_Makefile_in b/package/sudo/patches/patch-include_Makefile_in deleted file mode 100644 index bb07fa867..000000000 --- a/package/sudo/patches/patch-include_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- sudo-1.8.11p2.orig/include/Makefile.in 2014-10-07 22:26:20.000000000 +0200 -+++ sudo-1.8.11p2/include/Makefile.in 2014-12-15 13:06:08.966174328 +0100 -@@ -66,7 +66,7 @@ install-binaries: - install-doc: - - install-includes: install-dirs -- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(srcdir)/sudo_plugin.h $(DESTDIR)$(includedir) -+ $(INSTALL) -m 0644 $(srcdir)/sudo_plugin.h $(DESTDIR)$(includedir) - - install-plugin: - diff --git a/package/sudo/patches/patch-plugins_sudoers_Makefile_in b/package/sudo/patches/patch-plugins_sudoers_Makefile_in deleted file mode 100644 index 8b78f4b94..000000000 --- a/package/sudo/patches/patch-plugins_sudoers_Makefile_in +++ /dev/null @@ -1,31 +0,0 @@ ---- 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,/[^/]*$$,,'` -- $(INSTALL) -d $(INSTALL_OWNER) -m 0711 $(DESTDIR)$(rundir) -- $(INSTALL) -d $(INSTALL_OWNER) -m 0711 $(DESTDIR)$(vardir) -+ $(INSTALL) -d $(DESTDIR)$(rundir) -+ $(INSTALL) -d $(DESTDIR)$(vardir) - - install-binaries: visudo sudoreplay install-dirs -- INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay -- INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 visudo $(DESTDIR)$(visudodir)/visudo -+ INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) -m 0755 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay -+ INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) -m 0755 visudo $(DESTDIR)$(visudodir)/visudo - - install-includes: - -@@ -326,9 +326,9 @@ install-plugin: sudoers.la install-dirs - esac - - install-sudoers: install-dirs -- $(INSTALL) -d $(INSTALL_OWNER) -m 0750 $(DESTDIR)$(sudoersdir)/sudoers.d -+ $(INSTALL) -d -m 0750 $(DESTDIR)$(sudoersdir)/sudoers.d - test -r $(DESTDIR)$(sudoersdir)/sudoers || \ -- $(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers -+ $(INSTALL) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers - - uninstall: - -$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la diff --git a/package/sudo/patches/patch-src_Makefile_in b/package/sudo/patches/patch-src_Makefile_in deleted file mode 100644 index 4379371f6..000000000 --- a/package/sudo/patches/patch-src_Makefile_in +++ /dev/null @@ -1,23 +0,0 @@ ---- sudo-1.8.11p2.orig/src/Makefile.in 2014-10-07 22:26:20.000000000 +0200 -+++ sudo-1.8.11p2/src/Makefile.in 2014-12-15 13:03:47.830175190 +0100 -@@ -151,17 +151,17 @@ install-rc: - @if [ -n "$(INIT_SCRIPT)" ]; then \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(INIT_DIR) \ - `echo $(DESTDIR)$(RC_LINK) | $(SED) 's,/[^/]*$$,,'`; \ -- $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ -+ $(INSTALL) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ - rm -f $(DESTDIR)$(RC_LINK); \ - ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \ - fi - - install-binaries: install-dirs $(PROGS) -- INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 04755 sudo $(DESTDIR)$(bindir)/sudo -+ INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) -m 0755 sudo $(DESTDIR)$(bindir)/sudo - rm -f $(DESTDIR)$(bindir)/sudoedit - ln -s sudo $(DESTDIR)$(bindir)/sudoedit - if [ -f sesh ]; then \ -- INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 sesh $(DESTDIR)$(libexecdir)/sudo/sesh; \ -+ INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) -m 0755 sesh $(DESTDIR)$(libexecdir)/sudo/sesh; \ - fi - - install-doc: -- cgit v1.2.3