diff options
| -rw-r--r-- | security/putty/Makefile | 5 | ||||
| -rw-r--r-- | security/putty/distinfo | 14 | ||||
| -rw-r--r-- | security/putty/patches/patch-pscp.c | 35 | ||||
| -rw-r--r-- | security/putty/patches/patch-unix_Makefile.gtk | 18 |
4 files changed, 18 insertions, 54 deletions
diff --git a/security/putty/Makefile b/security/putty/Makefile index 3057bc032f7..21b99f6fce6 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.67 2020/11/30 14:15:09 schmonz Exp $ +# $NetBSD: Makefile,v 1.68 2021/07/24 14:54:08 ryoon Exp $ # -DISTNAME= putty-0.74 -PKGREVISION= 2 +DISTNAME= putty-0.76 CATEGORIES= security MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PKGVERSION_NOREV}/ diff --git a/security/putty/distinfo b/security/putty/distinfo index 3f637793e5b..d63016c7b10 100644 --- a/security/putty/distinfo +++ b/security/putty/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.31 2020/11/24 15:38:36 ryoon Exp $ +$NetBSD: distinfo,v 1.32 2021/07/24 14:54:08 ryoon Exp $ -SHA1 (putty-0.74.tar.gz) = 17b160e9720f67f9af9399d7d185b913b81f18fe -RMD160 (putty-0.74.tar.gz) = 0bcc5b606f19379168d19de6f5b764a7c2753bf5 -SHA512 (putty-0.74.tar.gz) = 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b -Size (putty-0.74.tar.gz) = 2476513 bytes +SHA1 (putty-0.76.tar.gz) = de09f50aee330eb05ad0cb81b970d0cc8e5c9b25 +RMD160 (putty-0.76.tar.gz) = 6e8bdea6badaecf8347d790c2fd58c7d20974429 +SHA512 (putty-0.76.tar.gz) = 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25 +Size (putty-0.76.tar.gz) = 2735687 bytes SHA1 (patch-ldisc.c) = cf31a65f920a3ea9b4a70602e4b2fd4d5df8d3e8 -SHA1 (patch-misc.c) = fa1c2db8eb20ceaadb4b57b6aefa57f22d2ae26f -SHA1 (patch-pscp.c) = f8ae20d5027e3a1c3bd53efd7df4480b1d004d78 SHA1 (patch-terminal.c) = 30d6196e371b5369f9ea69e193662a47dbefaa10 SHA1 (patch-timing.c) = a6a492fc8b22c58e2973c854bffa4c8bf71eb6a7 -SHA1 (patch-unix_Makefile.gtk) = 7fe7859ad91afb57ef3ba31194ffd2ef784f638d +SHA1 (patch-unix_Makefile.gtk) = 47cde3590b7e5ebe30a1ad5fcb6c9e4ce6c25eed SHA1 (patch-unix_uxnet.c) = 2d1c2939721993fe5616c2fe3f1935c03a31bb35 SHA1 (patch-unix_uxpgnt.c) = 64da7ac0b5f02de7d5e03858b0ea69c8662cc07a diff --git a/security/putty/patches/patch-pscp.c b/security/putty/patches/patch-pscp.c deleted file mode 100644 index 1b483ba94a2..00000000000 --- a/security/putty/patches/patch-pscp.c +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-pscp.c,v 1.1 2020/11/24 15:38:36 ryoon Exp $ - -* Fix https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/pscp-port-0.html - ---- pscp.c.orig 2020-06-21 17:30:46.000000000 +0000 -+++ pscp.c -@@ -330,7 +330,7 @@ static void do_cmd(char *host, char *use - * Force use of SSH. (If they got the protocol wrong we assume the - * port is useless too.) - */ -- if (conf_get_int(conf, CONF_protocol) != PROT_SSH) { -+ if (!backend_vt_from_proto(conf_get_int(conf, CONF_protocol))) { - conf_set_int(conf, CONF_protocol, PROT_SSH); - conf_set_int(conf, CONF_port, 22); - } -@@ -454,7 +454,9 @@ static void do_cmd(char *host, char *use - - platform_psftp_pre_conn_setup(); - -- err = backend_init(&ssh_backend, pscp_seat, &backend, logctx, conf, -+ err = backend_init(backend_vt_from_proto( -+ conf_get_int(conf, CONF_protocol)), -+ pscp_seat, &backend, logctx, conf, - conf_get_str(conf, CONF_host), - conf_get_int(conf, CONF_port), - &realhost, 0, -@@ -2240,8 +2242,6 @@ int psftp_main(int argc, char *argv[]) - int i; - bool sanitise_stderr = true; - -- default_protocol = PROT_SSH; -- - flags = 0 - #ifdef FLAG_SYNCAGENT - | FLAG_SYNCAGENT diff --git a/security/putty/patches/patch-unix_Makefile.gtk b/security/putty/patches/patch-unix_Makefile.gtk index 964948cbe80..815f51b17b9 100644 --- a/security/putty/patches/patch-unix_Makefile.gtk +++ b/security/putty/patches/patch-unix_Makefile.gtk @@ -1,19 +1,21 @@ -$NetBSD: patch-unix_Makefile.gtk,v 1.3 2019/04/01 12:10:43 ryoon Exp $ +$NetBSD: patch-unix_Makefile.gtk,v 1.4 2021/07/24 14:54:08 ryoon Exp $ Allow adding CFLAGS from the pkgsrc environment. Use pkgsrc infrastructure for deciding on whether to link against libdl or not. +pow(3) requires libm. ---- unix/Makefile.gtk.orig 2019-03-16 12:26:40.000000000 +0000 +--- unix/Makefile.gtk.orig 2021-07-10 09:47:57.000000000 +0000 +++ unix/Makefile.gtk -@@ -109,14 +109,14 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-3.0 +@@ -104,14 +104,14 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-3.0 unexport CFLAGS # work around a weird issue with krb5-config --CFLAGS = -O2 -Wall -Werror -std=gnu99 -Wvla -g -I.././ -I../charset/ \ -+CFLAGS += -O2 -Wall -Werror -std=gnu99 -Wvla -g -I.././ -I../charset/ \ - -I../windows/ -I../unix/ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64 +-CFLAGS = -O2 -Wall -std=gnu99 -Wvla -g -I.././ -I../charset/ -I../windows/ \ ++CFLAGS += -O2 -Wall -std=gnu99 -Wvla -g -I.././ -I../charset/ -I../windows/ \ + -I../unix/ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64 XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs) - ULDFLAGS = $(LDFLAGS) +-ULDFLAGS = $(LDFLAGS) ++ULDFLAGS = $(LDFLAGS) -lm ifeq (,$(findstring NO_GSSAPI,$(COMPAT))) ifeq (,$(findstring STATIC_GSSAPI,$(COMPAT))) -XLDFLAGS+= -ldl @@ -23,7 +25,7 @@ Use pkgsrc infrastructure for deciding on whether to link against libdl or not. else CFLAGS+= -DNO_LIBDL $(shell $(KRB5CONFIG) --cflags gssapi) XLDFLAGS+= $(shell $(KRB5CONFIG) --libs gssapi) -@@ -126,7 +126,7 @@ endif +@@ -121,7 +121,7 @@ endif INSTALL=install INSTALL_PROGRAM=$(INSTALL) INSTALL_DATA=$(INSTALL) |