diff options
Diffstat (limited to 'irc/tircproxy/files')
| -rw-r--r-- | irc/tircproxy/files/patch-Makefile.in | 26 | ||||
| -rw-r--r-- | irc/tircproxy/files/patch-tircproxy.c | 76 | ||||
| -rw-r--r-- | irc/tircproxy/files/patch-tircproxy.h | 36 |
3 files changed, 0 insertions, 138 deletions
diff --git a/irc/tircproxy/files/patch-Makefile.in b/irc/tircproxy/files/patch-Makefile.in deleted file mode 100644 index 2db323709ffb..000000000000 --- a/irc/tircproxy/files/patch-Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile.in Sat Oct 15 06:49:57 2005 -+++ Makefile.in Sat Oct 15 06:50:00 2005 -@@ -12,7 +12,7 @@ - TARGETNAME=@sbindir@/tircproxy - STRIP=@STRIP@ - --ALL_CFLAGS=-Wall -I. -I@srcdir@ $(CFLAGS) -+ALL_CFLAGS=-Wall -I. -I@srcdir@ $(CFLAGS) -I/sys -I/usr/src/sys - - .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-tircproxy.c b/irc/tircproxy/files/patch-tircproxy.c deleted file mode 100644 index 3f49a4fc8e10..000000000000 --- a/irc/tircproxy/files/patch-tircproxy.c +++ /dev/null @@ -1,76 +0,0 @@ ---- tircproxy.c.orig Thu May 4 22:53:30 2000 -+++ tircproxy.c Sat Oct 15 07:02:11 2005 -@@ -131,9 +131,16 @@ - # include <netinet/ip_compat.h> - # endif - # include <netinet/ip_fil.h> -+# include <netinet/ip_nat.h> -+# include <netinet/ip_state.h> - # include <netinet/ip_proxy.h> - # include <netinet/ip_nat.h> -+# include <netinet/ipl.h> -+# include <osreldate.h> - # define TRANS 1 -+# ifndef IPL_NAT -+# define IPL_NAT IPNAT_NAME -+# endif - # warning IPF transparent proxying available - # else - # undef IPF -@@ -1066,9 +1073,13 @@ - struct sockaddr_in to_addr; - int to_len; - #if IPF -- struct sockaddr_in socketin, sloc; -- natlookup_t natlook; -- int fd; -+#if __FreeBSD_version >=600024 -+ ipfobj_t obj; -+#endif -+ struct sockaddr_in socketin, sloc; -+ natlookup_t natlook; -+ natlookup_t *natlookp = &natlook; -+ int fd; - #endif - - /* Give this thing 10 minutes to get started (paranoia). -@@ -1144,6 +1155,13 @@ - exit(-1); - } - -+#if __FreeBSD_version >=600024 -+ bzero(&obj, sizeof(obj)); -+ obj.ipfo_rev = IPFILTER_VERSION; -+ obj.ipfo_size = sizeof(natlook); -+ obj.ipfo_ptr = &natlook; -+ obj.ipfo_type = IPFOBJ_NATLOOKUP; -+#endif - bzero((char *)&natlook, sizeof(natlook)); - natlook.nl_outip = socketin.sin_addr; - natlook.nl_inip = sloc.sin_addr; -@@ -1152,9 +1170,13 @@ - natlook.nl_inport = sloc.sin_port; - - fd = open(IPL_NAT, O_RDONLY); -- if (ioctl(fd, SIOCGNATL, &natlook) == -1) -+#if __FreeBSD_version >=600024 -+ if (ioctl(fd, SIOCGNATL, &obj) == -1) -+#else -+ if (ioctl(fd, SIOCGNATL, &natlookp) == -1) -+#endif - { -- perror("ioctl"); -+ perror("ioctl(SIOCGNATL)"); - exit(-1); - } - close(fd); -@@ -2201,7 +2223,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 diff --git a/irc/tircproxy/files/patch-tircproxy.h b/irc/tircproxy/files/patch-tircproxy.h deleted file mode 100644 index 51796e64dd71..000000000000 --- a/irc/tircproxy/files/patch-tircproxy.h +++ /dev/null @@ -1,36 +0,0 @@ ---- tircproxy.h Sat Oct 15 06:49:51 2005 -+++ tircproxy.h Sat Oct 15 06:50:00 2005 -@@ -34,8 +34,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. - */ -@@ -43,7 +43,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. - */ -@@ -117,11 +117,11 @@ - ** - ** This means the proxy does NOT need to run as root for ident responses to - ** 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" -- -+*/ - - /* The following table defines a list of filenames that are not - ** to be handled transparently by the DCC code.. if replace points to |