[glibc] 01/01: debian/control.in/*: add conflicts to only allow to install one set of multilib packages simultaneously. Closes: #702962, #743618, #784015, #820826, #870257.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 52e1594ab5088f525092f74b0b82d5fb92afff5e
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Jan 14 00:08:46 2018 +0100
debian/control.in/*: add conflicts to only allow to install one set of multilib packages simultaneously. Closes: #702962, #743618, #784015, #820826, #870257.
---
debian/changelog | 3 +++
debian/control | 15 +++++++++++++++
debian/control.in/amd64 | 1 +
debian/control.in/i386 | 1 +
debian/control.in/kfreebsd-i386 | 1 +
debian/control.in/mips32 | 1 +
debian/control.in/mips64 | 1 +
debian/control.in/mipsn32 | 1 +
debian/control.in/powerpc | 1 +
debian/control.in/ppc64 | 1 +
debian/control.in/s390 | 2 ++
debian/control.in/sparc | 2 ++
debian/control.in/sparc64 | 2 ++
debian/control.in/x32 | 1 +
14 files changed, 33 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index f1cebf4..53e990f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ glibc (2.26-4) UNRELEASED; urgency=medium
* debian/patches/git-updates.diff: update from upstream stable branch:
- Fix a buffer underflow in getcwd() (CVE-2018-1000001). Closes:
#887001.
+ * debian/control.in/*: add conflicts to only allow to install one set of
+ multilib packages simultaneously. Closes: #702962, #743618, #784015,
+ #820826, #870257.
-- Aurelien Jarno <aurel32@debian.org> Fri, 12 Jan 2018 22:26:33 +0100
diff --git a/debian/control b/debian/control
index 9dc2598..59f9982 100644
--- a/debian/control
+++ b/debian/control
@@ -513,6 +513,7 @@ Architecture: amd64 x32
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64 [amd64], libc6-amd64:i386 [x32], libc6-i386:amd64 [x32], libc6-i386:x32 [amd64], libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32 [x32], libc6-x32:i386 [amd64]
Replaces: libc6-dev-i386
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32-bit shared libraries for AMD64
@@ -539,6 +540,8 @@ Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Build-Profiles: <!stage1 !nobiarch>
+Package: libc6-sparc
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc64, libc6-x32
Description: GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
@@ -562,6 +565,8 @@ Architecture: sparc
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Package: libc6-sparc64
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
@@ -586,6 +591,8 @@ Architecture: s390x
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Package: libc6-s390
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
@@ -610,6 +617,7 @@ Architecture: i386 x32
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64:i386 [x32], libc6-amd64:x32 [i386], libc6-i386 [i386], libc6-i386:amd64 [x32], libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32 [x32], libc6-x32:amd64 [i386]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for AMD64
This package includes shared versions of the standard C library and the
@@ -634,6 +642,7 @@ Architecture: ppc64
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
@@ -658,6 +667,7 @@ Architecture: powerpc
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for PowerPC64
This package includes shared versions of the standard C library and the
@@ -682,6 +692,7 @@ Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 m
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32:mips64 [mips64el mips64r6 mips64r6el mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64el [mips64 mips64r6 mips64r6el mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64r6 [mips64 mips64el mips64r6el mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64r6el [mips64 mips64el mips64r6 mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mipsn32 [mips64 mips64el mips64r6 mips64r6el mipsn32el mipsn3 [...]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: o32 Shared libraries for MIPS
This package includes shared versions of the standard C library and the
@@ -709,6 +720,7 @@ Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32 [mips mipsel mipsr6 mipsr6el], libc6-mips32:mips64 [mips64el mips64r6 mips64r6el], libc6-mips32:mips64el [mips64 mips64r6 mips64r6el], libc6-mips32:mips64r6 [mips64 mips64el mips64r6el], libc6-mips32:mips64r6el [mips64 mips64el mips64r6], libc6-mips32:mipsn32 [mips64 mips64el mips64r6 mips64r6el], libc6-mips32:mipsn32el [mips64 mips64el mips64r6 mips64r6el], libc6-mips32:mipsn32r6 [mips64 mips64el mips64r6 mips64r6el], libc6- [...]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
@@ -733,6 +745,7 @@ Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6e
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32 [mips mipsel mipsr6 mipsr6el], libc6-mips32:mips64 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64el [mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64r6 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64r6el [mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mipsn32 [mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mipsn32el [mipsn32 mipsn32r6 mipsn32r6el], libc6-mips32:mipsn32r6 [mi [...]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
@@ -757,6 +770,7 @@ Architecture: kfreebsd-amd64
Section: libs
Priority: optional
Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
@@ -781,6 +795,7 @@ Architecture: amd64 i386
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64 [amd64], libc6-amd64:x32 [i386], libc6-i386 [i386], libc6-i386:x32 [amd64], libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32:amd64 [i386], libc6-x32:i386 [amd64]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: X32 ABI Shared libraries for AMD64
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/amd64 b/debian/control.in/amd64
index 3dff5ab..075970f 100644
--- a/debian/control.in/amd64
+++ b/debian/control.in/amd64
@@ -3,6 +3,7 @@ Architecture: i386 x32
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64:i386 [x32], libc6-amd64:x32 [i386], libc6-i386 [i386], libc6-i386:amd64 [x32], libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32 [x32], libc6-x32:amd64 [i386]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for AMD64
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/i386 b/debian/control.in/i386
index df62151..d273f38 100644
--- a/debian/control.in/i386
+++ b/debian/control.in/i386
@@ -3,6 +3,7 @@ Architecture: amd64 x32
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64 [amd64], libc6-amd64:i386 [x32], libc6-i386:amd64 [x32], libc6-i386:x32 [amd64], libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32 [x32], libc6-x32:i386 [amd64]
Replaces: libc6-dev-i386
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32-bit shared libraries for AMD64
diff --git a/debian/control.in/kfreebsd-i386 b/debian/control.in/kfreebsd-i386
index 0d06d26..8c2a9a1 100644
--- a/debian/control.in/kfreebsd-i386
+++ b/debian/control.in/kfreebsd-i386
@@ -3,6 +3,7 @@ Architecture: kfreebsd-amd64
Section: libs
Priority: optional
Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
diff --git a/debian/control.in/mips32 b/debian/control.in/mips32
index 7831000..d82bb0c 100644
--- a/debian/control.in/mips32
+++ b/debian/control.in/mips32
@@ -3,6 +3,7 @@ Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 m
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32:mips64 [mips64el mips64r6 mips64r6el mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64el [mips64 mips64r6 mips64r6el mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64r6 [mips64 mips64el mips64r6el mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64r6el [mips64 mips64el mips64r6 mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mipsn32 [mips64 mips64el mips64r6 mips64r6el mipsn32el mipsn3 [...]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: o32 Shared libraries for MIPS
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/mips64 b/debian/control.in/mips64
index 32aa1f3..318e9a7 100644
--- a/debian/control.in/mips64
+++ b/debian/control.in/mips64
@@ -3,6 +3,7 @@ Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6e
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32 [mips mipsel mipsr6 mipsr6el], libc6-mips32:mips64 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64el [mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64r6 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mips64r6el [mipsn32 mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mipsn32 [mipsn32el mipsn32r6 mipsn32r6el], libc6-mips32:mipsn32el [mipsn32 mipsn32r6 mipsn32r6el], libc6-mips32:mipsn32r6 [mi [...]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/mipsn32 b/debian/control.in/mipsn32
index 9ad5c0a..bd0ccdd 100644
--- a/debian/control.in/mipsn32
+++ b/debian/control.in/mipsn32
@@ -3,6 +3,7 @@ Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32 [mips mipsel mipsr6 mipsr6el], libc6-mips32:mips64 [mips64el mips64r6 mips64r6el], libc6-mips32:mips64el [mips64 mips64r6 mips64r6el], libc6-mips32:mips64r6 [mips64 mips64el mips64r6el], libc6-mips32:mips64r6el [mips64 mips64el mips64r6], libc6-mips32:mipsn32 [mips64 mips64el mips64r6 mips64r6el], libc6-mips32:mipsn32el [mips64 mips64el mips64r6 mips64r6el], libc6-mips32:mipsn32r6 [mips64 mips64el mips64r6 mips64r6el], libc6- [...]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/powerpc b/debian/control.in/powerpc
index f01e4ab..7dd7db9 100644
--- a/debian/control.in/powerpc
+++ b/debian/control.in/powerpc
@@ -3,6 +3,7 @@ Architecture: ppc64
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
diff --git a/debian/control.in/ppc64 b/debian/control.in/ppc64
index cc6cc7e..5348adf 100644
--- a/debian/control.in/ppc64
+++ b/debian/control.in/ppc64
@@ -3,6 +3,7 @@ Architecture: powerpc
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for PowerPC64
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/s390 b/debian/control.in/s390
index c419b7e..f7d605f 100644
--- a/debian/control.in/s390
+++ b/debian/control.in/s390
@@ -3,6 +3,8 @@ Architecture: s390x
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Package: libc6-s390
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/sparc b/debian/control.in/sparc
index c10e85a..50795e1 100644
--- a/debian/control.in/sparc
+++ b/debian/control.in/sparc
@@ -4,6 +4,8 @@ Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Build-Profiles: <!stage1 !nobiarch>
+Package: libc6-sparc
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc64, libc6-x32
Description: GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
diff --git a/debian/control.in/sparc64 b/debian/control.in/sparc64
index 05dac73..3a3dbbe 100644
--- a/debian/control.in/sparc64
+++ b/debian/control.in/sparc64
@@ -3,6 +3,8 @@ Architecture: sparc
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Package: libc6-sparc64
+Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/x32 b/debian/control.in/x32
index fdd77a5..bfa445a 100644
--- a/debian/control.in/x32
+++ b/debian/control.in/x32
@@ -3,6 +3,7 @@ Architecture: amd64 i386
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc0.1-i386, libc6-amd64 [amd64], libc6-amd64:x32 [i386], libc6-i386 [i386], libc6-i386:x32 [amd64], libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-sparc64, libc6-x32:amd64 [i386], libc6-x32:i386 [amd64]
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: X32 ABI Shared libraries for AMD64
This package includes shared versions of the standard C library and the
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: