diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-20 09:31:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-20 09:31:11 +0100 |
| commit | b289db8925f82e83048caa34332ccd654d12f62d (patch) | |
| tree | c03f6147981815269b7282753925a7f1233fbca6 | |
| parent | 46ca99ab03f2b7e70b1d7505cec7cd03b2e4e006 (diff) | |
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
37 files changed, 638 insertions, 303 deletions
diff --git a/.gitignore b/.gitignore index c66451c54..7e9e1ef50 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ toolchain_build_*/ .tmpconfig.h .prereq_done .config* +.defconfig +all.config .cfg/ .cfg.*/ cross_*/ diff --git a/mk/build.mk b/mk/build.mk index 3bfd3bce9..994611a15 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -160,7 +160,8 @@ cleankernel: cleandir: @$(TRACE) cleandir $(MAKE) -C $(CONFIG) clean - rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) ${TOPDIR}/.cfg + rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \ + ${TOPDIR}/.cfg* rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk @@ -174,9 +175,11 @@ cleantarget: distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean - rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) ${TOPDIR}/.cfg* + rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ + ${TOPDIR}/.cfg* rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) - rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk + rm -f .config* .defconfig .tmpconfig.h all.config \ + ${TOPDIR}/package/*/info.mk else # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) @@ -244,8 +247,10 @@ _mconfig2: ${CONFIG}/conf modconfig distclean: @$(MAKE) -C $(CONFIG) clean - @rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) ${TOPDIR}/.cfg* + @rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \ + ${TOPDIR}/.cfg* @rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR) - @rm -f .config* .tmpconfig.h ${TOPDIR}/package/*/info.mk + @rm -f .config* .defconfig all.config .tmpconfig.h \ + ${TOPDIR}/package/*/info.mk endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) diff --git a/package/Depends.mk b/package/Depends.mk index ee9f74030..170cbf65a 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -65,7 +65,7 @@ endif ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y) heimdal-compile: openldap-compile endif -heimdal-compile: openssl-compile ncurses-compile +heimdal-compile: openssl-compile ncurses-compile e2fsprogs-compile httping-compile: openssl-compile icecast-compile: curl-compile libvorbis-compile libxml2-compile libxslt-compile ifeq (${ADK_COMPILE_ID3LIB_WITH_UCLIBCXX},y) @@ -91,7 +91,7 @@ kismet-compile: uclibc++-compile endif kismet-compile: libpcap-compile ncurses-compile knock-compile: libpcap-compile -krb5-compile: ncurses-compile +krb5-compile: ncurses-compile e2fsprogs-compile l2tpns-compile: libcli-compile less-compile: ncurses-compile libgcrypt-compile: libgpg-error-compile @@ -129,7 +129,7 @@ endif lighttpd-compile: pcre-compile libxml2-compile sqlite-compile links-compile: openssl-compile libpng-compile jpeg-compile gpm-compile logrotate-compile: popt-compile -lynx-compile: ncurses-compile openssl-compile +lynx-compile: ncurses-compile openssl-compile zlib-compile madplay-compile: libid3tag-compile libmad-compile maradns-compile: libpthread-compile mc-compile: glib-compile ncurses-compile 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 <unistd.h> - #include <sys/param.h> --#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO) --#include <sha.h> --#elif defined(HAVE_LIBSSL) - #include <openssl/sha.h> - #endif --#endif - - #include <time.h> - #include <sys/stat.h> 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 <unistd.h> - #include <dirent.h> - #include <sys/param.h> --#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO) --#include <sha.h> --#elif defined(HAVE_LIBSSL) - #include <openssl/sha.h> - #endif --#endif - - #include <time.h> - #include <sys/stat.h> diff --git a/package/cups/Makefile b/package/cups/Makefile index 778c8fe47..608b043b7 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups -PKG_VERSION:= 1.3.10 +PKG_VERSION:= 1.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 84fffe96b8537c81a463faccead80026 +PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net PKG_DEPENDS:= zlib libpthread @@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' CONFIGURE_ARGS+= --with-cups-user=0 \ @@ -40,19 +40,19 @@ CONFIGURE_ARGS+= --with-cups-user=0 \ --disable-cdsassl \ --disable-dbus \ --disable-ssl -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" XAKE_FLAGS+= OPTIM='-fPIC' post-install: - ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin ${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin ${INSTALL_DIR} ${IDIR_CUPS}/etc/cups ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/cgi-bin ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/banners + ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/templates ${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/ rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default diff --git a/package/cups/patches/patch-Makefile b/package/cups/patches/patch-Makefile index 663b989b9..70febbf51 100644 --- a/package/cups/patches/patch-Makefile +++ b/package/cups/patches/patch-Makefile @@ -1,12 +1,16 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cups-1.3.10.orig/Makefile 2009-03-12 22:34:21.000000000 +0100 -+++ cups-1.3.10/Makefile 2009-05-09 22:41:42.000000000 +0200 -@@ -19,7 +19,7 @@ include Makedefs +--- cups-1.4.2.orig/Makefile 2009-07-01 06:01:31.000000000 +0200 ++++ cups-1.4.2/Makefile 2009-11-19 22:04:36.000000000 +0100 +@@ -27,10 +27,10 @@ include Makedefs # Directories to make... # --DIRS = cups backend berkeley cgi-bin filter locale man monitor \ -+DIRS = cups backend berkeley cgi-bin filter locale monitor \ - notifier scheduler systemv test \ +-DIRS = cups filter backend berkeley cgi-bin driver locale man monitor \ +- notifier ppdc scheduler systemv test \ ++DIRS = cups filter backend berkeley cgi-bin driver locale monitor \ ++ notifier ppdc scheduler systemv \ $(PHPDIR) \ - conf data doc $(FONTS) ppd templates +- conf data doc examples $(FONTS) templates ++ conf data examples doc $(FONTS) templates + + + # diff --git a/package/cups/patches/patch-conf_Makefile b/package/cups/patches/patch-conf_Makefile new file mode 100644 index 000000000..f3ae5c8dd --- /dev/null +++ b/package/cups/patches/patch-conf_Makefile @@ -0,0 +1,18 @@ +--- cups-1.4.2.orig/conf/Makefile 2009-09-22 23:53:31.000000000 +0200 ++++ cups-1.4.2/conf/Makefile 2009-11-19 22:02:20.000000000 +0100 +@@ -72,12 +72,12 @@ install: all install-data install-header + install-data: + for file in $(KEEP); do \ + if test -r $(SERVERROOT)/$$file ; then \ +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ ++ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \ + else \ +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ ++ $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \ + fi ; \ + done +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default ++ $(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default + $(INSTALL_DIR) -m 755 $(DATADIR)/mime + for file in $(REPLACE); do \ + if test -r $(DATADIR)/mime/$$file ; then \ diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure deleted file mode 100644 index 82550e632..000000000 --- a/package/cups/patches/patch-configure +++ /dev/null @@ -1,34 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cups-1.3.10.orig/configure 2009-04-16 22:02:06.000000000 +0200 -+++ cups-1.3.10/configure 2009-05-31 19:41:18.000000000 +0200 -@@ -7460,9 +7460,6 @@ done - - - case $uname in -- Darwin* | *BSD*) -- ARFLAGS="-rcv" -- ;; - *) - ARFLAGS="crvs" - ;; -@@ -9254,7 +9251,7 @@ if test "$libdir" = "\${exec_prefix}/lib - ;; - Linux*) - if test -d /usr/lib64; then -- libdir="$exec_prefix/lib64" -+ libdir="$exec_prefix/lib" - fi - ;; - HP-UX*) -@@ -9587,11 +9584,6 @@ _ACEOF - - # Server executables... - case "$uname" in -- *BSD* | Darwin*) -- # *BSD and Darwin (MacOS X) -- INSTALL_SYSV="" -- CUPS_SERVERBIN="$exec_prefix/libexec/cups" -- ;; - *) - # All others - INSTALL_SYSV="install-sysv" diff --git a/package/cups/patches/patch-ppdc_Makefile b/package/cups/patches/patch-ppdc_Makefile new file mode 100644 index 000000000..5cfa1ac9b --- /dev/null +++ b/package/cups/patches/patch-ppdc_Makefile @@ -0,0 +1,11 @@ +--- cups-1.4.2.orig/ppdc/Makefile 2009-05-27 01:27:06.000000000 +0200 ++++ cups-1.4.2/ppdc/Makefile 2009-11-19 21:58:49.000000000 +0100 +@@ -244,7 +244,7 @@ genstrings: genstrings.o libcupsppdc.a + libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ + $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) + echo Generating localization strings... +- ./genstrings >sample.c ++ #./genstrings >sample.c + + + # diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c deleted file mode 100644 index c1f3a3e94..000000000 --- a/package/cups/patches/patch-scheduler_auth_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cups-1.3.10.orig/scheduler/auth.c 2009-02-07 06:06:11.000000000 +0100 -+++ cups-1.3.10/scheduler/auth.c 2009-06-01 19:17:20.000000000 +0200 -@@ -54,6 +54,7 @@ - * Include necessary headers... - */ - -+#define _GNU_SOURCE - #include "cupsd.h" - #include <grp.h> - #ifdef HAVE_SHADOW_H diff --git a/package/cxxtools/patches/patch-Makefile_in b/package/cxxtools/patches/patch-Makefile_in new file mode 100644 index 000000000..d0936ae5d --- /dev/null +++ b/package/cxxtools/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- cxxtools-1.4.8.orig/Makefile.in 2008-05-26 19:51:34.000000000 +0200 ++++ cxxtools-1.4.8/Makefile.in 2009-11-19 22:10:18.000000000 +0100 +@@ -200,7 +200,7 @@ subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = src include demo ++SUBDIRS = src include + bin_SCRIPTS = cxxtools-config + EXTRA_dist = \ + m4/acx_pthread.m4 \ diff --git a/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp b/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp new file mode 100644 index 000000000..6afb0e2a5 --- /dev/null +++ b/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp @@ -0,0 +1,10 @@ +--- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp 2008-11-18 12:27:04.000000000 +0100 ++++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp 2009-11-19 22:17:54.000000000 +0100 +@@ -26,6 +26,7 @@ + #include "../HTMLTemplate.hpp" + #include "../ConnectionHandler.hpp" + ++#include <stdio.h> + #include <syslog.h> + #include <sys/time.h> + #include <sys/types.h> diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index 011b3b257..4f80a07dc 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -4,6 +4,7 @@ config ADK_PACKAGE_E2FSPROGS default n select ADK_PACKAGE_LIBUUID select ADK_PACKAGE_LIBCOM_ERR + select ADK_PACKAGE_LIBSS select ADK_PACKAGE_LIBBLKID help This package contains essential ext2 filesystem utilities which consists of @@ -32,3 +33,10 @@ config ADK_PACKAGE_LIBCOM_ERR tristate default n help + +config ADK_PACKAGE_LIBSS + prompt "libss........................... Subsystem command parsing library" + depends on ADK_PACKAGE_E2FSPROGS + tristate + default n + help diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index c6d924b84..3230b61df 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -18,12 +18,15 @@ PKG_DESCR_2:= Common error library PKG_SECTION_2:= libs PKG_DESCR_3:= Libblkid PKG_SECTION_3:= libs +PKG_DESCR_SS:= Subsystem command parsing library +PKG_SECTION_SS:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION_1})) $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION_2})) +$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SS},${PKG_SECTION_SS})) $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION_3})) CONFIGURE_STYLE= gnu @@ -55,15 +58,20 @@ post-install: ${IDIR_LIBBLKID}/usr/lib/ # subpackage libcom_err ${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcom_err.so.* \ + ${CP} ${WRKINST}/usr/lib/libcom_err.so* \ ${IDIR_LIBCOM_ERR}/usr/lib/ + # subpackage libss + ${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib + ${CP} ${WRKINST}/usr/lib/libss.so* \ + ${IDIR_LIBSS}/usr/lib/ # subpackage libuuid ${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib ${CP} ${WRKINST}/usr/lib/libuuid.so.* \ ${IDIR_LIBUUID}/usr/lib/ - # install some headers explicitely + # install some headers/apps explicitely ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ ${STAGING_DIR}/usr/include/uuid + ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_TOOLS}/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index 895ae527b..1e5304103 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= freeradius-server -PKG_VERSION:= 2.1.6 +PKG_VERSION:= 2.1.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 078f7d29b4d2d34f7c992abf772c28a0 +PKG_MD5SUM:= b1f77c5e3116bcb0ac0aa9080a06ebf1 PKG_DESCR:= a flexible RADIUS server PKG_SECTION:= net PKG_DEPENDS:= libltdl libopenssl libpthread diff --git a/package/freeradius-server/patches/patch-share_dictionary b/package/freeradius-server/patches/patch-share_dictionary index 6027a7810..075c19c71 100644 --- a/package/freeradius-server/patches/patch-share_dictionary +++ b/package/freeradius-server/patches/patch-share_dictionary @@ -1,18 +1,140 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- freeradius-server-2.1.6.orig/share/dictionary 2009-05-18 13:13:55.000000000 +0200 -+++ freeradius-server-2.1.6/share/dictionary 2009-06-01 16:15:56.702126337 +0200 -@@ -54,7 +54,7 @@ - # this directive to the end of this file if you want to see the - # old names in the logfiles, INSTEAD OF the new names. - # +--- freeradius-server-2.1.7.orig/share/dictionary 2009-09-14 16:43:29.000000000 +0200 ++++ freeradius-server-2.1.7/share/dictionary 2009-11-19 22:39:16.000000000 +0100 +@@ -1,224 +1,224 @@ +-# -*- text -*- +-# +-# Version $Id$ +-# +-# DO NOT EDIT THE FILES IN THIS DIRECTORY +-# +-# The files in this directory are maintained and updated by +-# the FreeRADIUS project. Newer releases of software may update +-# or change these files. +-# +-# Use the main dictionary file (usually /etc/raddb/dictionary) +-# for local system attributes and $INCLUDEs. +-# +-# +-# +-# This file contains dictionary translations for parsing +-# requests and generating responses. All transactions are +-# composed of Attribute/Value Pairs. The value of each attribute +-# is specified as one of 4 data types. Valid data types are: +-# +-# text - printable, generally UTF-8 encoded (subset of 'string') +-# string - 0-253 octets +-# ipaddr - 4 octets in network byte order +-# integer - 32 bit value in big endian order (high byte first) +-# date - 32 bit value in big endian order - seconds since +-# 00:00:00 GMT, Jan. 1, 1970 +-# ifid - 8 octets in network byte order +-# ipv6addr - 16 octets in network byte order +-# ipv6prefix - 18 octets in network byte order +-# ether - 6 octets of hh:hh:hh:hh:hh:hh +-# where 'h' is hex digits, upper or lowercase. +-# +-# FreeRADIUS includes extended data types which are not defined +-# in the RFC's. These data types are: +-# +-# abinary - Ascend's binary filter format. +-# octets - raw octets, printed and input as hex strings. +-# e.g.: 0x123456789abcdef +-# +-# +-# Enumerated values are stored in the user file with dictionary +-# VALUE translations for easy administration. +-# +-# Example: +-# +-# ATTRIBUTE VALUE +-# --------------- ----- +-# Framed-Protocol = PPP +-# 7 = 1 (integer encoding) +-# +- +-# +-# Include compatibility dictionary for older users file. Move +-# this directive to the end of this file if you want to see the +-# old names in the logfiles, INSTEAD OF the new names. +-# -$INCLUDE dictionary.compat -+#$INCLUDE dictionary.compat - - # - # Include the RFC dictionaries next. -@@ -82,110 +82,12 @@ $INCLUDE dictionary.rfc5176 - # - # Include vendor dictionaries after the standard ones. +- +-# +-# Include the RFC dictionaries next. +-# +-# For a complete list of the standard attributes and values, +-# see: +-# http://www.iana.org/assignments/radius-types +-# +-$INCLUDE dictionary.rfc2865 +-$INCLUDE dictionary.rfc2866 +-$INCLUDE dictionary.rfc2867 +-$INCLUDE dictionary.rfc2868 +-$INCLUDE dictionary.rfc2869 +-$INCLUDE dictionary.rfc3162 +-$INCLUDE dictionary.rfc3576 +-$INCLUDE dictionary.rfc3580 +-$INCLUDE dictionary.rfc4072 +-$INCLUDE dictionary.rfc4372 +-$INCLUDE dictionary.rfc4675 +-$INCLUDE dictionary.rfc4679 +-$INCLUDE dictionary.rfc4818 +-$INCLUDE dictionary.rfc4849 +-$INCLUDE dictionary.rfc5176 +-$INCLUDE dictionary.rfc5580 +- +-# +-# Include vendor dictionaries after the standard ones. ++## -*- text -*- ++## ++## Version $Id$ ++## ++## DO NOT EDIT THE FILES IN THIS DIRECTORY ++## ++## The files in this directory are maintained and updated by ++## the FreeRADIUS project. Newer releases of software may update ++## or change these files. ++## ++## Use the main dictionary file (usually /etc/raddb/dictionary) ++## for local system attributes and $INCLUDEs. ++## ++## ++## ++## This file contains dictionary translations for parsing ++## requests and generating responses. All transactions are ++## composed of Attribute/Value Pairs. The value of each attribute ++## is specified as one of 4 data types. Valid data types are: ++## ++## text - printable, generally UTF-8 encoded (subset of 'string') ++## string - 0-253 octets ++## ipaddr - 4 octets in network byte order ++## integer - 32 bit value in big endian order (high byte first) ++## date - 32 bit value in big endian order - seconds since ++## 00:00:00 GMT, Jan. 1, 1970 ++## ifid - 8 octets in network byte order ++## ipv6addr - 16 octets in network byte order ++## ipv6prefix - 18 octets in network byte order ++## ether - 6 octets of hh:hh:hh:hh:hh:hh ++## where 'h' is hex digits, upper or lowercase. ++## ++## FreeRADIUS includes extended data types which are not defined ++## in the RFC's. These data types are: ++## ++## abinary - Ascend's binary filter format. ++## octets - raw octets, printed and input as hex strings. ++## e.g.: 0x123456789abcdef ++## ++## ++## Enumerated values are stored in the user file with dictionary ++## VALUE translations for easy administration. ++## ++## Example: ++## ++## ATTRIBUTE VALUE ++## --------------- ----- ++## Framed-Protocol = PPP ++## 7 = 1 (integer encoding) ++## # -$INCLUDE dictionary.3com -$INCLUDE dictionary.3gpp @@ -30,10 +152,40 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.bintec -$INCLUDE dictionary.cablelabs -$INCLUDE dictionary.cabletron +-$INCLUDE dictionary.chillispot -$INCLUDE dictionary.cisco ++## ++## Include compatibility dictionary for older users file. Move ++## this directive to the end of this file if you want to see the ++## old names in the logfiles, INSTEAD OF the new names. ++## ++##$INCLUDE dictionary.compat # - # The Cisco VPN300 dictionary is the same as the altiga one. - # You shouldn't use both at the same time. +-# The Cisco VPN300 dictionary is the same as the altiga one. +-# You shouldn't use both at the same time. ++## ++## Include the RFC dictionaries next. ++## ++## For a complete list of the standard attributes and values, ++## see: ++## http://www.iana.org/assignments/radius-types ++## ++#$INCLUDE dictionary.rfc2865 ++#$INCLUDE dictionary.rfc2866 ++#$INCLUDE dictionary.rfc2867 ++#$INCLUDE dictionary.rfc2868 ++#$INCLUDE dictionary.rfc2869 ++#$INCLUDE dictionary.rfc3162 ++#$INCLUDE dictionary.rfc3576 ++#$INCLUDE dictionary.rfc3580 ++#$INCLUDE dictionary.rfc4072 ++#$INCLUDE dictionary.rfc4372 ++#$INCLUDE dictionary.rfc4675 ++#$INCLUDE dictionary.rfc4679 ++#$INCLUDE dictionary.rfc4818 ++#$INCLUDE dictionary.rfc4849 ++#$INCLUDE dictionary.rfc5176 ++#$INCLUDE dictionary.rfc5580 # -#$INCLUDE dictionary.cisco.vpn3000 -$INCLUDE dictionary.cisco.vpn5000 @@ -47,6 +199,43 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.erx -$INCLUDE dictionary.ericsson -$INCLUDE dictionary.extreme ++## ++## Include vendor dictionaries after the standard ones. ++## ++#$INCLUDE dictionary.3com ++#$INCLUDE dictionary.3gpp ++#$INCLUDE dictionary.3gpp2 ++#$INCLUDE dictionary.acc ++#$INCLUDE dictionary.airespace ++#$INCLUDE dictionary.alcatel ++#$INCLUDE dictionary.alteon ++#$INCLUDE dictionary.alvarion ++#$INCLUDE dictionary.apc ++#$INCLUDE dictionary.aruba ++#$INCLUDE dictionary.azaire ++#$INCLUDE dictionary.ascend ++#$INCLUDE dictionary.bay ++#$INCLUDE dictionary.bintec ++#$INCLUDE dictionary.cablelabs ++#$INCLUDE dictionary.cabletron ++#$INCLUDE dictionary.chillispot ++#$INCLUDE dictionary.cisco ++## ++## The Cisco VPN300 dictionary is the same as the altiga one. ++## You shouldn't use both at the same time. ++## ++##$INCLUDE dictionary.cisco.vpn3000 ++#$INCLUDE dictionary.cisco.vpn5000 ++#$INCLUDE dictionary.cisco.bbsm ++#$INCLUDE dictionary.clavister ++#$INCLUDE dictionary.colubris ++#$INCLUDE dictionary.cosine ++##$INCLUDE dictionary.dhcp ++#$INCLUDE dictionary.digium ++#$INCLUDE dictionary.epygi ++#$INCLUDE dictionary.erx ++#$INCLUDE dictionary.ericsson ++#$INCLUDE dictionary.extreme $INCLUDE dictionary.freeradius -$INCLUDE dictionary.freeswitch -$INCLUDE dictionary.fortinet @@ -56,6 +245,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.h3c -$INCLUDE dictionary.hp -$INCLUDE dictionary.huawei +-$INCLUDE dictionary.iea -$INCLUDE dictionary.infonet -$INCLUDE dictionary.issanni -$INCLUDE dictionary.itk @@ -77,7 +267,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.nexans -$INCLUDE dictionary.ntua -$INCLUDE dictionary.nokia - # +-# -# Commented out because of attribute conflicts. -# -#$INCLUDE dictionary.nokia.conflict @@ -85,7 +275,78 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.nortel -# -# Commented out because of attribute conflicts. --# ++#$INCLUDE dictionary.freeswitch ++#$INCLUDE dictionary.fortinet ++#$INCLUDE dictionary.foundry ++#$INCLUDE dictionary.gandalf ++#$INCLUDE dictionary.gemtek ++#$INCLUDE dictionary.h3c ++#$INCLUDE dictionary.hp ++#$INCLUDE dictionary.huawei ++#$INCLUDE dictionary.iea ++#$INCLUDE dictionary.infonet ++#$INCLUDE dictionary.issanni ++#$INCLUDE dictionary.itk ++#$INCLUDE dictionary.ipunplugged ++#$INCLUDE dictionary.juniper ++#$INCLUDE dictionary.jradius ++#$INCLUDE dictionary.karlnet ++#$INCLUDE dictionary.lancom ++#$INCLUDE dictionary.livingston ++#$INCLUDE dictionary.localweb ++#$INCLUDE dictionary.lucent ++#$INCLUDE dictionary.manzara ++#$INCLUDE dictionary.merit ++#$INCLUDE dictionary.microsoft ++#$INCLUDE dictionary.mikrotik ++#$INCLUDE dictionary.navini ++#$INCLUDE dictionary.netscreen ++#$INCLUDE dictionary.networkphysics ++#$INCLUDE dictionary.nexans ++#$INCLUDE dictionary.ntua ++#$INCLUDE dictionary.nokia ++## ++## Commented out because of attribute conflicts. ++## ++##$INCLUDE dictionary.nokia.conflict ++#$INCLUDE dictionary.nomadix ++#$INCLUDE dictionary.nortel ++## ++## Commented out because of attribute conflicts. ++## ++##$INCLUDE dictionary.openser ++#$INCLUDE dictionary.packeteer ++#$INCLUDE dictionary.patton ++#$INCLUDE dictionary.propel ++#$INCLUDE dictionary.prosoft ++#$INCLUDE dictionary.quiconnect ++#$INCLUDE dictionary.quintum ++#$INCLUDE dictionary.redback ++#$INCLUDE dictionary.redcreek ++#$INCLUDE dictionary.riverstone ++#$INCLUDE dictionary.roaringpenguin ++#$INCLUDE dictionary.shasta ++#$INCLUDE dictionary.shiva ++#$INCLUDE dictionary.slipstream ++#$INCLUDE dictionary.sonicwall ++#$INCLUDE dictionary.springtide ++#$INCLUDE dictionary.starent ++#$INCLUDE dictionary.telebit ++#$INCLUDE dictionary.trapeze ++#$INCLUDE dictionary.tropos ++#$INCLUDE dictionary.t_systems_nova ++#$INCLUDE dictionary.usr ++#$INCLUDE dictionary.utstarcom ++#$INCLUDE dictionary.valemount ++#$INCLUDE dictionary.versanet ++#$INCLUDE dictionary.vqp ++#$INCLUDE dictionary.waverider ++#$INCLUDE dictionary.walabi ++#$INCLUDE dictionary.wimax ++#$INCLUDE dictionary.wispr ++#$INCLUDE dictionary.xedia ++#$INCLUDE dictionary.xylan + # -#$INCLUDE dictionary.openser -$INCLUDE dictionary.packeteer -$INCLUDE dictionary.patton @@ -118,6 +379,62 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -$INCLUDE dictionary.wispr -$INCLUDE dictionary.xedia -$INCLUDE dictionary.xylan - +- ++## ++## And finally the server internal attributes. ++## ++#$INCLUDE dictionary.freeradius.internal + # +-# And finally the server internal attributes. ++## ++## Miscellaneous attributes defined in weird places that ++## don't really belong anywhere else... ++## ++#ATTRIBUTE Originating-Line-Info 94 string + # +-$INCLUDE dictionary.freeradius.internal +- ++## As defined in draft-sterman-aaa-sip-00.txt ++#ATTRIBUTE Digest-Response 206 string ++#ATTRIBUTE Digest-Attributes 207 octets # stupid format + # +-# Miscellaneous attributes defined in weird places that +-# don't really belong anywhere else... ++## ++## Integer Translations ++## ++#VALUE Service-Type Voice 12 ++#VALUE Service-Type Fax 13 ++#VALUE Service-Type Modem-Relay 14 ++#VALUE Service-Type IAPP-Register 15 ++#VALUE Service-Type IAPP-AP-Check 16 + # +-ATTRIBUTE Originating-Line-Info 94 string +- +-# As defined in draft-sterman-aaa-sip-00.txt +-ATTRIBUTE Digest-Response 206 string +-ATTRIBUTE Digest-Attributes 207 octets # stupid format +- ++#VALUE Framed-Protocol GPRS-PDP-Context 7 + # +-# Integer Translations ++#VALUE NAS-Port-Type Wireless-CDMA2000 22 ++#VALUE NAS-Port-Type Wireless-UMTS 23 ++#VALUE NAS-Port-Type Wireless-1X-EV 24 ++#VALUE NAS-Port-Type IAPP 25 # - # And finally the server internal attributes. +-VALUE Service-Type Voice 12 +-VALUE Service-Type Fax 13 +-VALUE Service-Type Modem-Relay 14 +-VALUE Service-Type IAPP-Register 15 +-VALUE Service-Type IAPP-AP-Check 16 +- +-VALUE Framed-Protocol GPRS-PDP-Context 7 +- +-VALUE NAS-Port-Type Wireless-CDMA2000 22 +-VALUE NAS-Port-Type Wireless-UMTS 23 +-VALUE NAS-Port-Type Wireless-1X-EV 24 +-VALUE NAS-Port-Type IAPP 25 +- +-VALUE Framed-Protocol PPTP 9 ++#VALUE Framed-Protocol PPTP 9 diff --git a/package/freeradius-server/patches/patch-src_main_event_c b/package/freeradius-server/patches/patch-src_main_event_c index 99184d09a..8dbcddf99 100644 --- a/package/freeradius-server/patches/patch-src_main_event_c +++ b/package/freeradius-server/patches/patch-src_main_event_c @@ -1,14 +1,21 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- freeradius-server-2.1.6.orig/src/main/event.c 2009-05-18 13:13:55.000000000 +0200 -+++ freeradius-server-2.1.6/src/main/event.c 2009-06-01 17:06:44.356592479 +0200 -@@ -1667,8 +1667,9 @@ static int originated_coa_request(REQUES +--- freeradius-server-2.1.7.orig/src/main/event.c 2009-09-14 16:43:29.000000000 +0200 ++++ freeradius-server-2.1.7/src/main/event.c 2009-11-19 22:55:03.000000000 +0100 +@@ -1143,7 +1143,7 @@ static void wait_a_bit(void *ctx) + break; + } + +-#if defined(HAVE_PTHREAD_H) || defined(WITH_PROXY) ++#if defined(HAVE_PTHREAD_H) + /* + * A child thread MAY still be running on the + * request. Ask the thread to stop working on +@@ -1617,7 +1617,9 @@ static int originated_coa_request(REQUES */ request->num_proxied_requests = 1; request->num_proxied_responses = 0; -+#if defined(HAVE_PTHREAD_H) ++#ifdef HAVE_PTHREAD_H request->child_pid = NO_SUCH_CHILD_PID; -- +#endif + update_event_timestamp(request->proxy, request->proxy_when.tv_sec); - request->child_state = REQUEST_PROXIED; diff --git a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in index 13cbb8215..17bbf64c2 100644 --- a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in +++ b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- freeradius-server-2.1.6.orig/src/modules/rlm_eap/Makefile.in 2009-05-18 13:13:55.000000000 +0200 -+++ freeradius-server-2.1.6/src/modules/rlm_eap/Makefile.in 2009-06-01 17:23:33.047631797 +0200 +--- freeradius-server-2.1.7.orig/src/modules/rlm_eap/Makefile.in 2009-09-14 16:43:29.000000000 +0200 ++++ freeradius-server-2.1.7/src/modules/rlm_eap/Makefile.in 2009-11-19 22:37:45.000000000 +0100 @@ -37,7 +37,7 @@ radeapclient.lo: radeapclient.c $(HEADER install-subdirs: diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index c42bae5bf..71b4eac29 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -68,38 +68,6 @@ config ADK_PACKAGE_LIBGNUTLS_OPENSSL This packages contains the GnuTLS OpenSSL compatibility layer shared library. -config ADK_PACKAGE_LIBGNUTLSXX - prompt "libgnutlsxx....................... The GNU TLS C++ library" - tristate - default n - depends on ADK_CXX - depends on ADK_PACKAGE_LIBGNUTLS - help - GnuTLS is a project that aims to develop a library which provides a - secure layer, over a reliable transport layer. Currently the GnuTLS - library implements the proposed standards by the IETF's TLS working - group. - - This packages contains the GnuTLS C++ shared library. - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_LIBGNUTLSXX -default ADK_COMPILE_GNUTLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -default ADK_COMPILE_GNUTLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_GNUTLS_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_GNUTLS_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice - config ADK_PACKAGE_GNUTLS_UTILS prompt "gnutls-utils...................... The GNU TLS utilities" tristate diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 358b69b51..235be1de4 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 2.8.3 +PKG_VERSION:= 2.8.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 72b77092c5d1ae01306cd14c0f22d6e4 +PKG_MD5SUM:= e3b2788b79bfc82acbe717e3c54d4e92 PKG_DESCR:= GNU TLS library PKG_SECTION:= libs PKG_DEPENDS:= libgcrypt libtasn1 zlib @@ -17,35 +17,18 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ -TLDFLAGS+= -nodefaultlibs -luClibc++ -PKG_DEPENDS_1:= ${PKG_DEPENDS} uclibc++ -else -PKG_DEPENDS_1:= ${PKG_DEPENDS} libstdcxx -endif - $(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -lncurses -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ --with-libgcrypt-prefix=${STAGING_DIR}/usr \ --without-libz-prefix -BUILD_STYLE= auto -INSTALL_STYLE= auto - -ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ - ${WRKBUILD}/libtool -endif +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib @@ -57,9 +40,5 @@ post-install: ${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \ ${IDIR_GNUTLS_UTILS}/usr/bin -ifeq ($(ADK_CXX),y) - ${INSTALL_DIR} ${IDIR_LIBGNUTLSXX}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutlsxx.so.* ${IDIR_LIBGNUTLSXX}/usr/lib -endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in index de86f9d27..edb4ea30d 100644 --- a/package/heimdal/Config.in +++ b/package/heimdal/Config.in @@ -1,7 +1,6 @@ config ADK_COMPILE_HEIMDAL prompt "heimdal........................... Heimdal kerberos software" bool - depends on !ADK_COMPILE_KRB5 default n config ADK_COMPILE_HEIMDAL_WITH_PKINIT @@ -14,6 +13,7 @@ config ADK_PACKAGE_HEIMDAL_SERVER prompt "heimdal-server.................... heimdal kerberos server" tristate depends on ADK_COMPILE_HEIMDAL + select ADK_PACKAGE_LIBCOM_ERR select ADK_PACKAGE_LIBPTHREAD select ADK_PACKAGE_LIBOPENSSL select ADK_PACKAGE_LIBNCURSES diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index d7926542b..5be7b5776 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e PKG_DESCR:= Kerberos 5 server PKG_SECTION:= net -PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses +PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses libcom_err PKG_URL:= http://www.h5l.org PKG_SITES:= http://www.h5l.org/dist/src/ @@ -36,6 +36,7 @@ $(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \ --disable-otp \ --disable-ndbm-db \ + --libdir=/usr/lib/heimdal \ --libexecdir=/usr/sbin \ --sysconfdir=/etc/heimdal @@ -65,6 +66,7 @@ else CONFIGURE_OPTS+= --disable-pk-init endif +TCFLAGS+= -I${STAGING_DIR}/usr/include/et TCFLAGS+= -pthread CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= ${CONFIGURE_OPTS} @@ -80,20 +82,15 @@ pre-configure: ${MAKE} -C ${WRKBUILD}/lib/roken ${MAKE} -C ${WRKBUILD}/lib/vers ${MAKE} -C ${WRKBUILD}/lib/editline - ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile ${MAKE} -C ${WRKBUILD}/lib/sl slc - ${INSTALL_BIN} ${WRKBUILD}/lib/com_err/compile_et \ - ${STAGING_TOOLS}/bin ${INSTALL_BIN} ${WRKBUILD}/lib/asn1/asn1_compile \ ${STAGING_TOOLS}/bin ${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc \ ${STAGING_TOOLS}/bin - ${MAKE} -C ${WRKBUILD}/lib/com_err clean ${MAKE} -C ${WRKBUILD} clean post-install: - -rm $(STAGING_DIR)/usr/lib/libcom_err* ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y) ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/openldap/schema ${INSTALL_DATA} ${WRKBUILD}/lib/hdb/hdb.schema \ @@ -101,10 +98,10 @@ ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y) endif ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/heimdal ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/sbin - ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib - ${CP} ${WRKINST}/usr/lib/libkdc.so* ${IDIR_HEIMDAL_SERVER}/usr/lib - ${CP} ${WRKINST}/usr/lib/libkadm5srv.so* ${IDIR_HEIMDAL_SERVER}/usr/lib - ${CP} ${WRKINST}/usr/lib/libhdb.so* ${IDIR_HEIMDAL_SERVER}/usr/lib + ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libkdc.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5srv.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libhdb.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal ${INSTALL_DATA} ./files/krb5.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal ${INSTALL_DATA} ./files/kdc.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal ${INSTALL_DATA} ./files/kadmind.acl ${IDIR_HEIMDAL_SERVER}/etc/heimdal @@ -115,22 +112,21 @@ endif ${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil ${IDIR_HEIMDAL_SERVER}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin ${IDIR_HEIMDAL_SERVER}/usr/sbin/ # heimdal libs - ${INSTALL_DIR} ${IDIR_HEIMDAL_LIBS}/usr/lib + ${INSTALL_DIR} ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y) - ${CP} ${WRKINST}/usr/lib/libhx509.so* ${IDIR_HEIMDAL_LIBS}/usr/lib + ${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal endif - ${CP} ${WRKINST}/usr/lib/libheimntlm.so* ${IDIR_HEIMDAL_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libwind.so* ${IDIR_HEIMDAL_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgssapi.so* ${IDIR_HEIMDAL_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libkafs.so* ${IDIR_HEIMDAL_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libkrb5.so* ${IDIR_HEIMDAL_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcom_err.so* ${IDIR_HEIMDAL_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libasn1.so* ${IDIR_HEIMDAL_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libroken.so* ${IDIR_HEIMDAL_LIBS}/usr/lib + ${CP} ${WRKINST}/usr/lib/heimdal/libheimntlm.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libwind.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libgssapi.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libkafs.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libkrb5.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libasn1.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal # heimdal client libs - ${INSTALL_DIR} ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libeditline.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libsl.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libkadm5clnt.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib + ${INSTALL_DIR} ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal + ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/heimdal/patches/patch-configure b/package/heimdal/patches/patch-configure index d92f7cdbc..53601d6db 100644 --- a/package/heimdal/patches/patch-configure +++ b/package/heimdal/patches/patch-configure @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- heimdal-1.2.1.orig/configure 2008-07-28 14:05:20.000000000 +0200 -+++ heimdal-1.2.1/configure 2009-01-04 18:24:14.421500455 +0100 ++++ heimdal-1.2.1/configure 2009-11-19 21:01:07.000000000 +0100 @@ -47096,9 +47096,6 @@ end EOF if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then @@ -11,3 +11,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ if test "$cross_compiling" = yes; then krb_cv_compile_et="yes" krb_cv_compile_et_cross=yes else +@@ -47183,7 +47180,7 @@ rm -fr conftest* + fi + + if test "${krb_cv_compile_et_cross}" = yes ; then +- krb_cv_com_err="cross" ++ krb_cv_com_err="yes" + elif test "${krb_cv_compile_et}" = "yes"; then + krb_cv_save_LIBS="${LIBS}" + LIBS="${LIBS} -lcom_err" diff --git a/package/id3lib/patches/patch-include_id3_id3lib_strings_h b/package/id3lib/patches/patch-include_id3_id3lib_strings_h index 9b21c2c4a..6f2b9f7a7 100644 --- a/package/id3lib/patches/patch-include_id3_id3lib_strings_h +++ b/package/id3lib/patches/patch-include_id3_id3lib_strings_h @@ -1,6 +1,6 @@ $Id$ --- id3lib-3.8.3.orig/include/id3/id3lib_strings.h 2003-03-02 01:23:00.000000000 +0100 -+++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-12-15 13:15:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2009-11-19 23:07:55.000000000 +0100 @@ -30,6 +30,7 @@ #define _ID3LIB_STRINGS_H_ @@ -9,12 +9,14 @@ $Id$ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) namespace std -@@ -41,7 +42,7 @@ namespace std +@@ -41,8 +42,8 @@ namespace std // Unsigned as wint_t in unsigned. typedef unsigned long int_type; typedef streampos pos_type; - typedef streamoff off_type; +- typedef mbstate_t state_type; + //typedef streamoff off_type; - typedef mbstate_t state_type; ++ //typedef mbstate_t state_type; static void + assign(char_type& __c1, const char_type& __c2) diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 6db433527..97a2b70dd 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -17,7 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${ADK_TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= PREFIX=/usr BUILD_STYLE:= auto @@ -28,7 +28,7 @@ INSTALL_TARGET:= binaries_install pre-build: V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ - LD=$(TARGET_CROSS)gcc + LD=$(TARGET_CROSS)gcc \ $(MAKE) -C ${WRKBUILD} modules post-install: diff --git a/package/ipset/patches/patch-Makefile b/package/ipset/patches/patch-Makefile new file mode 100644 index 000000000..9eaf33095 --- /dev/null +++ b/package/ipset/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- ipset-3.0.orig/Makefile 2009-05-16 21:09:38.000000000 +0200 ++++ ipset-3.0/Makefile 2009-11-19 23:32:37.000000000 +0100 +@@ -5,7 +5,7 @@ + ###################################################################### + + ifndef KERNEL_DIR +-KERNEL_DIR=/usr/src/linux ++KERNEL_DIR?=/usr/src/linux + endif + ifndef KBUILD_OUTPUT + KBUILD_OUTPUT=$(KERNEL_DIR) diff --git a/package/krb5/Config.in b/package/krb5/Config.in index d4f8b6436..d44a2f4cc 100644 --- a/package/krb5/Config.in +++ b/package/krb5/Config.in @@ -2,13 +2,14 @@ config ADK_COMPILE_KRB5 prompt "kerberos5......................... MIT kerberos software" bool select ADK_PACKAGE_LIBNCURSES + select ADK_PACKAGE_LIBSS + select ADK_PACKAGE_LIBCOM_ERR default n config ADK_PACKAGE_KRB5_SERVER prompt "krb5-server....................... MIT kerberos server" tristate depends on ADK_COMPILE_KRB5 - depends on !ADK_COMPILE_HEIMDAL select ADK_PACKAGE_LIBPTHREAD select ADK_PACKAGE_KRB5_LIBS default n diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 7ffef2877..f1261ba64 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= krb5 PKG_VERSION:= 1.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564 PKG_DESCR:= MIT kerberos server PKG_SECTION:= net -PKG_DEPENDS:= krb5-libs +PKG_DEPENDS:= krb5-libs libncurses libss libcom_err PKG_URL:= http://web.mit.edu/kerberos PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/ @@ -24,8 +24,12 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB})) +TCFLAGS+= -I${STAGING_DIR}/usr/include/et CONFIGURE_STYLE:= gnu -CONFIGURE_ARGS+= --disable-static --without-tcl +CONFIGURE_ARGS+= --disable-static \ + --with-system-ss \ + --with-system-et \ + --without-tcl CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \ ac_cv_func_regcomp=yes \ ac_cv_printf_positional=yes \ @@ -56,7 +60,7 @@ post-install: ${INSTALL_DIR} ${IDIR_KRB5_LIBS}/etc ${INSTALL_DIR} ${IDIR_KRB5_LIBS}/usr/lib ${INSTALL_DATA} ./files/krb5.conf ${IDIR_KRB5_LIBS}/etc - ${CP} ${WRKINST}/usr/lib/lib{com_err,gssapi_krb5,k5crypto,krb5,krb5support}.so* \ + ${CP} ${WRKINST}/usr/lib/lib{gssapi_krb5,k5crypto,krb5,krb5support}.so* \ ${IDIR_KRB5_LIBS}/usr/lib echo '/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init' > ${IDIR_KRB5_LIBS}/etc/gssapi_mech.conf diff --git a/package/krb5/patches/patch-src_util_profile_prof_int_h b/package/krb5/patches/patch-src_util_profile_prof_int_h new file mode 100644 index 000000000..5be692f11 --- /dev/null +++ b/package/krb5/patches/patch-src_util_profile_prof_int_h @@ -0,0 +1,11 @@ +--- krb5-1.7.orig/src/util/profile/prof_int.h 2008-05-27 18:25:51.000000000 +0200 ++++ krb5-1.7/src/util/profile/prof_int.h 2009-11-19 20:20:53.000000000 +0100 +@@ -12,7 +12,7 @@ + + #include "k5-thread.h" + #include "k5-platform.h" +-#include "com_err.h" ++#include "et/com_err.h" + #include "profile.h" + + typedef long prf_magic_t; diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in new file mode 100644 index 000000000..dd3a39e71 --- /dev/null +++ b/package/libX11/patches/patch-src_util_Makefile_in @@ -0,0 +1,67 @@ +--- libX11-1.3.2.orig/src/util/Makefile.in 2009-10-23 22:55:44.000000000 +0200 ++++ libX11-1.3.2/src/util/Makefile.in 2009-11-20 08:55:51.000000000 +0100 +@@ -58,7 +58,7 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERB + am__v_lt_0 = --silent + makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \ +- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CFLAGS) $(AM_LDFLAGS) $(HOSTLDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -103,7 +103,7 @@ BIGFONT_LIBS = @BIGFONT_LIBS@ + CC = @CC_FOR_BUILD@ + CCDEPMODE = @CCDEPMODE@ + CC_FOR_BUILD = @CC_FOR_BUILD@ +-CFLAGS = @CFLAGS@ ++CFLAGS = + CHANGELOG_CMD = @CHANGELOG_CMD@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +@@ -139,9 +139,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + KEYSYMDEF = @KEYSYMDEF@ + LAUNCHD = @LAUNCHD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = + LIBTOOL = @LIBTOOL@ + LIB_MAN_DIR = @LIB_MAN_DIR@ + LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +@@ -256,7 +256,8 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-makekeys_CFLAGS = $(X11_CFLAGS) ++makekeys_CFLAGS = $(HOSTCFLAGS) ++makekeys_CPPFLAGS = $(HOSTCPPFLAGS) + EXTRA_DIST = mkks.sh + + # Check source code with tools like lint & sparse +@@ -343,20 +344,20 @@ distclean-compile: + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + makekeys-makekeys.o: makekeys.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po + @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c + + makekeys-makekeys.obj: makekeys.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po + @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` + + mostlyclean-libtool: + -rm -f *.lo diff --git a/package/lynx/Config.in b/package/lynx/Config.in index 0b12bc0bb..0565c4150 100644 --- a/package/lynx/Config.in +++ b/package/lynx/Config.in @@ -4,6 +4,7 @@ config ADK_PACKAGE_LYNX default n select ADK_PACKAGE_LIBNCURSES select ADK_PACKAGE_LIBOPENSSL + select ADK_PACKAGE_ZLIB select ADK_PACKAGE_CA_CERTS help The standard text-based world wide web browser. diff --git a/package/lynx/Makefile b/package/lynx/Makefile index 388109c89..12a04f7f1 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME= lynx PKG_VERSION= 2.8.7dev.7 -PKG_RELEASE= 1 +PKG_RELEASE= 2 PKG_MD5SUM= 83891107c873421e5ac917cc0ab53fe8 PKG_DESCR:= Standard text browser PKG_SECTION:= text -PKG_DEPENDS:= libncurses libopenssl +PKG_DEPENDS:= libncurses libopenssl zlib PKG_URL:= http://lynx.isc.org PKG_SITES= http://lynx.isc.org/current/ \ ${MASTER_SITE_MIRBSD} @@ -19,11 +19,14 @@ WRKDIST= ${WRKDIR}/lynx2-8-7 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LYNX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu TCPPFLAGS+= -DLYNX_VERSION=\"${PKG_VERSION}-${PKG_RELEASE}\" -# do not hardcode paths; do not scan for ports stuff +TCPPFLAGS+= -I${STAGING_DIR}/include/openssl +TCPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT +TLDFLAGS+= -lz + +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \ ac_cv_path_TN3270=tn3270 \ ac_cv_path_RLOGIN=rlogin \ @@ -38,27 +41,18 @@ CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \ ac_cv_path_UUDECODE=uudecode \ ac_cv_path_ZCAT=zcat \ ac_cv_path_ZIP=zip -# from MirPorts Framework -CONFIGURE_ARGS+= --enable-vertrace \ - --enable-warnings \ + +CONFIGURE_ARGS+= \ + --disable-warnings \ --disable-nls \ - --disable-full-paths \ - --with-ssl=/usr \ --without-gnutls \ --without-socks \ --without-socks5 \ - --with-screen=ncursesw \ - --enable-widec \ --enable-addrlist-page \ --enable-charset-choice \ - --enable-cjk \ - --enable-japanese-utf8 \ --enable-color-style \ --disable-default-colors \ --disable-htmlized-cfg \ - --enable-ipv6 \ - --enable-kbd-layout \ - --enable-locale-charset \ --enable-nested-tables \ --disable-scrollbar \ --enable-justify-elts \ @@ -66,37 +60,30 @@ CONFIGURE_ARGS+= --enable-vertrace \ --enable-nsl-fork \ --enable-underlines \ --without-bzlib \ - --with-zlib \ - --without-x -# local stuff -CONFIGURE_ARGS+= --with-ssl=${STAGING_DIR}/usr \ + --without-x \ + --with-zlib=${STAGING_DIR}/usr \ + --with-ssl=${STAGING_DIR}/usr \ --disable-full-paths \ --with-cfg-file=/etc/lynx.cfg \ --with-lss-file=/etc/lynx.lss \ - --disable-font-switch -TCPPFLAGS+= -I${STAGING_DIR}/include/openssl -TCPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT -# needs libiconv -CONFIGURE_ARGS+= --disable-japanese-utf8 -# shrink size -CONFIGURE_ARGS+= --disable-vertrace \ + --disable-font-switch \ + --disable-japanese-utf8 \ + --disable-vertrace \ --disable-trace \ --disable-cjk \ --disable-kbd-layout \ --disable-prettysrc \ --disable-finger \ - --disable-dired -ifeq (${ADK_UNICODE},) -CONFIGURE_ARGS+= --with-screen=ncurses \ + --disable-dired \ + --with-screen=ncurses \ --disable-widec \ --disable-locale-charset -endif -ifneq (${ADK_IPV6},y) -CONFIGURE_ARGS+= --disable-ipv6 -endif -MAKE_FILE= makefile -BUILD_STYLE= auto -INSTALL_STYLE= auto + +# --prefix=${STAGING_DIR}/usr + +MAKE_FILE:= makefile +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LYNX}/etc ${IDIR_LYNX}/usr/bin diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index b9cb279d1..55841ae34 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -39,6 +39,10 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_PACKAGE_LIBUSB ]]; then + NEED_BISON="$NEED_BISON libusb" +fi + if [[ -n $ADK_COMPILE_HEIMDAL ]]; then NEED_BISON="$NEED_BISON heimdal-server" fi @@ -71,6 +75,7 @@ fi if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then NEED_FLEX="$NEED_FLEX libpcap" + NEED_BISON="$NEED_BISON libpcap" fi |