pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ftpd-tls: remove



Module Name:	pkgsrc-wip
Committed By:	miwarin <miwarin%gmail.com@localhost>
Pushed By:	miwarin
Date:		Fri May 25 01:10:07 2018 +0900
Changeset:	95a537bb68a9c1e3c54227c894831295289fd171

Modified Files:
	Makefile
Removed Files:
	ftpd-tls/DESCR
	ftpd-tls/MESSAGE
	ftpd-tls/Makefile
	ftpd-tls/PLIST
	ftpd-tls/distinfo
	ftpd-tls/files/ftpdtls.sh
	ftpd-tls/patches/patch-aa
	ftpd-tls/patches/patch-ab

Log Message:
ftpd-tls: remove

MASTER_SITE not found

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=95a537bb68a9c1e3c54227c894831295289fd171

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                  |  1 -
 ftpd-tls/DESCR            |  4 ---
 ftpd-tls/MESSAGE          | 10 --------
 ftpd-tls/Makefile         | 41 -------------------------------
 ftpd-tls/PLIST            |  5 ----
 ftpd-tls/distinfo         |  7 ------
 ftpd-tls/files/ftpdtls.sh | 20 ---------------
 ftpd-tls/patches/patch-aa | 22 -----------------
 ftpd-tls/patches/patch-ab | 62 -----------------------------------------------
 9 files changed, 172 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index bdd6d6184e..038533e3dd 100644
--- a/Makefile
+++ b/Makefile
@@ -834,7 +834,6 @@ SUBDIR+=	fstobdf
 SUBDIR+=	fswatch
 SUBDIR+=	fswebcam
 SUBDIR+=	ftgl
-SUBDIR+=	ftpd-tls
 SUBDIR+=	ftpsesame
 SUBDIR+=	fuse-cryfs
 SUBDIR+=	fuse-google-drive-git
