Attachment 7396 Details for Bug 16069 – file.diff

[patch] file.diff

file.diff (text/plain), 3.23 KB, created by Cy Schubert on 2000-01-11 19:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2000-01-11 19:30:00 UTC

Size: 3.23 KB

patch

obsolete

>diff -urPN --exclude=CVS --exclude=00_TRANS.TBL sftp.old/Makefile sftp/Makefile
>--- sftp.old/Makefile	Thu Dec 30 18:27:03 1999
>+++ sftp/Makefile	Tue Jan 11 11:07:19 2000
>@@ -6,7 +6,7 @@
> # $FreeBSD: ports/ftp/sftp/Makefile,v 1.1 1999/12/31 02:27:03 steve Exp $
> #
> 
>-DISTNAME=	sftp-0.5
>+DISTNAME=	sftp-0.6
> CATEGORIES=	ftp security
> MASTER_SITES=	ftp://ftp.xbill.org/pub/sftp/
> 
>@@ -21,12 +21,25 @@
> CONFIGURE_ARGS+=	--prefix=${PREFIX} \
> 			--enable-remotepath=${PREFIX}/libexec
> 
>-MAN1=		sftp.1
>+MAN1=		secftp.1
>+
>+PLIST=		${WRKDIR}/.PLIST
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/sftp ${PREFIX}/bin/sftp
>-	${LN} -s ${PREFIX}/bin/sftp ${PREFIX}/bin/rsftp
>+	${INSTALL_PROGRAM} ${WRKSRC}/sftp ${PREFIX}/bin/secftp
>+	${LN} -s ${PREFIX}/bin/secftp ${PREFIX}/bin/rsftp
> 	${INSTALL_PROGRAM} ${WRKSRC}/sftpserv ${PREFIX}/libexec/sftpserv
>-	${INSTALL_MAN} ${WRKSRC}/sftp.1 ${PREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/sftp.1 ${PREFIX}/man/man1/secftp.1
>+	${CP} ${PKGDIR}/PLIST.in ${PLIST}.unsorted
>+	@if [ ! -f ${PREFIX}/bin/sftp ]; then \
>+		${ECHO} "No other sftp found, linking sftp to secftp"; \
>+		${LN} -s ${PREFIX}/bin/secftp ${PREFIX}/bin/sftp; \
>+		${LN} -s ${PREFIX}/man/man1/secftp.1.gz ${PREFIX}/man/man1/sftp.1.gz; \
>+		${ECHO} bin/sftp >> ${PLIST}.unsorted; \
>+		${ECHO} man/man1/sftp.1.gz >> ${PLIST}.unsorted; \
>+	else \
>+		${ECHO} "Other sftp found, not linking sftp to secftp"; \
>+	fi
>+	@sort -u ${PLIST}.unsorted > ${PLIST}
> 
> .include <bsd.port.mk>
>diff -urPN --exclude=CVS --exclude=00_TRANS.TBL sftp.old/files/md5 sftp/files/md5
>--- sftp.old/files/md5	Thu Dec 30 18:27:04 1999
>+++ sftp/files/md5	Tue Jan 11 11:07:39 2000
>@@ -1 +1 @@
>-MD5 (sftp-0.5.tar.gz) = 8070983234f1a872b969f8eebe24b84d
>+MD5 (sftp-0.6.tar.gz) = 0412d22e066223890f99e8aeafc8160c
>diff -urPN --exclude=CVS --exclude=00_TRANS.TBL sftp.old/patches/patch-aa sftp/patches/patch-aa
>--- sftp.old/patches/patch-aa	Wed Dec 31 16:00:00 1969
>+++ sftp/patches/patch-aa	Tue Jan 11 11:14:42 2000
>@@ -0,0 +1,40 @@
>+--- sftp.1.orig	Tue Dec 28 11:44:39 1999
>++++ sftp.1	Tue Jan 11 11:14:23 2000
>+@@ -1,11 +1,19 @@
>+ .Dd November 26, 1999
>+-.Dt sftp 1
>++.Dt secftp 1
>+ .Os POSIX
>+ .Sh NAME
>++.Nm secftp
>+ .Nm sftp
>+ .Nd
>+ ftp replacement over ssh/rsh
>+ .Sh SYNOPSIS
>++.Nm secftp
>++.Op Ar -P remotepath
>++.Op Ar -l user
>++.Op Ar -p port
>++.Op Ar -C
>++.Op Ar -s sshargs
>++.Op Ar hostname
>+ .Nm sftp
>+ .Op Ar -P remotepath
>+ .Op Ar -l user
>+@@ -18,6 +26,7 @@
>+ .Op Ar -l user
>+ .Op Ar hostname
>+ .Sh DESCRIPTION
>++.Nm secftp,
>+ .Nm sftp
>+ and
>+ .Nm rsftp
>+@@ -25,7 +34,7 @@
>+ programs allows files to be transferred to and from remote servers.
>+ Authentication is provided by the underlying ssh/rsh connection.
>+ .Pp
>+-When sftp or rsftp is run, the server
>++When secftp, sftp or rsftp is run, the server
>+ .Nm (sftpserv)
>+ is automatically run on the remote end.
>+ .Pp
>diff -urPN --exclude=CVS --exclude=00_TRANS.TBL sftp.old/pkg/PLIST sftp/pkg/PLIST
>--- sftp.old/pkg/PLIST	Thu Dec 30 18:27:05 1999
>+++ sftp/pkg/PLIST	Wed Dec 31 16:00:00 1969
>@@ -1,3 +0,0 @@
>-bin/sftp
>-bin/rsftp
>-libexec/sftpserv
>diff -urPN --exclude=CVS --exclude=00_TRANS.TBL sftp.old/pkg/PLIST.in sftp/pkg/PLIST.in
>--- sftp.old/pkg/PLIST.in	Wed Dec 31 16:00:00 1969
>+++ sftp/pkg/PLIST.in	Sun Jan  2 12:17:31 2000
>@@ -0,0 +1,3 @@
>+bin/secftp
>+bin/rsftp
>+libexec/sftpserv

Actions: View | Diff

Attachments on bug 16069: 7396