From owner-freebsd-ports Wed Jun 5 11:20:36 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EDB7A37B40F for ; Wed, 5 Jun 2002 11:20:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g55IK1t28618; Wed, 5 Jun 2002 11:20:01 -0700 (PDT) (envelope-from gnats) Received: from lofi.dyndns.org (pD950A5D9.dip.t-dialin.net [217.80.165.217]) by hub.freebsd.org (Postfix) with ESMTP id 5044D37B401 for ; Wed, 5 Jun 2002 11:10:58 -0700 (PDT) Received: from lofi.dyndns.org (lofi@localhost [127.0.0.1]) by lofi.dyndns.org with ESMTP id g55IAAVw011113; Wed, 5 Jun 2002 20:10:51 +0200 (CEST) Received: (from lofi@localhost) by lofi.dyndns.org (8.12.3/8.12.3/Submit) id g55IA9BI011112; Wed, 5 Jun 2002 20:10:09 +0200 (CEST) Message-Id: <200206051810.g55IA9BI011112@lofi.dyndns.org> Date: Wed, 5 Jun 2002 20:10:09 +0200 (CEST) From: Michael Nottebrock Reply-To: Michael Nottebrock To: FreeBSD-gnats-submit@FreeBSD.org Cc: kris@obsecurity.org X-Send-Pr-Version: 3.113 Subject: ports/38922: Unbreak irc/tircproxy Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 38922 >Category: ports >Synopsis: Unbreak irc/tircproxy >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 05 11:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Michael Nottebrock >Release: FreeBSD 4.6-RC i386 >Organization: >Environment: System: FreeBSD lofi.dyndns.org 4.6-RC FreeBSD 4.6-RC #0: Wed Jun 5 16:26:40 CEST 2002 lofi@lofi.dyndns.org:/usr/obj/usr/src/sys/GENERIC i386 >Description: The latest ipfilter update breaks transparent mode on 4.6 and an obsolete pre-configure breaks this port on bento. The maintainer has told me by email that he is unable to maintain this port because he has no access to FreeBSD-machines anymore. Changes: - Cleaned Makefile - Removed scripts directory - Changed files/patch-ad (removed old pre-4.3-Glue, fixed ipfilter breakage) - Reset maintainership to ports@freebsd.org - Added %%PORTDOCS%% to pkg-plist - Bumped Portrevision >How-To-Repeat: >Fix: diff -urN tircproxy.orig/Makefile tircproxy/Makefile --- tircproxy.orig/Makefile Sat Nov 24 20:49:18 2001 +++ tircproxy/Makefile Wed Jun 5 19:42:15 2002 @@ -7,11 +7,11 @@ PORTNAME= tircproxy PORTVERSION= 0.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc MASTER_SITES= http://bre.klaki.net/programs/tircproxy/ -MAINTAINER= CoreDumped@CoreDumped.null.ru +MAINTAINER= ports@freebsd.org WRKSRC= ${WRKDIR}/tircproxy-0.4 GNU_CONFIGURE= YES @@ -22,8 +22,8 @@ post-install: .if !defined(NOPORTDOCS) @${ECHO} "===> Installing tircproxy docs in ${PREFIX}/share/doc/tircproxy" - @${MKDIR} ${PREFIX}/share/doc/tircproxy && ${CHMOD} a+rx ${PREFIX}/share/doc/tircproxy - @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tircproxy + @${MKDIR} ${PREFIX}/share/doc/tircproxy + @${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/tircproxy .endif .include diff -urN tircproxy.orig/files/patch-ad tircproxy/files/patch-ad --- tircproxy.orig/files/patch-ad Sat Nov 24 20:49:18 2001 +++ tircproxy/files/patch-ad Wed Jun 5 19:15:12 2002 @@ -1,59 +1,43 @@ -*** tircproxy.c.orig Thu May 4 22:53:30 2000 ---- tircproxy.c Wed Aug 22 13:42:46 2001 -*************** -*** 1065,1074 **** - { - struct sockaddr_in to_addr; - int to_len; - #if IPF -! struct sockaddr_in socketin, sloc; -! natlookup_t natlook; -! int fd; - #endif - - /* Give this thing 10 minutes to get started (paranoia). ---- 1065,1084 ---- - { - struct sockaddr_in to_addr; - int to_len; -+ - #if IPF -! struct sockaddr_in socketin, sloc; -! natlookup_t natlook; -! -! #if __FreeBSD__ >= 2 -! #include -! #if __FreeBSD_version >= 430000 -! -! natlookup_t *natlookp = &natlook; -! -! #endif -! #endif -! int fd; - #endif - - /* Give this thing 10 minutes to get started (paranoia). -*************** -*** 1152,1158 **** - natlook.nl_inport = sloc.sin_port; - - fd = open(IPL_NAT, O_RDONLY); -! if (ioctl(fd, SIOCGNATL, &natlook) == -1) - { - perror("ioctl"); - exit(-1); ---- 1162,1175 ---- - natlook.nl_inport = sloc.sin_port; - - fd = open(IPL_NAT, O_RDONLY); -! #if __FreeBSD__ >= 2 -! #include -! #if __FreeBSD_version >= 430000 -! if (ioctl(fd, SIOCGNATL, &natlookp) == -1) -! #else -! if (ioctl(fd, SIOCGNATL, &natlook) == -1) -! #endif -! #endif - { - perror("ioctl"); - exit(-1); +--- tircproxy.c.orig Wed Jun 5 19:13:00 2002 ++++ tircproxy.c Wed Jun 5 19:14:46 2002 +@@ -131,6 +131,8 @@ + # include + # endif + # include ++# include ++# include + # include + # include + # define TRANS 1 +@@ -1066,9 +1068,10 @@ + struct sockaddr_in to_addr; + int to_len; + #if IPF +- struct sockaddr_in socketin, sloc; +- natlookup_t natlook; +- int fd; ++ struct sockaddr_in socketin, sloc; ++ natlookup_t natlook; ++ natlookup_t *natlookp = &natlook; ++ int fd; + #endif + + /* Give this thing 10 minutes to get started (paranoia). +@@ -1148,13 +1151,13 @@ + natlook.nl_outip = socketin.sin_addr; + natlook.nl_inip = sloc.sin_addr; + natlook.nl_flags = IPN_TCP; +- natlook.nl_outport = socketin.sin_port; +- natlook.nl_inport = sloc.sin_port; ++ natlook.nl_outport = ntohs(socketin.sin_port); ++ natlook.nl_inport = ntohs(sloc.sin_port); + + fd = open(IPL_NAT, O_RDONLY); +- if (ioctl(fd, SIOCGNATL, &natlook) == -1) ++ if (ioctl(fd, SIOCGNATL, &natlookp) == -1) + { +- perror("ioctl"); ++ perror("ioctl(SIOCGNATL)"); + exit(-1); + } + close(fd); diff -urN tircproxy.orig/pkg-plist tircproxy/pkg-plist --- tircproxy.orig/pkg-plist Thu Aug 26 11:21:23 1999 +++ tircproxy/pkg-plist Wed Jun 5 19:19:07 2002 @@ -1,3 +1,3 @@ sbin/tircproxy -share/doc/tircproxy/README -@dirrm share/doc/tircproxy +%%PORTDOCS%%share/doc/tircproxy/README +%%PORTDOCS%%@dirrm share/doc/tircproxy diff -urN tircproxy.orig/scripts/pre-configure tircproxy/scripts/pre-configure --- tircproxy.orig/scripts/pre-configure Thu Aug 26 11:21:23 1999 +++ tircproxy/scripts/pre-configure Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ -#!/bin/sh -# -paths="/sys /usr/include /usr/src/sys" -for i in ${paths}; do - if [ -f $i/netinet/ip_nat.h ]; then - exit 0 - fi -done -echo Unable find netinet/ip_nat.h -echo This header file from ipfilter package -echo Try to locate ip_nat.h and manually create links in following catalogs: -echo $paths -exit 1 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message