diff --git a/ftpd-tls/DESCR b/ftpd-tls/DESCR
deleted file mode 100644
index 1be7d3ae5c..0000000000
--- a/ftpd-tls/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-ftpd-tls is a ftp server that supports TLS authentication and encryption
-(by the means of the OpenSSL toolkit).
-The base ftp server code is from OpenBSD 2.7. Porting to Linux and TLS
-implementation by Peter 'Luna' Runestig <peter%runestig.com@localhost>.
diff --git a/ftpd-tls/MESSAGE b/ftpd-tls/MESSAGE
deleted file mode 100644
index 9f1d98987d..0000000000
--- a/ftpd-tls/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2005/01/14 09:55:56 imilh Exp $
-
-You should read ${DOCDIR}/README.TLS to learn how to create
-and install your certificate.
-
-${PKGBASE} can be run either in daemon mode with the ${RCD_SCRIPTS} script
-or via inetd(8).
-
-===========================================================================
diff --git a/ftpd-tls/Makefile b/ftpd-tls/Makefile
deleted file mode 100644
index 73bc57e0f4..0000000000
--- a/ftpd-tls/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2014/10/09 14:06:27 thomasklausner Exp $
-#
-
-DISTNAME=	ftpd-tls-20031008
-PKGREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.zeist.de/pub/distfiles/			\
-		ftp://ftp.runestig.com/pub/ftpd-tls/
-
-MAINTAINER=	imil%gcu.info@localhost
-HOMEPAGE=	ftp://ftp.zeist.de/pub/distfiles/
-COMMENT=	Ftp server supporting FTP AUTH TLS
-
-GNU_CONFIGURE=	yes
-
-RCD_SCRIPTS=	ftpdtls
-
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
-SUBST_MESSAGE.path=	Fixing hardcoded path.
-SUBST_FILES.path=	ftpd.8.TLS pathnames.h tlsutil.c README.TLS
-SUBST_SED.path=		-e "s|/etc|${PKG_SYSCONFBASE}|"			\
-			-e "s|/ftpd|/${PKGBASE}|"
-
-DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
-MESSAGE_SUBST+=		PKGBASE=${PKGBASE}
-MESSAGE_SUBST+=		DOCDIR=${DOCDIR}
-MESSAGE_SUBST+=		RCD_SCRIPTS=${RCD_SCRIPTS}
-
-INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man8
-
-do-install:
-		${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-		${INSTALL_PROGRAM} ${WRKSRC}/ftpd ${DESTDIR}${PREFIX}/libexec/ftpd-tls
-		${INSTALL_MAN} ${WRKSRC}/ftpd.8.TLS \
-					${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ftpd-tls.8
-		${INSTALL_DATA} ${WRKSRC}/README.TLS ${DESTDIR}${DOCDIR}/README.TLS
-
-.include "../../security/openssl/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/ftpd-tls/PLIST b/ftpd-tls/PLIST
deleted file mode 100644
index 9e1920b645..0000000000
--- a/ftpd-tls/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/10/11 10:44:37 thomasklausner Exp $
-libexec/ftpd-tls
-man/man8/ftpd-tls.8
-share/doc/${PKGBASE}/README.TLS
-share/examples/rc.d/ftpdtls
diff --git a/ftpd-tls/distinfo b/ftpd-tls/distinfo
deleted file mode 100644
index 15b64c9a76..0000000000
--- a/ftpd-tls/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/09/28 06:41:14 rillig Exp $
-
-SHA1 (ftpd-tls-20031008.tar.gz) = 409facd3d105bd20c82fed06591687375ac2ac1e
-RMD160 (ftpd-tls-20031008.tar.gz) = 67ac41a85c20899c0b1a609e06eda026376a290c
-Size (ftpd-tls-20031008.tar.gz) = 202139 bytes
-SHA1 (patch-aa) = 738da533c2dff8ccc64492c7ded566cc31327ae6
-SHA1 (patch-ab) = 5ea4d375ef9fcd7a8dbe251613806c3611d2d0a5
diff --git a/ftpd-tls/files/ftpdtls.sh b/ftpd-tls/files/ftpdtls.sh
deleted file mode 100644
index 7955c60d7f..0000000000
--- a/ftpd-tls/files/ftpdtls.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: ftpdtls.sh,v 1.1.1.1 2004/12/28 09:34:03 imilh Exp $
-#
-
-. /etc/rc.subr
-
-name="ftpdtls"
-rcvar=${name}
-
-# having a - causes an error on rcvar
-ftpd_tls="ftpd-tls"
-command="@PREFIX@/libexec/${ftpd_tls}"
-
-# run in daemon mode by default
-command_args="-D"
-pidfile="/var/run/${ftpd_tls}.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/ftpd-tls/patches/patch-aa b/ftpd-tls/patches/patch-aa
deleted file mode 100644
index 586b86c26b..0000000000
--- a/ftpd-tls/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/01/06 13:06:48 imilh Exp $
-
---- ftpd.8.TLS.orig	2002-05-16 15:07:51.000000000 +0200
-+++ ftpd.8.TLS
-@@ -42,7 +42,7 @@
- .Nd Internet File Transfer Protocol server
- .Sh SYNOPSIS
- .Nm ftpd
--.Op Fl AdDhlMPSU46
-+.Op Fl AdDhlMPSU46o
- .Op Fl T Ar maxtimeout
- .Op Fl t Ar timeout
- .Op Fl u Ar mask
-@@ -137,6 +137,8 @@ When
- is specified, forces
- .Nm
- to use IPv6 addresses only.
-+.It Fl o
-+Forbid non-TLS authentication for non-guest users
- .It Fl T Ar maxtimeout
- A client may also request a different timeout period;
- the maximum period allowed may be set to
diff --git a/ftpd-tls/patches/patch-ab b/ftpd-tls/patches/patch-ab
deleted file mode 100644
index a41606d4f2..0000000000
--- a/ftpd-tls/patches/patch-ab
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/01/06 12:56:25 imilh Exp $
-
---- ftpd.c.orig	2003-10-06 16:20:00.000000000 +0200
-+++ ftpd.c
-@@ -107,6 +107,9 @@ static char rcsid[] = "$OpenBSD: ftpd.c,
- #include <fcntl.h>
- #include <glob.h>
- #include <limits.h>
-+#ifdef __NetBSD__
-+#undef HAVE_LOGIN_CAP_H
-+#endif
- #ifdef HAVE_LOGIN_CAP_H
- #include <login_cap.h>
- #endif /* HAVE_LOGIN_CAP_H */
-@@ -371,7 +374,8 @@ curdir()
- 
- #ifdef INET6
- # ifdef TLS
--char *argstr = "AdDhlMSt:T:u:UvPz:46";
-+char *argstr = "AdDhlMSt:T:u:UvPz:46o";
-+int tls_auth_only = 0;
- # else
- char *argstr = "AdDhlMSt:T:u:UvP46";
- # endif /* !TLS */
-@@ -389,13 +393,13 @@ usage()
- 	syslog(LOG_ERR,
- #ifdef INET6
- # ifdef TLS
--	    "usage: ftpd [-AdDhlMSU46] [-t timeout] [-T maxtimeout] [-u mask] [-z TLS option]");
-+	    "usage: ftpd [-AdDhlMSU46o] [-t timeout] [-T maxtimeout] [-u mask] [-z TLS option]");
- # else
- 	    "usage: ftpd [-AdDhlMSU46] [-t timeout] [-T maxtimeout] [-u mask]");
- # endif /* !TLS */
- #else
- # ifdef TLS
--	    "usage: ftpd [-AdDhlMSU4] [-t timeout] [-T maxtimeout] [-u mask] [-z TLS option]");
-+	    "usage: ftpd [-AdDhlMSU4o] [-t timeout] [-T maxtimeout] [-u mask] [-z TLS option]");
- # else
- 	    "usage: ftpd [-AdDhlMSU4] [-t timeout] [-T maxtimeout] [-u mask]");
- # endif /* !TLS */
-@@ -497,6 +501,9 @@ main(argc, argv, envp)
- 			if (tls_optarg(optarg))
- 			    usage();
- 			break;
-+		case 'o':
-+			tls_auth_only = 1;
-+			break;
- #endif /* TLS */
- 
- 		case '4':
-@@ -1003,6 +1010,11 @@ user(name)
- 		}
- 	}
- #ifdef TLS
-+	/* forbid non TLS connection if -o switch set */
-+	if (!guest && (tls_auth_only && !tls_on_ctrl)) {
-+		reply(503, "Non TLS login refused on this server.");
-+		return;
-+	}
- {
- /* Try TLS/X509 client authentication according to this:
-  *


Home | Main Index | Thread Index | Old Index