Changeset 21029


Ignore:
Timestamp:
2010-04-19T11:08:33+02:00 (7 years ago)
Author:
nico
Message:

[packages] gnutls: update to 2.8.6

Location:
packages/libs/gnutls
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/gnutls/Makefile

    r19719 r21029  
    11# 
    2 # Copyright (C) 2005-2009 OpenWrt.org 
     2# Copyright (C) 2005-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=gnutls 
    11 PKG_VERSION:=2.8.5 
     11PKG_VERSION:=2.8.6 
    1212PKG_RELEASE:=1 
    1313 
     
    1515PKG_SOURCE_URL:=@GNU/gnutls \ 
    1616        ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ 
    17 PKG_MD5SUM:=e3b2788b79bfc82acbe717e3c54d4e92 
     17PKG_MD5SUM:=eb0a6d7d3cb9ac684d971c14f9f6d3ba 
    1818 
    1919PKG_FIXUP:=libtool 
     20PKG_INSTALL:=1 
    2021PKG_LIBTOOL_PATHS:=. lib libextra 
    2122 
     
    2324 
    2425define Package/gnutls/Default 
     26  SUBMENU:=SSL 
    2527  SECTION:=libs 
    2628  CATEGORY:=Libraries 
     
    6769define Package/libgnutls 
    6870$(call Package/gnutls/Default) 
    69  TITLE+= (library) 
    70  DEPENDS+= +zlib +libgcrypt +libgpg-error 
    71  SUBMENU:=SSL 
     71  TITLE+= (library) 
     72  DEPENDS+= +zlib +libgcrypt +libgpg-error 
    7273endef 
    7374 
     
    8081define Package/libgnutls-extra 
    8182$(call Package/gnutls/Default) 
    82  TITLE+= (extra library) 
    83  DEPENDS+= +libgnutls 
    84  SUBMENU:=SSL 
     83  TITLE+= (extra library) 
     84  DEPENDS+= +libgnutls 
    8585endef 
    8686 
     
    9393define Package/libgnutls-openssl 
    9494$(call Package/gnutls/Default) 
    95  TITLE+= (OpenSSL compat library) 
    96  DEPENDS+= +libgnutls 
    97  SUBMENU:=SSL 
     95  TITLE+= (OpenSSL compat library) 
     96  DEPENDS+= +libgnutls 
    9897endef 
    9998 
     
    102101 This package contains the GnuTLS OpenSSL compatibility layer shared library. 
    103102endef 
    104  
    105 TARGET_CFLAGS += $(FPIC) 
    106103 
    107104CONFIGURE_ARGS+= \ 
     
    115112        --with-libreadline-prefix="$(STAGING_DIR)/usr" \ 
    116113        --with-libz-prefix="$(STAGING_DIR)/usr" \ 
     114        --without-lzo \ 
    117115 
    118116# XXX: AM_CFLAGS duplicates with CFLAGS 
    119 MAKE_ARGS:= \ 
     117MAKE_FLAGS:= \ 
    120118        AM_CFLAGS="" \ 
     119 
     120TARGET_CFLAGS += $(FPIC) 
    121121 
    122122define Build/Configure 
     
    126126endef 
    127127 
    128 define Build/Compile 
    129         $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" all install 
    130 endef 
    131  
    132128define Build/InstallDev 
    133         $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig 
    134         $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/ 
    135         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(1)/usr/lib/ 
    136         $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(1)/usr/lib/pkgconfig/ 
     129        $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig 
     130        $(CP) \ 
     131                $(PKG_INSTALL_DIR)/usr/include/gnutls \ 
     132                $(1)/usr/include/ 
     133        $(CP) \ 
     134                $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} \ 
     135                $(1)/usr/lib/ 
     136        $(CP) \ 
     137                $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc \ 
     138                $(1)/usr/lib/pkgconfig/ 
    137139endef 
    138140 
     
    145147        $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/certtool.cfg $(1)/etc/gnutls/ 
    146148        $(INSTALL_DIR) $(1)/usr/bin 
    147         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/ 
     149        $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/ 
    148150endef 
    149151 
     
    151153define Package/gnutls-utils/install 
    152154        $(INSTALL_DIR) $(1)/usr/bin 
    153         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/ 
    154         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psktool $(1)/usr/bin/ 
    155         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/srptool $(1)/usr/bin/ 
     155        $(CP) \ 
     156                $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} \ 
     157                $(PKG_INSTALL_DIR)/usr/bin/psktool \ 
     158                $(PKG_INSTALL_DIR)/usr/bin/srptool \ 
     159                $(1)/usr/bin/ 
    156160endef 
    157161 
  • packages/libs/gnutls/patches/001-no_doc_tests_po.patch

    r18574 r21029  
    1 Index: gnutls-2.8.5/Makefile.in 
    2 =================================================================== 
    3 --- gnutls-2.8.5.orig/Makefile.in       2009-11-02 11:36:03.000000000 +0100 
    4 +++ gnutls-2.8.5/Makefile.in    2009-11-28 00:12:19.000000000 +0100 
    5 @@ -147,7 +147,7 @@ 
     1--- a/Makefile.in 
     2+++ b/Makefile.in 
     3@@ -147,7 +147,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE 
    64        distdir dist dist-all distcheck 
    75 ETAGS = etags 
Note: See TracChangeset for help on using the changeset viewer.