Attachment 57690 Details for Bug 87024 – xboxproxy.patch

[patch] xboxproxy.patch

xboxproxy.patch (text/plain), 1.50 KB, created by Antony Mawer on 2005-10-07 02:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antony Mawer

Created: 2005-10-07 02:50:16 UTC

Size: 1.50 KB

patch

obsolete

>--- Makefile	Thu Oct  6 21:50:34 2005
>+++ Makefile	Fri Oct  7 11:06:23 2005
>@@ -17,14 +17,17 @@
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--program-prefix=xbox
>-USE_GMAKE=	yes
> 
> PLIST_FILES=	bin/xboxproxy
> 
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 500000
>-BROKEN=	"Doesn't build on FreeBSD < 5.x"
>+# FreeBSD 4.x requires the libpcap port
>+BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
>+# Without this, configure picks up the pcap lib in /usr/lib
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I/usr/include" LDFLAGS="-L${LOCALBASE}/lib -L/usr/lib"
>+CONFIGURE_ARGS+=	--with-libpcap=${LOCALBASE}
> .endif
> 
> .include <bsd.port.post.mk>
>--- files/patch-main.c	Thu Jan  1 10:00:00 1970
>+++ files/patch-main.c	Fri Oct  7 11:06:23 2005
>@@ -0,0 +1,29 @@
>+--- src/main.c	Thu Sep 22 01:16:07 2005
>++++ src/main.c	Fri Oct  7 10:52:40 2005
>+@@ -519,9 +519,9 @@
>+ 		int size = sizeof(struct sockaddr_in); /* sizeof(srcaddr) */
>+ 		int sel;
>+ 		struct timeval timeout;
>++		struct fd_set proxycopy;
>+ 		timeout.tv_sec = 10;
>+ 		timeout.tv_usec = 0;
>+-		fd_set proxycopy;
>+ 
>+ 		/* Some sort of select() thing here */
>+ 
>+@@ -735,6 +735,7 @@
>+ 	char errbuf[PCAP_ERRBUF_SIZE];
>+ 	//int *pthread_return;
>+ 	char ch;
>++	pthread_t pcapthread, proxythread;
>+ 
>+ 	progname = argv[0];
>+ 
>+@@ -743,7 +744,6 @@
>+ 	proxies = hash_create(HASHSIZE, compareip, haship);
>+ 	set_log_level(0);
>+ 
>+-	pthread_t pcapthread, proxythread;
>+ 
>+ 	/* Argument Processing */
>+ 	while ((ch = getopt(argc, argv, "B:bxmus:i:d:h?p:f:")) != -1) {

Actions: View | Diff

Attachments on bug 87024: 57690 | 57691