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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/srelay/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2008 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/socks-relay PKG_SOURCE_URL:=@SF/socks-relay
PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) # PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -32,23 +32,19 @@ define Package/srelay/conffiles
/etc/srelay.conf /etc/srelay.conf
endef endef
define Build/Configure CONFIGURE_ARGS += \
$(call Build/Configure/Default, \ --disable-thread \
--disable-thread \
)
endef
define Build/Compile CONFIGURE_VARS += \
$(MAKE) -C $(PKG_BUILD_DIR) CPPFLAGS="-DLINUX" \
endef
define Package/srelay/install define Package/srelay/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) files/srelay.conf $(1)/etc/ $(INSTALL_DATA) files/$(PKG_NAME).conf $(1)/etc/
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) files/srelay.init $(1)/etc/init.d/srelay $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
endef endef
$(eval $(call BuildPackage,srelay)) $(eval $(call BuildPackage,srelay))

0
net/srelay/files/srelay.init Executable file → Normal file
View File

7
net/srelay/patches/001-cross_compile.patch
View File

@ -1,6 +1,7 @@
diff -urN srelay-0.4.6/configure srelay-0.4.6.new/configure Index: srelay-0.4.6/configure
--- srelay-0.4.6/configure 2003-04-14 07:36:15.000000000 +0200 ===================================================================
+++ srelay-0.4.6.new/configure 2006-03-28 15:11:42.000000000 +0200 --- srelay-0.4.6.orig/configure 2008-02-28 13:21:29.000000000 +0100
+++ srelay-0.4.6/configure 2008-02-28 13:21:30.000000000 +0100
@@ -1394,8 +1394,8 @@ @@ -1394,8 +1394,8 @@
;; ;;

7
net/srelay/patches/002-linux_2.6.19_rtnetlink_changes.patch
View File

@ -1,6 +1,7 @@
diff -ruN srelay-0.4.6-old/get-bind.c srelay-0.4.6-new/get-bind.c Index: srelay-0.4.6/get-bind.c
--- srelay-0.4.6-old/get-bind.c 2003-04-10 04:53:17.000000000 +0200 ===================================================================
+++ srelay-0.4.6-new/get-bind.c 2006-12-18 12:53:06.000000000 +0100 --- srelay-0.4.6.orig/get-bind.c 2008-02-28 13:21:29.000000000 +0100
+++ srelay-0.4.6/get-bind.c 2008-02-28 13:21:30.000000000 +0100
@@ -50,6 +50,18 @@ @@ -50,6 +50,18 @@
#include <asm/types.h> #include <asm/types.h>
#include <linux/netlink.h> #include <linux/netlink.h>

11
net/srelay/patches/003-openlog.patch
View File

@ -1,7 +1,8 @@
diff -Naurp srelay-0.4.6.orig/main.c srelay-0.4.6/main.c Index: srelay-0.4.6/main.c
--- srelay-0.4.6.orig/main.c 2006-12-13 22:58:39.000000000 +0100 ===================================================================
+++ srelay-0.4.6/main.c 2006-12-13 23:02:59.000000000 +0100 --- srelay-0.4.6.orig/main.c 2008-02-28 13:21:29.000000000 +0100
@@ -33,6 +33,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DA +++ srelay-0.4.6/main.c 2008-02-28 13:21:30.000000000 +0100
@@ -33,6 +33,7 @@
*/ */
#include <sys/stat.h> #include <sys/stat.h>
@ -9,7 +10,7 @@ diff -Naurp srelay-0.4.6.orig/main.c srelay-0.4.6/main.c
#include "srelay.h" #include "srelay.h"
/* prototypes */ /* prototypes */
@@ -125,6 +126,8 @@ int main(int ac, char **av) @@ -125,6 +126,8 @@
uid = getuid(); uid = getuid();

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 Index: 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 --- srelay-0.4.6.orig/main.c 2008-02-28 13:21:30.000000000 +0100
@@ -43,6 +43,7 @@ +++ srelay-0.4.6/main.c 2008-02-28 13:21:30.000000000 +0100
@@ -44,6 +44,7 @@
char *ident = "srelay"; char *ident = "srelay";
char *pidfile = PIDFILE; char *pidfile = PIDFILE;
char *pwdfile = PWDFILE; 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; pid_t master_pid;
#if USE_THREAD #if USE_THREAD
@@ -74,6 +75,9 @@ @@ -75,6 +76,9 @@
fprintf(stderr, "options:\n" fprintf(stderr, "options:\n"
"\t-c file\tconfig file\n" "\t-c file\tconfig file\n"
"\t-i i/f\tlisten interface IP[:PORT]\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-m num\tmax child/thread\n"
"\t-o min\tidle timeout minutes\n" "\t-o min\tidle timeout minutes\n"
"\t-p file\tpid file\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:m:o:p:u:frstbvh?")) != -1)
+ while((ch = getopt(ac, av, "a:c:i:J:m:o:p:u:frstbvh?")) != -1) + while((ch = getopt(ac, av, "a:c:i:J:m:o:p:u:frstbvh?")) != -1)
switch (ch) { switch (ch) {
case 'a': case 'a':
if (optarg != NULL) { if (optarg != NULL) {
@@ -180,6 +184,14 @@ @@ -183,6 +187,14 @@
} }
break; break;
@ -43,9 +44,10 @@ diff -u srelay-0.4.6.orig/main.c srelay-0.4.6/main.c
case 'o': case 'o':
if (optarg != NULL) { if (optarg != NULL) {
idle_timeout = atol(optarg); idle_timeout = atol(optarg);
diff -u srelay-0.4.6.orig/socks.c srelay-0.4.6/socks.c Index: 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 --- 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 @@ @@ -990,6 +990,24 @@
return(-1); 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) { if (connect(cs, res->ai_addr, res->ai_addrlen) < 0) {
/* connect fail */ /* connect fail */
save_errno = errno; save_errno = errno;
diff -u srelay-0.4.6.orig/srelay.h srelay-0.4.6/srelay.h Index: 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 --- 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 @@ @@ -266,6 +266,7 @@
extern char *ident; extern char *ident;
extern char *pidfile; extern char *pidfile;