Ubuntu
glibc package

Merge ~rbalint/ubuntu/+source/glibc:ubuntu/focal-drop-libcrypt1-dep into ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/focal

  1. Git
  2. lp:~rbalint/ubuntu/+source/glibc
  3. ubuntu/focal-drop-libcrypt1-dep
  4. Merge into ubuntu/focal
Proposed by Balint Reczey
Status: Rejected
Rejected by: Balint Reczey
Proposed branch: ~rbalint/ubuntu/+source/glibc:ubuntu/focal-drop-libcrypt1-dep
Merge into: ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/focal
Diff against target: 65 lines (+5/-6)
3 files modified
debian/control (+4/-4)
debian/control.in/libc (+1/-1)
debian/rules.d/debhelper.mk (+0/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+391704@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Balint Reczey (rbalint) wrote :

It fixes installing libc6:i386 in LXC, I give it a round of testing by doing release upgrade to Focal, too.

Revision history for this message
Balint Reczey (rbalint) wrote :

No it is too risky to let libcrypt not being present on the system during upgrades for a while.

Unmerged commits

475ce8e... by Balint Reczey

Drop libc's libcrypt1 dependency

Libc itself does not use libcrypt1 and many essential packages already
picked up the libcrypt1 dependencies when having been rebuilt against
libcrypt-dev.

LP: #1871268

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index 740a731..11ffe86 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -147,7 +147,7 @@ Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32
6 Section: libs
7 Priority: optional
8 Multi-Arch: same
9-Depends: ${shlibs:Depends}, ${libgcc:Depends}, ${libcrypt:Depends}
10+Depends: ${shlibs:Depends}, ${libgcc:Depends}
11 Recommends: libidn2-0 (>= 2.0.5~)
12 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
13 Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf]
14@@ -238,7 +238,7 @@ Architecture: alpha ia64
15 Section: libs
16 Priority: optional
17 Multi-Arch: same
18-Depends: ${shlibs:Depends}, ${libgcc:Depends}, ${libcrypt:Depends}
19+Depends: ${shlibs:Depends}, ${libgcc:Depends}
20 Recommends: libidn2-0 (>= 2.0.5~)
21 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
22 Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf]
23@@ -329,7 +329,7 @@ Architecture: hurd-i386
24 Section: libs
25 Priority: optional
26 Multi-Arch: same
27-Depends: ${shlibs:Depends}, ${libgcc:Depends}, ${libcrypt:Depends}
28+Depends: ${shlibs:Depends}, ${libgcc:Depends}
29 Recommends: libidn2-0 (>= 2.0.5~)
30 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
31 Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf]
32@@ -420,7 +420,7 @@ Architecture: kfreebsd-amd64 kfreebsd-i386
33 Section: libs
34 Priority: optional
35 Multi-Arch: same
36-Depends: ${shlibs:Depends}, ${libgcc:Depends}, ${libcrypt:Depends}
37+Depends: ${shlibs:Depends}, ${libgcc:Depends}
38 Recommends: libidn2-0 (>= 2.0.5~)
39 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
40 Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf]
41diff --git a/debian/control.in/libc b/debian/control.in/libc
42index d459257..3904e84 100644
43--- a/debian/control.in/libc
44+++ b/debian/control.in/libc
45@@ -3,7 +3,7 @@ Architecture: @archs@
46 Section: libs
47 Priority: optional
48 Multi-Arch: same
49-Depends: ${shlibs:Depends}, ${libgcc:Depends}, ${libcrypt:Depends}
50+Depends: ${shlibs:Depends}, ${libgcc:Depends}
51 Recommends: libidn2-0 (>= 2.0.5~)
52 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
53 Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf]
54diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
55index 24b41b2..4397ad3 100644
56--- a/debian/rules.d/debhelper.mk
57+++ b/debian/rules.d/debhelper.mk
58@@ -167,7 +167,6 @@ endif
59 : > tmp.substvars
60 ifeq ($(filter stage1 stage2,$(DEB_BUILD_PROFILES)),)
61 echo 'libgcc:Depends=libgcc-s1 [!hppa !m68k], libgcc-s2 [m68k], libgcc-s4 [hppa]' >> tmp.substvars
62- echo 'libcrypt:Depends=libcrypt1 (>= 1:4.4.10-10ubuntu4)' >> tmp.substvars
63 echo 'libcrypt-dev:Depends=libcrypt-dev' >> tmp.substvars
64 endif
65 for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \

Subscribers

People subscribed via source and target branches