diff options
| -rw-r--r-- | irc/tircproxy/Makefile | 10 | ||||
| -rw-r--r-- | irc/tircproxy/files/patch-ad | 102 | ||||
| -rw-r--r-- | irc/tircproxy/pkg-plist | 4 | ||||
| -rw-r--r-- | irc/tircproxy/scripts/pre-configure | 13 |
4 files changed, 50 insertions, 79 deletions
diff --git a/irc/tircproxy/Makefile b/irc/tircproxy/Makefile index 6ec0310c3015..a883e2a016b0 100644 --- a/irc/tircproxy/Makefile +++ b/irc/tircproxy/Makefile @@ -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 @@ -21,9 +21,9 @@ do-install: 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 + @${ECHO} "===> Installing tircproxy docs in ${DOCSDIR}" + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/irc/tircproxy/files/patch-ad b/irc/tircproxy/files/patch-ad index f37ddbba3403..3f46c3ba27fb 100644 --- a/irc/tircproxy/files/patch-ad +++ b/irc/tircproxy/files/patch-ad @@ -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 <osreldate.h> -! #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 <osreldate.h> -! #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 <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> + # 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 --git a/irc/tircproxy/pkg-plist b/irc/tircproxy/pkg-plist index d7d147355855..785b506ba435 100644 --- a/irc/tircproxy/pkg-plist +++ b/irc/tircproxy/pkg-plist @@ -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 --git a/irc/tircproxy/scripts/pre-configure b/irc/tircproxy/scripts/pre-configure deleted file mode 100644 index a18a14fa5d10..000000000000 --- a/irc/tircproxy/scripts/pre-configure +++ /dev/null @@ -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 |