← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to debian/debhelper.in/libc.preinst

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/debhelper.in/libc.preinst
170
170
 
171
171
    if [ -n "$preversion" ]; then
172
172
        # NSS authentication trouble guard
173
 
        if dpkg --compare-versions "$preversion" lt 2.16; then
 
173
        if dpkg --compare-versions "$preversion" lt 2.17; then
174
174
            if pidof xscreensaver xlockmore >/dev/null; then
175
175
                if [ -f /usr/share/debconf/confmodule ] ; then
176
176
                    db_version 2.0
355
355
            else
356
356
                echo "Nothing to restart."
357
357
            fi
358
 
        fi # end upgrading and $preversion lt 2.16
 
358
        fi # end upgrading and $preversion lt 2.17
359
359
    fi # Upgrading
360
360
 
361
361
    # On upgrade from older glibc versions, our PI doesn't yet exist
362
362
    # on-disk, despite the preinst wanting to play with it, so make one
363
363
    if [ "${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)}" = "armhf" ]; then
364
364
        if dpkg --compare-versions "$preversion" lt 2.15-0ubuntu8; then
365
 
            ln -sf SLIBDIR/ld-linux.so.3 RTLD_SO
 
365
            ln -sf SLIBDIR/ld-linux.so.3 RTLD_SO
366
366
        fi
367
367
    fi
368
368
 
482
482
        esac
483
483
 
484
484
        case $realarch in
485
 
            ppc*|m68k) vmin=2.6.32;; # powerpc builders are all on lucid
486
 
            arm)       vmin=2.6.31;; # minimum version of imx51 kernel still in use
 
485
            ppc*)      vmin=2.6.32;; # keep minimum support at lucid/squeeze/RHEL6
 
486
            arm)       vmin=2.6.32;; # keep minimum support at lucid/squeeze/RHEL6
487
487
            *)         vmin=2.6.24;; # kernel version in hardy used on Xen-based ppa buildds
488
488
        esac
489
489