From 50da2952e4194a8c3f64ec127d02aad4d38ab5bc Mon Sep 17 00:00:00 2001 From: cyd01 Date: Fri, 30 Dec 2022 16:20:04 +0100 Subject: [PATCH] Tagging the 0.76.1.0 release of the KiTTY project. --- .github/workflows/ccpp.yml | 2 +- 0.76_My_PuTTY/noterm.c | 2 +- 0.76b_My_PuTTY/ldisc.c | 2 +- 0.76b_My_PuTTY/logging.c | 17 ++++++----------- 0.76b_My_PuTTY/version.h | 2 +- 0.76b_My_PuTTY/windows/MAKEFILE.MINGW | 17 +++++++++-------- 0.76b_My_PuTTY/windows/version_major.txt | 2 +- 0.76b_My_PuTTY/windows/version_minor.txt | 2 +- docs/pages/HowToCompile.md | 4 ++-- 9 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 45c144c..2222931 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -13,7 +13,7 @@ on: - v* env: - VERSION: 0.76 + VERSION: 0.76b jobs: # Build for Win 32bits diff --git a/0.76_My_PuTTY/noterm.c b/0.76_My_PuTTY/noterm.c index 4ca99fa..0d84170 100644 --- a/0.76_My_PuTTY/noterm.c +++ b/0.76_My_PuTTY/noterm.c @@ -4,7 +4,7 @@ */ #include "putty.h" -#include "terminal.h" +#include "terminal/terminal.h" void term_nopaste(Terminal *term) { diff --git a/0.76b_My_PuTTY/ldisc.c b/0.76b_My_PuTTY/ldisc.c index 3668c98..b63fb4e 100644 --- a/0.76b_My_PuTTY/ldisc.c +++ b/0.76b_My_PuTTY/ldisc.c @@ -10,7 +10,7 @@ #include #include "putty.h" -#include "terminal.h" +#include "terminal/terminal.h" struct Ldisc_tag { Terminal *term; Backend *backend; diff --git a/0.76b_My_PuTTY/logging.c b/0.76b_My_PuTTY/logging.c index dc77dd8..edf9414 100644 --- a/0.76b_My_PuTTY/logging.c +++ b/0.76b_My_PuTTY/logging.c @@ -86,17 +86,7 @@ size_t t_strftime( char *s, size_t max, const char *format, const struct tm tm, int p, i = 1 ; //struct tm tm ; size_t res = 0 ; -/* - tm.tm_sec = st.wSecond ; - tm.tm_min = st.wMinute ; - tm.tm_hour = st.wHour ; - tm.tm_mday = st.wDay ; - tm.tm_mon = st.wMonth - 1 ; - tm.tm_year = st.wYear - 1900 ; - tm.tm_wday = st.wDayOfWeek - 1 ; - tm.tm_yday = 0 ; - tm.tm_isdst = 0 ; -*/ + if( (nfor = (char*) malloc( strlen( format ) + 1024 )) == NULL ) return 0 ; strcpy( nfor, format ) ; @@ -239,8 +229,13 @@ static void logfopen_callback(void *vctx, int mode) /* Write header line into log file. */ tm = ltime(); strftime(buf, 24, "%Y.%m.%d %H:%M:%S", &tm); +#ifdef MOD_PERSO + logprintf(ctx, "=~=~=~=~=~=~=~=~=~=~=~= KiTTY log %s" + " =~=~=~=~=~=~=~=~=~=~=~=\r\n", buf); +#else logprintf(ctx, "=~=~=~=~=~=~=~=~=~=~=~= PuTTY log %s" " =~=~=~=~=~=~=~=~=~=~=~=\r\n", buf); +#endif } event = dupprintf("%s session log (%s mode) to file: %s", diff --git a/0.76b_My_PuTTY/version.h b/0.76b_My_PuTTY/version.h index 9c72066..79d61c0 100644 --- a/0.76b_My_PuTTY/version.h +++ b/0.76b_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.76 #define TEXTVER "Release 0.76" #define SSHVER "-Release-0.76" -#define BINARY_VERSION 0,76,0,8 +#define BINARY_VERSION 0,76,0,9 #define SOURCE_COMMIT "unavailable" diff --git a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW index 7ac9cd4..f456df9 100644 --- a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW @@ -827,17 +827,17 @@ norand.o: ../norand.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../windows/winhelp.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../norand.c -noterm.o: ../noterm.c ../putty.h ../terminal/terminal.h ../defs.h ../puttyps.h \ +noterm.o: ../stubs/noterm.c ../putty.h ../terminal/terminal.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../tree234.h ../windows/winstuff.h ../unix/unix.h \ ../puttymem.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../noterm.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../stubs/noterm.c -notiming.o: ../notiming.c ../putty.h ../defs.h ../puttyps.h ../network.h \ +notiming.o: ../stubs/notiming.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../notiming.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../stubs/notiming.c nullplug.o: ../stubs/nullplug.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ @@ -904,7 +904,7 @@ proxy.o: ../proxy/proxy.c ../putty.h ../network.h ../proxy/proxy.h ../defs.h \ ../tree234.h ../windows/winhelp.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../proxy/proxy.c -pscp.o: ../pscp.c ../putty.h ../psftp.h ../ssh.h ../sftp.h ../storage.h \ +pscp.o: ../pscp.c ../putty.h ../psftp.h ../ssh.h ../ssh/sftp.h ../storage.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ @@ -915,7 +915,7 @@ pscp.res.o: ../windows/pscp.rc ../windows/rcstuff.h ../windows/pscp.ico \ ../windows/version.rc2 ../version.h ../licence.h $(RC) $(RCFL) $(RCFLAGS) ../windows/pscp.rc -o pscp.res.o -psftp.o: ../psftp.c ../putty.h ../psftp.h ../storage.h ../ssh.h ../sftp.h \ +psftp.o: ../psftp.c ../putty.h ../psftp.h ../storage.h ../ssh.h ../ssh/sftp.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ @@ -926,7 +926,7 @@ psftp.res.o: ../windows/psftp.rc ../windows/rcstuff.h ../windows/pscp.ico \ ../windows/version.rc2 ../version.h ../licence.h $(RC) $(RCFL) $(RCFLAGS) ../windows/psftp.rc -o psftp.res.o -psftpcommon.o: ../psftpcommon.c ../putty.h ../sftp.h ../psftp.h ../defs.h \ +psftpcommon.o: ../psftpcommon.c ../putty.h ../ssh/sftp.h ../psftp.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ ../puttymem.h ../tree234.h ../windows/winhelp.h \ @@ -1992,7 +1992,7 @@ be_all_s_plink.o: ../be_all_s.c ../putty.h ../puttyps.h ../network.h ../misc.h \ ../windows/winhelp.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS_PLINK) $(XFLAGS) -o be_all_s_plink.o -c ../be_all_s.c -ldisc_plink.o: ../ldisc.c ../putty.h ../terminal/terminal.h ../ldisc.h ../puttyps.h \ +ldisc_plink.o: ../ldisc.c ../putty.h ../terminal/terminal.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../tree234.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h \ ../windows/winhelp.h ../charset/charset.h @@ -2308,6 +2308,7 @@ putty_portable.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o winselgui.o winser.o winshare.o winstore.o wintime.o \ winucs.o winutils.o winx11.o x11fwd.o \ adb.o \ + cencode.o cdecode.o \ kitty_portable.o kitty_commun_portable.o kitty_crypt.o kitty_image.o kitty_proxy.o kitty_registry.o kitty_ssh.o \ kitty_store.o kitty_tools.o kitty_win.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ diff --git a/0.76b_My_PuTTY/windows/version_major.txt b/0.76b_My_PuTTY/windows/version_major.txt index 6c99b07..66eb1cc 100644 --- a/0.76b_My_PuTTY/windows/version_major.txt +++ b/0.76b_My_PuTTY/windows/version_major.txt @@ -1 +1 @@ -"0.76.0" +"0.76.1" diff --git a/0.76b_My_PuTTY/windows/version_minor.txt b/0.76b_My_PuTTY/windows/version_minor.txt index 45a4fb7..573541a 100644 --- a/0.76b_My_PuTTY/windows/version_minor.txt +++ b/0.76b_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -8 +0 diff --git a/docs/pages/HowToCompile.md b/docs/pages/HowToCompile.md index b726b34..c1e2516 100644 --- a/docs/pages/HowToCompile.md +++ b/docs/pages/HowToCompile.md @@ -8,13 +8,13 @@ The best way to compile **KiTTY** is to use our cross-compile docker image: **For 32 bits compilation** ```bash mkdir -p builds 2> /dev/null || rm -f builds/*.exe -docker run --rm -it -v $(pwd)/builds:/builds cyd01/cross-gcc "git clone https://github.com/cyd01/KiTTY.git ; cd KiTTY/0.76_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross ; cd /builds ; ls -l" +docker run --rm -it -v $(pwd)/builds:/builds cyd01/cross-gcc "git clone https://github.com/cyd01/KiTTY.git ; cd KiTTY/0.76b_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross ; cd /builds ; ls -l" ``` **For 64 bits compilation** ```bash mkdir -p builds 2> /dev/null || rm -f builds/*.exe -docker run --rm -it -v $(pwd)/builds:/builds cyd01/cross-gcc "git clone https://github.com/cyd01/KiTTY.git ; cd KiTTY/0.76_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross64 ; cd /builds ; ls -l" +docker run --rm -it -v $(pwd)/builds:/builds cyd01/cross-gcc "git clone https://github.com/cyd01/KiTTY.git ; cd KiTTY/0.76b_My_PuTTY/windows ; make -f MAKEFILE.MINGW cross64 ; cd /builds ; ls -l" ``` The **kitty.exe** and other stuff will be available into **/builds** directory.