Carsten Schlote wrote: > From: Carsten Schlote <[email protected]> > > - Updated to latest stable version. Fixepd URL. > - Copies patch to disable stripping > - patches for cross-compilation (unsetenv) > > Signed-off-by: Carsten Schlote <[email protected]>
updated to latest (1.7.2p6) and added mol's sugestions (use sudo_cp_ instead of hacking configure.in) applied to master, Marc > --- > .../0001-install-sh-disable-stripping.patch | 29 > ++++++++++++++++++++ > patches/sudo-1.7.2p5/autogen.sh | 3 ++ > .../sudo-1.7.2p5/fix-problem-with-unsetenv.patch | 25 +++++++++++++++++ > patches/sudo-1.7.2p5/series | 2 + > rules/sudo.in | 1 + > rules/sudo.make | 4 +- > 6 files changed, 62 insertions(+), 2 deletions(-) > create mode 100644 > patches/sudo-1.7.2p5/0001-install-sh-disable-stripping.patch > create mode 100755 patches/sudo-1.7.2p5/autogen.sh > create mode 100644 patches/sudo-1.7.2p5/fix-problem-with-unsetenv.patch > create mode 100644 patches/sudo-1.7.2p5/series > > diff --git a/patches/sudo-1.7.2p5/0001-install-sh-disable-stripping.patch > b/patches/sudo-1.7.2p5/0001-install-sh-disable-stripping.patch > new file mode 100644 > index 0000000..c8421a5 > --- /dev/null > +++ b/patches/sudo-1.7.2p5/0001-install-sh-disable-stripping.patch > @@ -0,0 +1,29 @@ > +From 0c293e823cbe169ed09f1be263ff22e57b9d03ef Mon Sep 17 00:00:00 2001 > +From: Marc Kleine-Budde <[email protected]> > +Date: Wed, 13 Jan 2010 09:29:27 +0100 > +Subject: [PATCH] install-sh: disable stripping > + > +This patch disables stripping because the install-sh would use > +/usr/bin/strip which doesn't work during cross compilation. > + > +Signed-off-by: Marc Kleine-Budde <[email protected]> > +--- > + install-sh | 2 +- > + 1 files changed, 1 insertions(+), 1 deletions(-) > + > +diff --git a/install-sh b/install-sh > +index 5a6d399..e9a70b5 100755 > +--- a/install-sh > ++++ b/install-sh > +@@ -138,7 +138,7 @@ while ${MORETODO} ; do > + fi > + ;; > + X-s) > +- STRIPIT=true > ++ STRIPIT=false > + ;; > + X--) > + shift > +-- > +1.6.6 > + > diff --git a/patches/sudo-1.7.2p5/autogen.sh b/patches/sudo-1.7.2p5/autogen.sh > new file mode 100755 > index 0000000..84d1401 > --- /dev/null > +++ b/patches/sudo-1.7.2p5/autogen.sh > @@ -0,0 +1,3 @@ > +# Reconfigure configure script with patch .in file > +autoconf > + > diff --git a/patches/sudo-1.7.2p5/fix-problem-with-unsetenv.patch > b/patches/sudo-1.7.2p5/fix-problem-with-unsetenv.patch > new file mode 100644 > index 0000000..f537fa2 > --- /dev/null > +++ b/patches/sudo-1.7.2p5/fix-problem-with-unsetenv.patch > @@ -0,0 +1,25 @@ > +From: Carsten Schlote <[email protected]> > +Subject: Fix a problem with unsetenv and eglibc(?) > + > +The configuration for unsetenv() is detected wrong. The test has > +beend removed as a hotfix. > + > +Signed-off-by: Carsten Schlote <[email protected]> > +--- > +--- > + configure.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +Index: sudo-1.7.2p5/configure.in > +=================================================================== > +--- sudo-1.7.2p5.orig/configure.in 2010-03-01 12:15:55.000000000 +0100 > ++++ sudo-1.7.2p5/configure.in 2010-03-04 15:03:33.000000000 +0100 > +@@ -1842,7 +1842,7 @@ > + AC_CHECK_FUNCS(strchr strrchr memchr memcpy memset sysconf tzset \ > + strftime setrlimit initgroups getgroups fstat gettimeofday \ > + setlocale getaddrinfo setsid setenv setrlimit64) > +-AC_CHECK_FUNCS(unsetenv, SUDO_FUNC_UNSETENV_VOID) > ++#AC_CHECK_FUNCS(unsetenv, SUDO_FUNC_UNSETENV_VOID) > + SUDO_FUNC_PUTENV_CONST > + if test -z "$SKIP_SETRESUID"; then > + AC_CHECK_FUNCS(setresuid, [SKIP_SETREUID=yes]) > diff --git a/patches/sudo-1.7.2p5/series b/patches/sudo-1.7.2p5/series > new file mode 100644 > index 0000000..38ae162 > --- /dev/null > +++ b/patches/sudo-1.7.2p5/series > @@ -0,0 +1,2 @@ > +0001-install-sh-disable-stripping.patch > +fix-problem-with-unsetenv.patch > diff --git a/rules/sudo.in b/rules/sudo.in > index 4540dfa..7ad9a17 100644 > --- a/rules/sudo.in > +++ b/rules/sudo.in > @@ -1,4 +1,5 @@ > ## SECTION=shell_and_console > + > menuconfig SUDO > tristate > prompt "sudo " > diff --git a/rules/sudo.make b/rules/sudo.make > index 32e3a7f..e3c4c04 100644 > --- a/rules/sudo.make > +++ b/rules/sudo.make > @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_SUDO) += sudo > # > # Paths and names > # > -SUDO_VERSION := 1.6.9 > +SUDO_VERSION := 1.7.2p5 > SUDO := sudo-$(SUDO_VERSION) > SUDO_SUFFIX := tar.gz > -SUDO_URL := http://www.courtesan.com/sudo/dist/OLD/$(SUDO).$(SUDO_SUFFIX) > +SUDO_URL := http://www.sudo.ws/sudo/dist/$(SUDO).$(SUDO_SUFFIX) > SUDO_SOURCE := $(SRCDIR)/$(SUDO).$(SUDO_SUFFIX) > SUDO_DIR := $(BUILDDIR)/$(SUDO) > -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list [email protected]
