#
-# Copyright (C) 2005-2008 OpenWrt.org
+# Copyright (C) 2005-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=gnutls
-PKG_VERSION:=2.4.1
-PKG_RELEASE:=2
+PKG_VERSION:=2.8.6
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/pub/gnu/gnutls/ \
- ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \
- http://josefsson.org/gnutls/releases/
-PKG_MD5SUM:=573db36cb3f8472b0293cfa1f52c607a
+PKG_SOURCE_URL:=@GNU/gnutls \
+ ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
+PKG_MD5SUM:=eb0a6d7d3cb9ac684d971c14f9f6d3ba
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_LIBTOOL_PATHS:=. lib libextra
include $(INCLUDE_DIR)/package.mk
define Package/gnutls/Default
+ SUBMENU:=SSL
SECTION:=libs
CATEGORY:=Libraries
TITLE:=GNU TLS
define Package/gnutls/Default/description
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.
+ library implements the SSL 3.0, TLS 1.0, and TLS 1.1 protocols.
endef
define Package/libgnutls
$(call Package/gnutls/Default)
- TITLE+= (library)
- DEPENDS+= +zlib +libgcrypt +libgpg-error
+ TITLE+= (library)
+ DEPENDS+= +zlib +libgcrypt +libgpg-error
endef
define Package/libgnutls/description
define Package/libgnutls-extra
$(call Package/gnutls/Default)
- TITLE+= (extra library)
- DEPENDS+= +libgnutls
+ TITLE+= (extra library)
+ DEPENDS+= +libgnutls
endef
define Package/libgnutls-extra/description
define Package/libgnutls-openssl
$(call Package/gnutls/Default)
- TITLE+= (OpenSSL compat library)
- DEPENDS+= +libgnutls
+ TITLE+= (OpenSSL compat library)
+ DEPENDS+= +libgnutls
endef
define Package/libgnutls-openssl/description
This package contains the GnuTLS OpenSSL compatibility layer shared library.
endef
-TARGET_CFLAGS += $(FPIC)
-
CONFIGURE_ARGS+= \
--enable-shared \
--enable-static \
--disable-openpgp-authentication \
+ --disable-guile \
--with-included-libcfg \
--with-included-libtasn1 \
--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
--with-libreadline-prefix="$(STAGING_DIR)/usr" \
--with-libz-prefix="$(STAGING_DIR)/usr" \
+ --without-lzo \
# XXX: AM_CFLAGS duplicates with CFLAGS
-MAKE_ARGS:= \
+MAKE_FLAGS:= \
AM_CFLAGS="" \
+TARGET_CFLAGS += $(FPIC)
+
define Build/Configure
$(SED) 's,-I$$$${includedir},,g' $(PKG_BUILD_DIR)/configure
$(SED) 's,-L$$$${libdir},,g' $(PKG_BUILD_DIR)/configure
$(call Build/Configure/Default)
endef
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
define Build/InstallDev
- mkdir -p $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(2)/bin/
- $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(1)/usr/lib/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(1)/usr/lib/pkgconfig/
+ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/include/gnutls \
+ $(1)/usr/include/
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} \
+ $(1)/usr/lib/
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc \
+ $(1)/usr/lib/pkgconfig/
endef
define Package/certtool/conffiles
$(INSTALL_DIR) $(1)/etc/gnutls
$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/certtool.cfg $(1)/etc/gnutls/
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
endef
define Package/gnutls-utils/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psktool $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/srptool $(1)/usr/bin/
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} \
+ $(PKG_INSTALL_DIR)/usr/bin/psktool \
+ $(PKG_INSTALL_DIR)/usr/bin/srptool \
+ $(1)/usr/bin/
endef