diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
| commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
| tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/sudo | |
| parent | 5b11223fb6cd0469becf49b0986868832c076bfc (diff) | |
| parent | 2105ecbd86d04e446effa11108f6bd755ed5f19a (diff) | |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/sudo')
| -rw-r--r-- | package/sudo/sudo-1.8.4p4-utmpx.patch | 19 | ||||
| -rw-r--r-- | package/sudo/sudo.mk | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/package/sudo/sudo-1.8.4p4-utmpx.patch b/package/sudo/sudo-1.8.4p4-utmpx.patch deleted file mode 100644 index 4e9740608..000000000 --- a/package/sudo/sudo-1.8.4p4-utmpx.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix incomplete setutxent/endutxent defines for when there's no utmpx -Upstream bug #551 - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura sudo-1.8.4p4.orig/src/utmp.c sudo-1.8.4p4/src/utmp.c ---- sudo-1.8.4p4.orig/src/utmp.c 2012-03-30 07:10:38.381706315 -0300 -+++ sudo-1.8.4p4/src/utmp.c 2012-03-30 07:10:52.605802501 -0300 -@@ -63,8 +63,8 @@ - #if !defined(HAVE_GETUTXID) && defined(HAVE_GETUTID) - # define getutxline(u) getutline(u) - # define pututxline(u) pututline(u) --# define setutxent setutent(u) --# define endutxent endutent(u) -+# define setutxent(u) setutent(u) -+# define endutxent(u) endutent(u) - #endif /* !HAVE_GETUTXID && HAVE_GETUTID */ - - #ifdef HAVE_GETUTXID diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 71d7a20a7..3629ad188 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,7 +4,7 @@ # ############################################################# -SUDO_VERSION = 1.8.4p4 +SUDO_VERSION = 1.8.5p1 SUDO_SITE = http://www.sudo.ws/sudo/dist SUDO_CONF_OPT = \ --without-lecture \ |