diff --git a/net/putty/Makefile b/net/putty/Makefile index e391a6e34a2..29831e09372 100644 --- a/net/putty/Makefile +++ b/net/putty/Makefile @@ -1,7 +1,7 @@ COMMENT-main= SSH and telnet client COMMENT-gui= PuTTY GUI clients -V= 0.77 +V= 0.78 DISTNAME= putty-$V PKGNAME-main= ${DISTNAME} PKGNAME-gui= ${DISTNAME:S/putty/putty-gui/} diff --git a/net/putty/distinfo b/net/putty/distinfo index 6142f0afec7..e6a21467ba3 100644 --- a/net/putty/distinfo +++ b/net/putty/distinfo @@ -1,2 +1,2 @@ -SHA256 (putty-0.77.tar.gz) = QZp29FI4/UXyx2tCQ4mTBW50+ng3TxNgUqqoQwhb6uU= -SIZE (putty-0.77.tar.gz) = 2619481 +SHA256 (putty-0.78.tar.gz) = J04BvKxr0VXf1key8Y95G0sX/zE3U6qRn8ri4y00YU8= +SIZE (putty-0.78.tar.gz) = 2811628 diff --git a/net/putty/patches/patch-cmake_platforms_unix_cmake b/net/putty/patches/patch-cmake_platforms_unix_cmake index 26a99d80aae..add5f011ef4 100644 --- a/net/putty/patches/patch-cmake_platforms_unix_cmake +++ b/net/putty/patches/patch-cmake_platforms_unix_cmake @@ -4,16 +4,16 @@ Index: cmake/platforms/unix.cmake --- cmake/platforms/unix.cmake.orig +++ cmake/platforms/unix.cmake -@@ -81,7 +81,7 @@ function(check_x11) - endfunction() - check_x11() +@@ -102,7 +102,7 @@ else() + set(NOT_X_WINDOWS ON) + endif() -include_directories(${CMAKE_SOURCE_DIR}/charset ${GTK_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) +include_directories(${CMAKE_SOURCE_DIR}/charset ${CMAKE_SOURCE_DIR} ${GTK_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) link_directories(${GTK_LIBRARY_DIRS}) function(add_optional_system_lib library testfn) -@@ -125,7 +125,7 @@ endif() +@@ -211,7 +211,7 @@ endif() if(STRICT AND (CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")) diff --git a/net/putty/patches/patch-putty_h b/net/putty/patches/patch-putty_h index 854117e4ba2..95920a30017 100644 --- a/net/putty/patches/patch-putty_h +++ b/net/putty/patches/patch-putty_h @@ -1,7 +1,7 @@ Index: putty.h --- putty.h.orig +++ putty.h -@@ -2069,6 +2069,7 @@ typedef enum NoiseSourceId { +@@ -2124,6 +2124,7 @@ typedef enum NoiseSourceId { NOISE_SOURCE_THREADTIME, NOISE_SOURCE_PROCTIME, NOISE_SOURCE_PERFCOUNT, diff --git a/net/putty/patches/patch-unix_pageant_c b/net/putty/patches/patch-unix_pageant_c deleted file mode 100644 index 58150db5a71..00000000000 --- a/net/putty/patches/patch-unix_pageant_c +++ /dev/null @@ -1,14 +0,0 @@ -https://svnweb.freebsd.org/ports/head/security/putty/files/patch-unix_uxpgnt.c?revision=496064&view=co - -Index: unix/pageant.c ---- unix/pageant.c.orig -+++ unix/pageant.c -@@ -330,7 +330,7 @@ void pageant_fork_and_print_env(bool retain_tty) - /* Get out of our previous process group, to avoid being - * blasted by passing signals. But keep our controlling tty, - * so we can keep checking to see if we still have one. */ -- setpgrp(); -+ setpgrp(0, 0); - } else { - /* Do that, but also leave our entire session and detach from - * the controlling tty (if any). */