Author: jfthomps
Date: Tue May 12 20:52:22 2020
New Revision: 39419
Log:
updated code signing key for Josh Thompson in KEYS file
added patch (against 2.5.1), gpg signature, and sha512 sum to address VCL-1127
where cygwin had to change the name of sshd to cygsshd
Added:
release/vcl/patches/cygwin_sshd_to_cygsshd/
release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch
release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.asc
(with props)
release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.sha512
Modified:
release/vcl/KEYS
Modified: release/vcl/KEYS
==============================================================================
--- release/vcl/KEYS (original)
+++ release/vcl/KEYS Tue May 12 20:52:22 2020
@@ -258,21 +258,21 @@ FCiK24261P4oWEqdmWV6QwkMtRWjRUkLsTT+Yjry
lawUaqddON04ntfIz85bsJl7xuZQ13RUk/Yiq4rz4skDtIQj1vn+hrxeJuVyNHsw
1CqVOPqEIDqqe1YnLR1hOpfyiLjlaE59
=f7TJ
+-----END PGP PUBLIC KEY BLOCK-----
/*
** Josh Thompson (ASF Code Signing Key)
*/
------END PGP PUBLIC KEY BLOCK-----
-pub 4096R/E7E1C859 2009-09-16 [expires: 2019-09-14]
+pub rsa4096 2009-09-16 [SC] [expires: 2030-05-10]
+ 23470E426D1501D9210C045948D9F397E7E1C859
uid Josh Thompson (CODE SIGNING KEY) <jftho...@apache.org>
-sig 3 E7E1C859 2009-09-16 Josh Thompson (CODE SIGNING KEY)
<jftho...@apache.org>
-sig B5F246C3 2009-09-16 Josh Thompson (ASF Master Key)
<jftho...@apache.org>
-sub 4096R/86D736D2 2009-09-16 [expires: 2019-09-14]
-sig E7E1C859 2009-09-16 Josh Thompson (CODE SIGNING KEY)
<jftho...@apache.org>
+sig 3 48D9F397E7E1C859 2020-05-12 Josh Thompson (CODE SIGNING KEY)
<jftho...@apache.org>
+sig A0D9181BB5F246C3 2009-09-16 Josh Thompson (ASF Master Key)
<jftho...@apache.org>
+sub rsa4096 2009-09-16 [E] [expires: 2030-05-10]
+sig 48D9F397E7E1C859 2020-05-12 Josh Thompson (CODE SIGNING KEY)
<jftho...@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
mQINBEqxDAABEACpZhT+AcEIU9Q2PfbjNaHOJ6M/JPakzJhqWK9BPF2Sz1/tUZUt
NzF4oDjxqkrMWE4gg9Sl/HE0Wh0iUYFdguUGNQEEaqgHJaVgF8SXaCJ6X5NisKOl
@@ -286,51 +286,52 @@ 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
-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
-=QAzl
+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
+=nOGG
-----END PGP PUBLIC KEY BLOCK-----
Added: release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch
==============================================================================
--- release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch
(added)
+++ release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch Tue
May 12 20:52:22 2020
@@ -0,0 +1,159 @@
+diff -rupN apache-VCL-2.5.1.orig/managementnode/bin/cygwin-sshd-config.sh
apache-VCL-2.5.1/managementnode/bin/cygwin-sshd-config.sh
+--- apache-VCL-2.5.1.orig/managementnode/bin/cygwin-sshd-config.sh
2019-07-19 10:12:22.000000000 -0400
++++ apache-VCL-2.5.1/managementnode/bin/cygwin-sshd-config.sh 2020-05-12
14:53:58.415000000 -0400
+@@ -131,9 +131,17 @@ if [ $? -ne 0 ]; then die "failed to con
+ mount
+ print_hr
+
++sshdservice=$(sc queryex type= service state= all | grep sshd | grep
SERVICE_NAME | awk '{print $2}' | sed 's/
//g')
++
++if [[ $sshdservice == "" ]]; then
++ sshdservice=sshd
++fi
++
++echo "sshd service name is $sshdservice"
++
+ # Stop and kill all sshd processes
+ echo Stopping sshd service if it is running
+-net stop sshd 2>/dev/null
++net stop $sshdservice 2>/dev/null
+ print_hr
+
+ echo Killing any sshd.exe processes
+@@ -146,7 +154,7 @@ print_hr
+
+ # Delete the sshd service if it already exists
+ echo Deleting sshd service if it already exists
+-$SYSTEMROOT/system32/sc.exe delete sshd
++$SYSTEMROOT/system32/sc.exe delete $sshdservice
+ print_hr
+
+ # Make sure sshd service registry key is gone
+@@ -154,6 +162,7 @@ print_hr
+ # This prevents the service from being reinstalled
+ echo Deleting sshd service registry key
+ reg.exe DELETE 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\sshd' /f
++reg.exe DELETE
"HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\${sshdservice}" /f
+ print_hr
+
+ # Delete sshd user, a new account will be created
+@@ -377,8 +386,8 @@ echo rebaseall exit status: %ERRORLEVEL%
+ IF ERRORLEVEL 1 exit /b %ERRORLEVEL%
+ echo.
+
+-echo Starting Cygwin SSHD service
+-net start sshd
++echo Starting Cygwin SSHD service (${sshdservice})
++net start ${sshdservice}
+ IF ERRORLEVEL 1 exit /b %ERRORLEVEL%
+
+ echo /var/log/sshd.log ending:
+diff -rupN apache-VCL-2.5.1.orig/managementnode/bin/gen-node-key.sh
apache-VCL-2.5.1/managementnode/bin/gen-node-key.sh
+--- apache-VCL-2.5.1.orig/managementnode/bin/gen-node-key.sh 2019-07-19
10:12:22.000000000 -0400
++++ apache-VCL-2.5.1/managementnode/bin/gen-node-key.sh 2020-05-12
14:54:11.710000000 -0400
+@@ -151,6 +151,16 @@ case $OS in
+ die "Unsupported OS found, OS call reported $OS";;
+ esac
+
++# if OS is CYGWIN, try to determine sshd service name
++if [[ $OS =~ (CYGWIN) ]]; then
++ sshdservice=`ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE "sc queryex type=
service state= all | grep sshd | grep SERVICE_NAME | awk '{print \\$2}' | sed
's/
//g'"`
++ if [[ $sshdservice != "" && $sshdservice != "sshd" ]]; then
++ echo "Detected CYGWIN with alternate sshd service name:
$sshdservice"
++ SSHSTOP="net stop $sshdservice"
++ SSHSTART="net start $sshdservice"
++ fi
++fi
++
+ echo Setting PasswordAuthentication to no in sshd_config on $NODE
+ ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE 'sed -i -r -e "s/^[
#]*(PasswordAuthentication).*/\1 no/"' $SSHDCONFIG
+ ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE 'grep "^[
#]*PasswordAuthentication"' $SSHDCONFIG
+diff -rupN
apache-VCL-2.5.1.orig/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm
apache-VCL-2.5.1/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm
+---
apache-VCL-2.5.1.orig/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm
2019-07-19 10:12:22.000000000 -0400
++++ apache-VCL-2.5.1/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm
2020-05-12 14:55:11.929000000 -0400
+@@ -134,7 +134,7 @@ sub pre_capture {
+ }
+
+ # Set the sshd service startup mode to disabled so that it does not
start up until properly configured
+- if (!$self->set_service_startup_mode('sshd', 'disabled')) {
++ if (!$self->set_service_startup_mode('sshd', 'disabled') &&
!$self->set_service_startup_mode('cygsshd', 'disabled')) {
+ notify($ERRORS{'WARNING'}, 0, "sshd service could not be
disabled before shutting down computer");
+ return;
+ }
+diff -rupN apache-VCL-2.5.1.orig/managementnode/lib/VCL/Module/OS/Windows.pm
apache-VCL-2.5.1/managementnode/lib/VCL/Module/OS/Windows.pm
+--- apache-VCL-2.5.1.orig/managementnode/lib/VCL/Module/OS/Windows.pm
2019-07-19 10:12:22.000000000 -0400
++++ apache-VCL-2.5.1/managementnode/lib/VCL/Module/OS/Windows.pm
2020-05-12 14:54:40.062000000 -0400
+@@ -673,7 +673,7 @@ sub pre_capture {
+
+ =cut
+
+- if (!$self->set_service_startup_mode('sshd', 'manual')) {
++ if (!$self->set_service_startup_mode('sshd', 'manual') &&
!$self->set_service_startup_mode('cygsshd', 'manual')) {
+ notify($ERRORS{'WARNING'}, 0, "unable to set sshd service
startup mode to manual");
+ return 0;
+ }
+@@ -786,7 +786,7 @@ sub post_load {
+
+ =cut
+
+- if (!$self->set_service_startup_mode('sshd', 'auto')) {
++ if (!$self->set_service_startup_mode('sshd', 'auto') &&
!$self->set_service_startup_mode('cygsshd', 'auto')) {
+ notify($ERRORS{'WARNING'}, 0, "unable to set sshd service
startup mode to auto");
+ return 0;
+ }
+@@ -2349,15 +2349,21 @@ sub set_password {
+ # Get the list of services
+ my @services = $self->get_services_using_login_id($username);
+ if ($username eq 'root' && !@services) {
+- @services = ('sshd');
++ @services = ('sshd', 'cygsshd');
+ }
+
++ my $success = 0;
+ for my $service (@services) {
+ notify($ERRORS{'DEBUG'}, 0, "$service service is configured to
run as $username, updating service credentials");
+- if (!$self->set_service_credentials($service, $username,
$password)) {
+- notify($ERRORS{'WARNING'}, 0, "failed to set $service
service credentials to $username ($password)");
++ if ($self->set_service_credentials($service, $username,
$password)) {
++ $success = 1;
++ last;
+ }
+ }
++ if(!$success) {
++ my $servicelist = join(', ', @services);
++ notify($ERRORS{'WARNING'}, 0, "failed to set credentials to
$username ($password) for any of $servicelist");
++ }
+
+ # Get the scheduled tasks - check if any are configured to run as the
user
+ my $scheduled_task_info = $self->get_scheduled_task_info();
+@@ -3939,7 +3945,7 @@ sub reboot {
+ }
+
+ # Set sshd service startup mode to manual
+- if (!$self->set_service_startup_mode('sshd', 'manual'))
{
++ if (!$self->set_service_startup_mode('sshd', 'manual')
&& !$self->set_service_startup_mode('cygsshd', 'manual')) {
+ notify($ERRORS{'WARNING'}, 0, "reboot not
attempted, unable to set sshd service startup mode to manual");
+ return 0;
+ }
+diff -rupN
apache-VCL-2.5.1.orig/managementnode/tools/Windows/Scripts/update_cygwin.cmd
apache-VCL-2.5.1/managementnode/tools/Windows/Scripts/update_cygwin.cmd
+---
apache-VCL-2.5.1.orig/managementnode/tools/Windows/Scripts/update_cygwin.cmd
2019-07-19 10:12:22.000000000 -0400
++++ apache-VCL-2.5.1/managementnode/tools/Windows/Scripts/update_cygwin.cmd
2020-05-12 14:55:44.270000000 -0400
+@@ -172,14 +172,16 @@ echo.
+
+ echo ----------------------------------------------------------------------
+
++sc queryex type= service state= all | findstr "cygsshd" > nul && SET
sshdservice=cygsshd || SET sshdservice=sshd
++
+ echo %TIME%: Setting sshd service startup mode to auto...
+-"%SystemRoot%\System32\sc.exe" config sshd start= auto 2>&1
++"%SystemRoot%\System32\sc.exe" config %sshdservice% start= auto 2>&1
+ echo ERRORLEVEL: %ERRORLEVEL%
+ set /A STATUS+=%ERRORLEVEL%
+ echo.
+
+ echo %TIME%: Starting the sshd service...
+-"%SystemRoot%\System32\net.exe" start sshd 2>&1
++"%SystemRoot%\System32\net.exe" start %sshdservice% 2>&1
+ echo ERRORLEVEL: %ERRORLEVEL%
+ set /A STATUS+=%ERRORLEVEL%
+ echo.
Added:
release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.asc
==============================================================================
Binary file - no diff available.
Propchange:
release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.asc
------------------------------------------------------------------------------
svn:mime-type = application/pgp-signature
Added:
release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.sha512
==============================================================================
---
release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.sha512
(added)
+++
release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.sha512
Tue May 12 20:52:22 2020
@@ -0,0 +1 @@
+bdd033cf63f6f6d80870706ca052e8f52c6a7b7a23875617518509ff049493662625cb9c29e5e167c8c63e5110978bb5621d6fc5438c6510ad8f8831eb06febc
cygwin_sshd_for_2.5.1.patch
