summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-03-13 21:52:28 (UTC)
committer Michael Krelin <hacker@klever.net>2006-03-13 21:52:28 (UTC)
commit24e693797daef020ece3fa19bb5acce000e37165 (patch) (unidiff)
tree0f2333976f4bc86e8c0b30d0a3e99c8279e435a0
parent05d4b744ffcfd511f7c99969e9e32bf92afdfe4d (diff)
downloadpumpkin-24e693797daef020ece3fa19bb5acce000e37165.zip
pumpkin-24e693797daef020ece3fa19bb5acce000e37165.tar.gz
pumpkin-24e693797daef020ece3fa19bb5acce000e37165.tar.bz2
Prepared bugfix release 2.7.12.7.1
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@150 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--help/pumpkin.rtf2
-rw-r--r--help/pumpkin.xml3
-rw-r--r--install/install.cpp2
-rw-r--r--install/install.rc8
-rw-r--r--pumpkin.rc10
5 files changed, 15 insertions, 10 deletions
diff --git a/help/pumpkin.rtf b/help/pumpkin.rtf
index 620f458..85a7a12 100644
--- a/help/pumpkin.rtf
+++ b/help/pumpkin.rtf
@@ -19,24 +19,26 @@ K{\footnote about}
19\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}} 19\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}}
20{ 20{
21\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997-2006 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")} 21\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997-2006 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}
22\par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 22\par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
23\par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 23\par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
24\par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 24\par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25} 25}
26\page 26\page
27 27
28\pard\plain 28\pard\plain
29#{\footnote News} 29#{\footnote News}
30${\footnote What's New} 30${\footnote What's New}
31\par\pard\plain\f1\fs24\qc\cf2\b 2.7.1 - March 13th, 2006
32\par\pard\plain\fi0\li0\f1\fs18 \bullet Bugfix release
31\par\pard\plain\f1\fs24\qc\cf2\b 2.7 - February 28th, 2006 33\par\pard\plain\f1\fs24\qc\cf2\b 2.7 - February 28th, 2006
32\par\pard\plain\fi0\li0\f1\fs18 \bullet Access lists based on request IP address and TFTP opcode for automating access policy 34\par\pard\plain\fi0\li0\f1\fs18 \bullet Access lists based on request IP address and TFTP opcode for automating access policy
33\par\pard\plain\fi0\li0\f1\fs18 \bullet Possibility to start/stop TFTP server, while keeping client functionality intact 35\par\pard\plain\fi0\li0\f1\fs18 \bullet Possibility to start/stop TFTP server, while keeping client functionality intact
34\par\pard\plain\fi0\li0\f1\fs18 \bullet Logging to file 36\par\pard\plain\fi0\li0\f1\fs18 \bullet Logging to file
35\par\pard\plain\fi0\li0\f1\fs18 \bullet Resizable main window 37\par\pard\plain\fi0\li0\f1\fs18 \bullet Resizable main window
36\par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005 38\par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005
37\par\pard\plain\fi0\li0\f1\fs18 \bullet more robust solution to the backslash/slash dilemma 39\par\pard\plain\fi0\li0\f1\fs18 \bullet more robust solution to the backslash/slash dilemma
38\par\pard\plain\fi0\li0\f1\fs18 \bullet A bit more elaborate error reporting 40\par\pard\plain\fi0\li0\f1\fs18 \bullet A bit more elaborate error reporting
39\par\pard\plain\fi0\li0\f1\fs18 \bullet Fixed uninstall procedure so that it works on XP 41\par\pard\plain\fi0\li0\f1\fs18 \bullet Fixed uninstall procedure so that it works on XP
40\par\pard\plain\f1\fs24\qc\cf2\b 2.5 - July 11th, 2004 42\par\pard\plain\f1\fs24\qc\cf2\b 2.5 - July 11th, 2004
41\par\pard\plain\fi0\li0\f1\fs18 \bullet Change of {\uldb license}{\v About} and opening the source. 43\par\pard\plain\fi0\li0\f1\fs18 \bullet Change of {\uldb license}{\v About} and opening the source.
42\par\pard\plain\fi0\li0\f1\fs18 \bullet Minor cosmetic changes 44\par\pard\plain\fi0\li0\f1\fs18 \bullet Minor cosmetic changes
diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 369d5d7..c966fbd 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -1,23 +1,26 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<winhelp> 2<winhelp>
3 <topic id="About" title="About PumpKIN" keywords="about"> 3 <topic id="About" title="About PumpKIN" keywords="about">
4 <heading scroll="no">About <kin>PumpKIN</kin></heading> 4 <heading scroll="no">About <kin>PumpKIN</kin></heading>
5 <p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p> 5 <p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p>
6 <p/> 6 <p/>
7 <p><b><i>Enjoy!</i></b></p> 7 <p><b><i>Enjoy!</i></b></p>
8 <license years="1997-2006"/> 8 <license years="1997-2006"/>
9 <credist/> 9 <credist/>
10 </topic> 10 </topic>
11 <topic id="News" title="What's New"> 11 <topic id="News" title="What's New">
12 <newsfor version="2.7.1" date="March 13th, 2006">
13 <ni>Bugfix release</ni>
14 </newsfor>
12 <newsfor version="2.7" date="February 28th, 2006"> 15 <newsfor version="2.7" date="February 28th, 2006">
13 <ni>Access lists based on request IP address and TFTP opcode for automating access policy</ni> 16 <ni>Access lists based on request IP address and TFTP opcode for automating access policy</ni>
14 <ni>Possibility to start/stop TFTP server, while keeping client functionality intact</ni> 17 <ni>Possibility to start/stop TFTP server, while keeping client functionality intact</ni>
15 <ni>Logging to file</ni> 18 <ni>Logging to file</ni>
16 <ni>Resizable main window</ni> 19 <ni>Resizable main window</ni>
17 </newsfor> 20 </newsfor>
18 <newsfor version="2.6" date="August 6th, 2005"> 21 <newsfor version="2.6" date="August 6th, 2005">
19 <ni>more robust solution to the backslash/slash dilemma</ni> 22 <ni>more robust solution to the backslash/slash dilemma</ni>
20 <ni>A bit more elaborate error reporting</ni> 23 <ni>A bit more elaborate error reporting</ni>
21 <ni>Fixed uninstall procedure so that it works on XP</ni> 24 <ni>Fixed uninstall procedure so that it works on XP</ni>
22 </newsfor> 25 </newsfor>
23 <newsfor version="2.5" date="July 11th, 2004"> 26 <newsfor version="2.5" date="July 11th, 2004">
diff --git a/install/install.cpp b/install/install.cpp
index cfe4d27..01a05c4 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,16 +1,16 @@
1#include "resource.h" 1#include "resource.h"
2#include "../shared-code/install.h" 2#include "../shared-code/install.h"
3 3
4#define VERSION "2.7" 4#define VERSION "2.7.1"
5 #defineKINAME "PumpKIN " VERSION 5 #defineKINAME "PumpKIN " VERSION
6#define SKINAME "PumpKIN" 6#define SKINAME "PumpKIN"
7 7
8BOOL Install(void) 8BOOL Install(void)
9{ 9{
10STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path"); 10STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path");
11STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); 11STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");
12LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); 12LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");
13STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); 13STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath);
14 if(!path) 14 if(!path)
15 return NULL; 15 return NULL;
16 16
diff --git a/install/install.rc b/install/install.rc
index 9a03edb..9770ab6 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -122,49 +122,49 @@ END
122 122
123// Icon with lowest ID value placed first to ensure application icon 123// Icon with lowest ID value placed first to ensure application icon
124// remains consistent on all systems. 124// remains consistent on all systems.
125IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico" 125IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico"
126 126
127#ifndef _MAC 127#ifndef _MAC
128///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
129// 129//
130// Version 130// Version
131// 131//
132 132
133VS_VERSION_INFO VERSIONINFO 133VS_VERSION_INFO VERSIONINFO
134 FILEVERSION 2,7,0,0 134 FILEVERSION 2,7,1,0
135 PRODUCTVERSION 2,7,0,0 135 PRODUCTVERSION 2,7,1,0
136 FILEFLAGSMASK 0x3fL 136 FILEFLAGSMASK 0x3fL
137#ifdef _DEBUG 137#ifdef _DEBUG
138 FILEFLAGS 0x1L 138 FILEFLAGS 0x1L
139#else 139#else
140 FILEFLAGS 0x0L 140 FILEFLAGS 0x0L
141#endif 141#endif
142 FILEOS 0x40004L 142 FILEOS 0x40004L
143 FILETYPE 0x1L 143 FILETYPE 0x1L
144 FILESUBTYPE 0x0L 144 FILESUBTYPE 0x0L
145BEGIN 145BEGIN
146 BLOCK "StringFileInfo" 146 BLOCK "StringFileInfo"
147 BEGIN 147 BEGIN
148 BLOCK "040904b0" 148 BLOCK "040904b0"
149 BEGIN 149 BEGIN
150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
151 VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0" 151 VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
152 VALUE "FileVersion", "2, 7, 0, 0\0" 152 VALUE "FileVersion", "2, 7, 1, 0\0"
153 VALUE "InternalName", "INSTALL\0" 153 VALUE "InternalName", "INSTALL\0"
154 VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net/)\0" 154 VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net/)\0"
155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
156 VALUE "OriginalFilename", "INSTALL.EXE\0" 156 VALUE "OriginalFilename", "INSTALL.EXE\0"
157 VALUE "ProductName", "PumpKIN\0" 157 VALUE "ProductName", "PumpKIN\0"
158 VALUE "ProductVersion", "2, 7, 0, 0\0" 158 VALUE "ProductVersion", "2, 7, 1, 0\0"
159 END 159 END
160 END 160 END
161 BLOCK "VarFileInfo" 161 BLOCK "VarFileInfo"
162 BEGIN 162 BEGIN
163 VALUE "Translation", 0x409, 1200 163 VALUE "Translation", 0x409, 1200
164 END 164 END
165END 165END
166 166
167#endif // !_MAC 167#endif // !_MAC
168 168
169#endif // English (U.S.) resources 169#endif // English (U.S.) resources
170///////////////////////////////////////////////////////////////////////////// 170/////////////////////////////////////////////////////////////////////////////
diff --git a/pumpkin.rc b/pumpkin.rc
index 9933454..5ce2438 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -76,25 +76,25 @@ IDI_REMOVE ICON DISCARDABLE "res\\remove.ico"
76 76
77///////////////////////////////////////////////////////////////////////////// 77/////////////////////////////////////////////////////////////////////////////
78// 78//
79// Dialog 79// Dialog
80// 80//
81 81
82IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74 82IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74
83STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 83STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
84CAPTION "About PumpKIN" 84CAPTION "About PumpKIN"
85FONT 8, "MS Sans Serif" 85FONT 8, "MS Sans Serif"
86BEGIN 86BEGIN
87 ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 87 ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
88 LTEXT "PumpKIN, Version 2.7",IDC_STATIC,40,15,119,8, 88 LTEXT "PumpKIN, Version 2.7.1",IDC_STATIC,40,15,119,8,
89 SS_NOPREFIX 89 SS_NOPREFIX
90 LTEXT "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30, 90 LTEXT "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30,
91 170,8 91 170,8
92 DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP 92 DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP
93 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14 93 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14
94END 94END
95 95
96IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193 96IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193
97STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 97STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
98EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW 98EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW
99CAPTION " PumpKIN" 99CAPTION " PumpKIN"
100FONT 8, "MS Sans Serif" 100FONT 8, "MS Sans Serif"
@@ -317,49 +317,49 @@ BEGIN
317 PUSHBUTTON "&Add new rule",IDC_ACL_ADD,7,178,130,16 317 PUSHBUTTON "&Add new rule",IDC_ACL_ADD,7,178,130,16
318 PUSHBUTTON "&Replace rule",IDC_ACL_REPLACE,152,178,130,16 318 PUSHBUTTON "&Replace rule",IDC_ACL_REPLACE,152,178,130,16
319END 319END
320 320
321 321
322#ifndef _MAC 322#ifndef _MAC
323///////////////////////////////////////////////////////////////////////////// 323/////////////////////////////////////////////////////////////////////////////
324// 324//
325// Version 325// Version
326// 326//
327 327
328VS_VERSION_INFO VERSIONINFO 328VS_VERSION_INFO VERSIONINFO
329 FILEVERSION 2,7,0,0 329 FILEVERSION 2,7,1,0
330 PRODUCTVERSION 2,7,0,0 330 PRODUCTVERSION 2,7,1,0
331 FILEFLAGSMASK 0x3fL 331 FILEFLAGSMASK 0x3fL
332#ifdef _DEBUG 332#ifdef _DEBUG
333 FILEFLAGS 0x1L 333 FILEFLAGS 0x1L
334#else 334#else
335 FILEFLAGS 0x0L 335 FILEFLAGS 0x0L
336#endif 336#endif
337 FILEOS 0x4L 337 FILEOS 0x4L
338 FILETYPE 0x1L 338 FILETYPE 0x1L
339 FILESUBTYPE 0x0L 339 FILESUBTYPE 0x0L
340BEGIN 340BEGIN
341 BLOCK "StringFileInfo" 341 BLOCK "StringFileInfo"
342 BEGIN 342 BEGIN
343 BLOCK "040904b0" 343 BLOCK "040904b0"
344 BEGIN 344 BEGIN
345 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 345 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
346 VALUE "FileDescription", "PumpKIN, tftp client/daemon\0" 346 VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
347 VALUE "FileVersion", "2, 7, 0, 0\0" 347 VALUE "FileVersion", "2, 7, 1, 0\0"
348 VALUE "InternalName", "PUMPKIN\0" 348 VALUE "InternalName", "PUMPKIN\0"
349 VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net)\0" 349 VALUE "LegalCopyright", "Copyright © 1997-2006 Klever Group (http://www.klever.net)\0"
350 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 350 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
351 VALUE "OriginalFilename", "PUMPKIN.EXE\0" 351 VALUE "OriginalFilename", "PUMPKIN.EXE\0"
352 VALUE "ProductName", "PumpKIN\0" 352 VALUE "ProductName", "PumpKIN\0"
353 VALUE "ProductVersion", "2, 7, 0, 0\0" 353 VALUE "ProductVersion", "2, 7, 1, 0\0"
354 END 354 END
355 END 355 END
356 BLOCK "VarFileInfo" 356 BLOCK "VarFileInfo"
357 BEGIN 357 BEGIN
358 VALUE "Translation", 0x409, 1200 358 VALUE "Translation", 0x409, 1200
359 END 359 END
360END 360END
361 361
362#endif // !_MAC 362#endif // !_MAC
363 363
364 364
365///////////////////////////////////////////////////////////////////////////// 365/////////////////////////////////////////////////////////////////////////////