Migrate libcrypt -> libxcrypt. #218

jeremyd2019 · 2025-02-13T19:16:35Z

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023.

~~also drop some crazy i686 workarounds from vim, because i686 has now been synced so they are no longer necessary.~~

jeremyd2019 · 2025-02-13T19:19:36Z

Based on the comments, it should be possible to drop cyrus-sasl from your fork now, because i686 has been synced. Is that possible, and if so how, since this is a fork of old MSYS2-packages, packages that you don't provide are also in this repo, so just git rm-ing it doesn't seem like the thing to do?

dscho · 2025-02-13T19:30:37Z

it should be possible to drop cyrus-sasl from your fork now, because i686 has been synced. Is that possible, and if so how

The cyrus-sasl package has been deployed specifically (and manually) to Git for Windows' i686 Pacman repository, see #112 (comment). Along with it serf, and libssh2 were deployed, too.

The safest way to remove them would most likely be a custom workflow that is based on a previously-embargoed workflow I planned on integrating into git-for-windows-automation already (but am constantly running out of time). This workflow (creatively named deploy-embargoed-package) was used to deploy the embargoed git-lfs and git-credential-manager packages, and it should make for a fine starting point to call repo-remove <package>... followed by an upload.

I hope to get to that particular clean-up tomorrow. And if not tomorrow, Monday is a US holiday, so I should have time at least then.

vim/PKGBUILD

dscho · 2025-02-13T20:11:40Z

vim/PKGBUILD

+             'perl-devel' 'python-devel' 'ruby' 'autotools' 'libxcrypt-devel'
             'libiconv-devel' 'gettext-devel') # To satisfy python3/dyn feature #3052
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgver}/${pkgbase}-{pkgver}.tar.gz
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz


Actually it would be better if vim was dropped from Git for Windows' i686 Pacman repository (it's not part of the x86_64 repository, therefore I assume that the build and deploy was needed only to get rid of that Perl dependency).

And now that Git for Windows v2.48.1 is out, I do not care at all about any interactive parts in i686 Git for Windows anymore, only the parts that are required to build MinGit.

I think that the perl* stuff can equally go. That leaves only:

curl, heimdal and openssh. The others should simply be repo-remove'd from Git for Windows' i686 package database.

ok, I just want to make things that depend on libcrypt go away, any way they do is fine by me 😁

Actually it would be better if vim was dropped from Git for Windows' i686 Pacman repository (it's not part of the x86_64 repository, therefore I assume that the build and deploy was needed only to get rid of that Perl dependency).

I have to admit being thoroughly confused by this repo. I figured that git diff --merge-base upstream/master --name-only | grep '/PKGBUILD$' (where upstream is the remote for msys2/MSYS2-packages) would tell me what packages were actually relevant, and the fact that cyrus-sasl was arch=('i686') only meant that anything which has x86_64 in arch was actually relevant/present in the repo for x86_64.

I do have to admit that I stopped sync'ing with msys2's master at some stage... Therefore the source of truth is the package database.

Yes, git svn is the reason why I had to build Perl in Git for Windows (to have the Subversion<->Perl bindings) and git-for-windows/git#5405 is the ticket where I track dropping git svn support from Git for Windows. Maybe at some stage soon Git for Windows can unshadow (via repo-add) all of those perl* packages.

ok, now only the packages present in the x86_64 package database are in this PR. I will leave cyrus-sasl and vim to be removed from i686's package database instead of being updated. Presumably they will then sync with upstream msys2's packages in the sdk (and not really be relevant outside the sdk since they're not in mingit?)

Oh sorry. I meant to reply earlier: I'd like to split this commit so that each commit can have its own build-and-deploy check-run attached to it. If you don't mind, I'll do that right away.

Hmm. I am not allowed to push to this PR branch, so I pushed to jeremeyd2019...gfw-libcrypt-removal instead... @jeremyd2019 would you mind force-pushing this to your PR branch (it's tree-same)?

That's odd, the 'allow edits by maintainers' checkbox is checked... Oh well, done now.

jeremyd2019 · 2025-02-13T21:36:34Z

The safest way to remove them would most likely be a custom workflow that is based on a previously-embargoed workflow I planned on integrating into git-for-windows-automation already (but am constantly running out of time). This workflow (creatively named deploy-embargoed-package) was used to deploy the embargoed git-lfs and git-credential-manager packages, and it should make for a fine starting point to call repo-remove <package>... followed by an upload.

I hope to get to that particular clean-up tomorrow. And if not tomorrow, Monday is a US holiday, so I should have time at least then.

After that (and the rebuild, #219), there will need to be a way to uninstall packages from git-sdk* (if there isn't already), and we can get back to git-for-windows/git-sdk-32#39 (and most likely similar cleanup in the other sdk variants)

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

dscho · 2025-02-16T20:10:56Z

@jeremyd2019 I have not forgotten about this PR nor about git-for-windows/build-extra#594; I have been busy working on git-for-windows/build-extra#595 (and still need to become busy working on the companion build-and-deploy change in git-for-windows-automation) so that I can deploy simultaneously to Git for Windows' old as well as to its new Pacman repository. Once that's done, I will deploy 'em all.

dscho · 2025-02-17T20:13:10Z

You can follow along the deployments by looking at the check runs on the commits:

And I just noticed through the failed builds that I made a mistake in the commit messages: It's openssh, not openssl that was updated ;-)

dscho · 2025-02-17T20:17:15Z

Oh well, I still cannot push to the PR branch. I'll just leave the commit message as-is.

jeremyd2019 · 2025-02-17T20:19:17Z

I can do it, if that won't break what you're doing... oh, I see it's already going

dscho · 2025-02-17T20:21:32Z

I can do it, if that won't break what you're doing... oh, I see it's already going

Yeah, I am not such a stickler to correct commit messages ;-) I just want to deploy these packages 😁

jeremyd2019 · 2025-02-17T20:27:02Z

The cyrus-sasl package has been deployed specifically (and manually) to Git for Windows' i686 Pacman repository, see #112 (comment). Along with it serf, and libssh2 were deployed, too.

Is there anywhere the "shadowed" packages are documented as to why they're shadowed, so they can be checked to see if they still need to be shadowed or not?

dscho · 2025-02-17T20:38:48Z

The cyrus-sasl package has been deployed specifically (and manually) to Git for Windows' i686 Pacman repository, see #112 (comment). Along with it serf, and libssh2 were deployed, too.

Is there anywhere the "shadowed" packages are documented as to why they're shadowed, so they can be checked to see if they still need to be shadowed or not?

No, the only documentation of the reason why the cyrus-sasl package needed to be rebuilt (and hence, shadow MSYS2's version) that I could find was #112 (comment) and the commit message of 76a1448.

In general, the easiest way that I know of to check what packages Git for Windows shadows is to compare the contents of the respective package databases, i.e. something like this:

$ comm -12 \
  <(tar tf /var/lib/pacman/sync/msys.db |
    sed -n 's,\(-[^-]*\)\{2\}/$,,p' |
    sort) \
  <(tar tf /var/lib/pacman/sync/git-for-windows.db |
    sed -n '/^mingw-w64/d;s,\(-[^-]*\)\{2\}/$,,p' |
    sort)
bash
bash-devel
curl
fido2-tools
gawk
git-flow
gnupg
gnutls
heimdal
heimdal-devel
heimdal-libs
libcbor
libcbor-devel
libcurl
libcurl-devel
libfido2
libfido2-devel
libfido2-docs
libgcrypt
libgcrypt-devel
libgnutls
libgnutls-devel
libgpg-error
libgpg-error-devel
libopenssl
libpcre2_16
libpcre2_32
libpcre2_8
libpcre2posix
mintty
msys2-runtime
msys2-runtime-3.3
msys2-runtime-3.3-devel
msys2-runtime-devel
openssh
openssl
openssl-devel
openssl-docs
p7zip
pcre2
pcre2-devel
perl
perl-Clone
perl-HTML-Parser
perl-Locale-Gettext
perl-Net-SSLeay
perl-TermReadKey
perl-XML-Parser
perl-YAML-Syck
pkgconf
subversion
tig

This is the result in git-sdk-64. Let's run this in git-sdk-32, too:

bash
bash-devel
ca-certificates
curl
cyrus-sasl
docbook-xsl-ns
fido2-tools
gawk
git-flow
gnupg
gnutls
gzip
heimdal
heimdal-devel
heimdal-libs
less
libcbor
libcbor-devel
libcurl
libcurl-devel
libfido2
libfido2-devel
libfido2-docs
libgcrypt
libgcrypt-devel
libgnutls
libgnutls-devel
libgpg-error
libgpg-error-devel
libksba
libksba-devel
libopenssl
libpcre2_16
libpcre2_32
libpcre2_8
libpcre2posix
libsasl
libsasl-devel
libserf
libserf-devel
libssh2
libssh2-devel
mintty
msys2-runtime
msys2-runtime-devel
nano
openssh
openssl
openssl-devel
openssl-docs
p7zip
pcre2
pcre2-devel
perl
perl-Clone
perl-HTML-Parser
perl-Locale-Gettext
perl-Net-SSLeay
perl-TermReadKey
perl-XML-Parser
perl-YAML-Syck
pkgconf
subversion
tig
vim
zlib
zlib-devel

Looks pretty similar ;-)

jeremyd2019 · 2025-02-17T20:44:30Z

$ diff 32 64
3d2
< ca-certificates
5,6d3
< cyrus-sasl
< docbook-xsl-ns
12d8
< gzip
16d11
< less
30,31d24
< libksba
< libksba-devel
37,42d29
< libsasl
< libsasl-devel
< libserf
< libserf-devel
< libssh2
< libssh2-devel
44a32,33
> msys2-runtime-3.3
> msys2-runtime-3.3-devel
46d34
< nano
65,67d52
< vim
< zlib
< zlib-devel

dscho · 2025-02-17T21:06:08Z

Thanks @jeremyd2019 for this diff. So it looks as if we want to unshadow via:

$ repo-remove ca-certificates cyrus-sasl docbook-xsl-ns gzip less libksba libksba-devel libsasl libsasl-devel \
  libserf libserf-devel libssh2 libssh2-devel nano vim zlib zlib-devel

dscho · 2025-02-17T21:54:08Z

The deployments are all done.

jeremyd2019 · 2025-02-18T04:17:08Z

unused dll: usr/bin/msys-crypt-0.dll

Yeah, good, but I don't know why it failed with that on i686 but not x86_64

dscho · 2025-02-18T12:09:34Z

unused dll: usr/bin/msys-crypt-0.dll

Yeah, good, but I don't know why it failed with that on i686 but not x86_64

I suspect that the reason is cyrus-sasl, which is still shadowed by Git for Windows, and therefore still depends on libcrypt.

dscho · 2025-02-20T12:37:49Z

unused dll: usr/bin/msys-crypt-0.dll

Yeah, good, but I don't know why it failed with that on i686 but not x86_64

I suspect that the reason is cyrus-sasl, which is still shadowed by Git for Windows, and therefore still depends on libcrypt.

Turns out that was it: after removing that package from Git for Windows' Pacman repository, the check-for-missing-dlls run succeeded.

jeremyd2019 force-pushed the gfw-libcrypt-removal branch from bde8860 to db0c794 Compare February 13, 2025 19:59

jeremyd2019 commented Feb 13, 2025

View reviewed changes

vim/PKGBUILD Outdated Show resolved Hide resolved

jeremyd2019 force-pushed the gfw-libcrypt-removal branch from db0c794 to adf884d Compare February 13, 2025 20:01

jeremyd2019 mentioned this pull request Feb 13, 2025

orphaned and unneeded packages git-for-windows/git-sdk-32#39

Closed

dscho reviewed Feb 13, 2025

View reviewed changes

jeremyd2019 force-pushed the gfw-libcrypt-removal branch from adf884d to 00903b2 Compare February 14, 2025 18:06

jeremyd2019 added 11 commits February 14, 2025 19:15

curl: migrate libcrypt -> libxcrypt.

61e1c34

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

heimdal: migrate libcrypt -> libxcrypt.

5a1b9b8

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

openssl: migrate libcrypt -> libxcrypt.

e6b7ed1

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

perl-Clone: migrate libcrypt -> libxcrypt.

d3add35

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

perl-HTML-Parser: migrate libcrypt -> libxcrypt.

5f31fe2

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

perl-Locale-Gettext: migrate libcrypt -> libxcrypt.

0108384

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

perl-Net-SSLeay: migrate libcrypt -> libxcrypt.

ecedbfc

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

perl-TermReadKey: migrate libcrypt -> libxcrypt.

0e17657

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

perl-XML-Parser: migrate libcrypt -> libxcrypt.

dbf46bc

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

perl-YAML-Syck: migrate libcrypt -> libxcrypt.

304264a

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

perl: migrate libcrypt -> libxcrypt.

18ed9ef

libcrypt-devel was removed in July 2023, and libcrypt was removed in October 2023. Signed-off-by: Jeremy Drake <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

jeremyd2019 force-pushed the gfw-libcrypt-removal branch from 00903b2 to 18ed9ef Compare February 14, 2025 18:56

dscho merged commit 8269881 into git-for-windows:main Feb 17, 2025
5 checks passed

jeremyd2019 deleted the gfw-libcrypt-removal branch February 17, 2025 21:54

dscho mentioned this pull request Feb 19, 2025

Add remove-packages-from-repo action. git-for-windows/git-for-windows-automation#114

Merged

Migrate libcrypt -> libxcrypt. #218

Migrate libcrypt -> libxcrypt. #218

Conversation

jeremyd2019 commented Feb 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jeremyd2019 commented Feb 13, 2025

Uh oh!

dscho commented Feb 13, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jeremyd2019 commented Feb 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dscho commented Feb 16, 2025

Uh oh!

dscho commented Feb 17, 2025

Uh oh!

dscho commented Feb 17, 2025

Uh oh!

jeremyd2019 commented Feb 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dscho commented Feb 17, 2025

Uh oh!

jeremyd2019 commented Feb 17, 2025

Uh oh!

dscho commented Feb 17, 2025

Uh oh!

jeremyd2019 commented Feb 17, 2025

Uh oh!

dscho commented Feb 17, 2025

Uh oh!

dscho commented Feb 17, 2025

Uh oh!

Uh oh!

jeremyd2019 commented Feb 18, 2025

Uh oh!

dscho commented Feb 18, 2025

Uh oh!

dscho commented Feb 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jeremyd2019 commented Feb 13, 2025 •

edited

Loading

jeremyd2019 commented Feb 13, 2025 •

edited

Loading

jeremyd2019 commented Feb 17, 2025 •

edited

Loading