r6171 - in glibc-package/branches/glibc-2.19/debian: . control.in debhelper.in local/etc rules.d
Author: aurel32
Date: 2014-06-17 18:33:44 +0000 (Tue, 17 Jun 2014)
New Revision: 6171
Added:
glibc-package/branches/glibc-2.19/debian/local/etc/ld.so.conf
Modified:
glibc-package/branches/glibc-2.19/debian/changelog
glibc-package/branches/glibc-2.19/debian/control
glibc-package/branches/glibc-2.19/debian/control.in/libc
glibc-package/branches/glibc-2.19/debian/debhelper.in/libc-bin.install
glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.postinst
glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.postrm
glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.preinst
glibc-package/branches/glibc-2.19/debian/rules.d/build.mk
Log:
Merge from trunk
Modified: glibc-package/branches/glibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.19/debian/changelog 2014-06-17 18:13:01 UTC (rev 6170)
+++ glibc-package/branches/glibc-2.19/debian/changelog 2014-06-17 18:33:44 UTC (rev 6171)
@@ -30,6 +30,21 @@
-- Aurelien Jarno <aurel32@debian.org> Wed, 21 May 2014 12:38:51 +0200
+eglibc (2.19-3) unstable; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debian/control.in/libc: fix libtirpc1 breaks. Closes: #751852.
+ * debian/rules.d/build.mk: generate ld.so configuration file using
+ DEB_HOST_MULTIARCH instead of DEB_HOST_GNU_TYPE to have a stable
+ path even when the GNU triplet change.
+ * debian/debhelper.in/libc.{preinst,postrm,postinst}: remove old
+ ld.so configuration file on hurd-i386, i386 and kfreebsd-i386.
+ * debian/debhelper.in/libc.postinst: don't create/modify ld.so.conf,
+ but instead provide it as a conffile in libc-bin. Closes: #737588.
+ * debian/debhelper.in/libc.preinst: remove dead code.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 17 Jun 2014 18:57:11 +0200
+
eglibc (2.19-2) unstable; urgency=medium
[ Adam Conrad ]
@@ -55,7 +70,7 @@
* debian/control.in/libc: add a Breaks: check (<< 0.9.10-6.1+b1) on s390x,
to make sure libcheck.a is using the GLIBC_2.19 version of the *jmp*
functions.
- * debian/control.in/libc: add a Breaks: libtirpc1 (<< 2.3), as earlier
+ * debian/control.in/libc: add a Breaks: libtirpc1 (<< 0.2.3), as earlier
versions try to unlock a lock which hasn't been locked, causing an
issue with lock elision. Closes: #751134.
* Update Swedish debconf translation, by Martin Bagge. Closes: #751172.
Modified: glibc-package/branches/glibc-2.19/debian/control
===================================================================
--- glibc-package/branches/glibc-2.19/debian/control 2014-06-17 18:13:01 UTC (rev 6170)
+++ glibc-package/branches/glibc-2.19/debian/control 2014-06-17 18:33:44 UTC (rev 6171)
@@ -144,7 +144,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.19), locales (<< 2.19), locales-all (<< 2.19), 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 (<< 2.3)
+Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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],
@@ -237,7 +237,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.19), locales (<< 2.19), locales-all (<< 2.19), 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 (<< 2.3)
+Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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],
@@ -330,7 +330,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.19), locales (<< 2.19), locales-all (<< 2.19), 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 (<< 2.3)
+Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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],
@@ -423,7 +423,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.19), locales (<< 2.19), locales-all (<< 2.19), 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 (<< 2.3)
+Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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.19/debian/control.in/libc
===================================================================
--- glibc-package/branches/glibc-2.19/debian/control.in/libc 2014-06-17 18:13:01 UTC (rev 6170)
+++ glibc-package/branches/glibc-2.19/debian/control.in/libc 2014-06-17 18:33:44 UTC (rev 6171)
@@ -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.19), locales (<< 2.19), locales-all (<< 2.19), 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 (<< 2.3)
+Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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.19/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/branches/glibc-2.19/debian/debhelper.in/libc-bin.install 2014-06-17 18:13:01 UTC (rev 6170)
+++ glibc-package/branches/glibc-2.19/debian/debhelper.in/libc-bin.install 2014-06-17 18:33:44 UTC (rev 6171)
@@ -1,4 +1,5 @@
debian/local/etc/bindresvport.blacklist etc
+debian/local/etc/ld.so.conf etc
debian/local/etc/ld.so.conf.d etc
debian/local/etc/nsswitch.conf usr/share/libc-bin
nis/nss etc/default
Modified: glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.postinst 2014-06-17 18:13:01 UTC (rev 6170)
+++ glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.postinst 2014-06-17 18:33:44 UTC (rev 6171)
@@ -70,16 +70,6 @@
if [ "$type" = "configure" ]
then
- # Add support for /etc/ld.so.conf.d
- if [ -e /etc/ld.so.conf ]; then
- [ -z "$(tail -n 1 /etc/ld.so.conf)" ] || echo >> /etc/ld.so.conf
- else
- touch /etc/ld.so.conf
- fi
- if ! grep -q '^include /etc/ld.so.conf.d/.*\.conf$' /etc/ld.so.conf ; then
- echo 'include /etc/ld.so.conf.d/*.conf' >> /etc/ld.so.conf
- fi
-
# We don't use a registry anymore, remove the old file
rm -f /etc/ld.so.hwcappkgs
@@ -249,6 +239,21 @@
fi
fi
+# We now use the multiarch triplet instead of the GNU triplet for the ld.so
+# configuration file, in order to keep a stable path. Remove the old file.
+case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
+ hurd-i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+ i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+ kfreebsd-i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+esac
+
#DEBHELPER#
exit 0
Modified: glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.postrm
===================================================================
--- glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.postrm 2014-06-17 18:13:01 UTC (rev 6170)
+++ glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.postrm 2014-06-17 18:33:44 UTC (rev 6171)
@@ -37,6 +37,21 @@
# update-rc.d mountkernfs remove > /dev/null
#fi
+# We now use the multiarch triplet instead of the GNU triplet for the ld.so
+# configuration file, in order to keep a stable path. Remove the old file.
+case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
+ hurd-i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+ i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+ kfreebsd-i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+esac
+
#DEBHELPER#
exit 0
Modified: glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.preinst 2014-06-17 18:13:01 UTC (rev 6170)
+++ glibc-package/branches/glibc-2.19/debian/debhelper.in/libc.preinst 2014-06-17 18:33:44 UTC (rev 6171)
@@ -355,16 +355,8 @@
fi
# sanity checking for the appropriate kernel on each architecture.
- realarch=`uname -m`
kernel_ver=`uname -r`
- # convert "armv4l" and similar to just "arm", and "mips64" and similar
- # to just "mips"
- case $realarch in
- arm*) realarch="arm";;
- mips*) realarch="mips";;
- esac
-
# The GNU libc requires a >= 2.6.32 kernel, found in squeeze/lucid/RHEL6
if linux_compare_versions "$kernel_ver" lt 2.6.32
then
@@ -388,6 +380,21 @@
fi
fi
+# We now use the multiarch triplet instead of the GNU triplet for the ld.so
+# configuration file, in order to keep a stable path. Remove the old file.
+case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
+ hurd-i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+ i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+ kfreebsd-i386)
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-3~ libc6 -- "$@"
+ ;;
+esac
+
#DEBHELPER#
case $type in
Added: glibc-package/branches/glibc-2.19/debian/local/etc/ld.so.conf
===================================================================
--- glibc-package/branches/glibc-2.19/debian/local/etc/ld.so.conf (rev 0)
+++ glibc-package/branches/glibc-2.19/debian/local/etc/ld.so.conf 2014-06-17 18:33:44 UTC (rev 6171)
@@ -0,0 +1,2 @@
+include /etc/ld.so.conf.d/*.conf
+
Modified: glibc-package/branches/glibc-2.19/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.19/debian/rules.d/build.mk 2014-06-17 18:13:01 UTC (rev 6170)
+++ glibc-package/branches/glibc-2.19/debian/rules.d/build.mk 2014-06-17 18:33:44 UTC (rev 6171)
@@ -211,7 +211,7 @@
# Create the multiarch directories, and the configuration file in /etc/ld.so.conf.d
if [ $(curpass) = libc ]; then \
mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
- conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$(DEB_HOST_GNU_TYPE).conf"; \
+ conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$(DEB_HOST_MULTIARCH).conf"; \
echo "# Multiarch support" > $$conffile; \
echo "$(call xx,slibdir)" >> $$conffile; \
echo "$(call xx,libdir)" >> $$conffile; \
Reply to: