[PR PATCH] glibc: depend on libxcrypt to ensure partial upgrades work

[PR PATCH] glibc: depend on libxcrypt to ensure partial upgrades work

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 779 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages glibc-partial
https://github.com/void-linux/void-packages/pull/47931

glibc: depend on libxcrypt to ensure partial upgrades work
if a partial upgrade occurs that includes glibc but not libxcrypt, libcrypt.so.1 will disappear and things like PAM will fail to work. This is only solvable by chrooting in and downgrading glibc or installing libxcrypt.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (currently away from other systems I can test on)


A patch file from https://github.com/void-linux/void-packages/pull/47931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-partial-47931.patch --]
[-- Type: text/x-diff, Size: 1198 bytes --]

From 7f91e1d4b743797829eba963f7b88392d5ed3acd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Dec 2023 15:58:09 -0500
Subject: [PATCH] glibc: depend on libxcrypt to ensure partial upgrades work

if a partial upgrade occurs that includes glibc but not libxcrypt,
libcrypt.so.1 will disappear and things like PAM will fail to work.
This is only solvable by chrooting in and downgrading glibc or
installing libxcrypt.
---
 srcpkgs/glibc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index cf7cd073a9500..841856a5de993 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.38
-revision=2
+revision=3
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -50,6 +50,8 @@ if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison gettext perl python3 texinfo"
 fi
 makedepends="kernel-libc-headers"
+# to ensure partial upgrades don't break things like PAM
+depends="libxcrypt"
 lib32files="/usr/lib/gconv/gconv-modules"
 lib32symlinks="ld-linux.so.2"
 archs="~*-musl"

Re: [PR PATCH] [Updated] glibc: depend on libxcrypt to ensure partial upgrades work

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 784 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages glibc-partial
https://github.com/void-linux/void-packages/pull/47931

glibc: depend on libxcrypt to ensure partial upgrades work
if a partial upgrade occurs that includes glibc but not libxcrypt, libcrypt.so.1 will disappear and things like PAM will fail to work. This is only solvable by chrooting in and downgrading glibc or installing libxcrypt.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (currently away from other systems I can test on)


A patch file from https://github.com/void-linux/void-packages/pull/47931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-partial-47931.patch --]
[-- Type: text/x-diff, Size: 1185 bytes --]

From a1844b12570ed93f421ebbc8b16e86d3ea821860 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Dec 2023 15:58:09 -0500
Subject: [PATCH] glibc: depend on libxcrypt to ensure partial upgrades work

if a partial upgrade occurs that includes glibc but not libxcrypt,
libcrypt.so.1 will disappear and things like PAM will fail to work.
This is only solvable by chrooting in and downgrading glibc or
installing libxcrypt.
---
 srcpkgs/glibc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index cf7cd073a9500..beaf17407cc6e 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.38
-revision=2
+revision=3
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -48,6 +48,8 @@ conf_files="
 	/etc/ld.so.conf"
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison gettext perl python3 texinfo"
+	# to ensure partial upgrades don't break things like PAM
+	depends="libxcrypt"
 fi
 makedepends="kernel-libc-headers"
 lib32files="/usr/lib/gconv/gconv-modules"

Re: glibc: depend on libxcrypt to ensure partial upgrades work

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 372 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/47931#issuecomment-1870671431

Comment:
> libcrypt.so.1 will disappear

This can happen if e.g. glibc-32bit is not upgraded (since it provides libcrypt.so.1, even though the libcrypt only provided for 32-bit)
Might be a good idea to fix this on the xbps side as well.

Re: glibc: depend on libxcrypt to ensure partial upgrades work

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/47931#issuecomment-1870671431

Comment:
> libcrypt.so.1 will disappear

This can happen if e.g. glibc-32bit is not upgraded (since it provides libcrypt.so.1, even though the libcrypt only provided for 32-bit)
Might be a good idea to fix this on the xbps side as well. (if possible)

Re: glibc: depend on libxcrypt to ensure partial upgrades work

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/47931#issuecomment-1870671431

Comment:
> libcrypt.so.1 will disappear

This can happen if e.g. glibc-32bit is not upgraded since it provides libcrypt.so.1, even though that libcrypt can only be used by 32-bit applications.
Might be a good idea to fix this on the xbps side as well. (if possible)

Re: glibc: depend on libxcrypt to ensure partial upgrades work

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/47931#issuecomment-1870671431

Comment:
> libcrypt.so.1 will disappear

This can happen if e.g. glibc-32bit is not upgraded since it provides libcrypt.so.1, even though that libcrypt can only be used by 32-bit applications.
Might be a good idea to fix this on the xbps side as well. (if possible)

Edit: I just realized libxcrypt only has libcrypt.so.2, you can use libxcrypt-compat which provides libcrypt.so.1 instead.

Re: glibc: depend on libxcrypt to ensure partial upgrades work

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/47931#issuecomment-1870671431

Comment:
> libcrypt.so.1 will disappear

This can happen if glibc-32bit is not upgraded since it provides libcrypt.so.1, even though that libcrypt can only be used by 32-bit applications.
Might be a good idea to fix this on the xbps side as well. (if possible)

Edit: I just realized libxcrypt only has libcrypt.so.2, you can use libxcrypt-compat which provides libcrypt.so.1 instead.

Re: [PR PATCH] [Updated] glibc: depend on libxcrypt to ensure partial upgrades work

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 784 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages glibc-partial
https://github.com/void-linux/void-packages/pull/47931

glibc: depend on libxcrypt to ensure partial upgrades work
if a partial upgrade occurs that includes glibc but not libxcrypt, libcrypt.so.1 will disappear and things like PAM will fail to work. This is only solvable by chrooting in and downgrading glibc or installing libxcrypt.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (currently away from other systems I can test on)


A patch file from https://github.com/void-linux/void-packages/pull/47931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-partial-47931.patch --]
[-- Type: text/x-diff, Size: 1246 bytes --]

From 92133f5e9a6c808ee57b24090e68c326cd4fa0de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Dec 2023 15:58:09 -0500
Subject: [PATCH] glibc: depend on libxcrypt-compat to ensure partial upgrades
 work

if a partial upgrade occurs that includes glibc but not libxcrypt,
libcrypt.so.1 will disappear and things like PAM will fail to work.
This is only solvable by chrooting in and downgrading glibc or
installing libxcrypt-compat.
---
 srcpkgs/glibc/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index cf7cd073a9500..3272a1df265c1 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.38
-revision=2
+revision=3
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -48,6 +48,9 @@ conf_files="
 	/etc/ld.so.conf"
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison gettext perl python3 texinfo"
+	# XXX: remove this on the next update
+	# ensures partial upgrades don't break things like PAM
+	depends="libxcrypt-compat"
 fi
 makedepends="kernel-libc-headers"
 lib32files="/usr/lib/gconv/gconv-modules"

Re: [PR PATCH] [Merged]: glibc: depend on libxcrypt to ensure partial upgrades work

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

There's a merged pull request on the void-packages repository

glibc: depend on libxcrypt to ensure partial upgrades work
https://github.com/void-linux/void-packages/pull/47931

Description:
if a partial upgrade occurs that includes glibc but not libxcrypt, libcrypt.so.1 will disappear and things like PAM will fail to work. This is only solvable by chrooting in and downgrading glibc or installing libxcrypt.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (currently away from other systems I can test on)