10 files changed, 0 insertions, 317 deletions

diff --git a/ftp/Makefile b/ftp/Makefile
index e740233d366d..c78424d688fd 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -16,7 +16,6 @@
     SUBDIR += filezilla
     SUBDIR += fmirror
     SUBDIR += fpc-libcurl
-    SUBDIR += frox
     SUBDIR += ftpcopy
     SUBDIR += ftpfind
     SUBDIR += ftplib
diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile
deleted file mode 100644
index 24b6a8ba8833..000000000000
--- a/ftp/frox/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# Created by: Sergey Matveychuk <sem@ciam.ru>
-
-PORTNAME=	frox
-PORTVERSION=	0.7.18
-PORTREVISION=	4
-CATEGORIES=	ftp
-MASTER_SITES=	http://www.hollo.org/frox/download/ \
-		http://frox.sourceforge.net/download/ \
-		SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Transparent FTP proxy with caching support
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		gmake tar:bzip2
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-configfile=${PREFIX}/etc/frox.conf
-
-CFLAGS+=		-fcommon
-
-DEPRECATED=	Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
-EXPIRATION_DATE=2021-04-01
-
-USE_RC_SUBR=	frox
-SUB_FILES=	pkg-message
-
-PORTDOCS=	SECURITY CREDITS ChangeLog FAQ.html FAQ-1.html FAQ-2.html \
-		FAQ-3.html FAQ-4.html FAQ-5.html FAQ-6.html FAQ-7.html \
-		FAQ-8.html
-PORTEXAMPLES=	*
-PLIST_FILES=	sbin/frox \
-		man/man1/frox.1.gz \
-		man/man5/frox.conf.5.gz
-
-OPTIONS_DEFINE=	VIRUS_SCAN HTTP_CACHE LOCAL_CACHE CCP ROOT_RUN DOCS EXAMPLES
-OPTIONS_DEFAULT=	HTTP_CACHE CCP
-
-OPTIONS_RADIO=	PFILTER
-OPTIONS_RADIO_PFILTER=	IPFILTER PF
-
-IPFILTER_DESC=		Use ipfilter instead of ipfw
-PF_DESC=		Build with pf(4) support
-VIRUS_SCAN_DESC=	Run external virus scaner on each download
-HTTP_CACHE_DESC=	Enable use of external cache
-LOCAL_CACHE_DESC=	Enable use of local cache
-CCP_DESC=		Ftp-proxy style command control programs
-ROOT_RUN_DESC=		Allow frox running as root (not recomended)
-
-IPFILTER_CONFIGURE_ENABLE=	ipfilter
-PF_CPPFLAGS=			-DPF
-VIRUS_SCAN_CONFIGURE_ENABLE=	virus-scan
-HTTP_CACHE_CONFIGURE_ENABLE=	http-cache
-LOCAL_CACHE_CONFIGURE_ENABLE=	local-cache
-CCP_CONFIGURE_ENABLE=		ccp
-ROOT_RUN_CONFIGURE_ENABLE=	run-as-root
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/frox ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/doc/frox.man ${STAGEDIR}${MANPREFIX}/man/man1/frox.1
-	${INSTALL_MAN} ${WRKSRC}/doc/frox.conf.man ${STAGEDIR}${MANPREFIX}/man/man5/frox.conf.5
-
-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/frox.conf ${STAGEDIR}${EXAMPLESDIR}/frox.conf
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/ftp/frox/distinfo b/ftp/frox/distinfo
deleted file mode 100644
index c6d05861e838..000000000000
--- a/ftp/frox/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (frox-0.7.18.tar.bz2) = f7b637dd108444ff9c2302aa134f434e1606a2f965c01492abfbdc9b1c0bd0fc
-SIZE (frox-0.7.18.tar.bz2) = 173355
diff --git a/ftp/frox/files/frox.in b/ftp/frox/files/frox.in
deleted file mode 100644
index b005eeaedc86..000000000000
--- a/ftp/frox/files/frox.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: frox
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable frox:
-#
-# frox_enable="YES"
-# frox_flags="<set as needed>"
-#
-# See frox(8) for flags
-#
-
-. /etc/rc.subr
-
-name=frox
-rcvar=frox_enable
-
-command=%%PREFIX%%/sbin/frox
-pidfile=/var/run/frox.pid
-required_files=%%PREFIX%%/etc/frox.conf
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
-   rm -f $pidfile
-}
-
-# set defaults
-
-frox_enable=${frox_enable:-"NO"}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/ftp/frox/files/patch-lib-sstrlib-sstr_io.c b/ftp/frox/files/patch-lib-sstrlib-sstr_io.c
deleted file mode 100644
index b985c0b9e9be..000000000000
--- a/ftp/frox/files/patch-lib-sstrlib-sstr_io.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/sstrlib/sstr_io.c.orig	2005-02-04 10:24:55 UTC
-+++ lib/sstrlib/sstr_io.c
-@@ -26,6 +26,7 @@
- #include <sys/ioctl.h>
- #include <unistd.h>
- #include <ctype.h>
-+#include <sys/stat.h>
- 
- #include "sstr.h"
- #include "sstr_private.h"
-@@ -61,8 +62,14 @@ int sstr_apprintf(sstr * p, const char *
- int sstr_append_read(int fd, sstr * p, int cnt)
- {
- 	int i;
--	if(ioctl(fd, FIONREAD, &i) == -1)
--		return (-1);
-+	struct stat mystat;
-+
-+	if(ioctl(fd, FIONREAD, &i) == -1) {
-+		fstat(fd,&mystat);
-+		if (mystat.st_mode & S_IFREG == 0)
-+			return (-1);
-+		i=mystat.st_blksize;
-+	}
- 	if(i == 0)
- 		return (0);
- 
diff --git a/ftp/frox/files/patch-src-bsd.c b/ftp/frox/files/patch-src-bsd.c
deleted file mode 100644
index 2f90ecba530c..000000000000
--- a/ftp/frox/files/patch-src-bsd.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- src/bsd.c.orig	2005-02-04 10:24:55 UTC
-+++ src/bsd.c
-@@ -30,6 +30,16 @@
- #error --enable-transparent-data not supported under BSD
- #endif
- 
-+#ifdef PF
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <net/if.h>
-+#include <net/pfvar.h>
-+
-+static int natfd;
-+#endif
-+
-+
- #ifdef IPFILTER
- #include <fcntl.h>
- #include <sys/ioctl.h>
-@@ -51,6 +61,11 @@ int os_init(void)
- 	if(natfd < 0)
- 		write_log(ERROR, "Unable to initialise IPFilter");
- #endif
-+#ifdef PF
-+       natfd = open("/dev/pf", O_RDWR);
-+       if (natfd == -1)
-+               write_log(ERROR, "Unable to initialise PF");
-+#endif
- 	return 0;
- }
- 
-@@ -61,6 +76,11 @@ int os_init(void)
- int get_orig_dest(int fd, struct sockaddr_in *addr)
- {
- 	socklen_t len;
-+#ifdef PF
-+    struct pfioc_natlook nl;
-+    struct sockaddr_in from;
-+    int r2;
-+#endif
- #ifdef IPFILTER
- 	struct natlookup nat;
- 	struct sockaddr_in from;
-@@ -100,6 +120,31 @@ int get_orig_dest(int fd, struct sockadd
- 		return r2;
- 	}
- #endif
-+#ifdef PF
-+       getpeername(fd, (struct sockaddr *) &from, &len);
-+       memset(&nl, 0, sizeof(struct pfioc_natlook));
-+       memcpy( &nl.daddr.v4, &to.sin_addr.s_addr, sizeof( nl.saddr.v4 ));
-+       memcpy( &nl.saddr.v4, &from.sin_addr.s_addr, sizeof( nl.daddr.v4 ));
-+       nl.dport = to.sin_port;
-+       nl.sport = from.sin_port;
-+       nl.af = AF_INET;
-+       nl.proto = IPPROTO_TCP;
-+       nl.direction = PF_INOUT;
-+
-+       if ( natfd > 0 ){
-+           if (ioctl(natfd, DIOCNATLOOK, &nl)==-1){
-+               write_log(ERROR, "Failed to lookup address");
-+           }
-+           else {
-+               memset(addr, sizeof(*addr), 0);
-+               memcpy(&addr->sin_addr.s_addr, &nl.rdaddr.v4.s_addr, sizeof(struct sockaddr_in));
-+               addr->sin_len = sizeof(struct sockaddr_in);
-+               addr->sin_port = nl.rdport;
-+               addr->sin_family = AF_INET;
-+               return r2;
-+		   }
-+	   }
-+#endif
- 	memcpy(addr, &to, len);
- 	return r1;
- }
diff --git a/ftp/frox/files/patch-src-cache.c b/ftp/frox/files/patch-src-cache.c
deleted file mode 100644
index 234d61301042..000000000000
--- a/ftp/frox/files/patch-src-cache.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Apply patch
-
-
-Patch attached with submission follows:
-
---- src/cache.c.orig	2005-02-04 10:24:55 UTC
-+++ src/cache.c
-@@ -364,7 +364,7 @@ int setup_fileinfo(sstr * filename)
- 	int code;
- 	sstr *msg;
- 
--	if(!strcasecmp(config.cachemod, "Local") || !config.forcehttp) {
-+	if(!strcasecmp(config.cachemod, "Local") || config.forcehttp) {
- 		send_ccommand("SIZE", sstr_buf(filename));
- 		get_message(&code, &msg);
- 		if(code / 100 != 2) {
diff --git a/ftp/frox/files/patch-src_frox.conf b/ftp/frox/files/patch-src_frox.conf
deleted file mode 100644
index f47c53b0f18c..000000000000
--- a/ftp/frox/files/patch-src_frox.conf
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/frox.conf.orig	2005-02-04 10:24:55 UTC
-+++ src/frox.conf
-@@ -18,16 +18,13 @@
- # commented out to listen on all local IPs.
- #
- # Listen firewall.localnet
-+# Change it with your ip!
- Listen 192.168.2.1
- 
- # Port to listen on. Must be supplied.
- #
- Port 2121
- 
--# If specified then bind to this device
--#
--BindToDevice eth0
--
- # Whether to run from inetd. You should still define Port above, but
- # it isn't used for much.
- #
-@@ -44,7 +41,7 @@ BindToDevice eth0
- # comment this out and copy resolver libraries into the chroot jail instead.
- # See FAQ section 3.2 for details.
- #
--ResolvLoadHack wontresolve.doesntexist.abc
-+#ResolvLoadHack wontresolve.doesntexist.abc
- 
- # Another ftp proxy to forward on to. Frox will contact this ftp
- # proxy, and send it a login name of the form "user@host:port" where
-@@ -73,8 +70,8 @@ ResolvLoadHack wontresolve.doesntexist.a
- # you really want to run as root (not a good idea) you must say so
- # specifically, and have compiled with --enable-run-as-root.
- #
--# User nobody
--# Group nogroup
-+User nobody
-+Group nogroup
- 
- # This is frox's working directory - it must be specified. Temporary
- # files and sockets will be created here. If you are using local
-@@ -83,8 +80,8 @@ ResolvLoadHack wontresolve.doesntexist.a
- # also chroot to this dir on startup. To avoid this you must specifically 
- # set DontChroot to Yes.
- #
--# WorkingDir /usr/local/lib/frox
--# DontChroot Yes
-+WorkingDir /tmp
-+DontChroot Yes
- 
- # Logging level. 0=No logging. 5=Critical errors only. 10= All errors.
- # 15=Errors, other important stuf. 20= Errors, connections, cache
diff --git a/ftp/frox/files/pkg-message.in b/ftp/frox/files/pkg-message.in
deleted file mode 100644
index a82361dd292e..000000000000
--- a/ftp/frox/files/pkg-message.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Don't forget to create %%PREFIX%%/etc/frox.conf.
-See an example in %%EXAMPLESDIR%%/frox.conf
-
-You can use frox by two ways:
-1) run as a daemon:
-Add `frox_enable="YES"' in /etc/rc.conf and run %%PREFIX%%/etc/rc.d/frox.sh
-
-2) run frox with inetd(8):
-* uncomment 'FromInetd yes' in your %%PREFIX%%/etc/frox.conf
-* add a line in /etc/inetd.conf:
-frox     stream  tcp     nowait  nobody    %%PREFIX%%/sbin/frox    frox
-* assign a port number for frox inside /etc/services (e.g. 2121):
-frox	2121/tcp
-EOM
-}
-]
diff --git a/ftp/frox/pkg-descr b/ftp/frox/pkg-descr
deleted file mode 100644
index 3a18c1209785..000000000000
--- a/ftp/frox/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-This is frox, a transparent ftp proxy by James Hollingshead.
-
-Current features include:
-
-  o rfc959 compliant transparent proxying of ftp connections.
-  o active --> passive mode conversion for data connections.
-  o Optional caching support either locally or through an external
-    HTTP cache.
-  o Optional virus scanning
-  o Optional non-transparent proxy support by logging in with
-    user@host:port.
-  o Options to bind to a specific interface, chroot, and drop
-    priveleges for security.
-
-WWW: http://www.hollo.org/frox/