Changeset 10533


Ignore:
Timestamp:
2008-02-28T13:27:19+01:00 (10 years ago)
Author:
olli
Message:

[Packages] net/srelay: Fix compilation

Location:
packages/net/srelay
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • packages/net/srelay/Makefile

    r9349 r10533  
    11# 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2008 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1717PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f 
    1818 
    19 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
     19# PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    2020 
    2121include $(INCLUDE_DIR)/package.mk 
     
    3333endef 
    3434 
    35 define Build/Configure 
    36         $(call Build/Configure/Default, \ 
    37                 --disable-thread \ 
    38         ) 
    39 endef 
     35CONFIGURE_ARGS += \ 
     36        --disable-thread \ 
    4037 
    41 define Build/Compile 
    42         $(MAKE) -C $(PKG_BUILD_DIR) 
    43 endef 
     38CONFIGURE_VARS += \ 
     39        CPPFLAGS="-DLINUX" \ 
    4440 
    4541define Package/srelay/install    
    4642        $(INSTALL_DIR) $(1)/usr/bin 
    47         $(INSTALL_BIN) $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/ 
     43        $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ 
    4844        $(INSTALL_DIR) $(1)/etc 
    49         $(INSTALL_DATA) files/srelay.conf $(1)/etc/ 
     45        $(INSTALL_DATA) files/$(PKG_NAME).conf $(1)/etc/ 
    5046        $(INSTALL_DIR) $(1)/etc/init.d 
    51         $(INSTALL_BIN) files/srelay.init $(1)/etc/init.d/srelay 
     47        $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) 
    5248endef 
    5349 
  • packages/net/srelay/files/srelay.init

    • Property svn:executable deleted
  • packages/net/srelay/patches/001-cross_compile.patch

    r6526 r10533  
    1 diff -urN srelay-0.4.6/configure srelay-0.4.6.new/configure 
    2 --- srelay-0.4.6/configure      2003-04-14 07:36:15.000000000 +0200 
    3 +++ srelay-0.4.6.new/configure  2006-03-28 15:11:42.000000000 +0200 
     1Index: srelay-0.4.6/configure 
     2=================================================================== 
     3--- srelay-0.4.6.orig/configure 2008-02-28 13:21:29.000000000 +0100 
     4+++ srelay-0.4.6/configure      2008-02-28 13:21:30.000000000 +0100 
    45@@ -1394,8 +1394,8 @@ 
    56  
  • packages/net/srelay/patches/002-linux_2.6.19_rtnetlink_changes.patch

    r6526 r10533  
    1 diff -ruN srelay-0.4.6-old/get-bind.c srelay-0.4.6-new/get-bind.c 
    2 --- srelay-0.4.6-old/get-bind.c 2003-04-10 04:53:17.000000000 +0200 
    3 +++ srelay-0.4.6-new/get-bind.c 2006-12-18 12:53:06.000000000 +0100 
     1Index: srelay-0.4.6/get-bind.c 
     2=================================================================== 
     3--- srelay-0.4.6.orig/get-bind.c        2008-02-28 13:21:29.000000000 +0100 
     4+++ srelay-0.4.6/get-bind.c     2008-02-28 13:21:30.000000000 +0100 
    45@@ -50,6 +50,18 @@ 
    56 #include <asm/types.h> 
  • packages/net/srelay/patches/003-openlog.patch

    r6526 r10533  
    1 diff -Naurp srelay-0.4.6.orig/main.c srelay-0.4.6/main.c 
    2 --- srelay-0.4.6.orig/main.c    2006-12-13 22:58:39.000000000 +0100 
    3 +++ srelay-0.4.6/main.c 2006-12-13 23:02:59.000000000 +0100 
    4 @@ -33,6 +33,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DA 
     1Index: srelay-0.4.6/main.c 
     2=================================================================== 
     3--- srelay-0.4.6.orig/main.c    2008-02-28 13:21:29.000000000 +0100 
     4+++ srelay-0.4.6/main.c 2008-02-28 13:21:30.000000000 +0100 
     5@@ -33,6 +33,7 @@ 
    56 */ 
    67  
     
    1011  
    1112 /* prototypes */ 
    12 @@ -125,6 +126,8 @@ int main(int ac, char **av) 
     13@@ -125,6 +126,8 @@ 
    1314  
    1415   uid = getuid(); 
  • packages/net/srelay/patches/004-bindtodevice.patch

    • Property svn:eol-style set to native
    r8382 r10533  
    1 diff -u srelay-0.4.6.orig/main.c srelay-0.4.6/main.c 
    2 --- srelay-0.4.6.orig/main.c    2003-03-26 20:45:12.000000000 +0000 
    3 +++ srelay-0.4.6/main.c 2007-08-09 13:53:30.000000000 +0100 
    4 @@ -43,6 +43,7 @@ 
     1Index: srelay-0.4.6/main.c 
     2=================================================================== 
     3--- srelay-0.4.6.orig/main.c    2008-02-28 13:21:30.000000000 +0100 
     4+++ srelay-0.4.6/main.c 2008-02-28 13:21:30.000000000 +0100 
     5@@ -44,6 +44,7 @@ 
    56 char *ident = "srelay"; 
    67 char *pidfile = PIDFILE; 
     
    1011  
    1112 #if USE_THREAD 
    12 @@ -74,6 +75,9 @@ 
     13@@ -75,6 +76,9 @@ 
    1314   fprintf(stderr, "options:\n" 
    1415          "\t-c file\tconfig file\n" 
     
    2021          "\t-o min\tidle timeout minutes\n" 
    2122          "\t-p file\tpid file\n" 
    22 @@ -125,7 +129,7 @@ 
     23@@ -128,7 +132,7 @@ 
    2324  
    24    uid = getuid(); 
     25   openlog("srelay", LOG_PID, LOG_DAEMON); 
    2526  
    2627-  while((ch = getopt(ac, av, "a:c:i:m:o:p:u:frstbvh?")) != -1) 
     
    2930     case 'a': 
    3031       if (optarg != NULL) { 
    31 @@ -180,6 +184,14 @@ 
     32@@ -183,6 +187,14 @@ 
    3233       } 
    3334       break; 
     
    4445       if (optarg != NULL) { 
    4546        idle_timeout = atol(optarg); 
    46 diff -u srelay-0.4.6.orig/socks.c srelay-0.4.6/socks.c 
    47 --- srelay-0.4.6.orig/socks.c   2003-04-13 22:13:25.000000000 +0100 
    48 +++ srelay-0.4.6/socks.c        2007-08-09 14:44:24.000000000 +0100 
     47Index: srelay-0.4.6/socks.c 
     48=================================================================== 
     49--- srelay-0.4.6.orig/socks.c   2008-02-28 13:21:29.000000000 +0100 
     50+++ srelay-0.4.6/socks.c        2008-02-28 13:21:30.000000000 +0100 
    4951@@ -990,6 +990,24 @@ 
    5052   return(-1); 
     
    117119       /* connect fail */ 
    118120       save_errno = errno; 
    119 diff -u srelay-0.4.6.orig/srelay.h srelay-0.4.6/srelay.h 
    120 --- srelay-0.4.6.orig/srelay.h  2003-04-14 06:36:15.000000000 +0100 
    121 +++ srelay-0.4.6/srelay.h       2007-08-09 13:46:06.000000000 +0100 
     121Index: srelay-0.4.6/srelay.h 
     122=================================================================== 
     123--- srelay-0.4.6.orig/srelay.h  2008-02-28 13:21:29.000000000 +0100 
     124+++ srelay-0.4.6/srelay.h       2008-02-28 13:21:30.000000000 +0100 
    122125@@ -266,6 +266,7 @@ 
    123126 extern char *ident; 
Note: See TracChangeset for help on using the changeset viewer.