ports/90983: [Maintainer update] shells/scponly: Fix WinSCP compativility in SCP mode and etc

[Hideyuki KURASHINA]

>Number:         90983
>Category:       ports
>Synopsis:       [Maintainer update] shells/scponly: Fix WinSCP compativility and etc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 27 17:20:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Hideyuki KURASHINA
>Release:        FreeBSD 5.4-RELEASE-p8 i386
>Organization:
>Environment:

	System: FreeBSD ***.*******.jp 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #1: Thu Dec 1 00:38:07 JST 2005 hideyuki@***.*******.jp:/usr/obj/usr/src/sys/***_XCAST6 i386

>Description:

	1. Fix WinSCP compativility in SCP mode.  PORTREVISION bumped.
	2. Add sourceforge mirrors to ${MASTER_SITES}.
	3. From scponly 4.2, scp & WinSCP compatibilities are not enabled
	   by default.  Notice this at pre-everything target as well as
	   UPDATING.

>How-To-Repeat:

	1. Try to connect sshd with WinSCP using SCP mode.
	2. Check http://www.sublimation.org/scponly/
	3. Check https://lists.ccs.neu.edu/pipermail/scponly/2005-December/001039.html

>Fix:

	Apply following patch,

Index: UPDATING
===================================================================
RCS file: /home/ncvs/ports/UPDATING,v
retrieving revision 1.260
diff -u -r1.260 UPDATING
--- UPDATING	25 Dec 2005 17:24:50 -0000	1.260
+++ UPDATING	27 Dec 2005 17:09:41 -0000
@@ -6,6 +6,14 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20051228:
+  AFFECTS: users of shells/scponly
+  AUTHOR: rushani at FreeBSD.org
+
+  From scponly 4.2, scp & WinSCP compatibilities are not enabled by default.
+  To enable those compatibilities, define WITH_SCPONLY_SCP and/or
+  WITH_SCPONLY_WINSCP, respectively.
+
 20051225:
   AFFECTS: users of p5-libapreq2
   AUTHOR: vanilla at FreeBSD.org
Index: shells/scponly/Makefile
===================================================================
RCS file: /home/ncvs/ports/shells/scponly/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- shells/scponly/Makefile	22 Dec 2005 16:24:30 -0000	1.19
+++ shells/scponly/Makefile	27 Dec 2005 17:09:48 -0000
@@ -71,9 +71,11 @@
 
 PORTNAME=	scponly
 PORTVERSION=	4.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	shells
-MASTER_SITES=	http://www.sublimation.org/scponly/
+MASTER_SITES=	http://www.sublimation.org/scponly/ \
+		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	scponly
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rushani at FreeBSD.org
@@ -140,6 +142,10 @@
 .endif
 
 pre-everything::
+	@${ECHO_MSG} "From scponly 4.2, scp & WinSCP compatibilities are not"
+	@${ECHO_MSG} "enabled by default.  To enable those compatibilities,"
+	@${ECHO_MSG} "define WITH_SCPONLY_SCP and/or WITH_SCPONLY_WINSCP,"
+	@${ECHO_MSG} "respectively."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You can enable chroot functionality by defining WITH_SCPONLY_CHROOT."
 	@${ECHO_MSG} ""
Index: shells/scponly/files/patch-ac
===================================================================
RCS file: shells/scponly/files/patch-ac
diff -N shells/scponly/files/patch-ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ shells/scponly/files/patch-ac	27 Dec 2005 14:09:54 -0000
@@ -0,0 +1,22 @@
+--- scponly.c.orig	Thu Dec 22 08:12:22 2005
++++ scponly.c	Tue Dec 27 23:09:30 2005
+@@ -611,7 +611,9 @@ int process_ssh_request(char *request)
+ 				fflush(stdout);
+ 				fflush(stderr);
+ 				discard_vector(av);
++#ifdef USE_SAFE_ENVIRONMENT
+ 				discard_vector(safeenv);
++#endif
+ 				free(flat_request);
+ 				free(tmprequest);
+ 				return(WEXITSTATUS(status));
+@@ -629,7 +631,9 @@ int process_ssh_request(char *request)
+ 		syslog(LOG_ERR, "failed: %s with error %s(%u) (%s)", flat_request, strerror(errno), errno, logstamp());
+ 		free(flat_request);
+ 		discard_vector(av);
++#ifdef USE_SAFE_ENVIRONMENT
+ 		discard_vector(safeenv);
++#endif
+ #ifdef WINSCP_COMPAT
+ 		if (winscp_mode)
+ 		{
>Release-Note:
>Audit-Trail:
>Unformatted: