Please merge sudo 1.8.5p2-1 (main) from Debian testing (main)

[Tyler Hicks]

I'm working on merging sudo from Debian testing. The upstream changelog lists a a number of bugs fixed and we can drop several patches in the process.

I'll attach the debdiff after I'm done testing.

[Tyler Hicks (tyhicks)]

Here's the debdiff against the Debian sudo 1.8.5p2-1 source.

I've tested the new sudo on quantal amd64 and i386 using the test-sudo.py script in lp:qa-regression-testing, as well as some manual testing. I also tested sudo-ldap on quantal amd64 and i386 using test-sudo.py.

[Tyler Hicks (tyhicks)]

Here's the diff between the debian directories in sudo 1.8.3p2-1ubuntu2 and 1.8.5p2-1ubuntu1.

[Tyler Hicks (tyhicks)]

The debdiff I attached above included some debian/changelog mangling. I'm going to delete the attachments above and provide the corrected debdiff.

[Tyler Hicks (tyhicks)]

Here's the debdiff against the Debian sudo 1.8.5p2-1 source.

[Tyler Hicks (tyhicks)]

Here's the diff between the debian directories in sudo 1.8.3p2-1ubuntu2 and 1.8.5p2-1ubuntu1.

[Marc Deslauriers (mdeslaur)]

Since Quantal can only be upgraded from Precise, all the Ubuntu-specific sudoers file migration code isn't necessary anymore. Please remove it all to simplify merging in the future.

[Tyler Hicks (tyhicks)]

Here's the updated debdiff against the Debian sudo 1.8.5p2-1 source.

I've incorporated Marc's feedback by dropping the Ubuntu-specific sudoers migration code in the preinst, postinst, and postrm.

I've verified that upgrading from 1.8.3p1-1ubuntu3.3 (Precise) and 1.8.3p2-1ubuntu2 (Quantal) work as expected.

Since I've done a few revisions now, I also went ahead and retested this revision in Quantal amd64 and i386 using test-sudo.py. It passed all tests.

[Tyler Hicks (tyhicks)]

Here's the updated diff between the debian directories in sudo 1.8.3p2-1ubuntu2 and 1.8.5p2-1ubuntu1.

[Launchpad Janitor (janitor)]

This bug was fixed in the package sudo - 1.8.5p2-1ubuntu1

---------------
sudo (1.8.5p2-1ubuntu1) quantal; urgency=low

  * Merge from debian/testing (LP: #1024154), remaining changes:
    - debian/patches/keep_home_by_default.patch:
      + Set HOME in initial_keepenv_table.
    - debian/rules:
      + compile with --without-lecture --with-tty-tickets (Ubuntu specific)
      + install man/man8/sudo_root.8 in both flavours (Ubuntu specific)
      + install apport hooks
      + The ubuntu-sudo-as-admin-successful.patch was taken upstream by
        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/source_sudo.py, debian/sudo-ldap.dirs, debian/sudo.dirs:
      + add usr/share/apport/package-hooks
    - debian/sudo.pam:
      + Use pam_env to read /etc/environment and /etc/default/locale
        environment files. Reading ~/.pam_environment is not permitted due to
        security reasons.
  * Dropped changes:
    - debian/patches/lp927828-fix-abort-in-pam-modules-when-timestamp-valid.patch
      + Fixed upstream in 1.8.5
    - debian/patches/CVE-2012-2337.patch:
      + Fixed upstream in 1.8.4p5
    - debian/patches/pam_env_merge.patch:
      + Feature released upstream in 1.8.5
    - debian/{sudo,sudo-ldap}.{preinst,postinst,postrm}:
      + Drop Ubuntu-specific sudoers file migration code because the only
        upgrade path to quantal is from precise. All necessary sudoers file
        migration will have already been done by the time this version of the
        sudo package is installed.

sudo (1.8.5p2-1) unstable; urgency=low

  * new upstream version
  * patch to use flock on hurd, run autoconf in rules, closes: #655883
  * patch to avoid calling unlink with null pointer on hurd, closes: #655948
  * patch to actually use hardening build flags, closes: #655417
  * fix sudo-ldap.postinst syntax issue, closes: #669576
 -- Tyler Hicks <email address hidden> Mon, 16 Jul 2012 14:01:42 +0200