Attachment 165710 Details for Bug 204823 – patch-Makefile and add files patch

[patch] patch-Makefile and add files patch

sshpass.diff (text/plain), 1.74 KB, created by Andrey Fesenko on 2016-01-17 13:21:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Fesenko

Created: 2016-01-17 13:21:30 UTC

Size: 1.74 KB

patch

obsolete

>diff -r 7fca5580dff5 -r b57f71c348c8 security/sshpass/Makefile
>--- a/security/sshpass/Makefile	Sat Jan 16 17:43:11 2016 +0300
>+++ b/security/sshpass/Makefile	Sun Jan 17 00:05:50 2016 +0300
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	sshpass
> PORTVERSION=	1.05
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	security
> MASTER_SITES=	SF/${PORTNAME}/sshpass/${PORTVERSION}
> 
>diff -r 7fca5580dff5 -r b57f71c348c8 security/sshpass/files/patch-main.c
>--- a/security/sshpass/files/patch-main.c	Sat Jan 16 17:43:11 2016 +0300
>+++ b/security/sshpass/files/patch-main.c	Sun Jan 17 00:05:50 2016 +0300
>@@ -43,7 +43,17 @@
>  	case 'e':
>  	    VIRGIN_PWTYPE;
>  
>-@@ -359,7 +365,7 @@ int handleoutput( int fd )
>+@@ -265,6 +271,9 @@ int runprogram( int argc, char *argv[] )
>+ 	setsid();
>+         // This line makes the ptty our controlling tty. We do not otherwise need it open
>+         slavept=open(name, O_RDWR );
>++        if ( ioctl(slavept, TIOCSCTTY, NULL) ) {
>++            perror("sshpass: Failed to recover the controlling tty");
>++        }
>+         close( slavept );
>+ 	
>+ 	close( masterpt );
>+@@ -359,7 +368,7 @@ int handleoutput( int fd )
>      // We are looking for the string
>      static int prevmatch=0; // If the "password" prompt is repeated, we have the wrong password.
>      static int state1, state2;
>@@ -52,7 +62,7 @@
>      static const char compare2[]="The authenticity of host "; // Asks to authenticate host
>      // static const char compare3[]="WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!"; // Warns about man in the middle attack
>      // The remote identification changed error is sent to stderr, not the tty, so we do not handle it.
>-@@ -367,6 +373,10 @@ int handleoutput( int fd )
>+@@ -367,6 +376,10 @@ int handleoutput( int fd )
>      char buffer[40];
>      int ret=0;
>

Flags:

andrey: maintainer-approval? (gaod)

Actions: View | Diff

Attachments on bug 204823: 163540 | 163541 | 165266 | 165710