rework patches

2000-10-05 21:48:41 +00:00 · 2000-10-05 21:48:41 +00:00 · d7e775947e
commit d7e775947e
parent ff64815770
4 changed files with 37 additions and 60 deletions
--- a/www/transproxy/patches/patch-Makefile
+++ b/www/transproxy/patches/patch-Makefile
@ -0,0 +1,22 @@
+--- Makefile.orig	Fri Aug 18 08:35:46 2000
+++ Makefile	Tue Oct  3 09:37:23 2000
+@@ -44,7 +44,7 @@
+ OPTIONS += -DLOG_TO_FILE_LINEBUFF
+ 
+ # BSD IPFILTER mechanism for fetching intended destination address.
+-#OPTIONS += -DIPFILTER
+OPTIONS += -DIPFILTER
+ 
+ # linux-2.4 iptables mechanism for fetching intended destination address.
+ #OPTIONS += -DIPTABLES
+@@ -53,8 +53,8 @@
+ #OPTIONS += -DDO_DOUBLE_FORK
+ 
+ # Define these to enable tcp_wrappers. You can use the built-in ACLs instead though.
+-#OPTIONS += -DTCP_WRAPPERS
+-#LIBS    += -lwrap
+OPTIONS += -DTCP_WRAPPERS
+LIBS    += -lwrap
+ 
+ # You may need one or both of these to get a clean compile.
+ #OPTIONS += -DHAVE_PATHS_H
--- a/www/transproxy/patches/patch-aa
+++ b/www/transproxy/patches/patch-aa
@ -1,42 +0,0 @@
-*** Makefile.orig	Thu Apr 30 20:25:32 1998
--- Makefile	Thu Jun 18 13:09:00 1998
-***************
-*** 15,24 ****
-  #	PAY_THE_PENALTY		Slow down if they don't use proxy directly.
-  #
-  
-! OPTIONS=-DDNS_LOOKUPS #-DUSELESS_DNS_LOOKUPS
-  
-  CC=gcc
-! CFLAGS=-O2 -m486 -Wall $(OPTIONS)
-  LDFLAGS=-s
-  LIBS= #-lresolv
-  
--- 15,24 ----
-  #	PAY_THE_PENALTY		Slow down if they don't use proxy directly.
-  #
-  
-! OPTIONS+= -DDNS_LOOKUPS -DIPFILTER #-DUSELESS_DNS_LOOKUPS
-  
-  CC=gcc
-! CFLAGS=-O2 -Wall $(OPTIONS)
-  LDFLAGS=-s
-  LIBS= #-lresolv
-  
-***************
-*** 26,32 ****
-  RM=rm -f
-  INSTALL=install -c -o bin -g bin -m 555
-  
-! TARGETNAME=in.tproxyd
-  
-  tproxy:		tproxy.o
-  	$(CC) $(LDFLAGS) tproxy.o -o $@ $(LIBS)
--- 26,32 ----
-  RM=rm -f
-  INSTALL=install -c -o bin -g bin -m 555
-  
-! TARGETNAME=tproxy
-  
-  tproxy:		tproxy.o
-  	$(CC) $(LDFLAGS) tproxy.o -o $@ $(LIBS)
--- a/www/transproxy/patches/patch-ab
+++ b/www/transproxy/patches/patch-ab
@ -1,18 +0,0 @@
-*** tproxy.c.orig	Thu Jun 18 13:03:43 1998
--- tproxy.c	Thu Jun 18 13:05:06 1998
-***************
-*** 35,41 ****
--- 35,47 ----
-  #include <netinet/ip.h>
-  #include <netinet/tcp.h>
-  #include <net/if.h>
-+ 
-+ #ifdef __OpenBSD__
-+ #include <netinet/ip_fil_compat.h>
-+ #else
-  #include <netinet/ip_compat.h>
-+ #endif
-+ 
-  #include <netinet/ip_fil.h>
-  #include <netinet/ip_nat.h>
-  #endif
--- a/www/transproxy/patches/patch-tproxy.c
+++ b/www/transproxy/patches/patch-tproxy.c
@ -0,0 +1,15 @@
+--- tproxy.c.orig	Sun Oct  1 03:59:31 2000
+++ tproxy.c	Tue Oct  3 09:38:54 2000
+@@ -44,7 +44,11 @@
+ # include <netinet/ip.h>
+ # include <netinet/tcp.h>
+ # include <net/if.h>
+-# include <netinet/ip_compat.h>
+#ifdef __OpenBSD__
+#  include <netinet/ip_fil_compat.h>
+#else
+#  include <netinet/ip_compat.h>
+#endif
+ # include <netinet/ip_fil.h>
+ # include <netinet/ip_nat.h>
+ #endif