r6433 - in glibc-package/branches/glibc-2.21/debian: . control.in debhelper.in rules.d
Author: adconrad
Date: 2015-03-24 06:52:12 +0000 (Tue, 24 Mar 2015)
New Revision: 6433
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/control.in/libc
glibc-package/branches/glibc-2.21/debian/control.in/main
glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-alt.lintian-overrides
glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-otherbuild.lintian-overrides
glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.lintian-overrides
glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.postinst
glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.preinst
glibc-package/branches/glibc-2.21/debian/rules.d/control.mk
glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
Log:
* debian/{control.in/*,debhelper.in/*,rules.d/*}: Stop hardcoding our
upstream version all over the place and use GLIBC_VERSION instead.
* debian/debhelper.in/libc.preinst: Unconditionally wipe ld.so.cache
on major version upgrades, which is significantly less error-prone.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-24 06:52:12 UTC (rev 6433)
@@ -72,6 +72,10 @@
* debian/patches/arm/cvs-arm-sfi_breg.diff: Fix LDR_GLOBAL macro.
* debian/patches/arm/cvs-memcpy-memmove-always-bx.diff: Fix memcpy
and memmove for the ARM_ALWAYS_BX class of hardware like ArmadaXP.
+ * debian/{control.in/*,debhelper.in/*,rules.d/*}: Stop hardcoding our
+ upstream version all over the place and use GLIBC_VERSION instead.
+ * debian/debhelper.in/libc.preinst: Unconditionally wipe ld.so.cache
+ on major version upgrades, which is significantly less error-prone.
[ Aurelien Jarno ]
* debian/patches/any/local-libgcc-compat-main.diff: Fix definition of
Modified: glibc-package/branches/glibc-2.21/debian/control.in/libc
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control.in/libc 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/control.in/libc 2015-03-24 06:52:12 UTC (rev 6433)
@@ -8,7 +8,7 @@
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
-Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc6-x32 [x32],
Modified: glibc-package/branches/glibc-2.21/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control.in/main 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/control.in/main 2015-03-24 06:52:12 UTC (rev 6433)
@@ -83,7 +83,7 @@
Architecture: all
Section: localization
Priority: standard
-Depends: libc-bin (>> 2.21), ${misc:Depends}, debconf | debconf-2.0
+Depends: libc-bin (>> @GLIBC_VERSION@), ${misc:Depends}, debconf | debconf-2.0
Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data, manpages-fr-extra (<< 20141022)
Build-Profiles: <!stage1>
Modified: glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-alt.lintian-overrides
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-alt.lintian-overrides 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-alt.lintian-overrides 2015-03-24 06:52:12 UTC (rev 6433)
@@ -1,6 +1,6 @@
# libpthread must be stripped specially; GDB needs the non-dynamic
# symbol table in order to load the thread debugging library.
-LIBC-FLAVOR: unstripped-binary-or-object */libpthread-2.21.so
+LIBC-FLAVOR: unstripped-binary-or-object */libpthread-GLIBC_VERSION.so
# Those file are actually .o files not package in a ar archive, and
# thus should not be stripped
@@ -8,8 +8,8 @@
LIBC-FLAVOR: unstripped-binary-or-object */libmcheck.a
# ld.so must be executable, otherwise the system will not work
-LIBC-FLAVOR: shlib-with-executable-bit */ld-2.21.so 0755
+LIBC-FLAVOR: shlib-with-executable-bit */ld-GLIBC_VERSION.so 0755
# It is normal that the ELF dynamic linker does not need any other
# library
-LIBC-FLAVOR: shared-lib-without-dependency-information */ld-2.21.so
+LIBC-FLAVOR: shared-lib-without-dependency-information */ld-GLIBC_VERSION.so
Modified: glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-otherbuild.lintian-overrides
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-otherbuild.lintian-overrides 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/libc-otherbuild.lintian-overrides 2015-03-24 06:52:12 UTC (rev 6433)
@@ -1,13 +1,13 @@
# libpthread must be stripped specially; GDB needs the non-dynamic
# symbol table in order to load the thread debugging library.
-LIBC-FLAVOR: unstripped-binary-or-object */libpthread-2.21.so
+LIBC-FLAVOR: unstripped-binary-or-object */libpthread-GLIBC_VERSION.so
# ld.so must be executable, otherwise the system will not work
-LIBC-FLAVOR: shlib-with-executable-bit */ld-2.21.so 0755
+LIBC-FLAVOR: shlib-with-executable-bit */ld-GLIBC_VERSION.so 0755
# It is normal that the ELF dynamic linker does not need any other
# library
-LIBC-FLAVOR: shared-lib-without-dependency-information */ld-2.21.so
+LIBC-FLAVOR: shared-lib-without-dependency-information */ld-GLIBC_VERSION.so
# The libraries are installed in an hwcap directory, which contrary
# to what lintian thinks, is controlled by ldconfig
Modified: glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.lintian-overrides
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.lintian-overrides 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.lintian-overrides 2015-03-24 06:52:12 UTC (rev 6433)
@@ -1,13 +1,13 @@
# libpthread must be stripped specially; GDB needs the non-dynamic
# symbol table in order to load the thread debugging library.
-LIBC: unstripped-binary-or-object */libpthread-2.21.so
+LIBC: unstripped-binary-or-object */libpthread-GLIBC_VERSION.so
# ld.so must be executable, otherwise the system will not work
-LIBC: shlib-with-executable-bit */ld-2.21.so 0755
+LIBC: shlib-with-executable-bit */ld-GLIBC_VERSION.so 0755
# It is normal that the ELF dynamic linker does not need any other
# library
-LIBC: shared-lib-without-dependency-information */ld-2.21.so
+LIBC: shared-lib-without-dependency-information */ld-GLIBC_VERSION.so
# dependency on debconf is not needed, as glibc has a fallback to tty
LIBC: missing-debconf-dependency-for-preinst
Modified: glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.postinst 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.postinst 2015-03-24 06:52:12 UTC (rev 6433)
@@ -84,7 +84,7 @@
if [ ! -d /var/mail ] && [ ! -L /var/mail ]; then
ln -sf spool/mail /var/mail
fi
- if dpkg --compare-versions "$preversion" lt 2.21; then
+ if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
check="apache2.2-common apache apache-ssl apache-perl autofs at"
check="$check boa cucipop courier-authdaemon cron cups exim"
check="$check exim4-base dovecot-common cucipop incron lprng lpr"
@@ -215,7 +215,7 @@
else
echo "Nothing to restart."
fi
- fi # end upgrading and $preversion lt 2.21
+ fi # end upgrading and $preversion lt GLIBC_VERSION
fi # Upgrading
# Restart init. Currently handles chroots, systemd and upstart, and
Modified: glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.preinst 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/libc.preinst 2015-03-24 06:52:12 UTC (rev 6433)
@@ -142,7 +142,7 @@
if [ -n "$preversion" ]; then
# NSS authentication trouble guard
- if dpkg --compare-versions "$preversion" lt 2.21; then
+ if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
if pidof xscreensaver xlockmore >/dev/null; then
if [ -f /usr/share/debconf/confmodule ] ; then
db_version 2.0
@@ -220,7 +220,7 @@
exit 1
fi
fi
- fi # end upgrading and $preversion lt 2.21
+ fi # end upgrading and $preversion lt GLIBC_VERSION
fi # Upgrading
# Try to detect copies of the libc library in the various places
@@ -410,13 +410,10 @@
esac
if [ -n "$preversion" ]; then
- if dpkg --compare-versions "$preversion" lt 2.13-39; then
- # upgrading from a pre-multiarch libc to a multiarch libc; we have
- # to blow away /etc/ld.so.cache, otherwise the old unpacked libc
- # is still first in the cache and segfaults when combined with
- # our newly-unpacked ld.so. Do this last to avoid slowing down the
- # rest of the upgrade. Version number bumped to 2.13-39 to also
- # cover cache format upgrades for ARM.
+ if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
+ # unconditionally wipe ld.so.cache on major version upgrades; this
+ # makes those upgrades a bit slower, but is less error-prone than
+ # hoping we notice every time the cache format is changed upstream
rm -f /etc/ld.so.cache
rm -f /var/cache/ldconfig/aux-cache
fi
Modified: glibc-package/branches/glibc-2.21/debian/rules.d/control.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules.d/control.mk 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/control.mk 2015-03-24 06:52:12 UTC (rev 6433)
@@ -42,6 +42,6 @@
cat debian/control.in/opt >> $@T
cat debian/control.in/libnss-dns-udeb >> $@T
cat debian/control.in/libnss-files-udeb >> $@T
- sed -e 's%@libc@%$(libc)%g' < $@T > debian/control
+ sed -e 's%@libc@%$(libc)%g' -e 's%@GLIBC_VERSION@%$(GLIBC_VERSION)%g' < $@T > debian/control
rm $@T
touch $@
Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-03-23 09:15:47 UTC (rev 6432)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-03-24 06:52:12 UTC (rev 6433)
@@ -167,6 +167,7 @@
sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$y; \
sed -e "/NOHWCAP/r debian/script.in/nohwcap.sh" -i $$y; \
sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
+ sed -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" -i $$y; \
case $$y in \
*.install) \
sed -e "s/^#.*//" -i $$y ; \
Reply to: