Index: trunk/freewrt/package/Depends.mk =================================================================== --- trunk/freewrt/package/Depends.mk (revision 3566) +++ trunk/freewrt/package/Depends.mk (revision 3569) @@ -50,5 +50,5 @@ glib2-compile: gettext-compile libiconv-compile libpthread-compile gmediaserver-compile: id3lib-compile libupnp-compile -gnutls-compile: libgcrypt-compile opencdk-compile libtasn1-compile +gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile gpsd-compile: ncurses-compile uclibc++-compile httping-compile: openssl-compile Index: trunk/freewrt/package/gnutls/Config.in =================================================================== --- trunk/freewrt/package/gnutls/Config.in (revision 3067) +++ trunk/freewrt/package/gnutls/Config.in (revision 3569) @@ -10,6 +10,6 @@ select FWRT_COMPILE_GNUTLS select FWRT_PACKAGE_LIBGCRYPT - select FWRT_PACKAGE_LIBOPENCDK select FWRT_PACKAGE_LIBTASN1 + select FWRT_PACKAGE_ZLIB help GnuTLS is a project that aims to develop a library which provides a @@ -26,5 +26,4 @@ Features - * Support for TLS 1.1 and SSL 3.0 protocols * Support for TLS extensions @@ -36,8 +35,26 @@ http://www.gnu.org/software/gnutls/ - This packages contains the GnuTLS shared libraries, needed by other programs. + This packages contains the core GnuTLS shared library, + needed by other programs. -config FWRT_PACKAGE_GNUTLS_UTILS - prompt "gnutls-utils.................... The GNU TLS utilities" +config FWRT_PACKAGE_LIBGNUTLS_EXTRA + prompt "libgnutls-extra................... The GNU TLS extra library" + tristate + default n + depends FWRT_PACKAGE_LIBGNUTLS + select FWRT_PACKAGE_LIBOPENCDK + select FWRT_PACKAGE_LIBLZO + 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 optional "extra" GnuTLS shared + library, needed by other programs, which contains OpenPGP, + TLS/IA and LZO2 compression. + +config FWRT_PACKAGE_LIBGNUTLS_OPENSSL + prompt "libgnutls-openssl................. The GNU TLS OpenSSL compatibility layer library" tristate default n @@ -49,26 +66,9 @@ group. - Quoting from RFC2246 - the TLS 1.0 protocol specification: + This packages contains the GnuTLS OpenSSL compatibility + layer shared library. - "The TLS protocol provides communications privacy over the Internet. - The protocol allows client/server applications to communicate in a - way that is designed to prevent eavesdropping, tampering, or message - forgery." - - Features - - * Support for TLS 1.1 and SSL 3.0 protocols - * Support for TLS extensions - * Support for authentication using the SRP protocol - * Support for authentication using both X.509 certificates - * and OpenPGP keys Support for X.509 and OpenPGP certificate handling. - * Supports all the strong encryption algorithms - - http://www.gnu.org/software/gnutls/ - - This packages contains some GnuTLS utilities. - -config FWRT_PACKAGE_LIBGNUTLS_OPENSSL - prompt "libgnutls-openssl............... The GNU TLS OpenSSL compatibility layer library" +config FWRT_PACKAGE_LIBGNUTLSXX + prompt "libgnutlsxx....................... The GNU TLS C++ library" tristate default n @@ -80,21 +80,17 @@ group. - Quoting from RFC2246 - the TLS 1.0 protocol specification: + This packages contains the GnuTLS C++ shared library. - "The TLS protocol provides communications privacy over the Internet. - The protocol allows client/server applications to communicate in a - way that is designed to prevent eavesdropping, tampering, or message - forgery." +config FWRT_PACKAGE_GNUTLS_UTILS + prompt "gnutls-utils...................... The GNU TLS utilities" + tristate + default n + depends FWRT_PACKAGE_LIBGNUTLS + select FWRT_PACKAGE_LIBGNUTLS_EXTRA + 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. - Features - - * Support for TLS 1.1 and SSL 3.0 protocols - * Support for TLS extensions - * Support for authentication using the SRP protocol - * Support for authentication using both X.509 certificates - * and OpenPGP keys Support for X.509 and OpenPGP certificate handling. - * Supports all the strong encryption algorithms - - http://www.gnu.org/software/gnutls/ - - This packages contains the GnuTLS OpenSSL compatibility layer shared library. + This packages contains some GnuTLS command line utilities. Index: trunk/freewrt/package/gnutls/ipkg/libgnutls.control =================================================================== --- trunk/freewrt/package/gnutls/ipkg/libgnutls.control (revision 3068) +++ trunk/freewrt/package/gnutls/ipkg/libgnutls.control (revision 3569) @@ -3,3 +3,3 @@ Section: libs Description: GNU TLS library -Depends: libgcrypt, libtasn1, opencdk +Depends: libgcrypt, libtasn1, zlib Index: trunk/freewrt/package/gnutls/ipkg/libgnutlsxx.control =================================================================== --- trunk/freewrt/package/gnutls/ipkg/libgnutlsxx.control (revision 3569) +++ trunk/freewrt/package/gnutls/ipkg/libgnutlsxx.control (revision 3569) @@ -0,0 +1,5 @@ +Package: libgnutlsxx +Priority: optional +Section: libs +Description: GNU TLS C++ library +Depends: libgnutls Index: trunk/freewrt/package/gnutls/ipkg/libgnutls-extra.control =================================================================== --- trunk/freewrt/package/gnutls/ipkg/libgnutls-extra.control (revision 3569) +++ trunk/freewrt/package/gnutls/ipkg/libgnutls-extra.control (revision 3569) @@ -0,0 +1,5 @@ +Package: libgnutls-extra +Priority: optional +Section: libs +Description: GNU TLS extra library +Depends: libgnutls, opencdk, liblzo Index: trunk/freewrt/package/gnutls/ipkg/gnutls-utils.control =================================================================== --- trunk/freewrt/package/gnutls/ipkg/gnutls-utils.control (revision 1) +++ trunk/freewrt/package/gnutls/ipkg/gnutls-utils.control (revision 3569) @@ -3,3 +3,3 @@ Section: admin Description: GNU TLS utilities -Depends: libgnutls +Depends: libgnutls, libgnutls-extra Index: trunk/freewrt/package/gnutls/Makefile =================================================================== --- trunk/freewrt/package/gnutls/Makefile (revision 3554) +++ trunk/freewrt/package/gnutls/Makefile (revision 3569) @@ -8,13 +8,13 @@ PKG_NAME:= gnutls -PKG_VERSION:= 1.6.2 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 1b224e4de5ac5ab89a2e53c7af9cf6b0 -DISTFILES:= gnutls-1.6.2.tar.bz2 -MASTER_SITES:= ftp://ftp.gnutls.org/pub/gnutls/ \ +PKG_VERSION:= 2.0.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 181b2ff554a83e6cf85505ea16699d39 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +MASTER_SITES:= http://josefsson.org/gnutls/releases/ \ + http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \ + ftp://ftp.gnutls.org/pub/gnutls/ \ ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/ \ - http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \ - ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \ - http://josefsson.org/gnutls/releases/ + ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ include ${TOPDIR}/mk/package.mk @@ -22,25 +22,22 @@ $(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-srp-authentication \ - --disable-anon-authentication \ - --disable-openpgp-authentication \ - --with-included-libcfg=yes \ - --without-zlib \ - --without-lzo +CONFIGURE_ARGS+= --without-libopencdk-prefix \ + --without-libz-prefix BUILD_STYLE= auto INSTALL_STYLE= auto post-install: - ${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutls{,-extra}.so.* ${IDIR_LIBGNUTLS}/usr/lib/ - ${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so.* \ - ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib/ - ${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin - ${CP} ${WRKINST}/usr/bin/certtool ${IDIR_GNUTLS_UTILS}/usr/bin/ - ${CP} ${WRKINST}/usr/bin/gnutls-{cli,serv} ${IDIR_GNUTLS_UTILS}/usr/bin/ + cd ${WRKINST} && \ + ${PCP} usr/lib/libgnutls.so.* ${IDIR_LIBGNUTLS}/ && \ + ${PCP} usr/lib/libgnutls-extra.so.* ${IDIR_LIBGNUTLS_EXTRA}/ && \ + ${PCP} usr/lib/libgnutls-openssl.so.* ${IDIR_LIBGNUTLS_OPENSSL}/ && \ + ${PCP} usr/lib/libgnutlsxx.so.* ${IDIR_LIBGNUTLSXX}/ && \ + ${PCP} usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \ + ${IDIR_GNUTLS_UTILS}/ include ${TOPDIR}/mk/pkg-bottom.mk