diff options
Diffstat (limited to 'package/gnutls')
| -rw-r--r-- | package/gnutls/Makefile | 17 | ||||
| -rw-r--r-- | package/gnutls/patches/0001-uclibc.patch | 32 |
2 files changed, 12 insertions, 37 deletions
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 0465f6c59..188d5b3d5 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,16 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.6.16 +PKG_VERSION:= 3.8.10 PKG_RELEASE:= 1 -PKG_HASH:= 1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3 +PKG_HASH:= db7fab7cce791e7727ebbef2334301c821d79a550ec55c9ef096b610b03eb6b7 PKG_DESCR:= transport layer security library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp libunistring PKG_BUILDDEP:= libgcrypt liblzo libtasn1 PKG_BUILDDEP+= zlib ncurses libnettle libunistring +HOST_BUILDDEP:= libnettle-host libtasn1-host libunistring-host PKG_URL:= http://www.gnutls.org/ -PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/ +PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/ PKG_LIBNAME:= libgnutls PKG_OPTS:= dev @@ -27,8 +28,10 @@ PKG_FLAVOURS_LIBGNUTLS:=WITH_CRYPTODEV PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux PKGFB_WITH_CRYPTODEV:= cryptodev-linux +include ${ADK_TOPDIR}/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE})) $(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))) @@ -37,11 +40,14 @@ CONFIGURE_ARGS+= --enable-cryptodev endif TARGET_LDFLAGS+= -pthread +HOST_CONFIGURE_ARGS+= --without-p11-kit \ + --disable-seccomp-tests \ + --disable-tests \ + --disable-doc CONFIGURE_ARGS+= --disable-rpath \ --disable-doc \ --disable-tests \ --disable-seccomp-tests \ - --with-libunistring-prefix='$(STAGING_TARGET_DIR)/usr' \ --without-libz-prefix \ --without-p11-kit CONFIGURE_ENV+= ac_cv_prog_AR='$(TARGET_CROSS)ar' @@ -52,7 +58,8 @@ libgnutls-install: gnutls-utils-install: $(INSTALL_DIR) $(IDIR_GNUTLS_UTILS)/usr/bin - $(CP) $(WRKINST)/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \ + $(CP) $(WRKINST)/usr/bin/{{cert,psk}tool,gnutls-{cli,serv}} \ $(IDIR_GNUTLS_UTILS)/usr/bin +include ${ADK_TOPDIR}/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/gnutls/patches/0001-uclibc.patch b/package/gnutls/patches/0001-uclibc.patch deleted file mode 100644 index b1b90016a..000000000 --- a/package/gnutls/patches/0001-uclibc.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur gnutls-3.6.16.orig/gl/fopen.c gnutls-3.6.16/gl/fopen.c ---- gnutls-3.6.16.orig/gl/fopen.c 2021-05-24 10:04:41.000000000 +0200 -+++ gnutls-3.6.16/gl/fopen.c 2021-10-29 14:28:33.850290352 +0200 -@@ -19,12 +19,10 @@ - /* If the user's config.h happens to include <stdio.h>, let it include only - the system's <stdio.h> here, so that orig_fopen doesn't recurse to - rpl_fopen. */ --#define __need_FILE - #include <config.h> - - /* Get the original definition of fopen. It might be defined as a macro. */ - #include <stdio.h> --#undef __need_FILE - - static FILE * - orig_fopen (const char *filename, const char *mode) -diff -ur gnutls-3.6.16.orig/src/gl/fopen.c gnutls-3.6.16/src/gl/fopen.c ---- gnutls-3.6.16.orig/src/gl/fopen.c 2021-05-24 10:05:13.000000000 +0200 -+++ gnutls-3.6.16/src/gl/fopen.c 2021-10-29 14:28:41.435290892 +0200 -@@ -19,12 +19,10 @@ - /* If the user's config.h happens to include <stdio.h>, let it include only - the system's <stdio.h> here, so that orig_fopen doesn't recurse to - rpl_fopen. */ --#define __need_FILE - #include <config.h> - - /* Get the original definition of fopen. It might be defined as a macro. */ - #include <stdio.h> --#undef __need_FILE - - static FILE * - orig_fopen (const char *filename, const char *mode) |