r1841 - in glibc-package: branches/glibc-2.5/debian branches/glibc-2.5/debian/debhelper.in branches/glibc-2.5/debian/rules.d trunk/debian trunk/debian/debhelper.in trunk/debian/rules.d
Author: aurel32
Date: 2006-10-05 15:21:27 +0000 (Thu, 05 Oct 2006)
New Revision: 1841
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.preinst
glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* Improve the heuristic used to detect other copy of the C library (closes:
bug#390950).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-02 18:12:45 UTC (rev 1840)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-05 15:21:27 UTC (rev 1841)
@@ -198,6 +198,14 @@
-- Clint Adams <schizo@debian.org> Sun, 28 May 2006 03:28:14 +0200
+glibc (2.3.6.ds1-6) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * Improve the heuristic used to detect other copy of the C library (closes:
+ bug#390950).
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 5 Oct 2006 15:41:00 +0200
+
glibc (2.3.6.ds1-5) UNRELEASED; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.preinst 2006-10-02 18:12:45 UTC (rev 1840)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.preinst 2006-10-05 15:21:27 UTC (rev 1841)
@@ -107,9 +107,9 @@
# If there are versions of glibc outside of the normal installation
# location (/lib, /lib64, etc.) then things may break very badly
# as soon as ld.so is replaced by a new version. This check is not
-# foolproof, but it's pretty accurate. This script ignores old
-# libc4 or libc5, and libraries incompatible with the to-be-installed
-# ld.so.
+# foolproof, but it's pretty accurate. This script ignores libraries
+# with different sonames, and libraries incompatible with the
+# to-be-installed ld.so.
check_dirs () {
for dir in $*; do
@@ -127,8 +127,7 @@
continue
fi
if test -d $dir; then
- output=$(ls $dir | egrep '^lib(c|m|pthread|rt|dl)\.so\.[^/]*$' |\
- egrep -v '^lib[cm]\.so\.[45].*$' 2>/dev/null)
+ output=$(ls $dir | egrep '^(C_SO|M_SO|PTHREAD_SO|RT_SO|DL_SO)$' 2>/dev/null)
if test -n "$output"; then
# See if the found libraries are compatible with the system ld.so;
Modified: glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk 2006-10-02 18:12:45 UTC (rev 1840)
+++ glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk 2006-10-05 15:21:27 UTC (rev 1841)
@@ -189,8 +189,13 @@
fi ; \
;; \
debian/$(libc).preinst) \
- l=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
- sed -e "s#RTLD#$$l#" -i $$z ; \
+ rtld=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
+ c_so=`ls debian/tmp-libc/lib/ | grep "libc\.so\."` ; \
+ m_so=`ls debian/tmp-libc/lib/ | grep "libm\.so\."` ; \
+ pthread_so=`ls debian/tmp-libc/lib/ | grep "libpthread\.so\."` ; \
+ rt_so=`ls debian/tmp-libc/lib/ | grep "librt\.so\."` ; \
+ dl_so=`ls debian/tmp-libc/lib/ | grep "libdl\.so\."` ; \
+ sed -e "s#RTLD#$$rtld#" -e "s#C_SO#$$c_so#" -e "s#M_SO#$$m_so#" -e "s#PTHREAD_SO#$$pthread_so#" -e "s#RT_SO#$$rt_so#" -e "s#DL_SO#$$dl_so#" -i $$z ; \
;; \
esac; \
done
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-10-02 18:12:45 UTC (rev 1840)
+++ glibc-package/trunk/debian/changelog 2006-10-05 15:21:27 UTC (rev 1841)
@@ -1,3 +1,11 @@
+glibc (2.3.6.ds1-6) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * Improve the heuristic used to detect other copy of the C library (closes:
+ bug#390950).
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 5 Oct 2006 15:41:00 +0200
+
glibc (2.3.6.ds1-5) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-10-02 18:12:45 UTC (rev 1840)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-10-05 15:21:27 UTC (rev 1841)
@@ -107,9 +107,9 @@
# If there are versions of glibc outside of the normal installation
# location (/lib, /lib64, etc.) then things may break very badly
# as soon as ld.so is replaced by a new version. This check is not
-# foolproof, but it's pretty accurate. This script ignores old
-# libc4 or libc5, and libraries incompatible with the to-be-installed
-# ld.so.
+# foolproof, but it's pretty accurate. This script ignores libraries
+# with different sonames, and libraries incompatible with the
+# to-be-installed ld.so.
check_dirs () {
for dir in $*; do
@@ -127,8 +127,7 @@
continue
fi
if test -d $dir; then
- output=$(ls $dir | egrep '^lib(c|m|pthread|rt|dl)\.so\.[^/]*$' |\
- egrep -v '^lib[cm]\.so\.[45].*$' 2>/dev/null)
+ output=$(ls $dir | egrep '^(C_SO|M_SO|PTHREAD_SO|RT_SO|DL_SO)$' 2>/dev/null)
if test -n "$output"; then
# See if the found libraries are compatible with the system ld.so;
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-10-02 18:12:45 UTC (rev 1840)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-10-05 15:21:27 UTC (rev 1841)
@@ -195,8 +195,13 @@
fi ; \
;; \
debian/$(libc).preinst) \
- l=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
- sed -e "s#RTLD#$$l#" -i $$z ; \
+ rtld=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
+ c_so=`ls debian/tmp-libc/lib/ | grep "libc\.so\."` ; \
+ m_so=`ls debian/tmp-libc/lib/ | grep "libm\.so\."` ; \
+ pthread_so=`ls debian/tmp-libc/lib/ | grep "libpthread\.so\."` ; \
+ rt_so=`ls debian/tmp-libc/lib/ | grep "librt\.so\."` ; \
+ dl_so=`ls debian/tmp-libc/lib/ | grep "libdl\.so\."` ; \
+ sed -e "s#RTLD#$$rtld#" -e "s#C_SO#$$c_so#" -e "s#M_SO#$$m_so#" -e "s#PTHREAD_SO#$$pthread_so#" -e "s#RT_SO#$$rt_so#" -e "s#DL_SO#$$dl_so#" -i $$z ; \
;; \
esac; \
done
Reply to: