From: Juergen Borleis <jbe@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] sudo: upgrade to make it large filesystem aware
Date: Wed, 30 Aug 2017 15:55:57 +0200 [thread overview]
Message-ID: <20170830135557.20085-1-jbe@pengutronix.de> (raw)
The previous version isn't large filesystem aware so it fails at
run-time while development on 64 bit filesystems exported via NFS.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
patches/sudo-1.7.2p6/series | 1 -
.../0001-install-sh-disable-stripping.patch | 12 ++--
patches/sudo-1.8.9p5/series | 4 ++
rules/sudo.make | 73 ++++++----------------
4 files changed, 28 insertions(+), 62 deletions(-)
delete mode 100644 patches/sudo-1.7.2p6/series
rename patches/{sudo-1.7.2p6 => sudo-1.8.9p5}/0001-install-sh-disable-stripping.patch (66%)
create mode 100644 patches/sudo-1.8.9p5/series
diff --git a/patches/sudo-1.7.2p6/series b/patches/sudo-1.7.2p6/series
deleted file mode 100644
index fab226119..000000000
--- a/patches/sudo-1.7.2p6/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-install-sh-disable-stripping.patch
diff --git a/patches/sudo-1.7.2p6/0001-install-sh-disable-stripping.patch b/patches/sudo-1.8.9p5/0001-install-sh-disable-stripping.patch
similarity index 66%
rename from patches/sudo-1.7.2p6/0001-install-sh-disable-stripping.patch
rename to patches/sudo-1.8.9p5/0001-install-sh-disable-stripping.patch
index c8421a5a2..271a4cc87 100644
--- a/patches/sudo-1.7.2p6/0001-install-sh-disable-stripping.patch
+++ b/patches/sudo-1.8.9p5/0001-install-sh-disable-stripping.patch
@@ -1,4 +1,3 @@
-From 0c293e823cbe169ed09f1be263ff22e57b9d03ef Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 13 Jan 2010 09:29:27 +0100
Subject: [PATCH] install-sh: disable stripping
@@ -8,14 +7,14 @@ This patch disables stripping because the install-sh would use
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
- install-sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ install-sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install-sh b/install-sh
-index 5a6d399..e9a70b5 100755
+index 79e7f408172c..9e78efae7a2e 100755
--- a/install-sh
+++ b/install-sh
-@@ -138,7 +138,7 @@ while ${MORETODO} ; do
+@@ -141,7 +141,7 @@ while ${MORETODO} ; do
fi
;;
X-s)
@@ -24,6 +23,3 @@ index 5a6d399..e9a70b5 100755
;;
X--)
shift
---
-1.6.6
-
diff --git a/patches/sudo-1.8.9p5/series b/patches/sudo-1.8.9p5/series
new file mode 100644
index 000000000..7fbe9b80e
--- /dev/null
+++ b/patches/sudo-1.8.9p5/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-install-sh-disable-stripping.patch
+# e59116c14a9e0e7506df445b8a837bdc - git-ptx-patches magic
diff --git a/rules/sudo.make b/rules/sudo.make
index c9ba61c68..eeddc0b4e 100644
--- a/rules/sudo.make
+++ b/rules/sudo.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_SUDO) += sudo
#
# Paths and names
#
-SUDO_VERSION := 1.7.2p6
-SUDO_MD5 := c4f1a43e8ba94f6bf06d2211442148c4
+SUDO_VERSION := 1.8.9p5
+SUDO_MD5 := d3f1f1cfca6b2b06b048e1abb7d0227e
SUDO := sudo-$(SUDO_VERSION)
SUDO_SUFFIX := tar.gz
SUDO_URL := \
@@ -37,8 +37,8 @@ SUDO_ENV := \
$(CROSS_ENV) \
sudo_cv_func_fnmatch=yes \
sudo_cv_func_unsetenv_void=no \
- sudo_cv_sock_sa_len=yes \
- sudo_cv_uid_t_len=10
+ ac_cv_have_working_snprintf=yes \
+ ac_cv_have_working_vsnprintf=yes
#
# autoconf
@@ -50,7 +50,16 @@ SUDO_AUTOCONF = \
--disable-log-host \
--enable-noargs-shell \
--disable-path-info \
+ --enable-warnings \
+ --disable-werror \
+ --enable-hardening \
+ --enable-pie \
+ --disable-nls \
+ --disable-rpath \
+ --enable-static-sudoers \
--disable-sia \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-pam-session \
--without-AFS \
--without-DCE \
--without-logincap \
@@ -66,9 +75,11 @@ else
SUDO_AUTOCONF += --without-sendmail
endif
+ifdef PTXCONF_SUDO_INSTALL_VISUDO
ifneq ($(PTXCONF_SUDO_DEFAULT_EDITOR),"")
SUDO_AUTOCONF += --with-editor=$(PTXCONF_SUDO_DEFAULT_EDITOR)
endif
+endif
ifdef PTXCONF_SUDO_USE_ENV_EDITOR
SUDO_AUTOCONF += --with-env-editor
@@ -76,54 +87,6 @@ else
SUDO_AUTOCONF += --without-env-editor
endif
-# --disable-root-mailer Don't run the mailer as root, run as the user
-# --disable-setreuid Don't try to use the setreuid() function
-# --disable-setresuid Don't try to use the setresuid() function
-# --enable-shell-sets-home set $HOME to target user in shell mode
-# --with-AFS enable AFS support
-# --with-logging log via syslog, file, or both
-# --with-logfac syslog facility to log with (default is "local2")
-# --with-goodpri syslog priority for commands (def is "notice")
-# --with-badpri syslog priority for failures (def is "alert")
-# --with-logpath path to the sudo log file
-# --with-loglen maximum length of a log file line (default is 80)
-# --without-mail-if-no-user do not send mail if user not in sudoers
-# --with-mail-if-no-host send mail if user in sudoers but not for this host
-# --with-mail-if-noperms send mail if user not allowed to run command
-# --with-mailto who should get sudo mail (default is "root")
-# --with-mailsubject subject of sudo mail
-# --with-passprompt default password prompt
-# --with-badpass-message message the user sees when the password is wrong
-# --with-fqdn expect fully qualified hosts in sudoers
-# --with-timedir path to the sudo timestamp dir
-# --with-sudoers-mode mode of sudoers file (defaults to 0440)
-# --with-sudoers-uid uid that owns sudoers file (defaults to 0)
-# --with-sudoers-gid gid that owns sudoers file (defaults to 0)
-# --with-umask umask with which the prog should run (default is 022)
-# --without-umask Preserves the umask of the user invoking sudo.
-# --with-runas-default User to run commands as (default is "root")
-# --with-exempt=group no passwd needed for users in this group
-# --with-editor=path Default editor for visudo (defaults to vi)
-# --with-env-editor Use the environment variable EDITOR for visudo
-# --with-passwd-tries number of tries to enter password (default is 3)
-# --with-timeout minutes before sudo asks for passwd again (def is 5 minutes)
-# --with-password-timeout passwd prompt timeout in minutes (default is 5 minutes)
-# --with-tty-tickets use a different ticket file for each tty
-# --with-insults insult the user for entering an incorrect password
-# --with-all-insults include all the sudo insult sets
-# --with-classic-insults include the insults from the "classic" sudo
-# --with-csops-insults include CSOps insults
-# --with-hal-insults include 2001-like insults
-# --with-goons-insults include the insults from the "Goon Show"
-# --with-ldap[=DIR] enable LDAP support
-# --with-ldap-conf-file path to LDAP configuration file
-# --with-ldap-secret-file path to LDAP secret pasdword file
-# --with-pc-insults replace politically incorrect insults with less offensive ones
-# --with-secure-path override the user's path with a built-in one
-# --without-interfaces don't try to read the ip addr of ether interfaces
-# --with-stow properly handle GNU stow packaging
-# --with-pic try to use only PIC/non-PIC objects [default=use
-
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -141,7 +104,11 @@ $(STATEDIR)/sudo.targetinstall:
@$(call install_link, sudo, sudo, /usr/bin/sudoedit)
@$(call install_copy, sudo, 0, 0, 0644, -, \
- /usr/libexec/sudo_noexec.so)
+ /usr/libexec/sudo/sudo_noexec.so)
+ @$(call install_copy, sudo, 0, 0, 0644, -, \
+ /usr/libexec/sudo/group_file.so)
+ @$(call install_copy, sudo, 0, 0, 0644, -, \
+ /usr/libexec/sudo/system_group.so)
ifdef PTXCONF_SUDO_INSTALL_ETC_SUDOERS
@$(call install_alternative, sudo, 0, 0, 0440, /etc/sudoers, n)
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2017-08-30 13:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170830135557.20085-1-jbe@pengutronix.de \
--to=jbe@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox