Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Conversation

@shirosaki
Copy link
Contributor

I created a build script for OpenSSH in msys branch.
minires, libz and openssl have dll binary but not include and *.dll.a.
So I added include and *.dll.a files. Is this OK?
I also added a crypt build script for OpenSSH. We need to build crypt before OpenSSH build.

@dscho
Copy link
Member

dscho commented Jun 20, 2014

Apart from the binaries and the extra COPYING files to be patched in, this looks really good! I would probably untangle the configure.ac from the configure patches so that it is easier to upgrade, but I guess that could be done when upgrading.

@shirosaki
Copy link
Contributor Author

I could make a shell script instead of adding *.dll.a binaries. And I'm ok to remove COPYING.

@dscho
Copy link
Member

dscho commented Jun 20, 2014

I could make a shell script instead of adding *.dll.a binaries.

Well, I was really curious from where you got them...

@shirosaki
Copy link
Contributor Author

I fixed the following points.

  • remove binaries and openssh release.sh creates *.dll.a binaries
  • remove COPYING file in the crypt patch
  • use autoreconf instead of configure patch in openssh

@dscho
Copy link
Member

dscho commented Jun 23, 2014

Thank you!

@dscho
Copy link
Member

dscho commented Jun 23, 2014

Just one more question: you extracted the headers for msys-crypto-0.9.8.dll and msys-minires.dll from where? I just went for a hunt for five minutes (using up a third of my daily Git time budget) and could not find any sensible candidate. Would be nice if you could mention the source for those files in the commit message (also to confirm that the headers match the existing binaries).

After that, we'll be good to go! Thank you so much for all your hard work!

@shirosaki
Copy link
Contributor Author

@shirosaki
Copy link
Contributor Author

I succeed to build OpenSSH 6.6p1 for msys. Added the commit.
Can we use OpenSSH 6.6p1?

dscho added a commit that referenced this pull request Jun 24, 2014
@dscho dscho merged commit 5c2897b into msysgit:msys Jun 24, 2014
@dscho
Copy link
Member

dscho commented Jun 24, 2014

Excellent work, @shirosaki! @kusma thank you for your review! I will now let my slow VM build it... ;-)

@dscho
Copy link
Member

dscho commented Jun 24, 2014

@shirosaki I also found that I had to remove some obsolete headers... Did you have to do something similar to 7cf3e99?

@dscho
Copy link
Member

dscho commented Jun 24, 2014

I cherry-picked the compiled OpenSSH binaries and put it on the branch ssh-6.6p1 so I can test it thoroughly first.

@dscho
Copy link
Member

dscho commented Jun 24, 2014

Tested and merged. Thank you again!

@shirosaki
Copy link
Contributor Author

Thank you for merging and test.
I didn't notice obsolete headers. My build completed without removing the headers.

It seems msys-crypt is not needed for OpenSSH 6.6p1.
crypt would be replaced with DES_crypt in openssl if crypt is not available.

openbsd-compat/xcrypt.c:62

#  define crypt DES_crypt

@shirosaki
Copy link
Contributor Author

@shirosaki shirosaki deleted the upgrade_openssh branch June 25, 2014 10:19
@dscho
Copy link
Member

dscho commented Jun 25, 2014

I didn't notice obsolete headers. My build completed without removing the headers.

Okay, strange. Maybe some timestamp issue where my checkout let other directories in the INCLUDE search path take precedence.

It seems msys-crypt is not needed for OpenSSH 6.6p1.

Thanks for the analysis! However, in the interest of time I am inclined to leave things as they are. If you feel strongly about this issue, though, just file a PR and I will merge it right away!

https://github.com/msysgit/msysgit/blob/msys/bin/slogin looks obsolete.
It should be removed since slogin.exe exists.

Thanks! See 4f2618e

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants