summaryrefslogtreecommitdiff
path: root/package/gnutls
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-01-11 19:15:36 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2017-01-11 19:15:36 +0100
commit49f7b12497cfbd9dbf5a9e04788b5bb3175456a9 (patch)
treea3f77985b4d2b956b69cfbff7d5500ca23a36f07 /package/gnutls
parent09f3b807de46e7e34f659ccad0d35b0cbaa697ed (diff)
gnutls: update to 3.5.8, remove extra subpackage
Diffstat (limited to 'package/gnutls')
-rw-r--r--package/gnutls/Makefile27
1 files changed, 10 insertions, 17 deletions
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 55bf38ea6..2eb868de8 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -4,35 +4,33 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= gnutls
-PKG_VERSION:= 3.4.17
+PKG_VERSION:= 3.5.8
PKG_RELEASE:= 1
-PKG_HASH:= 9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e
+PKG_HASH:= 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff
PKG_DESCR:= transport layer security library
PKG_SECTION:= libs/crypto
-PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp
-PKG_BUILDDEP:= libgcrypt liblzo libtasn1
-PKG_BUILDDEP+= zlib ncurses libnettle
+PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp libunistring
+PKG_BUILDDEP:= libgcrypt liblzo libtasn1
+PKG_BUILDDEP+= zlib ncurses libnettle libunistring
PKG_URL:= http://www.gnutls.org/
-PKG_SITES:= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/
+PKG_SITES:= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/
PKG_LIBNAME:= libgnutls
PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA
+PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS
PKGSD_GNUTLS_UTILS:= transport layer security utilities
PKGSS_GNUTLS_UTILS:= libgnutls libgnutls-extra
PKGSC_GNUTLS_UTILS:= app/crypto
PKGSC_LIBGNUTLS:= libs/crypto
-PKGSC_LIBGNUTLS_EXTRA:= libs/crypto
-PKG_FLAVOURS_LIBGNUTLS:= WITH_CRYPTODEV
-PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
-PKGFB_WITH_CRYPTODEV:= cryptodev-linux
+PKG_FLAVOURS_LIBGNUTLS:=WITH_CRYPTODEV
+PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
+PKGFB_WITH_CRYPTODEV:= cryptodev-linux
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBGNUTLS,libgnutls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS),$(PKG_OPTS)))
$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_GNUTLS_UTILS),$(PKGSD_GNUTLS_UTILS),$(PKGSC_GNUTLS_UTILS)))
-$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_EXTRA)))
ifneq ($(ADK_PACKAGE_LIBGNUTLS_WITH_CRYPTODEV),)
CONFIGURE_ARGS+= --enable-cryptodev
@@ -49,11 +47,6 @@ libgnutls-install:
$(INSTALL_DIR) $(IDIR_LIBGNUTLS)/usr/lib
$(CP) $(WRKINST)/usr/lib/libgnutls.so* $(IDIR_LIBGNUTLS)/usr/lib
-libgnutls-extra-install:
- $(INSTALL_DIR) $(IDIR_LIBGNUTLS_EXTRA)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libgnutlsxx.so* \
- $(IDIR_LIBGNUTLS_EXTRA)/usr/lib
-
gnutls-utils-install:
$(INSTALL_DIR) $(IDIR_GNUTLS_UTILS)/usr/bin
$(CP) $(WRKINST)/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \