Author: aurel32
Date: 2010-02-07 21:47:42 +0000 (Sun, 07 Feb 2010)
New Revision: 4156
Added:
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-leading-zero-stack-guard.diff
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-stack-guard-quick-randomization.diff
glibc-package/branches/eglibc-2.11/debian/patches/localedata/locale-es_CR.diff
Modified:
glibc-package/branches/eglibc-2.11/debian/changelog
glibc-package/branches/eglibc-2.11/debian/control
glibc-package/branches/eglibc-2.11/debian/control.in/amd64
glibc-package/branches/eglibc-2.11/debian/control.in/i386
glibc-package/branches/eglibc-2.11/debian/control.in/kfreebsd-i386
glibc-package/branches/eglibc-2.11/debian/control.in/libc
glibc-package/branches/eglibc-2.11/debian/control.in/main
glibc-package/branches/eglibc-2.11/debian/control.in/mips64
glibc-package/branches/eglibc-2.11/debian/control.in/mipsn32
glibc-package/branches/eglibc-2.11/debian/control.in/opt
glibc-package/branches/eglibc-2.11/debian/control.in/powerpc
glibc-package/branches/eglibc-2.11/debian/control.in/ppc64
glibc-package/branches/eglibc-2.11/debian/control.in/s390x
glibc-package/branches/eglibc-2.11/debian/control.in/sparc64
glibc-package/branches/eglibc-2.11/debian/patches/series
glibc-package/branches/eglibc-2.11/debian/script.in/nsscheck.sh
Log:
Merge from unstable, up to revision 4155
Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog 2010-02-07 21:39:40 UTC
(rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/changelog 2010-02-07 21:47:42 UTC
(rev 4156)
@@ -65,9 +65,19 @@
-- Aurelien Jarno <aure...@debian.org> Sun, 07 Feb 2010 17:58:42 +0100
-eglibc (2.10.2-6) UNRELEASED; urgency=low
+eglibc (2.10.2-7) UNRELEASED; urgency=low
+ [ Samuel Thibault ]
+ * patches/hurd-i386/local-pthread.diff: Refresh patch.
+
[ Aurelien Jarno ]
+ * debian/control.in/*: add ${misc:Depends} to all binary packages.
+
+ -- Aurelien Jarno <aure...@debian.org> Sun, 07 Feb 2010 22:39:12 +0100
+
+eglibc (2.10.2-6) unstable; urgency=low
+
+ [ Aurelien Jarno ]
* kfreebsd/local-sysdeps.diff: update to revision 2957 (from glibc-bsd).
* Don't run the testsuite in parallel, as it sometimes causes some failures
in some tests.
@@ -79,6 +89,13 @@
arguments.
* Add patches/ia64/submitted-memchr.diff to fix memchr() overshoot on ia64.
Closes: #563882
+ * Add patches/any/submitted-leading-zero-stack-guard.diff and
+ patches/any/submitted-stack-guard-quick-randomization.diff from Ubuntu and
+ Fedora to improve stack randomisation. Closes: #568488.
+ * Update es_CR locale from Marcelo Magallon. Closes: #567351.
+ * debian/script.in/nsscheck.sh: Only restart services that are currently
+ running. Closes: #528755.
+ * Move locales and locales-all to section localization. Closes: #568753.
[ Samuel Thibault ]
* patches/hurd-i386/local-pthread.diff: New hurd-only patch to provide
@@ -93,7 +110,7 @@
* patches/hurd-i386/submitted-getnprocs.diff: New patch to add get_nprocs()
and such weak aliases.
- -- Aurelien Jarno <aure...@debian.org> Fri, 05 Feb 2010 21:11:00 +0100
+ -- Aurelien Jarno <aure...@debian.org> Sun, 07 Feb 2010 16:54:24 +0100
eglibc (2.10.2-5) unstable; urgency=low
Modified: glibc-package/branches/eglibc-2.11/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control 2010-02-07 21:39:40 UTC
(rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control 2010-02-07 21:47:42 UTC
(rev 4156)
@@ -8,7 +8,7 @@
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.17cvs20070426), binutils (>= 2.20-3) [mips mipsel],
g++-4.4 (>= 4.4.2-2) [!i386], g++-4.4-multilib [amd64 kfreebsd-amd64 mips
mipsel powerpc ppc64 s390 sparc],
- g++-4.3 [i386], g++-4.3-multilib [i386],
+ g++-4.3 [i386], g++-4.3-multilib [i386]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: GOTO Masanori <go...@debian.org>, Philip Blundell
<p...@nexus.co.uk>, Jeff Bailey <jbai...@raspberryginger.com>, Daniel
Jacobowitz <d...@debian.org>, Clint Adams <sch...@debian.org>, Aurelien Jarno
<aure...@debian.org>, Pierre Habouzit <madco...@debian.org>
@@ -21,6 +21,7 @@
Architecture: any
Section: libs
Priority: required
+Depends: ${misc:Depends}
Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<<
2.10)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: Embedded GNU C Library: Binaries
@@ -39,7 +40,7 @@
Architecture: any
Section: libdevel
Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: manpages-dev
Replaces: libc0.1-dev, libc0.3-dev, libc6-dev, libc6.1-dev
Description: Embedded GNU C Library: Development binaries
@@ -50,6 +51,7 @@
Architecture: all
Section: doc
Priority: optional
+Depends: ${misc:Depends}
Suggests: glibc-doc-reference
Description: Embedded GNU C Library: Documentation
Contains man pages for libpthread functions and the complete GNU C Library
@@ -60,6 +62,7 @@
Architecture: all
Section: devel
Priority: optional
+Depends: ${misc:Depends}
Recommends: xz-utils
Description: Embedded GNU C Library: sources
This package contains the sources and patches which are needed to
@@ -67,9 +70,9 @@
Package: locales
Architecture: all
-Section: libs
+Section: localization
Priority: standard
-Depends: ${locale:Depends}, debconf | debconf-2.0
+Depends: ${locale:Depends}, ${misc:Depends}, debconf | debconf-2.0
Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
Description: Embedded GNU C Library: National Language (locale) data [support]
@@ -85,9 +88,9 @@
Package: locales-all
Architecture: any
-Section: libs
+Section: localization
Priority: extra
-Depends: ${locale:Depends}, lzma
+Depends: ${locale:Depends}, ${misc:Depends}, lzma
Provides: locales
Description: Embedded GNU C Library: Precompiled locale data
This package contains the precompiled locale data for all supported locales.
@@ -99,7 +102,7 @@
Architecture: any
Section: admin
Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Embedded GNU C Library: Name Service Cache Daemon
A daemon which handles passwd, group and host lookups
for running programs and caches the results for the next
@@ -110,7 +113,7 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64
sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
-Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386],
libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>=
20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4
[hppa]
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -125,7 +128,7 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64
sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: optional
-Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any],
gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
+Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11)
[kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386
kfreebsd-amd64]
@@ -139,7 +142,7 @@
Section: debug
Priority: extra
Provides: libc-dbg
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: detached debugging symbols
This package contains the detached debugging symbols for the GNU C
library.
@@ -148,7 +151,7 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64
sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: extra
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: Profiling Libraries
Static libraries compiled with profiling info (-pg) suitable for use
with gprof.
@@ -159,7 +162,7 @@
Priority: optional
Conflicts: libc-pic
Provides: libc-pic, glibc-pic
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: PIC archive library
Contains an archive library (ar file) composed of individual shared objects.
This is used for creating a library which is a smaller subset of the
@@ -185,7 +188,7 @@
Architecture: alpha ia64
Section: libs
Priority: required
-Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386],
libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>=
20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4
[hppa]
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -200,7 +203,7 @@
Architecture: alpha ia64
Section: libdevel
Priority: optional
-Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any],
gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
+Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11)
[kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386
kfreebsd-amd64]
@@ -214,7 +217,7 @@
Section: debug
Priority: extra
Provides: libc-dbg
-Depends: libc6.1 (= ${binary:Version})
+Depends: libc6.1 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: detached debugging symbols
This package contains the detached debugging symbols for the GNU C
library.
@@ -223,7 +226,7 @@
Architecture: alpha ia64
Section: libdevel
Priority: extra
-Depends: libc6.1 (= ${binary:Version})
+Depends: libc6.1 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: Profiling Libraries
Static libraries compiled with profiling info (-pg) suitable for use
with gprof.
@@ -234,7 +237,7 @@
Priority: optional
Conflicts: libc-pic
Provides: libc-pic, glibc-pic
-Depends: libc6.1 (= ${binary:Version})
+Depends: libc6.1 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: PIC archive library
Contains an archive library (ar file) composed of individual shared objects.
This is used for creating a library which is a smaller subset of the
@@ -260,7 +263,7 @@
Architecture: hurd-i386
Section: libs
Priority: required
-Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386],
libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>=
20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4
[hppa]
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -275,7 +278,7 @@
Architecture: hurd-i386
Section: libdevel
Priority: optional
-Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any],
gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
+Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11)
[kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386
kfreebsd-amd64]
@@ -289,7 +292,7 @@
Section: debug
Priority: extra
Provides: libc-dbg
-Depends: libc0.3 (= ${binary:Version})
+Depends: libc0.3 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: detached debugging symbols
This package contains the detached debugging symbols for the GNU C
library.
@@ -298,7 +301,7 @@
Architecture: hurd-i386
Section: libdevel
Priority: extra
-Depends: libc0.3 (= ${binary:Version})
+Depends: libc0.3 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: Profiling Libraries
Static libraries compiled with profiling info (-pg) suitable for use
with gprof.
@@ -309,7 +312,7 @@
Priority: optional
Conflicts: libc-pic
Provides: libc-pic, glibc-pic
-Depends: libc0.3 (= ${binary:Version})
+Depends: libc0.3 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: PIC archive library
Contains an archive library (ar file) composed of individual shared objects.
This is used for creating a library which is a smaller subset of the
@@ -335,7 +338,7 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libs
Priority: required
-Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386],
libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>=
20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4
[hppa]
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -350,7 +353,7 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: optional
-Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any],
gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
+Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11)
[kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386
kfreebsd-amd64]
@@ -364,7 +367,7 @@
Section: debug
Priority: extra
Provides: libc-dbg
-Depends: libc0.1 (= ${binary:Version})
+Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: detached debugging symbols
This package contains the detached debugging symbols for the GNU C
library.
@@ -373,7 +376,7 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: extra
-Depends: libc0.1 (= ${binary:Version})
+Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: Profiling Libraries
Static libraries compiled with profiling info (-pg) suitable for use
with gprof.
@@ -384,7 +387,7 @@
Priority: optional
Conflicts: libc-pic
Provides: libc-pic, glibc-pic
-Depends: libc0.1 (= ${binary:Version})
+Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: PIC archive library
Contains an archive library (ar file) composed of individual shared objects.
This is used for creating a library which is a smaller subset of the
@@ -410,7 +413,7 @@
Architecture: amd64
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Replaces: libc6-dev-i386
Breaks: fakeroot (<= 1.12.2), gnu-efi (<= 3.0e-2), fakechroot (<= 2.9-1),
fglrx-glx-ia32 (<= 1:9-5-1), ia32-libs (<= 2.7), ia32-libs-gtk (<= 2.7),
lib32asound2 (<= 1.0.20-2), lib32asound2-dev (<= 1.0.20-2), lib32bz2-1.0 (<=
1.0.5-2), lib32bz2-dev (<= 1.0.5-2), lib32ffi-dev (<= 3.0.7-1), lib32ffi5 (<=
3.0.7-1), lib32g2c0 (<= 1:3.4.6-9), lib32gcc1 (<= 1:4.4.0-6), lib32gfortran3
(<= 4.4.0-6), lib32gmp3 (<= 2:4.3.1+dfsg-2), lib32gmp3-dev (<= 2:4.3.1+dfsg-2),
lib32gmpxx4 (<= 2:4.3.1+dfsg-2), lib32gomp1 (<= 4.4.0-6), lib32icu-dev (<=
4.0.1-2), lib32icu38 (<= 4.0.1-2), lib32icu40 (<= 4.0.1-2), lib32mudflap0 (<=
4.4.0-6), lib32ncurses5 (<= 5.7+20090523-1), lib32ncurses5-dev (<=
5.7+20090523-1), lib32ncursesw5 (<= 5.7+20090523-1), lib32ncursesw5-dev (<=
5.7+20090523-1), lib32nss-mdns (<= 0.10-3), lib32objc2 (<= 4.4.0-6),
lib32readline5 (<= 5.2-4), lib32readline5-dev (<= 5.2-4), lib32stdc++6 (<=
4.4.0-6), lib32stdc++6-4.4-dbg (<= 4.4.0-6), lib32z1 (<= 1:1.2.3.3.dfsg-13),
lib32z1-dev (
<= 1:1.2.3.3.dfsg-13), libc6-dev-i386 (<= 2.9-14), nvidia-glx-ia32 (<=
185.18.14-1), nvidia-libvdpau1-ia32 (<= 185.18.14-1)
Description: GNU C Library: 32-bit shared libraries for AMD64
@@ -424,7 +427,7 @@
Priority: optional
Provides: lib32c-dev
Conflicts: libc6-i386 (<= 2.9-18)
-Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 32-bit development libraries for AMD64
Contains the symlinks and object files needed to compile and link programs
@@ -435,7 +438,7 @@
Architecture: sparc
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Conflicts: gcc-3.0 (<< 1:3.0.4ds3-11), libgcc1 (<< 1:3.0.4ds3-11), fakeroot
(<< 0.4.5-2.7)
Description: GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
@@ -447,7 +450,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 64bit Development Libraries for UltraSPARC
Contains the symlinks and object files needed to compile and link programs
@@ -458,7 +461,7 @@
Architecture: s390
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 64bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -469,7 +472,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-s390x (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-s390x (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 64bit Development Libraries for IBM zSeries
Contains the symlinks and object files needed to compile and link programs
@@ -480,7 +483,7 @@
Architecture: i386
Section: libs
Priority: standard
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Conflicts: amd64-libs (<= 1.2)
Description: GNU C Library: 64bit Shared libraries for AMD64
This package includes shared versions of the standard C library and the
@@ -491,7 +494,7 @@
Architecture: i386
Section: libdevel
Priority: optional
-Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Replaces: amd64-libs-dev (<= 1.2)
Provides: lib64c-dev
@@ -504,7 +507,7 @@
Architecture: ppc64
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -515,7 +518,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 32bit powerpc development libraries for ppc64
Contains the symlinks and object files needed to compile and link programs
@@ -526,7 +529,7 @@
Architecture: powerpc
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 64bit Shared libraries for PowerPC64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -537,7 +540,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 64bit Development Libraries for PowerPC64
Contains the symlinks and object files needed to compile and link programs
@@ -548,7 +551,7 @@
Architecture: mips mipsel
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the n32 version
@@ -559,7 +562,7 @@
Section: libdevel
Priority: optional
Provides: libn32c-dev
-Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: n32 Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
@@ -570,7 +573,7 @@
Architecture: mips mipsel
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 64bit Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -581,7 +584,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-mips64 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-mips64 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 64bit Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
@@ -592,7 +595,7 @@
Architecture: kfreebsd-amd64
Section: libs
Priority: optional
-Depends: libc0.1 (= ${binary:Version})
+Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -603,7 +606,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Depends: libc0.1-i386 (= ${binary:Version}), libc0.1-dev (= ${binary:Version})
+Depends: libc0.1-i386 (= ${binary:Version}), libc0.1-dev (=
${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 32bit development libraries for AMD64
Contains the symlinks and object files needed to compile and link programs
@@ -615,6 +618,7 @@
Section: libs
Priority: extra
Pre-Depends: libc6 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries [v9b optimized]
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
@@ -629,6 +633,7 @@
Section: libs
Priority: extra
Pre-Depends: libc6 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries [i686 optimized]
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
@@ -645,6 +650,7 @@
Section: libs
Priority: extra
Pre-Depends: libc6 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries [Xen version]
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
@@ -658,6 +664,7 @@
Section: libs
Priority: extra
Pre-Depends: libc0.1 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries [i686 optimized]
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
@@ -674,6 +681,7 @@
Section: libs
Priority: extra
Pre-Depends: libc6.1 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries (EV67 optimized)
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/amd64
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/amd64 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/amd64 2010-02-07
21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: i386
Section: libs
Priority: standard
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Conflicts: amd64-libs (<= 1.2)
Description: GNU C Library: 64bit Shared libraries for AMD64
This package includes shared versions of the standard C library and the
@@ -13,7 +13,7 @@
Architecture: i386
Section: libdevel
Priority: optional
-Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Replaces: amd64-libs-dev (<= 1.2)
Provides: lib64c-dev
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/i386
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/i386 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/i386 2010-02-07
21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: amd64
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Replaces: libc6-dev-i386
Breaks: fakeroot (<= 1.12.2), gnu-efi (<= 3.0e-2), fakechroot (<= 2.9-1),
fglrx-glx-ia32 (<= 1:9-5-1), ia32-libs (<= 2.7), ia32-libs-gtk (<= 2.7),
lib32asound2 (<= 1.0.20-2), lib32asound2-dev (<= 1.0.20-2), lib32bz2-1.0 (<=
1.0.5-2), lib32bz2-dev (<= 1.0.5-2), lib32ffi-dev (<= 3.0.7-1), lib32ffi5 (<=
3.0.7-1), lib32g2c0 (<= 1:3.4.6-9), lib32gcc1 (<= 1:4.4.0-6), lib32gfortran3
(<= 4.4.0-6), lib32gmp3 (<= 2:4.3.1+dfsg-2), lib32gmp3-dev (<= 2:4.3.1+dfsg-2),
lib32gmpxx4 (<= 2:4.3.1+dfsg-2), lib32gomp1 (<= 4.4.0-6), lib32icu-dev (<=
4.0.1-2), lib32icu38 (<= 4.0.1-2), lib32icu40 (<= 4.0.1-2), lib32mudflap0 (<=
4.4.0-6), lib32ncurses5 (<= 5.7+20090523-1), lib32ncurses5-dev (<=
5.7+20090523-1), lib32ncursesw5 (<= 5.7+20090523-1), lib32ncursesw5-dev (<=
5.7+20090523-1), lib32nss-mdns (<= 0.10-3), lib32objc2 (<= 4.4.0-6),
lib32readline5 (<= 5.2-4), lib32readline5-dev (<= 5.2-4), lib32stdc++6 (<=
4.4.0-6), lib32stdc++6-4.4-dbg (<= 4.4.0-6), lib32z1 (<= 1:1.2.3.3.dfsg-13),
lib32z1-dev (
<= 1:1.2.3.3.dfsg-13), libc6-dev-i386 (<= 2.9-14), nvidia-glx-ia32 (<=
185.18.14-1), nvidia-libvdpau1-ia32 (<= 185.18.14-1)
Description: GNU C Library: 32-bit shared libraries for AMD64
@@ -16,7 +16,7 @@
Priority: optional
Provides: lib32c-dev
Conflicts: libc6-i386 (<= 2.9-18)
-Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 32-bit development libraries for AMD64
Contains the symlinks and object files needed to compile and link programs
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/kfreebsd-i386
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/kfreebsd-i386
2010-02-07 21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/kfreebsd-i386
2010-02-07 21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: kfreebsd-amd64
Section: libs
Priority: optional
-Depends: libc0.1 (= ${binary:Version})
+Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Depends: libc0.1-i386 (= ${binary:Version}), libc0.1-dev (= ${binary:Version})
+Depends: libc0.1-i386 (= ${binary:Version}), libc0.1-dev (=
${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 32bit development libraries for AMD64
Contains the symlinks and object files needed to compile and link programs
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/libc
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/libc 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/libc 2010-02-07
21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: @archs@
Section: libs
Priority: required
-Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386],
libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>=
20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4
[hppa]
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -17,7 +17,7 @@
Architecture: @archs@
Section: libdevel
Priority: optional
-Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any],
gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
+Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}),
${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11)
[kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386],
libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386
kfreebsd-amd64]
@@ -31,7 +31,7 @@
Section: debug
Priority: extra
Provides: libc-dbg
-Depends: @libc@ (= ${binary:Version})
+Depends: @libc@ (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: detached debugging symbols
This package contains the detached debugging symbols for the GNU C
library.
@@ -40,7 +40,7 @@
Architecture: @archs@
Section: libdevel
Priority: extra
-Depends: @libc@ (= ${binary:Version})
+Depends: @libc@ (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: Profiling Libraries
Static libraries compiled with profiling info (-pg) suitable for use
with gprof.
@@ -51,7 +51,7 @@
Priority: optional
Conflicts: libc-pic
Provides: libc-pic, glibc-pic
-Depends: @libc@ (= ${binary:Version})
+Depends: @libc@ (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: PIC archive library
Contains an archive library (ar file) composed of individual shared objects.
This is used for creating a library which is a smaller subset of the
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/main 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/main 2010-02-07
21:47:42 UTC (rev 4156)
@@ -21,6 +21,7 @@
Architecture: any
Section: libs
Priority: required
+Depends: ${misc:Depends}
Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<<
2.10)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: Embedded GNU C Library: Binaries
@@ -39,7 +40,7 @@
Architecture: any
Section: libdevel
Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: manpages-dev
Replaces: libc0.1-dev, libc0.3-dev, libc6-dev, libc6.1-dev
Description: Embedded GNU C Library: Development binaries
@@ -50,6 +51,7 @@
Architecture: all
Section: doc
Priority: optional
+Depends: ${misc:Depends}
Suggests: glibc-doc-reference
Description: Embedded GNU C Library: Documentation
Contains man pages for libpthread functions and the complete GNU C Library
@@ -60,6 +62,7 @@
Architecture: all
Section: devel
Priority: optional
+Depends: ${misc:Depends}
Recommends: xz-utils
Description: Embedded GNU C Library: sources
This package contains the sources and patches which are needed to
@@ -67,9 +70,9 @@
Package: locales
Architecture: all
-Section: libs
+Section: localization
Priority: standard
-Depends: ${locale:Depends}, debconf | debconf-2.0
+Depends: ${locale:Depends}, ${misc:Depends}, debconf | debconf-2.0
Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
Description: Embedded GNU C Library: National Language (locale) data [support]
@@ -85,9 +88,9 @@
Package: locales-all
Architecture: any
-Section: libs
+Section: localization
Priority: extra
-Depends: ${locale:Depends}, lzma
+Depends: ${locale:Depends}, ${misc:Depends}, lzma
Provides: locales
Description: Embedded GNU C Library: Precompiled locale data
This package contains the precompiled locale data for all supported locales.
@@ -99,7 +102,7 @@
Architecture: any
Section: admin
Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Embedded GNU C Library: Name Service Cache Daemon
A daemon which handles passwd, group and host lookups
for running programs and caches the results for the next
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/mips64
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/mips64 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/mips64 2010-02-07
21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: mips mipsel
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 64bit Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-mips64 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-mips64 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 64bit Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/mipsn32
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/mipsn32
2010-02-07 21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/mipsn32
2010-02-07 21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: mips mipsel
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the n32 version
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: libn32c-dev
-Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: n32 Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/opt
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/opt 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/opt 2010-02-07
21:47:42 UTC (rev 4156)
@@ -3,6 +3,7 @@
Section: libs
Priority: extra
Pre-Depends: libc6 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries [v9b optimized]
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
@@ -17,6 +18,7 @@
Section: libs
Priority: extra
Pre-Depends: libc6 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries [i686 optimized]
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
@@ -33,6 +35,7 @@
Section: libs
Priority: extra
Pre-Depends: libc6 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries [Xen version]
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
@@ -46,6 +49,7 @@
Section: libs
Priority: extra
Pre-Depends: libc0.1 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries [i686 optimized]
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
@@ -62,6 +66,7 @@
Section: libs
Priority: extra
Pre-Depends: libc6.1 (= ${binary:Version})
+Depends: ${misc:Depends}
Description: GNU C Library: Shared libraries (EV67 optimized)
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/powerpc
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/powerpc
2010-02-07 21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/powerpc
2010-02-07 21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: ppc64
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-powerpc (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 32bit powerpc development libraries for ppc64
Contains the symlinks and object files needed to compile and link programs
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/ppc64
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/ppc64 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/ppc64 2010-02-07
21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: powerpc
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 64bit Shared libraries for PowerPC64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-ppc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 64bit Development Libraries for PowerPC64
Contains the symlinks and object files needed to compile and link programs
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/s390x
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/s390x 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/s390x 2010-02-07
21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: s390
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: GNU C Library: 64bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-s390x (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-s390x (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 64bit Development Libraries for IBM zSeries
Contains the symlinks and object files needed to compile and link programs
Modified: glibc-package/branches/eglibc-2.11/debian/control.in/sparc64
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/sparc64
2010-02-07 21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/sparc64
2010-02-07 21:47:42 UTC (rev 4156)
@@ -2,7 +2,7 @@
Architecture: sparc
Section: libs
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Conflicts: gcc-3.0 (<< 1:3.0.4ds3-11), libgcc1 (<< 1:3.0.4ds3-11), fakeroot
(<< 0.4.5-2.7)
Description: GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
@@ -14,7 +14,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version})
+Depends: libc6-sparc64 (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
Recommends: gcc-multilib
Description: GNU C Library: 64bit Development Libraries for UltraSPARC
Contains the symlinks and object files needed to compile and link programs
Added:
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-leading-zero-stack-guard.diff
===================================================================
---
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-leading-zero-stack-guard.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-leading-zero-stack-guard.diff
2010-02-07 21:47:42 UTC (rev 4156)
@@ -0,0 +1,54 @@
+Description: require that the first byte in the stack guard in a NULL byte,
+ to improve mitigation of NULL-terminated string overflows.
+Bug: http://sourceware.org/bugzilla/show_bug.cgi?id=10149
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/413278
+Author: Kees Cook <kees.c...@canonical.com>
+
+--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
+@@ -65,7 +65,12 @@
+ static inline uintptr_t __attribute__ ((always_inline))
+ _dl_setup_stack_chk_guard (void *dl_random)
+ {
+- uintptr_t ret;
++ uintptr_t ret = 0;
++ /* Having a leading zero byte protects the stack guard from being
++ overwritten with str* write operations or exposed by an
++ unterminated str* read operation. */
++ unsigned char *p = ((unsigned char *) &ret) + 1;
++ int size = sizeof (ret) - 1;
+ #ifndef __ASSUME_AT_RANDOM
+ if (__builtin_expect (dl_random == NULL, 0))
+ {
+@@ -73,16 +78,16 @@
+ int fd = __open ("/dev/urandom", O_RDONLY);
+ if (fd >= 0)
+ {
+- ssize_t reslen = __read (fd, &ret, sizeof (ret));
++ ssize_t reslen = __read (fd, p, size);
+ __close (fd);
+- if (reslen == (ssize_t) sizeof (ret))
++ if (reslen == (ssize_t) size)
+ return ret;
+ }
+ # endif
+- ret = 0;
+- unsigned char *p = (unsigned char *) &ret;
+- p[sizeof (ret) - 1] = 255;
+- p[sizeof (ret) - 2] = '\n';
++ /* Lacking any other form of randomized stack guard, add other
++ terminators in an attempt to block things like fgets, etc. */
++ p[size - 1] = 255;
++ p[size - 2] = '\n';
+ #ifdef HP_TIMING_NOW
+ hp_timing_t hpt;
+ HP_TIMING_NOW (hpt);
+@@ -115,7 +120,7 @@
+ /* We need in the moment only 8 bytes on 32-bit platforms and 16
+ bytes on 64-bit platforms. Therefore we can use the data
+ directly and not use the kernel-provided data to seed a PRNG. */
+- memcpy (&ret, dl_random, sizeof (ret));
++ memcpy (p, dl_random, size);
+ return ret;
+ }
+
Added:
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-stack-guard-quick-randomization.diff
===================================================================
---
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-stack-guard-quick-randomization.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-stack-guard-quick-randomization.diff
2010-02-07 21:47:42 UTC (rev 4156)
@@ -0,0 +1,119 @@
+Description: when AT_RANDOM is not available, attempt to build randomization
+ of stack guard value from the ASLR of stack and heap locations, and finally
+ the hp_timing_t value. Upstream glibc does not want this patch, as they
+ feel AT_RANDOM is sufficient.
+Author: Jakub Jelinek
+Origin: http://cvs.fedora.redhat.com/viewvc/devel/glibc/
+Forwarded: not-needed
+
+---
+ elf/tst-stackguard1.c | 8 ++++++--
+ nptl/tst-stackguard1.c | 8 ++++++--
+ sysdeps/unix/sysv/linux/dl-osinfo.h | 29 +++++++++++++++++++++++++++++
+ 3 files changed, 41 insertions(+), 4 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
+@@ -17,10 +17,13 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#include <errno.h>
+ #include <kernel-features.h>
+ #include <dl-sysdep.h>
+ #include <fcntl.h>
+ #include <stdint.h>
++#include <hp-timing.h>
++#include <endian.h>
+
+ #ifndef MIN
+ # define MIN(a,b) (((a)<(b))?(a):(b))
+@@ -80,6 +83,32 @@
+ unsigned char *p = (unsigned char *) &ret;
+ p[sizeof (ret) - 1] = 255;
+ p[sizeof (ret) - 2] = '\n';
++#ifdef HP_TIMING_NOW
++ hp_timing_t hpt;
++ HP_TIMING_NOW (hpt);
++ hpt = (hpt & 0xffff) << 8;
++ ret ^= hpt;
++#endif
++ uintptr_t stk;
++ /* Avoid GCC being too smart. */
++ asm ("" : "=r" (stk) : "r" (p));
++ stk &= 0x7ffff0;
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++ stk <<= (__WORDSIZE - 23);
++#elif __WORDSIZE == 64
++ stk <<= 31;
++#endif
++ ret ^= stk;
++ /* Avoid GCC being too smart. */
++ p = (unsigned char *) &errno;
++ asm ("" : "=r" (stk) : "r" (p));
++ stk &= 0x7fff00;
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++ stk <<= (__WORDSIZE - 29);
++#else
++ stk >>= 8;
++#endif
++ ret ^= stk;
+ }
+ else
+ #endif
+Index: b/elf/tst-stackguard1.c
+===================================================================
+--- a/elf/tst-stackguard1.c
++++ b/elf/tst-stackguard1.c
+@@ -160,17 +160,21 @@
+ the 16 runs, something is very wrong. */
+ int ndifferences = 0;
+ int ndefaults = 0;
++ int npartlyrandomized = 0;
+ for (i = 0; i < N; ++i)
+ {
+ if (child_stack_chk_guards[i] != child_stack_chk_guards[i+1])
+ ndifferences++;
+ else if (child_stack_chk_guards[i] == default_guard)
+ ndefaults++;
++ else if (*(char *) &child_stack_chk_guards[i] == 0)
++ npartlyrandomized++;
+ }
+
+- printf ("differences %d defaults %d\n", ndifferences, ndefaults);
++ printf ("differences %d defaults %d partly randomized %d\n",
++ ndifferences, ndefaults, npartlyrandomized);
+
+- if (ndifferences < N / 2 && ndefaults < N / 2)
++ if ((ndifferences + ndefaults + npartlyrandomized) < 3 * N / 4)
+ {
+ puts ("stack guard canaries are not randomized enough");
+ puts ("nor equal to the default canary value");
+Index: b/nptl/tst-stackguard1.c
+===================================================================
+--- a/nptl/tst-stackguard1.c
++++ b/nptl/tst-stackguard1.c
+@@ -190,17 +190,21 @@
+ the 16 runs, something is very wrong. */
+ int ndifferences = 0;
+ int ndefaults = 0;
++ int npartlyrandomized = 0;
+ for (i = 0; i < N; ++i)
+ {
+ if (child_stack_chk_guards[i] != child_stack_chk_guards[i+1])
+ ndifferences++;
+ else if (child_stack_chk_guards[i] == default_guard)
+ ndefaults++;
++ else if (*(char *) &child_stack_chk_guards[i] == 0)
++ npartlyrandomized++;
+ }
+
+- printf ("differences %d defaults %d\n", ndifferences, ndefaults);
++ printf ("differences %d defaults %d partly randomized %d\n",
++ ndifferences, ndefaults, npartlyrandomized);
+
+- if (ndifferences < N / 2 && ndefaults < N / 2)
++ if ((ndifferences + ndefaults + npartlyrandomized) < 3 * N / 4)
+ {
+ puts ("stack guard canaries are not randomized enough");
+ puts ("nor equal to the default canary value");
Added:
glibc-package/branches/eglibc-2.11/debian/patches/localedata/locale-es_CR.diff
===================================================================
---
glibc-package/branches/eglibc-2.11/debian/patches/localedata/locale-es_CR.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.11/debian/patches/localedata/locale-es_CR.diff
2010-02-07 21:47:42 UTC (rev 4156)
@@ -0,0 +1,115 @@
+2010-01-28 Marcelo E. Magallon <marcelo.magal...@gmail.com>
+
+ * locales/es_CR: Update for LC_MONETARY, LC_NUMERIC, LC_PAPER,
+ LC_TELEPHONE and LC_NAME and LC_ADDRESS.
+
+diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
+index 0385179..35a4b84 100644
+--- a/localedata/locales/es_CR
++++ b/localedata/locales/es_CR
+@@ -21,8 +21,8 @@ tel ""
+ fax ""
+ language "Spanish"
+ territory "Costa Rica"
+-revision "1.0"
+-date "2000-08-21"
++revision "1.1"
++date "2009-12-23"
+ %
+ category "es_CR:2000";LC_IDENTIFICATION
+ category "es_CR:2000";LC_CTYPE
+@@ -53,9 +53,10 @@ END LC_MESSAGES
+
+ LC_MONETARY
+ int_curr_symbol "<U0043><U0052><U0043><U0020>"
+-currency_symbol "<U0043>"
+-mon_decimal_point "<U002E>"
+-mon_thousands_sep "<U002C>"
++currency_symbol "<U20A1>"
++% Decreto Ejecutivo 29660
++mon_decimal_point "<U002C>"
++mon_thousands_sep "<U0020>"
+ mon_grouping 3;3
+ positive_sign ""
+ negative_sign "<U002D>"
+@@ -70,9 +71,10 @@ n_sign_posn 1
+ END LC_MONETARY
+
+ LC_NUMERIC
+-decimal_point "<U002E>"
+-thousands_sep ""
+-grouping 0;0
++% Decreto Ejecutivo 29660
++decimal_point "<U002C>"
++thousands_sep "<U0020>"
++grouping 3;3
+ END LC_NUMERIC
+
+ LC_TIME
+@@ -106,39 +108,42 @@ mon "<U0065><U006E><U0065><U0072><U006F>";/
+ "<U006E><U006F><U0076><U0069><U0065><U006D><U0062><U0072><U0065>";/
+ "<U0064><U0069><U0063><U0069><U0065><U006D><U0062><U0072><U0065>"
+ d_t_fmt
"<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+-d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
++d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
+ t_fmt "<U0025><U0054>"
+ am_pm "<U0061><U002E><U006D><U002E>";"<U0070><U002E><U006D><U002E>"
+ t_fmt_ampm
"<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
+-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
++date_fmt "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
+ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+ <U0025><U005A><U0020><U0025><U0059>"
+-first_weekday 1
++first_weekday 2
+ first_workday 2
+ END LC_TIME
+
+ LC_PAPER
+-% FIXME
+-height 297
+-% FIXME
+-width 210
++height 279
++width 216
+ END LC_PAPER
+
+ LC_TELEPHONE
+-tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
+-<U006C>"
++tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020>/
++<U0025><U006C>"
++tel_dom_fmt "<U0025><U006C>"
+ int_prefix "<U0035><U0030><U0036>"
+ int_select "<U0030><U0030>"
+ END LC_TELEPHONE
+
+ LC_MEASUREMENT
+-% FIXME
+ measurement 1
+ END LC_MEASUREMENT
+
+ LC_NAME
+ name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+ <U0025><U006D><U0025><U0074><U0025><U0066>"
++name_gen "<U0053><U0072><U002E><U002F><U0053><U0072><U0061><U002E>"
++name_miss "<U0053><U0072><U0074><U0061><U002E>"
++name_mr "<U0053><U0072><U002E>"
++name_mrs "<U0053><U0072><U0061><U002E>"
++name_ms "<U0053><U0072><U0061><U002E>"
+ END LC_NAME
+
+ LC_ADDRESS
+@@ -147,6 +152,13 @@ postal_fmt
"<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+ <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+ <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
+ <U004E><U0025><U0063><U0025><U004E>"
++country_name
"<U0043><U006F><U0073><U0074><U0061><U0020><U0052><U0069><U0063><U0061>"
++country_post "<U0043><U0052>"
++country_car "<U0043><U0052>"
++country_isbn "9930,9977,9968"
++lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
++lang_ab "<0065><0073>"
++lang_term "<U0073><U0070><U0061>"
+ country_ab2 "<U0043><U0052>"
+ country_ab3 "<U0043><U0052><U0049>"
+ country_num 188
Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series 2010-02-07
21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series 2010-02-07
21:47:42 UTC (rev 4156)
@@ -40,6 +40,7 @@
localedata/submitted-bz9912-locale-ru_UA.diff
localedata/submitted-pt_BR.diff
localedata/locale-et_EE.diff
+localedata/locale-es_CR.diff
alpha/local-gcc4.1.diff
alpha/submitted-creat64.diff
@@ -207,7 +208,9 @@
any/submitted-gethostbyname3.diff
any/local-ntp-update.diff
#any/cvs-futimens.diff
-any/cvs-malloc_info-init.diff
any/cvs-resolv-bindv6only.diff
any/submitted-nis-shadow.diff
any/local-no-SOCK_NONBLOCK.diff
+any/cvs-malloc_info-init.diff
+any/submitted-stack-guard-quick-randomization.diff
+any/submitted-leading-zero-stack-guard.diff
Modified: glibc-package/branches/eglibc-2.11/debian/script.in/nsscheck.sh
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/script.in/nsscheck.sh
2010-02-07 21:39:40 UTC (rev 4155)
+++ glibc-package/branches/eglibc-2.11/debian/script.in/nsscheck.sh
2010-02-07 21:47:42 UTC (rev 4156)
@@ -17,12 +17,10 @@
rl=$(runlevel | sed 's/.*\ //')
for service in $check; do
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- # Should be "if invoke-rc.d ${service} status; then", but
- # it is not yet supported by all scripts
- invoke-rc.d --query ${service} start 2>/dev/null ||
status=$?
- if [ "$status" = "104" ] ; then
+ invoke-rc.d ${service} status 2>/dev/null || status=$?
+ if [ "$status" = "0" ] || [ "$status" = "1" ] ; then
services="$service $services"
- else
+ elif [ "$status" = "100" ] ; then
echo "WARNING: init script for $service not found."
fi
else
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
