bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Packages] net/srelay: Fix compilation

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@10533 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
olli
2008-02-28 12:27:19 +00:00
parent ef94e80ccb
commit 45012a8bdb
6 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
net/srelay/patches/004-bindtodevice.patch
View File

@ -1,7 +1,8 @@
diff -u srelay-0.4.6.orig/main.c srelay-0.4.6/main.c
--- srelay-0.4.6.orig/main.c 2003-03-26 20:45:12.000000000 +0000
+++ srelay-0.4.6/main.c 2007-08-09 13:53:30.000000000 +0100
@@ -43,6 +43,7 @@
Index: srelay-0.4.6/main.c
===================================================================
--- srelay-0.4.6.orig/main.c 2008-02-28 13:21:30.000000000 +0100
+++ srelay-0.4.6/main.c 2008-02-28 13:21:30.000000000 +0100
@@ -44,6 +44,7 @@
char *ident = "srelay";
char *pidfile = PIDFILE;
char *pwdfile = PWDFILE;
@ -9,7 +10,7 @@ diff -u srelay-0.4.6.orig/main.c srelay-0.4.6/main.c
pid_t master_pid;
#if USE_THREAD
@@ -74,6 +75,9 @@
@@ -75,6 +76,9 @@
fprintf(stderr, "options:\n"
"\t-c file\tconfig file\n"
"\t-i i/f\tlisten interface IP[:PORT]\n"
@ -19,16 +20,16 @@ diff -u srelay-0.4.6.orig/main.c srelay-0.4.6/main.c
"\t-m num\tmax child/thread\n"
"\t-o min\tidle timeout minutes\n"
"\t-p file\tpid file\n"
@@ -125,7 +129,7 @@
@@ -128,7 +132,7 @@
uid = getuid();
openlog("srelay", LOG_PID, LOG_DAEMON);
- while((ch = getopt(ac, av, "a:c:i:m:o:p:u:frstbvh?")) != -1)
+ while((ch = getopt(ac, av, "a:c:i:J:m:o:p:u:frstbvh?")) != -1)
switch (ch) {
case 'a':
if (optarg != NULL) {
@@ -180,6 +184,14 @@
@@ -183,6 +187,14 @@
}
break;
@ -43,9 +44,10 @@ diff -u srelay-0.4.6.orig/main.c srelay-0.4.6/main.c
case 'o':
if (optarg != NULL) {
idle_timeout = atol(optarg);
diff -u srelay-0.4.6.orig/socks.c srelay-0.4.6/socks.c
--- srelay-0.4.6.orig/socks.c 2003-04-13 22:13:25.000000000 +0100
+++ srelay-0.4.6/socks.c 2007-08-09 14:44:24.000000000 +0100
Index: srelay-0.4.6/socks.c
===================================================================
--- srelay-0.4.6.orig/socks.c 2008-02-28 13:21:29.000000000 +0100
+++ srelay-0.4.6/socks.c 2008-02-28 13:21:30.000000000 +0100
@@ -990,6 +990,24 @@
return(-1);
}
@ -116,9 +118,10 @@ diff -u srelay-0.4.6.orig/socks.c srelay-0.4.6/socks.c
if (connect(cs, res->ai_addr, res->ai_addrlen) < 0) {
/* connect fail */
save_errno = errno;
diff -u srelay-0.4.6.orig/srelay.h srelay-0.4.6/srelay.h
--- srelay-0.4.6.orig/srelay.h 2003-04-14 06:36:15.000000000 +0100
+++ srelay-0.4.6/srelay.h 2007-08-09 13:46:06.000000000 +0100
Index: srelay-0.4.6/srelay.h
===================================================================
--- srelay-0.4.6.orig/srelay.h 2008-02-28 13:21:29.000000000 +0100
+++ srelay-0.4.6/srelay.h 2008-02-28 13:21:30.000000000 +0100
@@ -266,6 +266,7 @@
extern char *ident;
extern char *pidfile;