Merge lp://staging/~xnox/ubuntu/quantal/sudo/merge into lp://staging/ubuntu/quantal/sudo
Status: | Merged |
---|---|
Merged at revision: | 57 |
Proposed branch: | lp://staging/~xnox/ubuntu/quantal/sudo/merge |
Merge into: | lp://staging/ubuntu/quantal/sudo |
Diff against target: |
7378 lines (+370/-6300) 37 files modified
.pc/CVE-2012-0809.patch/src/sudo.c (+0/-1222) .pc/applied-patches (+0/-2) .pc/enable_badpass.patch/doc/sudoers.man.in (+0/-2035) .pc/enable_badpass.patch/doc/sudoers.pod (+0/-1969) .pc/enable_badpass.patch/plugins/sudoers/defaults.c (+0/-781) ChangeLog (+14/-0) NEWS (+6/-0) configure (+9/-9) configure.in (+1/-1) debian/README (+0/-17) debian/changelog (+66/-0) debian/control (+3/-3) debian/patches/CVE-2012-0809.patch (+0/-28) debian/patches/enable_badpass.patch (+0/-42) debian/patches/keep_home_by_default.patch (+3/-3) debian/patches/lp927828-fix-abort-in-pam-modules-when-timestamp-valid.patch (+22/-14) debian/patches/series (+0/-2) debian/rules (+22/-9) debian/source.lintian-overrides (+0/-2) debian/sudo-ldap.dirs (+1/-0) debian/sudo-ldap.lintian (+2/-0) debian/sudo-ldap.postinst (+62/-45) debian/sudo-ldap.postrm (+5/-0) debian/sudo-ldap.sudo.init (+2/-2) debian/sudo.dirs (+1/-0) debian/sudo.lintian (+2/-0) debian/sudo.postinst (+53/-42) debian/sudo.preinst (+1/-0) debian/sudo.service (+10/-0) debian/sudo.sudo.init (+2/-2) debian/sudoers (+1/-0) doc/sudoers.man.in (+1/-1) doc/sudoers.pod (+1/-1) plugins/sudoers/defaults.c (+0/-1) plugins/sudoers/po/sudoers.pot (+64/-64) src/po/sudo.pot (+2/-2) sudo.pp (+14/-1) |
To merge this branch: | bzr merge lp://staging/~xnox/ubuntu/quantal/sudo/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Steve Langasek | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2012-05-02.
Description of the change
This branch includes does include the recent CVE 1.8.3p1-1ubuntu5.
dpkg-genchanges: not including original source code in upload
Format: 1.8
Date: Tue, 01 May 2012 16:12:45 +0100
Source: sudo
Binary: sudo sudo-ldap
Architecture: source
Version: 1.8.3p2-1ubuntu1
Distribution: quantal
Urgency: high
Maintainer: Ubuntu Developers <email address hidden>
Changed-By: Dmitrijs Ledkovs <email address hidden>
Description:
sudo - Provide limited super user privileges to specific users
sudo-ldap - Provide limited super user privileges to specific users
Closes: 610600 612532 636049 639530 639633 641218 641782 648104 655417 655510 655894 657985
Launchpad-
Changes:
sudo (1.8.3p2-1ubuntu1) quantal; urgency=low
.
* Merge from debian/testing, remaining changes:
- debian/
+ Set HOME in initial_
- debian/
+ Fix Abort in some PAM modules when timestamp is valid. (LP: #927828)
- debian/rules:
+ compile with --without-lecture --with-tty-tickets (Ubuntu specific)
+ install man/man8/
+ install apport hooks
+ The ubuntu-
Debian however it requires a --enable-admin-flag configure flag to
actually enable it in both flavours.
- debian/control:
+ Mark Debian Vcs-* as XS-Debian-Vcs-*
+ update debian/control
- debian/sudoers:
+ grant admin group sudo access
- debian/
+ add usr/share/
- debian/
+ avoid conffile prompt by checking for known default /etc/sudoers
and if found installing the correct default /etc/sudoers file.
Modified for updated default sudoers. Aproach taken is different
from Debian. Maybe this should now be dropped, since an LTS was
released.
.
* Dropped changes:
- debian/
+ droped, included in this new upstream release.
- debian/
+ droped as Debian chose to set this by default in the sudoers.
.
sudo (1.8.3p2-1) unstable; urgency=high
.
* new upstream version, closes: #657985 (CVE-2012-0809)
* patch from Pino Toscano to only use selinux on Linux, closes: #655894
.
sudo (1.8.3p1-3) unstable; urgency=low
.
* patch from Moritz Muehlenhoff enables hardened build flags, closes: #655417
* replacement postinst script from Mike Beattie using shell instead of Perl
* include systemd service file from Michael Stapelberg, closes: #639633
* add init.d status support, closes: #641782
* make sudo-ldap package manage a sudoers entry in nsswitch.conf,
closes: #610600, #639530
* enable mail_badpass in the default sudoers file, closes: #641218
* enable selinux support, closes: #655510
.
sudo (1.8.3p1-2) unstable; urgency=low
.
* if upgrading from squeeze, and the sudoers file is unmodified, avoid
the packaging system prompting the user about a change they didn't make
now that sudoers is a conffile, closes: #612532, #636049
* add a recommendation for the use of visudo to the sudoers.d/README file,
closes: #648104
- debian/ patches/ CVE-2012- 0809.patch: patches/ enable_ badpass. patch:
+ dropped, included in this new upstream release.
- debian/
+ dropped as Debian chose to set this by default in the sudoers.
Please document these separately in debian/changelog, not as part of "remaining changes" since these are changes that *don't* remain. ("Dropped changes" makes a good header for such things.)
debian/sudoers has been changed - this means that debian/sudo.preinst also needs updated, for avoid_conffile_ prompt( ) to know about the new checksums. The version check also needs updated from 1.8.3p1-1ubuntu1 to 1.8.3p2-1ubuntu1.
debian/ patches/ paths-in- samples. diff, debian/ patches/ typo-in- classic- insults. diff have modified headers relative to the Debian package when they don't need to... this cosmetic delta could be dropped.
debian/rules passes --enable-admin-flag to the main sudo build, but not to the ldap build - I think this is a bug? (Not one introduced by your merge, but one that should be fixed nevertheless)
Otherwise, this looks good to me.