Date: Sat, 17 Mar 2001 13:53:21 -0500 (EST) From: wisesage98@yahoo.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/25881: Tircproxy Update Message-ID: <200103171853.f2HIrL075221@C1130985-A.elnsng1.mi.home.com>
next in thread | raw e-mail | index | archive | help
>Number: 25881 >Category: ports >Synopsis: Upgrade to 0.4.5 with patches >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: Sat Mar 17 11:00:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: JTSage >Release: FreeBSD 4.2-RELEASE i386 >Organization: wisefreebsd >Environment: FreeBSD-4.x, IPFilter 3.4.x >Description: Update tircproxy to 0.4.5, allow it to work with IPFilter 3.4.x >How-To-Repeat: IPFilter 3.4.x breaks transparent mode, Included is a fix and upgrade to latest tircproxy >Fix: diff -ruN tircproxy.bak/Makefile tircproxy/Makefile --- tircproxy.bak/Makefile Fri Feb 23 10:18:40 2001 +++ tircproxy/Makefile Fri Feb 23 10:19:04 2001 @@ -6,7 +6,7 @@ # PORTNAME= tircproxy -PORTVERSION= 0.4.3 +PORTVERSION= 0.4.5 CATEGORIES= irc MASTER_SITES= http://bre.klaki.net/programs/tircproxy/ diff -ruN tircproxy.bak/distinfo tircproxy/distinfo --- tircproxy.bak/distinfo Fri Feb 23 10:18:40 2001 +++ tircproxy/distinfo Fri Feb 23 10:21:36 2001 @@ -1 +1 @@ -MD5 (tircproxy-0.4.3.tar.gz) = 94f508ed95cefc3e3d841c9c52b59e58 +MD5 (tircproxy-0.4.5.tar.gz) = 63ccc8626c3fdcee32c29464d0d716e9 diff -ruN tircproxy.bak/files/patch-aa tircproxy/files/patch-aa --- tircproxy.bak/files/patch-aa Fri Feb 23 10:18:40 2001 +++ tircproxy/files/patch-aa Wed Dec 31 19:00:00 1969 @@ -1,34 +0,0 @@ ---- tircproxy.h.orig Wed Aug 11 15:40:04 1999 -+++ tircproxy.h Wed Aug 11 15:43:06 1999 -@@ -25,8 +25,8 @@ - /* Set the location of the broadcast & MOTD files. Undef these to disable - ** the broadcasting feature. - */ --#define BROADCAST_FILE "/tmp/ircbroadcast" --#define IRC_MOTD_FILE "/etc/motd.irc" -+#define BROADCAST_FILE "/usr/local/etc/tircproxy/ircbroadcast" -+#define IRC_MOTD_FILE "/usr/local/etc/tircproxy/motd.irc" - - /* Enable this if you want to use the IPF code for tranparency. - */ -@@ -34,7 +34,7 @@ - - /* Enable this if you want to use the Linux code for tranparency. - */ --#define LINUX 1 -+#define LINUX 0 - - /* Enable this if you want to ask proxy users for passwords. - */ -@@ -97,10 +97,10 @@ - ** - ** This means the proxy does NOT need to run as root for ident responses to - ** be correct (so go get oidentd-1.4+cdir !!). --*/ - #define CDIR "/var/oidentd/" - #define CDIR_IDENT "ident" - #define CDIR_MAP "user" -+*/ - - - /* The following table defines a list of filenames that are not diff -ruN tircproxy.bak/files/patch-ab tircproxy/files/patch-ab --- tircproxy.bak/files/patch-ab Fri Feb 23 10:18:40 2001 +++ tircproxy/files/patch-ab Fri Feb 23 10:43:35 2001 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Wed Aug 11 16:48:33 1999 -+++ Makefile.in Wed Aug 11 16:48:49 1999 +--- Makefile.in.orig Thu May 4 11:11:25 2000 ++++ Makefile.in Fri Feb 23 10:43:05 2001 @@ -12,7 +12,7 @@ TARGETNAME=@sbindir@/tircproxy STRIP=@STRIP@ @@ -9,3 +9,29 @@ .SUFFIXES: .SUFFIXES: .c .o +@@ -26,12 +26,11 @@ + tircproxy.static: tircproxy.o + $(CC) $(LDFLAGS) -static -O3 tircproxy.o -o $@ $(LIBS) + strip $@ +- pgp -sba $@ -u 3004 + + manual: + @(cd docs; make all) + +-all: tircproxy tircproxy.static documentation ++all: tircproxy tircproxy.static + + install: tircproxy + $(INSTALL) -o bin -g bin -m 555 tircproxy $(TARGETNAME) +@@ -48,11 +47,8 @@ + rm -f config.h config.cache config.status config.log *.asc + + dist: dist-clean +- pgp -sba tircproxy.c -u 3004 +- pgp -sba tircproxy.h -u 3004 + (cd ..;tar cvfz tircproxy-0.4.tar.gz tircproxy-0.4 -X tircproxy-0.4/.nodist) + mv ../tircproxy-0.4.tar.gz . +- pgp -sba tircproxy-0.4.tar.gz -u 3004 + + dist-rpm: dist + su -c "cp tircproxy-0.4.tar.gz /usr/src/redhat/SOURCES && rpm -vv --sign -ba tircproxy.spec" diff -ruN tircproxy.bak/files/patch-ac tircproxy/files/patch-ac --- tircproxy.bak/files/patch-ac Wed Dec 31 19:00:00 1969 +++ tircproxy/files/patch-ac Fri Feb 23 10:15:31 2001 @@ -0,0 +1,20 @@ +--- tircproxy.c Thu May 4 16:53:30 2000 ++++ ../works/tircproxy.c Fri Feb 16 14:18:10 2001 +@@ -1067,7 +1067,7 @@ + int to_len; + #if IPF + struct sockaddr_in socketin, sloc; +- natlookup_t natlook; ++ natlookup_t natlook, *nlptr = &natlook; + int fd; + #endif + +@@ -1152,7 +1152,7 @@ + natlook.nl_inport = sloc.sin_port; + + fd = open(IPL_NAT, O_RDONLY); +- if (ioctl(fd, SIOCGNATL, &natlook) == -1) ++ if (ioctl(fd, SIOCGNATL, &nlptr ) == -1) + { + perror("ioctl"); + 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103171853.f2HIrL075221>