gnutls: merge gnutls.inc into the gnutls recipe
PATCH 1/3 gnutls: merge gnutls.inc into the gnutls recipe
Signed-off-by Andre McCurdy <[email protected]>
--- meta/recipes-support/gnutls/gnutls.inc | 59 -------------------------- meta/recipes-support/gnutls/gnutls_3.6.3.bb | 65 +++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 63 deletions(-) delete mode 100644 meta/recipes-support/gnutls/gnutls.inc
meta/recipes-support/gnutls/gnutls.inc deleted +0 -59
@@ -1,59 +0,0 @@ -SUMMARY = "GNU Transport Layer Security Library" -HOMEPAGE = "http://www.gnu.org/software/gnutls/" -BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" - -LICENSE = "GPLv3+ & LGPLv2.1+" -LICENSE_${PN} = "LGPLv2.1+" -LICENSE_${PN}-xx = "LGPLv2.1+" -LICENSE_${PN}-bin = "GPLv3+" -LICENSE_${PN}-openssl = "GPLv3+" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ - file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" - -DEPENDS = "nettle gmp virtual/libiconv libunistring" -DEPENDS_append_libc-musl = " argp-standalone" - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" - -inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc - -PACKAGECONFIG ??= "libidn" - -# You must also have CONFIG_SECCOMP enabled in the kernel for -# seccomp to work. -PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" -PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" -PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" -PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" -PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" -PACKAGECONFIG[ssl3] = "--enable-ssl3-support,--disable-ssl3-support," -PACKAGECONFIG[tls13] = "--enable-tls13-support,--disable-tls13-support," - -EXTRA_OECONF = " \ - --enable-doc \ - --disable-libdane \ - --disable-guile \ - --disable-rpath \ - --enable-local-libopts \ - --enable-openssl-compatibility \ - --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ - --without-libunistring-prefix \ -" - -LDFLAGS_append_libc-musl = " -largp" - -do_configure_prepend() { - for dir in . lib; do - rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 - done -} - -PACKAGES =+ "${PN}-openssl ${PN}-xx" - -FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
meta/recipes-support/gnutls/gnutls_3.6.3.bb +61 -4
71 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 2/3 gnutls: drop obsolete configure.ac patch
From gnutls 3.5.8 onwards, the code in configure.ac has been passing "basename $i" to sed, rather than "echo $i". Since the full ${srcdir} path is not being processed, there's no risk of unexpected matches.
https://gitlab.com/armcc/gnutls/commit/478179316bc815e1ad518ae318f46e94a13b0e1f
Signed-off-by Andre McCurdy <[email protected]>
--- .../gnutls/0001-configure.ac-fix-sed-command.patch | 29 ---------------------- meta/recipes-support/gnutls/gnutls_3.6.3.bb | 1 - 2 files changed, 30 deletions(-) delete mode 100644 meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 21 Feb 2017 17:10:07 +0200 -Subject: [PATCH] configure.ac: fix sed command - -The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors -when the S contains "bitbake", fix to "sed 's/\.bak$//'`" - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <[email protected]> -Signed-off-by: Alexander Kanavin <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gnutls-3.5.16/configure.ac -=================================================================== ---- gnutls-3.5.16.orig/configure.ac -+++ gnutls-3.5.16/configure.ac -@@ -955,7 +955,7 @@ YEAR=`date +%Y` - AC_SUBST([YEAR], $YEAR) - - for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do -- nam=$(basename $i|sed 's/.bak//g') -+ nam=$(basename $i|sed 's/\.bak$//') - if test "$create_libopts_links" = "yes";then - rm -f "src/$nam.stamp" - rm -f "src/$nam"
meta/recipes-support/gnutls/gnutls_3.6.3.bb +0 -1
@@ -18,7 +18,6 @@ DEPENDS_append_libc-musl = " argp-standalone" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ - file://0001-configure.ac-fix-sed-command.patch \ file://arm_eabi.patch \ "
Signature · 1 line
1.9.1
PATCH 3/3 gnutls: drop PACKAGECONFIG options for SSL v3 and TLS v1.3
In reply to Andre McCurdyBy including PACKAGECONFIG options, the recipe takes responsibility for defining the default state of these options. Although the recipe currently aligns with the gnutls defaults (ie both disabled) tracking new gnutls releases will be a maintenance effort. Unless there's a clear reason to do otherwise, it seems safer to leave the choice of which SSL/TLS versions to enable by default up to the gnutls developers.
Signed-off-by Andre McCurdy <[email protected]>
--- meta/recipes-support/gnutls/gnutls_3.6.3.bb | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-support/gnutls/gnutls_3.6.3.bb +0 -2
@@ -35,8 +35,6 @@ PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" -PACKAGECONFIG[ssl3] = "--enable-ssl3-support,--disable-ssl3-support," -PACKAGECONFIG[tls13] = "--enable-tls13-support,--disable-tls13-support," EXTRA_OECONF = " \ --enable-doc \
Signature · 1 line
1.9.1