Date: Mon, 26 Mar 2001 11:00:33 +0800 (CST) From: Ying-Chieh Liao <ijliao@terry.dragon2.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/26088: upgrade ports : net/delegate Message-ID: <200103260300.f2Q30Xx69344@Terry.Dorm8.NCTU.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 26088 >Category: ports >Synopsis: upgrade ports : net/delegate >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 25 19:10:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Ying-Chieh Liao >Release: FreeBSD 5.0-CURRENT i386 >Organization: NCTU CSIE >Environment: System: FreeBSD Terry.Dorm8.NCTU.edu.tw 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Thu Mar 15 01:35:29 CST 2001 root@Terry.Dorm8.NCTU.edu.tw:/usr/obj/usr/src/sys/TERRY i386 >Description: upgrade delegate from 6.1.22 to 7.1.2 >How-To-Repeat: >Fix: diff -ruN /usr/ports/net/delegate/Makefile delegate/Makefile --- /usr/ports/net/delegate/Makefile Sun Dec 31 14:47:45 2000 +++ delegate/Makefile Wed Mar 21 11:44:18 2001 @@ -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 @@ ${INSTALL_DATA} ${WRKSRC}/doc/Manual.htm \ ${PREFIX}/share/doc/delegate .endif - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -ruN /usr/ports/net/delegate/distinfo delegate/distinfo --- /usr/ports/net/delegate/distinfo Sun Dec 31 14:47:45 2000 +++ delegate/distinfo Wed Mar 21 11:30:48 2001 @@ -1 +1 @@ -MD5 (delegate6.1.22.tar.gz) = 94b5972a172de45a186abd7e81a72ae1 +MD5 (delegate7.1.2.tar.gz) = af0d60a91520f219aa3d2d41e6c07f45 diff -ruN /usr/ports/net/delegate/files/patch-aa delegate/files/patch-aa --- /usr/ports/net/delegate/files/patch-aa Sun Apr 18 14:31:28 1999 +++ delegate/files/patch-aa Thu Jan 1 08:00:00 1970 @@ -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 -ruN /usr/ports/net/delegate/files/patch-aj delegate/files/patch-aj --- /usr/ports/net/delegate/files/patch-aj Sun Oct 29 21:41:28 2000 +++ delegate/files/patch-aj Thu Jan 1 08:00:00 1970 @@ -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 -ruN /usr/ports/net/delegate/files/patch-ak delegate/files/patch-ak --- /usr/ports/net/delegate/files/patch-ak Sun Oct 29 21:41:28 2000 +++ delegate/files/patch-ak Thu Jan 1 08:00:00 1970 @@ -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 -ruN /usr/ports/net/delegate/pkg-message delegate/pkg-message --- /usr/ports/net/delegate/pkg-message Mon Jun 26 15:57:09 2000 +++ delegate/pkg-message Thu Jan 1 08:00:00 1970 @@ -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. ----------------------------------------------------------------------- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103260300.f2Q30Xx69344>