Merge lp:~ubuntu-branches/ubuntu/precise/eglibc/precise-201308281639 into lp:ubuntu/precise/eglibc

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/eglibc reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/eglibc/precise-201308281639. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

309. By Steve Langasek on 2012-04-19

kdm is not meant to be restarted, only warned about; moving the restart
code to the preinst is causing kdm restarts that will break the desktop
in the middle of the upgrade. Zero out our list of services between the
two uses of the variable. LP: #985735.

308. By Adam Conrad on 2012-04-15

debian/debhelper.in/libc.preinst: Brown paper bag fix; when we
upgrade from older versions, we don't have our linker in place
before unpacking, however the preisnt wants one, so create a
temporary linker symlink in the new location for one-time use

307. By Adam Conrad on 2012-04-12

[ James Hunt ]
* debian/debhelper.in/libc.preinst: Moved logic from postinst to
  prompt user for services to restart. We ask here to allow the
  problematic cron to be stopped in the preinst, but defer the restart of
  remaining services until postinst time (LP: #508083).

[ Steve Langasek ]
* debian/debhelper.in/libc.{pre,post}inst: drop special casing of upstart
  jobs when restarting, since the check was completely wrong anyway,
  depending on the no-longer-existent /lib/init/readlink.
* Drop obsolete gdm upgrade handling code that only applies for upgrades
  from hardy to lucid.
* Remove the /etc/ld.so.conf.d/i486-linux-gnu.conf conffile on upgrade on
  i386, since it's no longer shipped and we should give consistent results
  on upgrade and install; and add a Breaks on the three library packages
  in lucid that used this path.

[ Adam Conrad ]
* debian/patches/any/local-nscd-NO_MAPPING.diff: Apply patch from Jeff Law
  to clean up thread handling in __nscd_get_nl_timestamp and resolve a few
  random crashing issues with chromium-browser and ktorrent (LP: #929219)
* debian/rules.d/debhelper.mk: Fix RTLD_SO replacement regex for sanity.

306. By Steve Beattie on 2012-03-12

* SECURITY UPDATE: denial of service in RPC implementation (LP: #901716)
  - debian/patches/any/local-CVE-2011-4609.patch: nanosleep when too
    many open fds are detected
  - CVE-2011-4609
* SECURITY UPDATE: vfprintf nargs overflow leading to FORTIFY
  check bypass (LP: #953171)
  - debian/patches/any/cvs-CVE-2012-0864.patch: check for integer
    overflow
  - CVE-2012-0864