diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:33:25 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:59:03 +0200 |
commit | 32a0454d3c495b12824ef4a0d0341237302d148a (patch) | |
tree | 9acc870d089b0028cecdfb1846b828ae4bd38910 /package/sudo | |
parent | f9686563b4fd3eed22e26105f7c440f0b74fcac1 (diff) | |
parent | dafa32b3bd75e9d155d075c796fa5b0ecbb9b11b (diff) | |
download | buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.tar.gz buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.zip |
Merge branch 'next'
Conflicts:
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/smartmontools/smartmontools.mk
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/sudo')
-rw-r--r-- | package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch (renamed from package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch) | 0 | ||||
-rw-r--r-- | package/sudo/sudo.mk | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch b/package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch index 69512b037..69512b037 100644 --- a/package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch +++ b/package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 15e06fa3d..3e548ef41 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,7 +4,7 @@ # ############################################################# -SUDO_VERSION = 1.8.5p1 +SUDO_VERSION = 1.8.5p2 SUDO_SITE = http://www.sudo.ws/sudo/dist SUDO_CONF_OPT = \ --without-lecture \ |