bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] gnutls: update to 2.8.6

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@21029 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2010-04-19 09:08:33 +00:00
parent 4c91b42d90
commit 7a201ff822
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libs/gnutls/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2005-2009 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.
@ -8,20 +8,22 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gnutls
PKG_VERSION:=2.8.5
PKG_VERSION:=2.8.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@GNU/gnutls \
ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
PKG_MD5SUM:=e3b2788b79bfc82acbe717e3c54d4e92
PKG_MD5SUM:=eb0a6d7d3cb9ac684d971c14f9f6d3ba
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
@ -66,9 +68,8 @@ endef
define Package/libgnutls
$(call Package/gnutls/Default)
TITLE+= (library)
DEPENDS+= +zlib +libgcrypt +libgpg-error
SUBMENU:=SSL
TITLE+= (library)
DEPENDS+= +zlib +libgcrypt +libgpg-error
endef
define Package/libgnutls/description
@ -79,9 +80,8 @@ endef
define Package/libgnutls-extra
$(call Package/gnutls/Default)
TITLE+= (extra library)
DEPENDS+= +libgnutls
SUBMENU:=SSL
TITLE+= (extra library)
DEPENDS+= +libgnutls
endef
define Package/libgnutls-extra/description
@ -92,9 +92,8 @@ endef
define Package/libgnutls-openssl
$(call Package/gnutls/Default)
TITLE+= (OpenSSL compat library)
DEPENDS+= +libgnutls
SUBMENU:=SSL
TITLE+= (OpenSSL compat library)
DEPENDS+= +libgnutls
endef
define Package/libgnutls-openssl/description
@ -102,8 +101,6 @@ $(call Package/gnutls/Default/description)
This package contains the GnuTLS OpenSSL compatibility layer shared library.
endef
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS+= \
--enable-shared \
--enable-static \
@ -114,26 +111,31 @@ CONFIGURE_ARGS+= \
--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
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(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/
$(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
@ -144,15 +146,17 @@ define Package/certtool/install
$(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

8
libs/gnutls/patches/001-no_doc_tests_po.patch
View File

@ -1,8 +1,6 @@
Index: gnutls-2.8.5/Makefile.in
===================================================================
--- gnutls-2.8.5.orig/Makefile.in 2009-11-02 11:36:03.000000000 +0100
+++ gnutls-2.8.5/Makefile.in 2009-11-28 00:12:19.000000000 +0100
@@ -147,7 +147,7 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -147,7 +147,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags