diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/rrs | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/rrs')
| -rw-r--r-- | package/rrs/Makefile | 9 | ||||
| -rw-r--r-- | package/rrs/ipkg/rrs-nossl.control | 5 | ||||
| -rw-r--r-- | package/rrs/ipkg/rrs.control | 5 |
3 files changed, 6 insertions, 13 deletions
diff --git a/package/rrs/Makefile b/package/rrs/Makefile index 9ecf6adcf..9404034f4 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -9,7 +9,10 @@ PKG_NAME:= rrs PKG_VERSION:= 1.70 PKG_RELEASE:= 2 PKG_MD5SUM:= b400d03c0e39e3e78a7327ba78f789f0 -MASTER_SITES:= http://www.cycom.se/uploads/36/19/ +PKG_DESCR:= A reverse (connecting) remote shell, with SSL support. +PKG_SECTION:= net +PKG_URL:= http://www.cycom.se/dl/rrs +PKG_SITES:= http://www.cycom.se/uploads/36/19/ PKG_DEPENDS:= libopenssl zlib PKG_DEPENDS_NOSSL:= zlib @@ -24,8 +27,8 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) -$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL})) +$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y) PKG_CFLAGS=-fno-builtin -fno-rtti -nostdinc++ diff --git a/package/rrs/ipkg/rrs-nossl.control b/package/rrs/ipkg/rrs-nossl.control deleted file mode 100644 index a61cd7049..000000000 --- a/package/rrs/ipkg/rrs-nossl.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: rrs-nossl -Priority: optional -Section: net -Description: A reverse (connecting) remote shell, without SSL support. - diff --git a/package/rrs/ipkg/rrs.control b/package/rrs/ipkg/rrs.control deleted file mode 100644 index 2652d7603..000000000 --- a/package/rrs/ipkg/rrs.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: rrs -Priority: optional -Section: net -Description: A reverse (connecting) remote shell, with SSL support. - |