Skip to content
This repository was archived by the owner on Jun 15, 2020. It is now read-only.

Commit 22563ee

Browse files
committed
Updated version string and README for 1.2.
1 parent f14b03e commit 22563ee

File tree

2 files changed

+29
-21
lines changed

2 files changed

+29
-21
lines changed

README.md

+26-18
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,25 @@ the user who started the WSL environment. In practice, *if you allow someone els
2929
log in to your WSL environment remotely, they may be able to access the SSH keys stored in
3030
your Pageant with `weasel-pageant`.* This is a fundamental feature of WSL; if you
3131
are not sure of what you're doing, do not allow remote access to your WSL environment
32-
(i.e. by starting an SSH server).
32+
(e.g. by starting an SSH server).
3333

34-
**COMPATIBILITY NOTICE:** `weasel-pageant` does not, and will never work on
35-
a version of Windows 10 older than 1703 ("Creators Update"), because
36-
it requires the new [Windows/Ubuntu interoperability support](https://blogs.msdn.microsoft.com/wsl/2016/10/19/windows-and-ubuntu-interoperability/)
37-
feature shipped with version 1703. It has been verified to work with versions
38-
up to and including 1709 ("Fall Creators Update").
39-
40-
Non-Ubuntu distributions (available since 1709) have not been tested, but
41-
they should work as well. Please open a GitHub issue if something is broken.
42-
43-
If you are still using Anniversary Update, you may be able to use the (unrelated)
44-
[wsl-ssh-pageant](https://github.com/benpye/wsl-ssh-pageant).
34+
`weasel-pageant` does not work on a version of Windows 10 older
35+
than 1703 ("Creators Update"), because it requires the
36+
[Windows/Ubuntu interoperability support](https://blogs.msdn.microsoft.com/wsl/2016/10/19/windows-and-ubuntu-interoperability/)
37+
feature shipped with that version. It has been verified to work with versions
38+
up to and including 1809 ("October 2018 Update").
4539

4640
## Installation
4741

4842
### From binaries
4943

5044
Download the zip file from the [releases page](https://github.com/vuori/weasel-pageant/releases)
5145
and unpack it in a convenient location *on the Windows part of your drive*.
46+
5247
Because WSL can only execute Win32 binaries from `drvfs` locations, `weasel-pageant`
5348
*will not work* if unpacked inside the WSL filesystem (onto an `lxfs` mount).
54-
(Advanced users may place only `helper.exe` on `drvfs`, but in general it is easier
55-
to keep the pieces together.)
49+
Advanced users may place only `helper.exe` on `drvfs`, but in general it is easier
50+
to keep the pieces together.
5651

5752
### From source
5853

@@ -66,7 +61,7 @@ A VS2017 project is included. You will need the "Desktop development with C++" a
6661
`/usr/include` into `linux/include` under the project directory.
6762
This is not required for the build, but will make Intellisense more useful.
6863

69-
3. Hit Build Solution and both the Linux executable and the Win32 helper will be built.
64+
3. Hit Build Solution. Both the Linux executable and the Win32 helper will be built.
7065

7166
If you want to create a binary package, you can use the `create_pkg.py` script
7267
at the root of the project. This should work with Python 3.4 or newer on either
@@ -77,7 +72,7 @@ Visual Studio for the Win32 helper (no Makefile or similar is supplied at the mo
7772
In theory the helper should be buildable with MinGW-w64 for a fully Linux-based
7873
build, but this has not been tested.
7974

80-
The release binaries have been built with VS2017 15.6.0 Preview 5.0.
75+
The release binaries have been built with VS2017 15.9.4 Preview 1.0.
8176

8277
## Usage
8378

@@ -164,7 +159,7 @@ to your shell initialization files (e.g. `.bashrc`).
164159
* 2018-03-30: 1.1 - Fixed console/agent connection hangs and enabled restarting of the helper.
165160
**Upgrade note:** remove the `-a` flag from the `weasel-pageant` command line unless you
166161
know you need it.
167-
* 2018-12-28: 1.2b1 (test release) - Probably fixed unexpected exits due to signal handling bug.
162+
* 2019-01-06: 1.2 - Fixed unexpected daemon exits caused by a signal handling issue.
168163

169164
## Bug reports and contributions
170165

@@ -179,10 +174,23 @@ Please do not send bug reports by e-mail.
179174
Pull requests are also welcome, though if you intend to do major changes it's recommended to open an
180175
issue first.
181176

177+
## Related projects
178+
179+
There are several projects that provide similar functionality (I have not tested all
180+
of these):
181+
182+
* [ssh-pageant](https://github.com/cuviper/ssh-pageant): the Cygwin program on
183+
which `weasel-pageant` is based on.
184+
* [wsl-ssh-pageant](https://github.com/benpye/wsl-ssh-pageant): a Win32 app that
185+
uses the Unix domain socket support introduced in Windows 10 1803 to provide
186+
agent connectivity.
187+
* [ssh-agent-wsl](https://github.com/rupor-github/ssh-agent-wsl): a fork of
188+
`weasel-pageant` that includes support for using keys held by Microsoft's
189+
SSH Agent service.
182190

183191

184192
------------------------------------------------------------------------------
185-
Copyright 2017, 2018 Valtteri Vuorikoski
193+
Copyright 2017-2019 Valtteri Vuorikoski
186194

187195
Based on `ssh-pageant`, copyright (C) 2009-2014 Josh Stone
188196

linux/main.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* weasel-pageant Linux-side main code.
33
*
4-
* Copyright 2017, 2018 Valtteri Vuorikoski
4+
* Copyright 2017-2019 Valtteri Vuorikoski
55
* Based on ssh-pageant, Copyright 2009-2015 Josh Stone
66
*
77
* This file is part of weasel-pageant, and is free software: you can
@@ -42,7 +42,7 @@
4242
// code is left here in case things improve in future Windows releases.
4343
//#define REAL_DAEMONIZE 1
4444

45-
#define VERSION "1.2b1"
45+
#define VERSION "1.2"
4646

4747
#define FD_FOREACH(fd, set) \
4848
for (fd = 0; fd < FD_SETSIZE; ++fd) \
@@ -787,7 +787,7 @@ main(int argc, char *argv[])
787787

788788
case 'v':
789789
printf("weasel-pageant " VERSION "\n");
790-
printf("Copyright 2017, 2018 Valtteri Vuorikoski\n");
790+
printf("Copyright 2017-2019 Valtteri Vuorikoski\n");
791791
printf("Based on ssh-pageant, copyright 2009-2014 Josh Stone\n");
792792
printf("License GPLv3+: GNU GPL version 3 or later"
793793
" <http://gnu.org/licenses/gpl.html>.\n");

0 commit comments

Comments
 (0)