Browse Source

Merge pull request #8489 from neheb/tl

gnutls: Update to 3.6.6
lilik-openwrt-22.03
Nikos Mavrogiannopoulos 6 years ago
committed by GitHub
parent
commit
7feacbd00d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 24 deletions
  1. +0
    -4
      libs/gnutls/Config.in
  2. +17
    -20
      libs/gnutls/Makefile

+ 0
- 4
libs/gnutls/Config.in View File

@ -23,10 +23,6 @@ config GNUTLS_HEARTBEAT
bool "enable DTLS heartbeat support"
default y
config GNUTLS_OPENPGP
bool "enable OPENPGP authentication support"
default n
config GNUTLS_SRP
bool "enable SRP authentication support"
default n


+ 17
- 20
libs/gnutls/Makefile View File

@ -8,21 +8,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gnutls
PKG_VERSION:=3.6.5
PKG_VERSION:=3.6.7
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6
PKG_HASH:=073eced3acef49a3883e69ffd5f0f0b5f46e2760ad86eddc6c0866df4e7abb35
PKG_HASH:=5b3409ad5aaf239808730d1ee12fdcd148c0be00262c7edf157af655a8a188e2
#PKG_FIXUP:=autoreconf gettext-version
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
PKG_LICENSE:=LGPLv2.1+
PKG_CPE_ID:=cpe:/a:gnu:gnutls
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_LIBTOOL_PATHS:=. lib
PKG_CHECK_FORMAT_SECURITY:=0
PKG_CONFIG_DEPENDS:= \
CONFIG_GNUTLS_ALPN \
@ -32,7 +32,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_GNUTLS_EXT_LIBTASN1 \
CONFIG_GNUTLS_HEARTBEAT \
CONFIG_GNUTLS_OCSP \
CONFIG_GNUTLS_OPENPGP \
CONFIG_GNUTLS_PKCS11 \
CONFIG_GNUTLS_PSK \
CONFIG_GNUTLS_SRP \
@ -97,7 +96,7 @@ endef
define Package/libgnutls
$(call Package/gnutls/Default)
TITLE+= (library)
DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1 +GNUTLS_PKCS11:p11-kit +GNUTLS_CRYPTODEV:kmod-cryptodev
DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1 +GNUTLS_PKCS11:p11-kit +GNUTLS_CRYPTODEV:kmod-cryptodev +libatomic
endef
define Package/libgnutls/description
@ -109,19 +108,23 @@ endef
CONFIGURE_ARGS+= \
--enable-shared \
--enable-static \
--disable-doc \
--disable-gcc-warnings \
--disable-guile \
--disable-rpath \
--disable-seccomp-tests \
--disable-tests \
--disable-valgrind-tests \
\
--disable-libdane \
--with-included-unistring \
--disable-guile \
--disable-nls \
--without-idn \
--without-zlib \
--disable-ssl2-support \
--disable-ssl3-support \
--enable-local-libopts \
--disable-doc \
--disable-tests \
--without-idn \
--with-default-trust-store-dir=/etc/ssl/certs/ \
--disable-crywrap \
--with-librt-prefix="$(LIBRT_ROOT_DIR)/"
--with-included-unistring \
--with-librt-prefix="$(LIBRT_ROOT_DIR)/" \
--with-pic
ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y)
CONFIGURE_ARGS += --with-included-libtasn1
@ -155,10 +158,6 @@ ifneq ($(CONFIG_GNUTLS_PSK),y)
CONFIGURE_ARGS += --disable-psk-authentication
endif
ifneq ($(CONFIG_GNUTLS_OPENPGP),y)
CONFIGURE_ARGS += --disable-openpgp-authentication
endif
ifneq ($(CONFIG_GNUTLS_ANON),y)
CONFIGURE_ARGS += --disable-anon-authentication
endif
@ -175,8 +174,6 @@ ifeq ($(CONFIG_GNUTLS_CRYPTODEV),y)
CONFIGURE_ARGS += --enable-cryptodev
endif
TARGET_CFLAGS += $(FPIC)
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
$(CP) \


Loading…
Cancel
Save