From owner-freebsd-ports Sun Oct 8 17:10:18 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B794937B66D for ; Sun, 8 Oct 2000 17:10:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id RAA65917; Sun, 8 Oct 2000 17:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from totem.fix.no (totem.fix.no [213.142.66.130]) by hub.freebsd.org (Postfix) with ESMTP id EF8D737B6C6 for ; Sun, 8 Oct 2000 17:00:37 -0700 (PDT) Received: by totem.fix.no (Postfix, from userid 1000) id DBB365865; Mon, 9 Oct 2000 02:03:45 +0200 (CEST) Message-Id: <20001009000345.DBB365865@totem.fix.no> Date: Mon, 9 Oct 2000 02:03:45 +0200 (CEST) From: Anders Nordby Reply-To: Anders Nordby To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/21846: Update port: net/dante Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21846 >Category: ports >Synopsis: Update port: net/dante >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 08 17:10:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: FreeBSD 4.1-STABLE i386 >Organization: Fluxpod Information eXchange >Environment: FreeBSD eggsilo.localnet 4.1-STABLE FreeBSD 4.1-STABLE #0: Mon Aug 28 10:23:12 CEST 2000 root@:/usr/src/sys/compile/EGGSILO i386 >Description: Updates the Dante port to version 1.1.4. Removes all patches, as they have been incorporated. >How-To-Repeat: >Fix: diff -Nur dante.old/Makefile dante/Makefile --- dante.old/Makefile Sun Oct 8 17:35:33 2000 +++ dante/Makefile Sun Oct 8 20:29:51 2000 @@ -6,7 +6,7 @@ # PORTNAME= dante -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.4 CATEGORIES= net security MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \ http://www.freenix.no/~anders/ \ diff -Nur dante.old/distinfo dante/distinfo --- dante.old/distinfo Mon Jul 3 01:20:06 2000 +++ dante/distinfo Sun Oct 8 20:31:48 2000 @@ -1 +1 @@ -MD5 (dante-1.1.2.tar.gz) = d522a4c2da7c68ef7340e39c642a7ca2 +MD5 (dante-1.1.4.tar.gz) = 39aae565b602586972da7eda2d64f968 diff -Nur dante.old/files/patch-ac dante/files/patch-ac --- dante.old/files/patch-ac Fri Jul 7 19:47:46 2000 +++ dante/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,21 +0,0 @@ ---- configure Fri Jun 23 01:04:17 2000 -+++ configure Fri Jul 7 10:53:32 2000 -@@ -9896,6 +9896,7 @@ - - - -+ - trap '' 1 2 15 - cat > confcache <<\EOF - # This file is a shell script that caches the results of configure -@@ -10295,8 +10296,8 @@ - EOF - - cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff -Nur dante.old/files/patch-ad dante/files/patch-ad --- dante.old/files/patch-ad Fri Jul 7 19:47:46 2000 +++ dante/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- configure.in Fri Jun 23 01:02:43 2000 -+++ configure.in Fri Jul 7 10:52:19 2000 -@@ -1425,6 +1425,7 @@ - AC_LINK_FILES(dlib/interposition.c, sockd/interposition.c) - AC_LINK_FILES(lib/broken.c, dlib/broken.c) - AC_LINK_FILES(dlib/broken.c, sockd/broken.c) -+AC_LINK_FILES(lib/hostcache.c, dlib/hostcache.c) - - AC_OUTPUT([sockd/Makefile include/Makefile lib/Makefile dlib/Makefile \ - Makefile example/Makefile doc/Makefile bin/Makefile \ diff -Nur dante.old/files/patch-ae dante/files/patch-ae --- dante.old/files/patch-ae Fri Jul 7 19:47:46 2000 +++ dante/files/patch-ae Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- dlib/Makefile.am Fri Jun 9 05:11:37 2000 -+++ dlib/Makefile.am Fri Jul 7 10:45:29 2000 -@@ -6,7 +6,7 @@ - clientconfig.c clientprotocol.c Raccept.c userio.c method_uname.c \ - connectchild.c config.c log.c protocol.c socket.c udp_util.c \ - Rbindresvport.c Rconnect.c util.c Rgethostbyname.c Rcompat.c \ -- msproxy_clientprotocol.c broken.c -+ msproxy_clientprotocol.c broken.c hostcache.c - - #libdsocks version info, interfaceversion:revision:old interfaces supported - #XXX SPEC/dante.spec.in must have the same value as version info diff -Nur dante.old/files/patch-af dante/files/patch-af --- dante.old/files/patch-af Fri Jul 7 19:47:46 2000 +++ dante/files/patch-af Thu Jan 1 01:00:00 1970 @@ -1,32 +0,0 @@ ---- dlib/Makefile.in Mon Jun 26 05:44:23 2000 -+++ dlib/Makefile.in Fri Jul 7 11:00:13 2000 -@@ -81,7 +81,7 @@ - YACC = @YACC@ - - lib_LTLIBRARIES = libdsocks.la --libdsocks_la_SOURCES = interposition.c int_osf1.c int_osf2.c int_osf3.c config_parse.y io.c debug.c Rgetpeername.c Rgetsockname.c udp.c Rrresvport.c Rbind.c config_scan.l address.c authneg.c client.c clientconfig.c clientprotocol.c Raccept.c userio.c method_uname.c connectchild.c config.c log.c protocol.c socket.c udp_util.c Rbindresvport.c Rconnect.c util.c Rgethostbyname.c Rcompat.c msproxy_clientprotocol.c broken.c -+libdsocks_la_SOURCES = interposition.c int_osf1.c int_osf2.c int_osf3.c config_parse.y io.c debug.c Rgetpeername.c Rgetsockname.c udp.c Rrresvport.c Rbind.c config_scan.l address.c authneg.c client.c clientconfig.c clientprotocol.c Raccept.c userio.c method_uname.c connectchild.c config.c log.c protocol.c socket.c udp_util.c Rbindresvport.c Rconnect.c util.c Rgethostbyname.c Rcompat.c msproxy_clientprotocol.c broken.c hostcache.c - - - #libdsocks version info, interfaceversion:revision:old interfaces supported -@@ -116,7 +116,8 @@ - authneg.lo client.lo clientconfig.lo clientprotocol.lo Raccept.lo \ - userio.lo method_uname.lo connectchild.lo config.lo log.lo protocol.lo \ - socket.lo udp_util.lo Rbindresvport.lo Rconnect.lo util.lo \ --Rgethostbyname.lo Rcompat.lo msproxy_clientprotocol.lo broken.lo -+Rgethostbyname.lo Rcompat.lo msproxy_clientprotocol.lo broken.lo \ -+hostcache.lo - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ - LEXLIB = @LEXLIB@ - CFLAGS = @CFLAGS@ -@@ -340,6 +341,10 @@ - ../include/interposition.h ../include/socks.h - debug.lo debug.o : debug.c ../include/common.h ../include/autoconf.h \ - ../include/redefac.h ../include/yacconfig.h ../include/config.h \ -+ ../include/interposition.h ../include/socks.h -+hostcache.lo hostcache.o : hostcache.c ../include/common.h \ -+ ../include/autoconf.h ../include/redefac.h \ -+ ../include/yacconfig.h ../include/config.h \ - ../include/interposition.h ../include/socks.h - int_osf1.lo int_osf1.o : int_osf1.c ../include/common.h \ - ../include/autoconf.h ../include/redefac.h \ diff -Nur dante.old/files/patch-ag dante/files/patch-ag --- dante.old/files/patch-ag Fri Jul 7 19:47:46 2000 +++ dante/files/patch-ag Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- sockd/Makefile.in Mon Jun 26 05:44:47 2000 -+++ sockd/Makefile.in Fri Jul 7 11:00:44 2000 -@@ -329,7 +329,7 @@ - ../include/interposition.h ../include/sockd.h - sockd_io.o: sockd_io.c ../include/common.h ../include/autoconf.h \ - ../include/redefac.h ../include/yacconfig.h ../include/config.h \ -- ../include/interposition.h ../include/sockd.h -+ ../include/interposition.h ../include/sockd.h config_parse.h - sockd_negotiate.o: sockd_negotiate.c ../include/common.h \ - ../include/autoconf.h ../include/redefac.h \ - ../include/yacconfig.h ../include/config.h \ diff -Nur dante.old/files/patch-ah dante/files/patch-ah --- dante.old/files/patch-ah Fri Jul 7 19:50:25 2000 +++ dante/files/patch-ah Thu Jan 1 01:00:00 1970 @@ -1,27 +0,0 @@ ---- lib/address.c 1999/12/22 09:29:22 1.75 -+++ lib/address.c 2000/07/07 15:55:47 -@@ -162,9 +162,21 @@ - if (!socksfdv[d].state.system) - switch (socksfdv[d].state.command) { - case SOCKS_BIND: -- if (socksfdv[d].control != -1 -- && d != (unsigned int)socksfdv[d].control) -- close(socksfdv[d].control); -+ if (socksfdv[d].control == -1 -+ || socksfdv[d].control == (int)d) -+ break; -+ -+ /* -+ * If we are using the bind extension it's possible -+ * that this controlconnection is shared with other -+ * (accept()'ed) addresses, if so we must leave it -+ * open for the other connections. -+ */ -+ if (socks_addrcontrol(&socksfdv[d].local, &socksfdv[d].remote) -+ == -1) -+ break; -+ -+ close(socksfdv[d].control); - break; - - case SOCKS_CONNECT: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message