From b289db8925f82e83048caa34332ccd654d12f62d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 20 Nov 2009 09:31:11 +0100 Subject: package updates and compile fixes - update ctorrent, cups, gnutls and freeradius-server - compile kerberos (heimdal,krb5) with com_err library from e2fsprogs to allow both to be build without installing local copys of libcom_err - cleanup lynx package add zlib dependency --- package/ctorrent/Makefile | 20 +++++++++----------- package/ctorrent/patches/patch-bencode_cpp | 16 ---------------- package/ctorrent/patches/patch-bencode_h | 11 ----------- package/ctorrent/patches/patch-btcontent_cpp | 16 ---------------- package/ctorrent/patches/patch-btfiles_cpp | 16 ---------------- 5 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 package/ctorrent/patches/patch-bencode_cpp delete mode 100644 package/ctorrent/patches/patch-bencode_h delete mode 100644 package/ctorrent/patches/patch-btcontent_cpp delete mode 100644 package/ctorrent/patches/patch-btfiles_cpp (limited to 'package/ctorrent') diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index 23ba6ac71..ff4b662cb 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -4,15 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ctorrent -PKG_VERSION:= 1.3.4-dnh2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 6635e2d0d0ee21faeb85d95cd93c137b +PKG_VERSION:= dnh3.3.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= net PKG_URL:= http://www.rahul.net/dholmes/ctorrent -PKG_SITES:= http://www.rahul.net/dholmes/ctorrent/ - -WRKDIST= ${WRKDIR}/${PKG_NAME}-dnh2 +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dtorrent/} ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) PKG_DEPENDS:= uclibc++ @@ -29,12 +27,12 @@ TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs endif -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_CTORRENT} - ${CP} ${WRKINST}/* ${IDIR_CTORRENT}/ + ${INSTALL_DIR} ${IDIR_CTORRENT}/usr/bin + ${CP} ${WRKINST}/usr/bin/ctorrent ${IDIR_CTORRENT}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ctorrent/patches/patch-bencode_cpp b/package/ctorrent/patches/patch-bencode_cpp deleted file mode 100644 index 9f2a4381e..000000000 --- a/package/ctorrent/patches/patch-bencode_cpp +++ /dev/null @@ -1,16 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ctorrent-dnh2.orig/bencode.cpp 2006-01-02 03:38:01.000000000 +0100 -+++ ctorrent-dnh2/bencode.cpp 2009-06-01 19:10:05.000000000 +0200 -@@ -213,10 +213,10 @@ size_t bencode_end_dict_list(FILE *fp) - return (EOF == fputc('e',fp)) ? 0 : 1; - } - --size_t bencode_path2list(const char *pathname, FILE *fp) -+size_t bencode_path2list(char *pathname, FILE *fp) - { - char *pn; -- const char *p = pathname; -+ char *p = pathname; - - if( bencode_begin_list(fp) != 1 ) return 0; - diff --git a/package/ctorrent/patches/patch-bencode_h b/package/ctorrent/patches/patch-bencode_h deleted file mode 100644 index 594fa668a..000000000 --- a/package/ctorrent/patches/patch-bencode_h +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ctorrent-dnh2.orig/bencode.h 2005-08-27 05:43:00.000000000 +0200 -+++ ctorrent-dnh2/bencode.h 2009-06-01 19:11:29.000000000 +0200 -@@ -31,6 +31,6 @@ size_t bencode_int(const int integer, FI - size_t bencode_begin_dict(FILE *fp); - size_t bencode_begin_list(FILE *fp); - size_t bencode_end_dict_list(FILE *fp); --size_t bencode_path2list(const char *pathname, FILE *fp); -+size_t bencode_path2list(char *pathname, FILE *fp); - - #endif diff --git a/package/ctorrent/patches/patch-btcontent_cpp b/package/ctorrent/patches/patch-btcontent_cpp deleted file mode 100644 index e402465f8..000000000 --- a/package/ctorrent/patches/patch-btcontent_cpp +++ /dev/null @@ -1,16 +0,0 @@ -$Id$ ---- ctorrent-dnh2.orig/btcontent.cpp 2006-01-02 03:40:49.000000000 +0100 -+++ ctorrent-dnh2/btcontent.cpp 2007-01-22 23:43:50.000000000 +0100 -@@ -9,12 +9,8 @@ - #else - #include - #include --#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO) --#include --#elif defined(HAVE_LIBSSL) - #include - #endif --#endif - - #include - #include diff --git a/package/ctorrent/patches/patch-btfiles_cpp b/package/ctorrent/patches/patch-btfiles_cpp deleted file mode 100644 index e390083bb..000000000 --- a/package/ctorrent/patches/patch-btfiles_cpp +++ /dev/null @@ -1,16 +0,0 @@ -$Id$ ---- ctorrent-dnh2.orig/btfiles.cpp 2006-01-02 03:41:21.000000000 +0100 -+++ ctorrent-dnh2/btfiles.cpp 2007-01-22 23:46:13.000000000 +0100 -@@ -8,12 +8,8 @@ - #include - #include - #include --#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO) --#include --#elif defined(HAVE_LIBSSL) - #include - #endif --#endif - - #include - #include -- cgit v1.2.3