Index: head/security/putty/Makefile =================================================================== --- head/security/putty/Makefile (revision 496063) +++ head/security/putty/Makefile (revision 496064) @@ -1,108 +1,115 @@ # $FreeBSD$ PORTNAME= putty -PORTVERSION= 0.70 +PORTVERSION= 0.71 CATEGORIES= security ipv6 MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \ ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ -# Beat Gaetzi (beat@) is permitted to take maintainership back -# or commit to this port without my prior approval. MAINTAINER= mandree@FreeBSD.org COMMENT= Secure shell and telnet client +# test plan: test ALL 4 GSSAPI_* options, ALL 3 GTK options, WITH_DEBUG=yes build. LICENSE= MIT LICENSE_FILE= ${FILESDIR}/LICENSE USES= cpe gmake pkgconfig + WRKSRC= ${WRKDIR}/${DISTNAME}/unix +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} MAKEFILE= Makefile.gtk CPE_VENDOR= simon_tatham PLIST_FILES= bin/plink bin/pscp bin/psftp bin/puttygen PLIST_FILES+= man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man1/puttygen.1.gz OPTIONS_RADIO= TOOLKIT OPTIONS_RADIO_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT=GSSAPI_BASE GTK3 OPTIONS_SINGLE= GSSAPI_SELECT -OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \ - GSSAPI_MIT +#OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +# XXX FIXME TODO: GSSAPI_NONE is broken as of PuTTY 0.71 (did work in 0.70). +# Report has been sent to putty.AT.projects.tartarus.org on 2019-03-17 +OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT CONFLICTS_INSTALL?= pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]* .include CFLAGS+= -DBSD_PTYS -DOMIT_UTMP -DIPV6 LDFLAGS+= -Wl,--as-needed .if (${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}) && !defined(WITHOUT_X11) USE_XORG= x11 .if ${PORT_OPTIONS:MGTK2} +USES+= gnome USE_GNOME= cairo gdkpixbuf2 gtk20 MAKE_ARGS+= PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-2.0 x11 --cflags" .endif .if ${PORT_OPTIONS:MGTK3} +USES+= gnome USE_GNOME= cairo gdkpixbuf2 gtk30 MAKE_ARGS+= PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-3.0 x11 --cflags" .endif PLIST_FILES+= bin/pageant bin/pterm bin/putty bin/puttytel PLIST_FILES+= man/man1/pageant.1.gz man/man1/pterm.1.gz man/man1/putty.1.gz man/man1/puttytel.1.gz PLIST_FILES+= share/pixmaps/putty.ico DESKTOP_ENTRIES="PuTTY" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ "${PORTNAME}" \ "" \ false .else MAKE_ARGS+= GTK_CONFIG=: .endif .if ${PORT_OPTIONS:MGSSAPI_BASE} _COMPAT= -DSTATIC_GSSAPI USES+= gssapi:base,flags MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG} .elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL} _COMPAT= -DSTATIC_GSSAPI USES+= gssapi:heimdal,flags MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG} .elif ${PORT_OPTIONS:MGSSAPI_MIT} _COMPAT= -DSTATIC_GSSAPI USES+= gssapi:mit,flags MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG} .else _COMPAT= -DNO_GSSAPI .endif _COMPAT+= -DOMIT_UTMP .if defined(WITH_DEBUG) +CFLAGS+= -DDEBUG XFLAGS= -DDEBUG +_COMPAT+= -DDEBUG .endif # upstream sets -Werror - there are no issues on 9.1-FreeBSD amd64 # currently, but override it nonetheless. XFLAGS+= -Wno-error MAKE_ARGS+= COMPAT="${_COMPAT}" \ CC="${CC}" \ XFLAGS="${XFLAGS}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" post-patch: @${REINPLACE_CMD} -e 's,prefix=/usr/local,prefix=${PREFIX},;\ s,make,${MAKE_CMD},'\ ${WRKSRC}/${MAKEFILE} post-install: .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/../windows/putty.ico \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .endif .include Index: head/security/putty/distinfo =================================================================== --- head/security/putty/distinfo (revision 496063) +++ head/security/putty/distinfo (revision 496064) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500391843 -SHA256 (putty-0.70.tar.gz) = bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be -SIZE (putty-0.70.tar.gz) = 2386108 +TIMESTAMP = 1552820659 +SHA256 (putty-0.71.tar.gz) = 2f931ce2f89780cc8ca7bbed90fcd22c44515d2773f5fa954069e209b48ec6b8 +SIZE (putty-0.71.tar.gz) = 2423752 Index: head/security/putty/files/patch-unix__uxpgnt.c =================================================================== --- head/security/putty/files/patch-unix__uxpgnt.c (revision 496063) +++ head/security/putty/files/patch-unix__uxpgnt.c (nonexistent) @@ -1,11 +0,0 @@ ---- uxpgnt.c.orig 2017-03-16 03:33:18.000000000 +0000 -+++ uxpgnt.c 2017-03-16 03:33:18.000000000 +0000 -@@ -270,7 +270,7 @@ - /* 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). */ Property changes on: head/security/putty/files/patch-unix__uxpgnt.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/putty/files/patch-uxnet.c =================================================================== --- head/security/putty/files/patch-uxnet.c (revision 496063) +++ head/security/putty/files/patch-uxnet.c (nonexistent) @@ -1,16 +0,0 @@ ---- ./uxnet.c.orig 2009-08-07 00:55:15.000000000 +0200 -+++ ./uxnet.c 2011-07-17 14:55:44.000000000 +0200 -@@ -11,8 +11,13 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#include -+#else - #include - #include -+#endif - #include - #include - #include Property changes on: head/security/putty/files/patch-uxnet.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/putty/files/patch-Makefile.gtk =================================================================== --- head/security/putty/files/patch-Makefile.gtk (revision 496063) +++ head/security/putty/files/patch-Makefile.gtk (nonexistent) @@ -1,59 +0,0 @@ ---- Makefile.gtk.orig 2017-04-24 13:52:46 UTC -+++ Makefile.gtk -@@ -111,7 +111,7 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-3.0 - - unexport CFLAGS # work around a weird issue with krb5-config - --CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \ -+CFLAGS := $(CFLAGS) -Wall -Werror -I.././ -I../charset/ -I../windows/ -I../unix/ \ - $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64 - XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs) - ULDFLAGS = $(LDFLAGS) -@@ -138,8 +138,12 @@ man1dir=$(mandir)/man1 - .SUFFIXES: - - -+ifdef PUTTY_WITH_GTK - all: cgtest fuzzterm osxlaunch pageant plink pscp psftp pterm ptermapp putty \ - puttyapp puttygen puttytel testbn -+else -+all: plink pscp psftp puttygen -+endif - - cgtest: cgtest.o conf.o import.o misc.o notiming.o sshaes.o sshbcrypt.o \ - sshblowf.o sshbn.o sshdes.o sshdss.o sshdssg.o sshecc.o \ -@@ -1047,10 +1051,12 @@ xpmputty.o: ../unix/xpmputty.c - - install: - mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) -- $(INSTALL_PROGRAM) -m 755 pageant $(DESTDIR)$(bindir)/pageant - $(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink - $(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp - $(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp -+ $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen -+ifdef PUTTY_WITH_GTK -+ $(INSTALL_PROGRAM) -m 755 pageant $(DESTDIR)$(bindir)/pageant - $(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm - if test -n "$(UTMP_GROUP)"; then \ - chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \ -@@ -1060,16 +1066,18 @@ install: - chmod 4755 $(DESTDIR)$(bindir)/pterm; \ - fi - $(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty -- $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen - $(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel - $(INSTALL_DATA) -m 644 ../doc/pageant.1 $(DESTDIR)$(man1dir)/pageant.1 -+endif - $(INSTALL_DATA) -m 644 ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1 - $(INSTALL_DATA) -m 644 ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1 - $(INSTALL_DATA) -m 644 ../doc/psftp.1 $(DESTDIR)$(man1dir)/psftp.1 -+ $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1 -+ifdef PUTTY_WITH_GTK - $(INSTALL_DATA) -m 644 ../doc/pterm.1 $(DESTDIR)$(man1dir)/pterm.1 - $(INSTALL_DATA) -m 644 ../doc/putty.1 $(DESTDIR)$(man1dir)/putty.1 -- $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1 - $(INSTALL_DATA) -m 644 ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1 -+endif - - install-strip: - $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" Property changes on: head/security/putty/files/patch-Makefile.gtk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/putty/files/patch-uxpty.c =================================================================== --- head/security/putty/files/patch-uxpty.c (revision 496063) +++ head/security/putty/files/patch-uxpty.c (nonexistent) @@ -1,10 +0,0 @@ ---- ./uxpty.c.orig 2011-03-02 20:12:42.000000000 +0100 -+++ ./uxpty.c 2011-07-17 14:55:44.000000000 +0200 -@@ -13,7 +13,6 @@ - #include - #include - #include --#include - #include - #include - #include Property changes on: head/security/putty/files/patch-uxpty.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/putty/files/patch-settings.c =================================================================== --- head/security/putty/files/patch-settings.c (nonexistent) +++ head/security/putty/files/patch-settings.c (revision 496064) @@ -0,0 +1,12 @@ +--- settings.c.orig 2019-03-16 12:26:35 UTC ++++ settings.c +@@ -990,7 +990,9 @@ void load_open_settings(settings_r *sesskey, Conf *con + gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN", + hknames, HK_MAX, conf, CONF_ssh_hklist); + gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time); ++#ifndef NO_GSSAPI + gppi(sesskey, "GssapiRekey", GSS_DEF_REKEY_MINS, conf, CONF_gssapirekey); ++#endif + gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data); + { + /* SSH-2 only by default */ Property changes on: head/security/putty/files/patch-settings.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/putty/files/patch-sshgssc.c =================================================================== --- head/security/putty/files/patch-sshgssc.c (nonexistent) +++ head/security/putty/files/patch-sshgssc.c (revision 496064) @@ -0,0 +1,11 @@ +--- sshgssc.c.orig 2019-03-16 12:26:36 UTC ++++ sshgssc.c +@@ -75,7 +75,7 @@ static Ssh_gss_stat ssh_gssapi_acquire_cred(struct ssh + gssctx->maj_stat = + gss->inquire_cred_by_mech(&gssctx->min_stat, cred, + (gss_OID) GSS_MECH_KRB5, +- GSS_C_NO_NAME, ++ NULL, + &time_rec, + NULL, + NULL); Property changes on: head/security/putty/files/patch-sshgssc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/putty/files/patch-unix_Makefile.gtk =================================================================== --- head/security/putty/files/patch-unix_Makefile.gtk (nonexistent) +++ head/security/putty/files/patch-unix_Makefile.gtk (revision 496064) @@ -0,0 +1,80 @@ +--- unix/Makefile.gtk.orig 2019-03-16 12:26:40 UTC ++++ unix/Makefile.gtk +@@ -109,7 +109,7 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-3.0 x11 $$0 2>/dev + + unexport CFLAGS # work around a weird issue with krb5-config + +-CFLAGS = -O2 -Wall -Werror -std=gnu99 -Wvla -g -I.././ -I../charset/ \ ++CFLAGS := $(CFLAGS) -Wall -Werror -std=gnu99 -Wvla -I.././ -I../charset/ \ + -I../windows/ -I../unix/ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64 + XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs) + ULDFLAGS = $(LDFLAGS) +@@ -136,8 +136,13 @@ man1dir=$(mandir)/man1 + .SUFFIXES: + + ++ifdef PUTTY_WITH_GTK + all: cgtest fuzzterm osxlaunch pageant plink pscp psftp pterm ptermapp putty \ + puttyapp puttygen puttytel testcrypt testsc testzlib uppity ++else ++all: cgtest fuzzterm osxlaunch plink pscp psftp \ ++ puttygen testcrypt testsc testzlib uppity ++endif + + cgtest: cgtest.o conf.o ecc.o import.o marshal.o memory.o misc.o mpint.o \ + notiming.o sshaes.o sshauxcrypt.o sshbcrypt.o sshblowf.o \ +@@ -497,15 +502,15 @@ testsc: ecc.o marshal.o memory.o mpint.o sshaes.o ssha + sshblowf.o sshccp.o sshcrc.o sshcrcda.o sshdes.o sshdh.o \ + sshdss.o sshecc.o sshhmac.o sshmac.o sshmd5.o sshrsa.o \ + sshsh256.o sshsh512.o sshsha.o testsc.o tree234.o utils.o \ +- uxutils.o wildcard.o ++ uxutils.o wildcard.o uxmisc.o + $(CC) -o $@ ecc.o marshal.o memory.o mpint.o sshaes.o ssharcf.o \ + sshauxcrypt.o sshblowf.o sshccp.o sshcrc.o sshcrcda.o \ + sshdes.o sshdh.o sshdss.o sshecc.o sshhmac.o sshmac.o \ + sshmd5.o sshrsa.o sshsh256.o sshsh512.o sshsha.o testsc.o \ +- tree234.o utils.o uxutils.o wildcard.o $(ULDFLAGS) ++ tree234.o utils.o uxutils.o wildcard.o uxmisc.o $(ULDFLAGS) + +-testzlib: marshal.o memory.o sshzlib.o testzlib.o utils.o +- $(CC) -o $@ marshal.o memory.o sshzlib.o testzlib.o utils.o \ ++testzlib: marshal.o memory.o sshzlib.o testzlib.o utils.o uxmisc.o ++ $(CC) -o $@ marshal.o memory.o sshzlib.o testzlib.o utils.o uxmisc.o \ + $(ULDFLAGS) + + uppity: be_misc.o be_none.o callback.o conf.o cproxy.o ecc.o errsock.o \ +@@ -1602,10 +1607,12 @@ xpmputty.o: ../unix/xpmputty.c + + install: + mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) +- $(INSTALL_PROGRAM) -m 755 pageant $(DESTDIR)$(bindir)/pageant + $(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink + $(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp + $(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp ++ $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen ++ifdef PUTTY_WITH_GTK ++ $(INSTALL_PROGRAM) -m 755 pageant $(DESTDIR)$(bindir)/pageant + $(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm + if test -n "$(UTMP_GROUP)"; then \ + chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \ +@@ -1615,16 +1622,18 @@ install: + chmod 4755 $(DESTDIR)$(bindir)/pterm; \ + fi + $(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty +- $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen + $(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel + $(INSTALL_DATA) -m 644 ../doc/pageant.1 $(DESTDIR)$(man1dir)/pageant.1 ++endif + $(INSTALL_DATA) -m 644 ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1 + $(INSTALL_DATA) -m 644 ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1 + $(INSTALL_DATA) -m 644 ../doc/psftp.1 $(DESTDIR)$(man1dir)/psftp.1 ++ $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1 ++ifdef PUTTY_WITH_GTK + $(INSTALL_DATA) -m 644 ../doc/pterm.1 $(DESTDIR)$(man1dir)/pterm.1 + $(INSTALL_DATA) -m 644 ../doc/putty.1 $(DESTDIR)$(man1dir)/putty.1 +- $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1 + $(INSTALL_DATA) -m 644 ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1 ++endif + + install-strip: + $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" Property changes on: head/security/putty/files/patch-unix_Makefile.gtk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/putty/files/patch-unix_uxnet.c =================================================================== --- head/security/putty/files/patch-unix_uxnet.c (nonexistent) +++ head/security/putty/files/patch-unix_uxnet.c (revision 496064) @@ -0,0 +1,16 @@ +--- unix/uxnet.c.orig 2019-03-16 12:26:37 UTC ++++ unix/uxnet.c +@@ -11,8 +11,13 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include + #include ++#else ++#include + #include ++#endif + #include + #include + #include Property changes on: head/security/putty/files/patch-unix_uxnet.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/putty/files/patch-unix_uxpgnt.c =================================================================== --- head/security/putty/files/patch-unix_uxpgnt.c (nonexistent) +++ head/security/putty/files/patch-unix_uxpgnt.c (revision 496064) @@ -0,0 +1,11 @@ +--- unix/uxpgnt.c.orig 2019-03-16 12:26:38 UTC ++++ unix/uxpgnt.c +@@ -241,7 +241,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). */ Property changes on: head/security/putty/files/patch-unix_uxpgnt.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/putty/files/patch-unix_uxpty.c =================================================================== --- head/security/putty/files/patch-unix_uxpty.c (nonexistent) +++ head/security/putty/files/patch-unix_uxpty.c (revision 496064) @@ -0,0 +1,10 @@ +--- unix/uxpty.c.orig 2019-03-16 12:26:38 UTC ++++ unix/uxpty.c +@@ -13,7 +13,6 @@ + #include + #include + #include +-#include + #include + #include + #include Property changes on: head/security/putty/files/patch-unix_uxpty.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property