Changeset 10533
- Timestamp:
- 2008-02-28T13:27:19+01:00 (10 years ago)
- Location:
- packages/net/srelay
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
packages/net/srelay/Makefile
r9349 r10533 1 1 # 2 # Copyright (C) 2006 OpenWrt.org2 # Copyright (C) 2006-2008 OpenWrt.org 3 3 # 4 4 # This is free software, licensed under the GNU General Public License v2. … … 17 17 PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f 18 18 19 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)19 # PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 20 20 21 21 include $(INCLUDE_DIR)/package.mk … … 33 33 endef 34 34 35 define Build/Configure 36 $(call Build/Configure/Default, \ 37 --disable-thread \ 38 ) 39 endef 35 CONFIGURE_ARGS += \ 36 --disable-thread \ 40 37 41 define Build/Compile 42 $(MAKE) -C $(PKG_BUILD_DIR) 43 endef 38 CONFIGURE_VARS += \ 39 CPPFLAGS="-DLINUX" \ 44 40 45 41 define Package/srelay/install 46 42 $(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/ 48 44 $(INSTALL_DIR) $(1)/etc 49 $(INSTALL_DATA) files/ srelay.conf $(1)/etc/45 $(INSTALL_DATA) files/$(PKG_NAME).conf $(1)/etc/ 50 46 $(INSTALL_DIR) $(1)/etc/init.d 51 $(INSTALL_BIN) files/ srelay.init $(1)/etc/init.d/srelay47 $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) 52 48 endef 53 49 -
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 1 Index: 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 4 5 @@ -1394,8 +1394,8 @@ 5 6 -
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 1 Index: 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 4 5 @@ -50,6 +50,18 @@ 5 6 #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 1 Index: 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 @@ 5 6 */ 6 7 … … 10 11 11 12 /* prototypes */ 12 @@ -125,6 +126,8 @@ int main(int ac, char **av)13 @@ -125,6 +126,8 @@ 13 14 14 15 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 @@ 1 Index: 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 @@ 5 6 char *ident = "srelay"; 6 7 char *pidfile = PIDFILE; … … 10 11 11 12 #if USE_THREAD 12 @@ -7 4,6 +75,9 @@13 @@ -75,6 +76,9 @@ 13 14 fprintf(stderr, "options:\n" 14 15 "\t-c file\tconfig file\n" … … 20 21 "\t-o min\tidle timeout minutes\n" 21 22 "\t-p file\tpid file\n" 22 @@ -12 5,7 +129,7 @@23 @@ -128,7 +132,7 @@ 23 24 24 uid = getuid();25 openlog("srelay", LOG_PID, LOG_DAEMON); 25 26 26 27 - while((ch = getopt(ac, av, "a:c:i:m:o:p:u:frstbvh?")) != -1) … … 29 30 case 'a': 30 31 if (optarg != NULL) { 31 @@ -18 0,6 +184,14 @@32 @@ -183,6 +187,14 @@ 32 33 } 33 34 break; … … 44 45 if (optarg != NULL) { 45 46 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 47 Index: 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 49 51 @@ -990,6 +990,24 @@ 50 52 return(-1); … … 117 119 /* connect fail */ 118 120 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 121 Index: 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 122 125 @@ -266,6 +266,7 @@ 123 126 extern char *ident;
Note: See TracChangeset
for help on using the changeset viewer.