rrs:

 * Fix menu
 * Cleanup Makefile
 * Refresh patches

SVN-Revision: 8224

diff --git a/net/rrs/Makefile b/net/rrs/Makefile
index bff46447962468a72e14b41a78cfabbdd906c360..ee9dfa0c4e8b001a5b76a518ff6ffaedf661929c 100644 (file)
--- a/net/rrs/Makefile
+++ b/net/rrs/Makefile
@@ -10,32 +10,31 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrs
 PKG_VERSION:=1.70
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.cycom.se/uploads/36/19 
 PKG_MD5SUM:=b400d03c0e39e3e78a7327ba78f789f0
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rrs/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+uclibcxx 
+  MENU:=1
   TITLE:=A reverse (connecting) remote shell
   URL:=http://www.cycom.se/dl/rrs/
 endef
 
 define Package/rrs
   $(call Package/rrs/Default)
-  DEPENDS+= +libopenssl
+  DEPENDS:=+uclibcxx
   TITLE+= (with SSL support)
 endef
 
 define Package/rrs-nossl
+  $(call Package/rrs/Default)
+  DEPENDS:=rrs
   TITLE+= (without SSL support)
 endef
 

diff --git a/net/rrs/patches/001-shell.patch b/net/rrs/patches/001-shell.patch
index 822ce7c18e60771928f1b5d721bf87f0e1796c12..13520fce1d635fd7012de1b674df26fe633d5e4c 100644 (file)
--- a/net/rrs/patches/001-shell.patch
+++ b/net/rrs/patches/001-shell.patch
@@ -1,6 +1,7 @@
-diff -ruN rrs-1.70-old/rrs.c rrs-1.70-new/rrs.c
---- rrs-1.70-old/rrs.c 2004-05-30 02:32:03.000000000 +0200
-+++ rrs-1.70-new/rrs.c 2005-10-12 12:41:24.000000000 +0200
+Index: rrs-1.70/rrs.c
+===================================================================
+--- rrs-1.70.orig/rrs.c        2007-07-30 14:30:24.000000000 +0200
++++ rrs-1.70/rrs.c     2007-07-30 14:30:24.000000000 +0200
 @@ -920,7 +920,7 @@
          close(slave_fd);
          signal(SIGHUP, SIG_DFL);

diff --git a/net/rrs/patches/002-no_sslv2.patch b/net/rrs/patches/002-no_sslv2.patch
index 67f05663dc9ae6a5adc94bf47330e36e519ce787..1f7c35d127c387a956330391a44333e0ffec8156 100644 (file)
--- a/net/rrs/patches/002-no_sslv2.patch
+++ b/net/rrs/patches/002-no_sslv2.patch
@@ -1,6 +1,7 @@
-diff -ruN rrs-1.70-old/rrs.c rrs-1.70-new/rrs.c
---- rrs-1.70-old/rrs.c 2006-12-18 11:41:42.000000000 +0100
-+++ rrs-1.70-new/rrs.c 2006-12-18 11:53:43.000000000 +0100
+Index: rrs-1.70/rrs.c
+===================================================================
+--- rrs-1.70.orig/rrs.c        2007-07-30 14:30:24.000000000 +0200
++++ rrs-1.70/rrs.c     2007-07-30 14:30:25.000000000 +0200
 @@ -1826,9 +1826,12 @@
                  }
                  rrs_ssl = TLSv1;