From 2959a333f85d45557c09dbfcc95cc38add70fef7 Mon Sep 17 00:00:00 2001 From: Stephen Walker Date: Wed, 29 Dec 2010 06:54:09 +0000 Subject: [PATCH] [packages] sudo: update to 1.7.4p4 * disable zlib I/O log compression * build without lecture support since /var is a tmpfs mount * drop the local patch as upstream no longer strips binaries SVN-Revision: 24845 --- admin/sudo/Makefile | 9 ++++++--- admin/sudo/patches/101-install_no_strip.patch | 17 ----------------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 admin/sudo/patches/101-install_no_strip.patch diff --git a/admin/sudo/Makefile b/admin/sudo/Makefile index 27e1e2b699..b5038afb5c 100644 --- a/admin/sudo/Makefile +++ b/admin/sudo/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sudo -PKG_VERSION:=1.7.2p6 +PKG_VERSION:=1.7.4p4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.sudo.ws/sudo/dist -PKG_MD5SUM:=c4f1a43e8ba94f6bf06d2211442148c4 +PKG_MD5SUM:=55d9906535d70a1de347cd3d3550ee87 PKG_INSTALL:=1 @@ -40,7 +40,9 @@ endef CONFIGURE_ARGS+= \ --without-pam \ --disable-pam-session \ - --with-editor=/bin/vi + --with-editor=/bin/vi \ + --without-lecture \ + --disable-zlib CONFIGURE_VARS+= \ sudo_cv_uid_t_len=10 \ @@ -55,6 +57,7 @@ define Package/sudo/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/sudoers $(1)/etc/ chmod 0440 $(1)/etc/sudoers + $(INSTALL_DIR) $(1)/etc/sudoers.d $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo_noexec.so $(1)/usr/lib/ endef diff --git a/admin/sudo/patches/101-install_no_strip.patch b/admin/sudo/patches/101-install_no_strip.patch deleted file mode 100644 index 138c142ef1..0000000000 --- a/admin/sudo/patches/101-install_no_strip.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -412,11 +412,11 @@ install-dirs: - $(DESTDIR)$(noexecdir) - - install-binaries: install-dirs $(PROGS) -- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)$(sudodir)/sudo -+ $(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 sudo $(DESTDIR)$(sudodir)/sudo - rm -f $(DESTDIR)$(sudodir)/sudoedit - ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit -- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo --@SELINUX@ $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s sesh $(DESTDIR)$(libexecdir)/sesh -+ $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo -+@SELINUX@ $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh - - install-noexec: install-dirs sudo_noexec.la - test -f .libs/$(noexecfile) && $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0755 .libs/$(noexecfile) $(DESTDIR)$(noexecdir) -- 2.30.2