Index: head/www/ffproxy/files/patch-Makefile.in
===================================================================
--- head/www/ffproxy/files/patch-Makefile.in	(revision 415143)
+++ head/www/ffproxy/files/patch-Makefile.in	(revision 415144)
@@ -1,20 +1,20 @@
---- Makefile.in.orig
+--- Makefile.in.orig	2005-01-05 15:50:10 UTC
 +++ Makefile.in
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ man:
  conf:
  	sed -e 's|_BASE_|$(pkgdatadir)|g' sample.config.s \
  		> sample.config || cp sample.config.s sample.config
 -	cp sample.config ffproxy.conf
 +	cp sample.config ffproxy.conf.sample
  
  installdirs: mkinstalldirs
  	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ install_man: man
  	$(INSTALL_DATA) ffproxy.8 $(DESTDIR)$(mandir)/man8
  
  install_config: conf
 -	$(INSTALL_DATA) ffproxy.conf $(DESTDIR)$(sysconfdir)
 +	$(INSTALL_DATA) ffproxy.conf.sample $(DESTDIR)$(sysconfdir)
  
  install_sample: conf
  	$(INSTALL_DATA) sample.config $(DESTDIR)$(pkgdatadir)
Index: head/www/ffproxy/files/patch-dbs.h
===================================================================
--- head/www/ffproxy/files/patch-dbs.h	(revision 415143)
+++ head/www/ffproxy/files/patch-dbs.h	(revision 415144)
@@ -1,7 +1,7 @@
---- dbs.h.orig	Sun Jul 20 19:16:32 2003
-+++ dbs.h	Sun Jul 20 19:16:48 2003
+--- dbs.h.orig	2002-07-25 12:24:10 UTC
++++ dbs.h
 @@ -1,3 +1,4 @@
 +#include <unistd.h>
  #include <regex.h>
  
  extern regex_t *a_ip[];
Index: head/www/ffproxy/files/patch-request.c
===================================================================
--- head/www/ffproxy/files/patch-request.c	(nonexistent)
+++ head/www/ffproxy/files/patch-request.c	(revision 415144)
@@ -0,0 +1,47 @@
+--- request.c.orig	2004-12-31 08:59:54 UTC
++++ request.c
+@@ -49,7 +49,7 @@
+ 
+ static int      read_header(int, struct req *);
+ static char     sgetc(int);
+-static size_t   getline(int, char[], int);
++static size_t   get_line(int, char[], int);
+ static int      do_request(int, struct req *);
+ 
+ void
+@@ -63,7 +63,7 @@ keep_alive:
+ 	(void) memset(&r, 0, sizeof(r));
+ 	r.cl = clinfo;
+ 
+-	if (getline(cl, buf, sizeof(buf)) < 1)
++	if (get_line(cl, buf, sizeof(buf)) < 1)
+ 		*buf = '\0';
+ 
+ 	if ((http_url(&r, buf)) == 0) {
+@@ -189,7 +189,7 @@ read_header(int cl, struct req * r)
+ 	char           *b, *p;
+ 
+ 	i = 0;
+-	while ((len = getline(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
++	while ((len = get_line(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
+ 		b = buf;
+ 		while (isspace((int) *b) && *(b++) != '\0');
+ 		if (*b == '\0')
+@@ -228,7 +228,7 @@ sgetc(int s)
+ }
+ 
+ static          size_t
+-getline(int s, char buf[], int len)
++get_line(int s, char buf[], int len)
+ {
+ 	int             c;
+ 	size_t          i;
+@@ -493,7 +493,7 @@ do_request(int cl, struct req * r)
+ 	}
+ 	if (r->type != CONNECT) {
+ 		i = 0;
+-		while ((len = getline(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
++		while ((len = get_line(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
+ 			DEBUG(("do_request() => got remote header line: (%s)", buf));
+ 			r->header[i] = (char *) my_alloc(len + 1);
+ 			(void) strcpy(r->header[i++], buf);

Property changes on: head/www/ffproxy/files/patch-request.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/ffproxy/files/patch-socket.c
===================================================================
--- head/www/ffproxy/files/patch-socket.c	(revision 415143)
+++ head/www/ffproxy/files/patch-socket.c	(revision 415144)
@@ -1,35 +1,35 @@
---- socket.c.orig	Fri Dec 31 10:59:54 2004
-+++ socket.c	Thu Nov  9 20:19:53 2006
-@@ -58,7 +58,7 @@
+--- socket.c.orig	2004-12-31 08:59:54 UTC
++++ socket.c
+@@ -58,7 +58,7 @@ void
  open_socket(void)
  {
  	extern struct cfg config;
 -	struct sockaddr claddr;
 +	struct sockaddr_storage claddr;
  	struct addrinfo hints[2], *res;
  	struct clinfo  *clinfo;
  	struct pollfd	s[2];
-@@ -135,7 +135,6 @@
+@@ -135,7 +135,6 @@ open_socket(void)
  	if (config.bind_ipv6)
  		info("waiting for requests on %s port %d (IPv6)", *config.ipv6 ? config.ipv6 : "(any)", config.port);
  
 -	claddr_len = sizeof(claddr);
  	config.ccount = 0;
  	cl = 0;
  	isipv4 = config.bind_ipv4;
-@@ -160,13 +159,14 @@
+@@ -160,13 +159,14 @@ open_socket(void)
  			}
  		} else
  			st = s[0].fd;
 +		claddr_len = sizeof(claddr);
  		if ((cl = accept(st, (struct sockaddr *) & claddr, &claddr_len)) == -1) {
  			DEBUG(("open_socket() => accept() failed"));
  			continue;
  		}
  
  		DEBUG(("open_socket() => connection, checking access"));
 -		clinfo = identify(&claddr, (socklen_t) isipv4 ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6));
 +		clinfo = identify((struct sockaddr *)&claddr, claddr_len);
  		if (check_access(clinfo) != 0) {
  			DEBUG(("open_socket() => no access"));
  			if (config.logrequests)