upgrade to 7.1.2, it's not in-secure now

PR:		26088
Submitted by:	ijliao (me)
No Response from:	maintainer

6 files changed, 3 insertions, 103 deletions

diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index 207f3ea17781..b125a842bd9b 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -6,42 +6,16 @@
 #
 
 PORTNAME=	delegate
-PORTVERSION=	6.1.22
-CATEGORIES=	net www japanese
+PORTVERSION=	7.1.2
+CATEGORIES=	net www
 MASTER_SITES=	ftp://ftp.delegate.org/pub/DeleGate/ \
 		ftp://ftp.etl.go.jp/pub/DeleGate/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	max@FreeBSD.org
 
-NO_PACKAGE=	"Insecure program."
 IS_INTERACTIVE=	YES
 
-pre-fetch:
-.if !defined(FORCE_BUILD) || ${FORCE_BUILD}!="YES"
-	@${ECHO} "*********************************************************************"
-	@${ECHO} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO} "* This program has know security problems which may allow a remote  *"
-	@${ECHO} "* attacker to take control of your machine.                         *"
-	@${ECHO} "* See FreeBSD security advisory 00:04 for more information.         *"
-	@${ECHO} "*                                                                   *"
-	@${ECHO} "* It is strongly recommended that you avoid using this program.     *"
-	@${ECHO} "*                                                                   *"
-	@${ECHO} "* If you would like to use this program despite the danger, run     *"
-	@${ECHO} "* make with ``FORCE_BUILD=YES''                                     *"
-	@${ECHO} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO} "*********************************************************************"
-	@${FALSE}
-.else
-	@${ECHO} "*********************************************************************"
-	@${ECHO} "*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *"
-	@${ECHO} "* You have chosen to build an insecure program.                     *"
-	@${ECHO} "* This program has know security problems which may allow a remote  *"
-	@${ECHO} "* attacker to take control of your machine.                         *"
-	@${ECHO} "* See FreeBSD security advisory 00:04 for more information.         *"
-	@${ECHO} "*********************************************************************"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/delegated ${PREFIX}/sbin
 	@${MKDIR} ${PREFIX}/share/examples/delegate
@@ -52,6 +26,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/Manual.htm \
 	  ${PREFIX}/share/doc/delegate
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/delegate/distinfo b/net/delegate/distinfo
index 0fa893684b48..ee467e4ba90c 100644
--- a/net/delegate/distinfo
+++ b/net/delegate/distinfo
@@ -1 +1 @@
-MD5 (delegate6.1.22.tar.gz) = 94b5972a172de45a186abd7e81a72ae1
+MD5 (delegate7.1.2.tar.gz) = af0d60a91520f219aa3d2d41e6c07f45
diff --git a/net/delegate/files/patch-aa b/net/delegate/files/patch-aa
deleted file mode 100644
index 914a4c3e4b55..000000000000
--- a/net/delegate/files/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/lock.c.orig	Mon Mar 15 19:24:15 1999
-+++ src/lock.c	Sun Apr 18 15:26:15 1999
-@@ -136,6 +136,22 @@
- 			break;
- 		}
- 
-+#ifdef EWOULDBLOCK
-+		/*
-+		 * Only retry the lock if it was busy.  Other
-+		 * possible sources for the lock to fail are:
-+		 * invalid argument, bad filedescriptor, and
-+		 * operation not supported by device.  The latter
-+		 * happens if you start DeleGateD with -v, so it
-+		 * logs to stderr (which usually doesn't support
-+		 * locking at all).
-+		 */
-+		if (rcode == -1 && errno != EWOULDBLOCK) {
-+			/* pretend lock succeeded */
-+			rcode = 0;
-+			break;
-+		}
-+#endif
- 		remain = timeout - elapsed;
- 		if( remain <= 0 )
- 			break;
-@@ -146,6 +162,13 @@
- 
- 			start = Time();
- 			rcode = callFuncTimeout(remain/1000,-1,func,fd);
-+#ifdef EWOULDBLOCK
-+			if (rcode == -1 && errno != EWOULDBLOCK) {
-+				/* pretend lock succeeded */
-+				rcode = 0;
-+				break;
-+			}
-+#endif
- 			elapse1 = (Time() - start) * 1000; 
- /*{
- static int n;
diff --git a/net/delegate/files/patch-aj b/net/delegate/files/patch-aj
deleted file mode 100644
index 55cf79d58ecb..000000000000
--- a/net/delegate/files/patch-aj
+++ /dev/null
@@ -1,7 +0,0 @@
---- maker/__fork.c.orig	Tue Jun  3 22:56:42 1997
-+++ maker/__fork.c	Sun Oct 29 22:32:55 2000
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <sys/wait.h>
- 
- INHERENT_fork(){ return 1; }
diff --git a/net/delegate/files/patch-ak b/net/delegate/files/patch-ak
deleted file mode 100644
index 960895f0a73b..000000000000
--- a/net/delegate/files/patch-ak
+++ /dev/null
@@ -1,7 +0,0 @@
---- maker/spawnvp_.c.orig	Thu Jun 19 02:40:16 1997
-+++ maker/spawnvp_.c	Sun Oct 29 22:32:55 2000
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <sys/wait.h>
- 
- INHERENT_spawn(){ return 0; }
diff --git a/net/delegate/pkg-message b/net/delegate/pkg-message
deleted file mode 100644
index 5edcb5021a47..000000000000
--- a/net/delegate/pkg-message
+++ /dev/null
@@ -1,20 +0,0 @@
-*********************************************************************
-*   WARNING!     WARNING!     WARNING!     WARNING!     WARNING!    *
-* You have installed an insecure program.                           *
-* This program has know security problems which may allow a remote  *
-* attacker to take control of your machine.                         *
-* Use with great caution!                                           *
-* See FreeBSD security advisory 00:04 for more information.         *
-*********************************************************************
-
-----------------------------------------------------------------------
-Now, edit the sample script in /usr/local/share/examples/delegate directory
-and copy it into /usr/local/etc/rc.d.
-Especially, don't forget to specify correct value for the MANAGER.
-
-You can also run an interactive configuration session by executing 
-delegated with no argument.
-
-Consult /usr/local/share/doc/delegate/Manual.htm for configuration 
-information.
-----------------------------------------------------------------------