Date: Mon, 27 Dec 1999 14:49:44 +0100 (CET) From: Anders Nordby <anders@fix.no> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/15715: Update of port: net/dante Message-ID: <19991227134944.A69775762@totem.fix.no>
next in thread | raw e-mail | index | archive | help
>Number: 15715 >Category: ports >Synopsis: Update of 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: Mon Dec 27 05:50:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: FreeBSD 3.3-STABLE i386 >Organization: Fluxpod Information eXchange >Environment: FreeBSD eggsilo.bsdonline.org 3.3-STABLE FreeBSD 3.3-STABLE #0: Sun Dec 26 22:36:33 CET 1999 root@eggsilo.bsdonline.org:/usr/src/sys/compile/EGGSILO i386 >Description: Updates the port to version 1.1.1-pre1. Removes patch-aa. Changes since version 1.1.0: o Can't do rulespermit() that early, move to after connect(). Fixes a hang that could occur when using libwrap, thanks to Marc G. Fournier (marc.fournier@acadiau.ca) for help and testing. o socksify on elf-based FreeBSD systems should hopefully work now; thanks to Andre Albsmeier <andre.albsmeier@mchp.siemens.de> for testing. o Allow specifying what facility to use for syslog output. Code mostly from Per Hedeland (per@erix.ericsson.se). o Fix bug preventing one of the serverchilds from dying when the server is killed. Reported by Per Hedeland (per@erix.ericsson.se). o config.c: increment pointed to area, not pointer. Patch from Per Hedeland (per@erix.ericsson.se). >How-To-Repeat: >Fix: diff -Nur dante.old/Makefile dante/Makefile --- dante.old/Makefile Mon Dec 27 13:14:39 1999 +++ dante/Makefile Mon Dec 27 14:13:09 1999 @@ -6,7 +6,8 @@ # $FreeBSD: ports/net/dante/Makefile,v 1.1.1.1 1999/11/26 23:23:02 steve Exp $ # -DISTNAME= dante-1.1.0 +DISTNAME= dante-1.1.1-pre1 +PKGNAME= dante-1.1.1 CATEGORIES= security net MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \ http://www.freenix.no/~anders/ \ diff -Nur dante.old/files/md5 dante/files/md5 --- dante.old/files/md5 Mon Dec 27 13:14:28 1999 +++ dante/files/md5 Mon Dec 27 13:41:02 1999 @@ -1 +1 @@ -MD5 (dante-1.1.0.tar.gz) = 0b844df4371fc95666637edd248a0ac0 +MD5 (dante-1.1.1-pre1.tar.gz) = 3f648d5f9edc91ad39d711db02a9f3ec diff -Nur dante.old/patches/patch-aa dante/patches/patch-aa --- dante.old/patches/patch-aa Mon Dec 27 13:14:28 1999 +++ dante/patches/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,76 +0,0 @@ ---- sockd/sockd_io.c.orig Thu Sep 2 12:53:05 1999 -+++ sockd/sockd_io.c Sun Dec 19 21:37:35 1999 -@@ -44,7 +44,7 @@ - #include "common.h" - - static const char rcsid[] = --"$Id: sockd_io.c,v 1.159 1999/09/02 10:42:04 michaels Exp $"; -+"$Id: sockd_io.c,v 1.162 1999/12/16 09:01:25 michaels Exp $"; - - /* - * Accept io objects from mother and does io on them. We never -@@ -819,8 +819,8 @@ - - /* - * If client hasn't sent us it's address yet we have to -- * assume the first packet is from is it. Client can only -- * blame itself if not. -+ * assume the first packet is from is it. -+ * Client can only blame itself if not. - */ - if (io->in.raddr.sin_addr.s_addr == htonl(INADDR_ANY) - || io->in.raddr.sin_port == htons(0)) { -@@ -836,30 +836,19 @@ - - /* LINTED pointer casts may be troublesome */ - sockaddr2sockshost((struct sockaddr *)&io->in.raddr, &io->src); -- -- /* -- * Do a rulecheck here with destination set to NULL, -- * if that isn't permitted nothing else is either from -- * this source so disconnect it. -- */ -- if (!rulespermit(io->in.s, &io->rule, &io->state, &io->src, -- NULL)) { -- delete_io(mother, io, io->in.s, IO_SRCBLOCK); -- return; -- } - } - - /* -- * When we receive the first packet we also have a fixed -- * source so connect the socket, both for better performance -- * and so that getpeername() will work on it, for -- * libwrap/rulespermit(). -+ * When we receive the first packet we also have a fixed source -+ * so connect the socket, both for better performance and so -+ * that getpeername() will work on it (libwrap/rulespermit()). - */ -- if (io->in.read == 0) { /* could happend more than once, but ok. */ -+ if (io->in.read == 0) { /* could happen more than once, but ok. */ - /* LINTED pointer casts may be troublesome */ - if (!sockaddrareeq((struct sockaddr *)&io->in.raddr, &from)) { - char src[MAXSOCKADDRSTRING], dst[MAXSOCKADDRSTRING]; - -+ /* perhaps this should be LOG_DEBUG. */ - slog(LOG_NOTICE, - "%s(0): %s: expected from %s, got it from %s", - VERDICT_BLOCKs, protocol2string(io->state.protocol), -@@ -871,6 +860,17 @@ - - if (connect(io->in.s, &from, sizeof(from)) != 0) { - delete_io(mother, io, io->in.s, IO_ERROR); -+ return; -+ } -+ -+ /* -+ * Do a rulecheck here with destination set to NULL. -+ * If that isn't permitted nothing else is either from -+ * this source so might as well disconnect it. -+ */ -+ if (!rulespermit(io->in.s, &io->rule, &io->state, &io->src, -+ NULL)) { -+ delete_io(mother, io, io->in.s, IO_SRCBLOCK); - return; - } - } >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?19991227134944.A69775762>