Skip to content

Commit 5266ecd

Browse files
artifexorartifexor
committed
Merge remote-tracking branch 'upstream/next'
Conflicts: .gitignore Recipe adb.c be_nossh.c cmdline.c config.c dialog.h mkfiles.pl mkunxarc.sh putty.h settings.c ssh.c terminal.c terminal.h unix/configure.ac unix/gtkdlg.c windows/build-debug.bat windows/build-release.bat windows/re_lib/regexp.h windows/urlhack.h windows/wincfg.c windows/winctrls.c windows/windefs.c windows/windlg.c windows/window.c windows/winmisc.c windows/winplink.c windows/winstore.c
2 parents 1d2cd79 + 4f8a275 commit 5266ecd

File tree

189 files changed

+19592
-9051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+19592
-9051
lines changed

‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.vcxproj eol=crlf
2+
*.sln eol=crlf

‎.gitignore

+152-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
windows/MSVC
1+
windows/MSVC*
22
windows/DEVCPP
33
Makefile*
44
charset/sbcsdat.c
@@ -8,6 +8,7 @@ charset/sbcsdat.c
88
*.res
99
*.map
1010
*.pdb
11+
/empty.h
1112
*.o
1213
unix/plink
1314
unix/pscp
@@ -16,3 +17,153 @@ unix/puttygen
1617
unix/pterm
1718
unix/putty
1819
unix/puttytel
20+
21+
# github's gitignore for Visual Studio: a6dd83c18d0beb8e36c091fd33b64ca45a3a0f3a
22+
## Ignore Visual Studio temporary files, build results, and
23+
## files generated by popular Visual Studio add-ons.
24+
25+
# User-specific files
26+
*.suo
27+
*.user
28+
*.sln.docstates
29+
30+
# Build results
31+
32+
[Dd]ebug/
33+
[Rr]elease/
34+
x64/
35+
build/
36+
[Bb]in/
37+
[Oo]bj/
38+
39+
# MSTest test Results
40+
[Tt]est[Rr]esult*/
41+
[Bb]uild[Ll]og.*
42+
43+
*_i.c
44+
*_p.c
45+
*.ilk
46+
*.meta
47+
*.obj
48+
*.pch
49+
*.pdb
50+
*.pgc
51+
*.pgd
52+
*.rsp
53+
*.sbr
54+
*.tlb
55+
*.tli
56+
*.tlh
57+
*.tmp
58+
*.tmp_proj
59+
*.log
60+
*.vspscc
61+
*.vssscc
62+
.builds
63+
*.pidb
64+
*.log
65+
*.scc
66+
67+
# Visual C++ cache files
68+
ipch/
69+
*.aps
70+
*.ncb
71+
*.opensdf
72+
*.sdf
73+
*.cachefile
74+
75+
# Visual Studio profiler
76+
*.psess
77+
*.vsp
78+
*.vspx
79+
80+
# Guidance Automation Toolkit
81+
*.gpState
82+
83+
# ReSharper is a .NET coding add-in
84+
_ReSharper*/
85+
*.[Rr]e[Ss]harper
86+
87+
# TeamCity is a build add-in
88+
_TeamCity*
89+
90+
# DotCover is a Code Coverage Tool
91+
*.dotCover
92+
93+
# NCrunch
94+
*.ncrunch*
95+
.*crunch*.local.xml
96+
97+
# Installshield output folder
98+
[Ee]xpress/
99+
100+
# DocProject is a documentation generator add-in
101+
DocProject/buildhelp/
102+
DocProject/Help/*.HxT
103+
DocProject/Help/*.HxC
104+
DocProject/Help/*.hhc
105+
DocProject/Help/*.hhk
106+
DocProject/Help/*.hhp
107+
DocProject/Help/Html2
108+
DocProject/Help/html
109+
110+
# Click-Once directory
111+
publish/
112+
113+
# Publish Web Output
114+
*.Publish.xml
115+
*.pubxml
116+
117+
# NuGet Packages Directory
118+
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
119+
#packages/
120+
121+
# Windows Azure Build Output
122+
csx
123+
*.build.csdef
124+
125+
# Windows Store app package directory
126+
AppPackages/
127+
128+
# Others
129+
sql/
130+
*.Cache
131+
ClientBin/
132+
[Ss]tyle[Cc]op.*
133+
~$*
134+
*~
135+
*.dbmdl
136+
*.[Pp]ublish.xml
137+
*.pfx
138+
*.publishsettings
139+
140+
# RIA/Silverlight projects
141+
Generated_Code/
142+
143+
# Backup & report files from converting an old project file to a newer
144+
# Visual Studio version. Backup files are not needed, because we have git ;-)
145+
_UpgradeReport_Files/
146+
Backup*/
147+
UpgradeLog*.XML
148+
UpgradeLog*.htm
149+
150+
# SQL Server files
151+
App_Data/*.mdf
152+
App_Data/*.ldf
153+
154+
# =========================
155+
# Windows detritus
156+
# =========================
157+
158+
# Windows image file caches
159+
Thumbs.db
160+
ehthumbs.db
161+
162+
# Folder config file
163+
Desktop.ini
164+
165+
# Recycle Bin used on file shares
166+
$RECYCLE.BIN/
167+
168+
# Mac crap
169+
.DS_Store

‎CHECKLST.txt

+7-4
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,13 @@ of the tag.
177177
subdirectory for the new version and mentions it in its .htaccess.
178178

179179
- Announce the release!
180-
+ Mail the announcement to <[email protected]>.
181-
* Put a 'Reply-To: [email protected]' header on the
182-
mail so that people don't keep replying to my personal
183-
address.
180+
+ Construct a release announcement email whose message body is the
181+
announcement written above, and which includes the following
182+
headers:
183+
* Reply-To: <[email protected]>
184+
* Subject: PuTTY X.YZ is released
185+
+ Mail that release announcement to
186+
<[email protected]>.
184187
+ Post it to comp.security.ssh.
185188
+ Mention it in <TDHTT> on mono.
186189

‎LICENCE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PuTTY is copyright 1997-2011 Simon Tatham.
1+
PuTTY is copyright 1997-2012 Simon Tatham.
22

33
Portions copyright Robert de Bath, Joris van Rantwijk, Delian
44
Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,

‎README

+40-12
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ For building on Windows:
4040
Makefile.bor' while in the `windows' subdirectory to build all
4141
the PuTTY binaries.
4242

43-
- windows/Makefile.cyg is for Cygwin / mingw32 installations. Type
43+
- windows/Makefile.cyg is for Cygwin / MinGW installations. Type
4444
`make -f Makefile.cyg' while in the `windows' subdirectory to
4545
build all the PuTTY binaries.
4646

@@ -65,8 +65,12 @@ For building on Unix:
6565

6666
- unix/configure is for Unix and GTK. If you don't have GTK, you
6767
should still be able to build the command-line utilities (PSCP,
68-
PSFTP, Plink, PuTTYgen) using this script. To use it, change
69-
into the `unix' subdirectory, run `./configure' and then `make'.
68+
PSFTP, Plink, PuTTYgen) using this script. To use it, change into
69+
the `unix' subdirectory, run `./configure' and then `make'. Or you
70+
can do the same in the top-level directory (we provide a little
71+
wrapper that invokes configure one level down), which is more like
72+
a normal Unix source archive but doesn't do so well at keeping the
73+
per-platform stuff in each platform's subdirectory; it's up to you.
7074

7175
Note that Unix PuTTY has mostly only been tested on Linux so far;
7276
portability problems such as BSD-style ptys or different header file
@@ -80,22 +84,46 @@ For building on Unix:
8084
utilities and has no Gtk dependence.
8185

8286
- For the graphical utilities, Gtk+-1.2 and Gtk+-2.0 should both be
83-
supported.
84-
85-
- Both Unix Makefiles have an `install' target. Note that by default
86-
it tries to install `man' pages, which you may need to have built
87-
using Halibut first -- see below.
87+
supported. If you have both installed, you can manually specify
88+
which one you want by giving the option '--with-gtk=1' or
89+
'--with-gtk=2' to the configure script. (2 is the default, of
90+
course.) In the absence of either, the configure script will
91+
automatically construct a Makefile which builds only the
92+
command-line utilities; you can manually create this condition by
93+
giving configure the option '--without-gtk'.
94+
95+
- pterm would like to be setuid or setgid, as appropriate, to permit
96+
it to write records of user logins to /var/run/utmp and
97+
/var/log/wtmp. (Of course it will not use this privilege for
98+
anything else, and in particular it will drop all privileges before
99+
starting up complex subsystems like GTK.) By default the makefile
100+
will not attempt to add privileges to the pterm executable at 'make
101+
install' time, but you can ask it to do so by running configure
102+
with the option '--enable-setuid=USER' or '--enable-setgid=GROUP'.
103+
104+
- The Unix Makefiles have an `install' target. Note that by default
105+
it tries to install `man' pages; if you have fetched the source via
106+
Subversion then you will need to have built these using Halibut
107+
first - see below.
108+
109+
- It's also possible to build the Windows version of PuTTY to run
110+
on Unix by using Winelib. To do this, change to the `windows'
111+
directory and run `make -f Makefile.cyg CC=winegcc RC=wrc'.
88112

89113
All of the Makefiles are generated automatically from the file
90-
`Recipe' by the Perl script `mkfiles.pl'. Additions and corrections
91-
to Recipe and the mkfiles.pl are much more useful than additions and
92-
corrections to the alternative Makefiles themselves.
114+
`Recipe' by the Perl script `mkfiles.pl' (except for the Unix one,
115+
which is generated by the `configure' script; mkfiles.pl only
116+
generates the input to automake). Additions and corrections to Recipe,
117+
mkfiles.pl and/or configure.ac are much more useful than additions and
118+
corrections to the actual Makefiles, Makefile.am or Makefile.in.
93119

94120
The Unix `configure' script and its various requirements are generated
95121
by the shell script `mkauto.sh', which requires GNU Autoconf, GNU
96122
Automake, and Gtk; if you've got the source from Subversion rather
97123
than using one of our source snapshots, you'll need to run this
98-
yourself.
124+
yourself. The input file to Automake is generated by mkfiles.pl along
125+
with all the rest of the makefiles, so you will need to run mkfiles.pl
126+
and then mkauto.sh.
99127

100128
Documentation (in various formats including Windows Help and Unix
101129
`man' pages) is built from the Halibut (`.but') files in the `doc'

‎README.md

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# PuTTYTray
2+
3+
This is [PuTTYTray][1], a fork of [Simon Tatham's PuTTY][2].
4+
5+
## Documentation
6+
7+
* For a list of current features, see the [PuTTYTray website][1].
8+
* The [github wiki][3] has documentation for some of these features, and help for other things, including contributing.
9+
* Please feel free to report any problems or feature requests using the [github issue tracker][5].
10+
11+
## Aims
12+
13+
There are a lot of patches against PuTTY that have never been submitted to, or have been rejected from, upstream. PuTTYTray is collecting these, with the aim of eventually getting them merged back in.
14+
15+
I'm looking to take ownership of any patches that are:
16+
17+
* Cool or useful to someone, even if that someone is just you,
18+
* Maintainable against the PuTTY code; i.e. mostly independent with some hooks or appends to some functionality,
19+
* Are at least vaguely following the original design goals of PuTTY, and follow the coding style a bit, and
20+
* Not security related, or, at least, there not being any visible security risk. PuTTY is a security product, and the security is critical. I want everyone, even very paranoid people, to be able to use PuTTYTray.
21+
22+
23+
## Building
24+
25+
Visual Studio 2010 project files are included. These should **just work**, there are absolutely no dependencies beyond what Visual Studio ships; even the Express edition works fine. There is a [full walkthrough of building PuTTYTray][4] on the wiki.
26+
27+
The original build system for PuTTY is intact, i.e. you can run `perl mkfiles.pl` and it will regenerate all the other build systems, including VS6 and various flavours of makefiles.
28+
29+
My released builds are still done with VS2010's nmake (using `windows/build-release.bat`, and will continue to be done so until XP drops out of support.
30+
31+
## License
32+
33+
This compilation is released under the same license as PuTTY itself;
34+
the MIT license. Individual contributions may be copyrighted by the original authors.
35+
36+
See `LICENSE.MIT` for the full text.
37+
38+
39+
[1]: https://puttytray.goeswhere.com/
40+
[2]: http://www.chiark.greenend.org.uk/~sgtatham/putty/
41+
[3]: https://github.com/FauxFaux/PuTTYTray/wiki
42+
[4]: https://github.com/FauxFaux/PuTTYTray/wiki/Building-with-VS2010-Express
43+
[5]: https://github.com/FauxFaux/PuTTYTray/issues

0 commit comments

Comments
 (0)