5 files changed, 43 insertions, 14 deletions

diff --git a/irc/tircproxy/Makefile b/irc/tircproxy/Makefile
index 4bef2d84b9ee..973fe4d16cd5 100644
--- a/irc/tircproxy/Makefile
+++ b/irc/tircproxy/Makefile
@@ -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 --git a/irc/tircproxy/distinfo b/irc/tircproxy/distinfo
index d4347f19f99e..4348d87aabc9 100644
--- a/irc/tircproxy/distinfo
+++ b/irc/tircproxy/distinfo
@@ -1 +1 @@
-MD5 (tircproxy-0.4.3.tar.gz) = 94f508ed95cefc3e3d841c9c52b59e58
+MD5 (tircproxy-0.4.5.tar.gz) = 63ccc8626c3fdcee32c29464d0d716e9
diff --git a/irc/tircproxy/files/patch-aa b/irc/tircproxy/files/patch-aa
index 0590e6ae3d69..16c03da0efeb 100644
--- a/irc/tircproxy/files/patch-aa
+++ b/irc/tircproxy/files/patch-aa
@@ -1,6 +1,6 @@
---- tircproxy.h.orig	Wed Aug 11 15:40:04 1999
-+++ tircproxy.h	Wed Aug 11 15:43:06 1999
-@@ -25,8 +25,8 @@
+--- tircproxy.h.orig	Fri Dec 22 01:13:40 2000
++++ tircproxy.h	Fri Dec 22 01:15:39 2000
+@@ -34,8 +34,8 @@
  /* Set the location of the broadcast & MOTD files.  Undef these to disable
  ** the broadcasting feature.
  */
@@ -11,7 +11,7 @@
  
  /* Enable this if you want to use the IPF code for tranparency.
  */
-@@ -34,7 +34,7 @@
+@@ -43,7 +43,7 @@
  
  /* Enable this if you want to use the Linux code for tranparency.
  */
@@ -20,15 +20,17 @@
  
  /* Enable this if you want to ask proxy users for passwords.
  */
-@@ -97,10 +97,10 @@
+@@ -117,11 +117,11 @@
  **
  ** This means the proxy does NOT need to run as root for ident responses to
- ** be correct (so go get oidentd-1.4+cdir !!).
+ ** be correct.  This method is now obsolete - use UDB if at all possible!
 -*/
- #define CDIR		"/var/oidentd/"
- #define CDIR_IDENT	"ident"
- #define CDIR_MAP       	"user"
++
+ #define CDIR        "/var/oidentd/"
+ #define CDIR_IDENT  "ident"
+ #define CDIR_MAP    "user"
+-
 +*/
  
- 
  /* The following table defines a list of filenames that are not
+ ** to be handled transparently by the DCC code.. if replace points to
diff --git a/irc/tircproxy/files/patch-ab b/irc/tircproxy/files/patch-ab
index 5b9fcb539580..7242aa8cb7d8 100644
--- a/irc/tircproxy/files/patch-ab
+++ b/irc/tircproxy/files/patch-ab
@@ -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 08:11:25 2000
++++ Makefile.in	Thu Mar 29 14:31:46 2001
 @@ -12,7 +12,7 @@
  TARGETNAME=@sbindir@/tircproxy
  STRIP=@STRIP@
@@ -9,3 +9,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .o
+@@ -26,12 +26,12 @@
+ tircproxy.static:	tircproxy.o
+ 	$(CC) $(LDFLAGS) -static -O3 tircproxy.o -o $@ $(LIBS)
+ 	strip $@
+-	pgp -sba $@ -u 3004
++#	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)
diff --git a/irc/tircproxy/files/patch-ac b/irc/tircproxy/files/patch-ac
new file mode 100644
index 000000000000..386946627b62
--- /dev/null
+++ b/irc/tircproxy/files/patch-ac
@@ -0,0 +1,12 @@
+--- tircproxy.c.orig	Thu Mar 29 14:28:26 2001
++++ tircproxy.c	Thu Mar 29 14:28:28 2001
+@@ -2201,7 +2201,9 @@
+ 	/* People neither using the CDIR stuff nor running as root probably 
+ 	 * couldn't care less about ident problems.
+ 	 */
++#ifdef CDIR_IDENT
+ 	if (!use_cdir && getuid()) tries = 10;
++#endif
+ 
+ 	/* FIXME: dangerous sprintfs */
+ #ifdef CDIR