[PR PATCH] glibc: prevent broken update without causing a cycle

[PR PATCH] glibc: prevent broken update without causing a cycle

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages xcrypt-fix
https://github.com/void-linux/void-packages/pull/48061

glibc: prevent broken update without causing a cycle
on empty roots, depending on libxcrypt-compat causes a dependency solver cycle:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

this is a slightly worse user experience, but it does not cause this dependency loop:
```
...
CONFLICT: glibc-2.38_4 with installed pkg pam-1.5.3_2 (matched by pam<=1.5.3_2)
Transaction aborted due to conflicting packages.
```
Users can resolve this issue by adding `pam` to the list of packages to update, which ensures that `libxcrypt` is installed and the system doesn't break.

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

#### Testing the changes
- I tested the changes in this PR: **YES** (on both systems with glibc 2.36 and empty roots)



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xcrypt-fix-48061.patch --]
[-- Type: text/x-diff, Size: 1840 bytes --]

From fa9e3b0d22d228645e415a1ad13f4fe5de0786d2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 4 Jan 2024 00:42:05 -0500
Subject: [PATCH] glibc: prevent broken update without causing a cycle

on empty roots, depending on libxcrypt-compat causes a dependency solver cycle:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

this is a slightly worse user experience, but it does not cause this dependency loop:
```
...
CONFLICT: glibc-2.38_4 with installed pkg pam-1.5.3_2 (matched by pam<=1.5.3_2)
Transaction aborted due to conflicting packages.
```
Users can resolve this issue by adding `pam` to the list of packages to
update, which ensures that `libxcrypt` is installed and the system
doesn't break.
---
 srcpkgs/glibc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 3272a1df265c1..efd7134c1a5bb 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.38
-revision=3
+revision=4
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -48,9 +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
+	# XXX: remove this on the next update?
 	# ensures partial upgrades don't break things like PAM
-	depends="libxcrypt-compat"
+	conflicts="pam<=1.5.3_2"
 fi
 makedepends="kernel-libc-headers"
 lib32files="/usr/lib/gconv/gconv-modules"

Re: [PR PATCH] [Updated] glibc: prevent broken update without causing a cycle

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages xcrypt-fix
https://github.com/void-linux/void-packages/pull/48061

glibc: prevent broken update without causing a cycle
on empty roots, depending on libxcrypt-compat causes a dependency solver cycle:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

this is a slightly worse user experience, but it does not cause this dependency loop:
```
$ doas xbps-install -Su somepkg
...
CONFLICT: glibc-2.38_4 with installed pkg pam-1.5.3_2 (matched by pam<=1.5.3_2)
Transaction aborted due to conflicting packages.
```
Users can resolve this issue by adding `pam` to the list of packages to update, which ensures that `libxcrypt` is installed and the system doesn't break.

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

#### Testing the changes
- I tested the changes in this PR: **YES** (on both systems with glibc 2.36 and empty roots)



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xcrypt-fix-48061.patch --]
[-- Type: text/x-diff, Size: 1872 bytes --]

From 0a707ac6dbcfe787ecb00c07c56d4ffdefacd235 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 4 Jan 2024 00:42:05 -0500
Subject: [PATCH] glibc: prevent broken update without causing a cycle

on empty roots, depending on libxcrypt-compat causes a dependency solver cycle:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

this is a slightly worse user experience, but it does not cause this dependency loop:
```
$ doas xbps-install -Su somepkg
...
CONFLICT: glibc-2.38_4 with installed pkg pam-1.5.3_2 (matched by pam<=1.5.3_2)
Transaction aborted due to conflicting packages.
```
Users can resolve this issue by adding `pam` to the list of packages to
update, which ensures that `libxcrypt` is installed and the system
doesn't break.
---
 srcpkgs/glibc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 3272a1df265c1..efd7134c1a5bb 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.38
-revision=3
+revision=4
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -48,9 +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
+	# XXX: remove this on the next update?
 	# ensures partial upgrades don't break things like PAM
-	depends="libxcrypt-compat"
+	conflicts="pam<=1.5.3_2"
 fi
 makedepends="kernel-libc-headers"
 lib32files="/usr/lib/gconv/gconv-modules"

Re: [PR PATCH] [Updated] glibc: prevent broken update without causing a cycle

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages xcrypt-fix
https://github.com/void-linux/void-packages/pull/48061

glibc: prevent broken update without causing a cycle
on empty roots, depending on libxcrypt-compat causes a dependency solver cycle:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

this is a slightly worse user experience, but it does not cause this dependency loop:
```
$ doas xbps-install -Su somepkg
...
CONFLICT: glibc-2.38_4 with installed pkg pam-1.5.3_2 (matched by pam<=1.5.3_3)
Transaction aborted due to conflicting packages.
```
Users can resolve this issue by adding `pam` to the list of packages to update, which ensures that `libxcrypt` is installed and the system doesn't break.

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

#### Testing the changes
- I tested the changes in this PR: **YES** (on both systems with glibc 2.36 and empty roots)



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xcrypt-fix-48061.patch --]
[-- Type: text/x-diff, Size: 1872 bytes --]

From afdaf1bb1fe3c71fc403243151e8979d7d7a71a8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 4 Jan 2024 00:42:05 -0500
Subject: [PATCH] glibc: prevent broken update without causing a cycle

on empty roots, depending on libxcrypt-compat causes a dependency solver cycle:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

this is a slightly worse user experience, but it does not cause this dependency loop:
```
$ doas xbps-install -Su somepkg
...
CONFLICT: glibc-2.38_4 with installed pkg pam-1.5.3_2 (matched by pam<=1.5.3_3)
Transaction aborted due to conflicting packages.
```
Users can resolve this issue by adding `pam` to the list of packages to
update, which ensures that `libxcrypt` is installed and the system
doesn't break.
---
 srcpkgs/glibc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 3272a1df265c1..98e9dfff104e4 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.38
-revision=3
+revision=4
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -48,9 +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
+	# XXX: remove this on the next update?
 	# ensures partial upgrades don't break things like PAM
-	depends="libxcrypt-compat"
+	conflicts="pam<=1.5.3_3"
 fi
 makedepends="kernel-libc-headers"
 lib32files="/usr/lib/gconv/gconv-modules"

Re: glibc: prevent broken update without causing a cycle

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/48061#issuecomment-1876474847

Comment:
see also https://github.com/void-linux/void-packages/pull/48061

Re: glibc: prevent broken update without causing a cycle

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/48061#issuecomment-1876474847

Comment:
see also https://github.com/void-linux/void-linux.github.io/pull/223

Re: [PR PATCH] [Updated] glibc: prevent broken update without causing a cycle

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages xcrypt-fix
https://github.com/void-linux/void-packages/pull/48061

glibc: prevent broken update without causing a cycle
on empty roots, depending on libxcrypt-compat causes a dependency solver cycle:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

this is a slightly worse user experience, but it does not cause this dependency loop:
```
$ doas xbps-install -Su somepkg
...
CONFLICT: glibc-2.38_4 with installed pkg pam-1.5.3_2 (matched by pam<=1.5.3_3)
Transaction aborted due to conflicting packages.
```
Users can resolve this issue by adding `pam` to the list of packages to update, which ensures that `libxcrypt` is installed and the system doesn't break.

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

#### Testing the changes
- I tested the changes in this PR: **YES** (on both systems with glibc 2.36 and empty roots)



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xcrypt-fix-48061.patch --]
[-- Type: text/x-diff, Size: 2194 bytes --]

From c55a58cd9d1a822cf7b587142d48a41efaee1f49 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 4 Jan 2024 12:56:51 -0500
Subject: [PATCH 1/2] common/shlibs: libxcrypt-compat provides libcrypt.so.1

this is needed for some restricted packages like android-studio
---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index cc42af6682aad..9d46b9376971b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -43,6 +43,7 @@ libnss_dns.so.2 glibc-2.38_1
 libnss_hesiod.so.2 glibc-2.38_1
 libBrokenLocale.so.1 glibc-2.38_1
 libcrypt.so.2 libxcrypt-4.4.36_1
+libcrypt.so.1 libxcrypt-compat-4.4.36_1
 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1
 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1
 libmemusage.so glibc-2.38_1

From 7ab030918dc66cafb5ab26474ee1522e40c4ae0b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 4 Jan 2024 12:57:33 -0500
Subject: [PATCH 2/2] libxcrypt: noverifyrdeps on libxcrypt-compat

this fixes the dependency cycle when installing e.g. `base-system` on an
empty root:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

After this change, there should be no special user intervention needed
or error to resolve.
---
 srcpkgs/libxcrypt/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxcrypt/template b/srcpkgs/libxcrypt/template
index 3e8ecdbe40eb7..603fcc8dee743 100644
--- a/srcpkgs/libxcrypt/template
+++ b/srcpkgs/libxcrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'libxcrypt'
 pkgname=libxcrypt
 version=4.4.36
-revision=2
+revision=3
 archs="~*-musl"
 build_style=gnu-configure
 configure_args="--enable-hashes=all --disable-failure-tokens --enable-obsolete-api=no"
@@ -66,6 +66,7 @@ libxcrypt-devel_package() {
 
 libxcrypt-compat_package() {
 	short_desc+=" - legacy compatibility"
+	noverifyrdeps=yes
 	pkg_install() {
 		vmove usr/lib/libcrypt.so.1*
 	}

Re: [PR PATCH] [Updated] libxcrypt: noverifyrdeps on libxcrypt-compat to prevent a cycle

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages xcrypt-fix
https://github.com/void-linux/void-packages/pull/48061

libxcrypt: noverifyrdeps on libxcrypt-compat to prevent a cycle
this fixes the dependency cycle when installing e.g. `base-system` on an empty root:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

After this change, there should be no special user intervention needed or error to resolve.

#### Testing the changes
- I tested the changes in this PR: **YES** (on both systems with glibc 2.36 and empty roots)



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xcrypt-fix-48061.patch --]
[-- Type: text/x-diff, Size: 2795 bytes --]

From c55a58cd9d1a822cf7b587142d48a41efaee1f49 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 4 Jan 2024 12:56:51 -0500
Subject: [PATCH 1/2] common/shlibs: libxcrypt-compat provides libcrypt.so.1

this is needed for some restricted packages like android-studio
---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index cc42af6682aad..9d46b9376971b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -43,6 +43,7 @@ libnss_dns.so.2 glibc-2.38_1
 libnss_hesiod.so.2 glibc-2.38_1
 libBrokenLocale.so.1 glibc-2.38_1
 libcrypt.so.2 libxcrypt-4.4.36_1
+libcrypt.so.1 libxcrypt-compat-4.4.36_1
 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1
 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1
 libmemusage.so glibc-2.38_1

From 820b480a56b32fb68b4d099e3b78878cb3a1f1e2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 4 Jan 2024 12:57:33 -0500
Subject: [PATCH 2/2] libxcrypt: noverifyrdeps on libxcrypt-compat

this fixes the dependency cycle when installing e.g. `base-system` on an
empty root:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

After this change, there should be no special user intervention needed
or error to resolve.
---
 srcpkgs/libxcrypt/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxcrypt/template b/srcpkgs/libxcrypt/template
index 3e8ecdbe40eb7..228d758e1618a 100644
--- a/srcpkgs/libxcrypt/template
+++ b/srcpkgs/libxcrypt/template
@@ -1,10 +1,11 @@
 # Template file for 'libxcrypt'
 pkgname=libxcrypt
 version=4.4.36
-revision=2
+revision=3
 archs="~*-musl"
 build_style=gnu-configure
 configure_args="--enable-hashes=all --disable-failure-tokens --enable-obsolete-api=no"
+make_cmd="make -C build"
 hostmakedepends="perl-bootstrap"
 checkdepends="python3-passlib"
 short_desc="Modern library for one-way hashing of passwords"
@@ -13,7 +14,6 @@ license="LGPL-2.1-or-later, BSD-3-Clause, BSD-2-Clause, 0BSD, Public Domain"
 homepage="https://github.com/besser82/libxcrypt"
 distfiles="https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz"
 checksum=e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943
-make_cmd="make -C build"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	broken="musl already provides libcrypt"
@@ -66,6 +66,7 @@ libxcrypt-devel_package() {
 
 libxcrypt-compat_package() {
 	short_desc+=" - legacy compatibility"
+	noverifyrdeps=yes
 	pkg_install() {
 		vmove usr/lib/libcrypt.so.1*
 	}

Re: [PR PATCH] [Merged]: libxcrypt: noverifyrdeps on libxcrypt-compat to prevent a cycle

[classabbyamp]

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

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

libxcrypt: noverifyrdeps on libxcrypt-compat to prevent a cycle
https://github.com/void-linux/void-packages/pull/48061

Description:
this fixes the dependency cycle when installing e.g. `base-system` on an empty root:
```
$ mkdir /tmp/testroot
$ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system
...
[DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links
...
```

After this change, there should be no special user intervention needed or error to resolve.

#### Testing the changes
- I tested the changes in this PR: **YES** (on both systems with glibc 2.36 and empty roots)