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 From b465429a7e4a1f336947ec59ef5f660db85022f0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 20 Nov 2009 20:23:01 +0100 Subject: fix more uclibc bulk build errors and add sfdisk/parted - add sfdisk and parted for nfsroot installations to cfdisk - fix more uclibc bulk build errors --- package/ctorrent/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/ctorrent') diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index ff4b662cb..a73cef591 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -23,7 +23,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) -TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ +TCXXFLAGS+= -fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs endif -- cgit v1.2.3 From 15f7f8f402eab5b7cd03094c358435c4c880b5b6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 11:36:13 +0100 Subject: more bulk build fixes - update rtorrent, libtorrent and libsigc++ - add skeleton for cfinstaller - fix uclibc samba compile - fix parallel builds - update tcl - update iw - remove mac80211 package, use kernel integrated drivers - mark packages which can not be compiled parallel (make -j2) --- package/ctorrent/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'package/ctorrent') diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in index 862b8c460..fa6f355d5 100644 --- a/package/ctorrent/Config.in +++ b/package/ctorrent/Config.in @@ -24,6 +24,7 @@ config ADK_COMPILE_CTORRENT_WITH_STDCXX config ADK_COMPILE_CTORRENT_WITH_UCLIBCXX bool "Embedded uClibc++ library" select ADK_PACKAGE_UCLIBCXX + depends on ADK_BROKEN help endchoice -- cgit v1.2.3 From 02e9bb0970ba681f228dc642b1e5026cc97047c7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Nov 2009 21:13:21 +0100 Subject: simplify buildsystem - remove ADK_IPV6, ADK_CXX and ADK_X11 - enable ipv6 by default in uclibc - enable build of c++ compiler by default --- package/ctorrent/Config.in | 1 - 1 file changed, 1 deletion(-) (limited to 'package/ctorrent') diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in index fa6f355d5..8a6562061 100644 --- a/package/ctorrent/Config.in +++ b/package/ctorrent/Config.in @@ -2,7 +2,6 @@ config ADK_PACKAGE_CTORRENT prompt "ctorrent.......................... console-based BitTorrent client" tristate default n - depends on ADK_CXX help CTorrent is a BitTorrent client written in the C programming language, known to be a very robust and mature programming language, which produces fast and -- cgit v1.2.3 From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- package/ctorrent/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'package/ctorrent') diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index a73cef591..db9c54378 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl +ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= net -- cgit v1.2.3 From 39d2849441575a8cc683c215ab32f93eccfd79ab Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 00:53:52 +0059 Subject: automatic handling of CFrustFrust packages Signed-off-by: Thorsten Glaser --- package/ctorrent/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'package/ctorrent') diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index db9c54378..fb51b1090 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -7,21 +7,13 @@ PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 PKG_BUILDDEP+= openssl -ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= CTORRENT PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= net PKG_URL:= http://www.rahul.net/dholmes/ctorrent PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dtorrent/} -ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) -PKG_DEPENDS:= uclibc++ -else -PKG_DEPENDS:= libstdcxx -endif - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -- cgit v1.2.3 From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:37:42 +0100 Subject: remove and ignore autogenerated Config.in files --- package/ctorrent/Config.in | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 package/ctorrent/Config.in (limited to 'package/ctorrent') diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in deleted file mode 100644 index 8a6562061..000000000 --- a/package/ctorrent/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config ADK_PACKAGE_CTORRENT - prompt "ctorrent.......................... console-based BitTorrent client" - tristate - default n - help - CTorrent is a BitTorrent client written in the C programming language, known to - be a very robust and mature programming language, which produces fast and - optimized application. - - http://www.rahul.net/dholmes/ctorrent/ - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_CTORRENT -default ADK_COMPILE_CTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -default ADK_COMPILE_CTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_CTORRENT_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_CTORRENT_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - depends on ADK_BROKEN - help - -endchoice -- cgit v1.2.3 From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Dec 2009 23:09:19 +0100 Subject: fix make allmodconfig update several packages, remove snort-wireless. --- package/ctorrent/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/ctorrent') diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index fb51b1090..6cc8878fa 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 PKG_BUILDDEP+= openssl -PKG_CXX:= CTORRENT +#PKG_CXX:= CTORRENT PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= net @@ -18,10 +18,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) -TCXXFLAGS+= -fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ -TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs -endif +#ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) +#TCXXFLAGS+= -fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ +#TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs +#endif CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/ctorrent/Makefile | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'package/ctorrent') diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index 6cc8878fa..aad41b850 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -7,7 +7,6 @@ PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 PKG_BUILDDEP+= openssl -#PKG_CXX:= CTORRENT PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= net @@ -18,15 +17,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -#ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) -#TCXXFLAGS+= -fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ -#TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs -#endif - -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - post-install: ${INSTALL_DIR} ${IDIR_CTORRENT}/usr/bin ${CP} ${WRKINST}/usr/bin/ctorrent ${IDIR_CTORRENT}/usr/bin -- cgit v1.2.3