gnutls: update to 3.2.13

new file mode 100644
index 0000000..eb7c9de
@@ -0,0 +1,22 @@
+DESCRIPTION = "A low level cryptographic library"
+HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
+SECTION = "libs"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+DEPENDS += "gmp"
+
+SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
+
+SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
+SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
+
+do_configure_prepend() {
+       if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
+               cp ${S}/aclocal.m4 ${S}/acinclude.m4
+       fi
+}
+
+inherit autotools
+
+BBCLASSEXTEND = "native"

new file mode 100644
index 0000000..87f1639
@@ -0,0 +1,24 @@
+SUMMARY = "A low level cryptographic library"
+HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+                    file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \
+                    file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d"
+
+DEPENDS += "gmp"
+
+SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz"
+
+SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
+SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
+
+do_configure_prepend() {
+       if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
+               cp ${S}/aclocal.m4 ${S}/acinclude.m4
+       fi
+}
+
+inherit autotools
+
+BBCLASSEXTEND = "native"

index 25ec3a6..b77b3e5 100644
@@ -1,46 +1,42 @@
 SUMMARY = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline"
-
-INC_PR = "r8"
+DEPENDS = "zlib nettle"
 
 LICENSE = "GPLv3+ & LGPLv2.1+"
 LICENSE_${PN} = "LGPLv2.1+"
 LICENSE_${PN}-xx = "LGPLv2.1+"
 LICENSE_${PN}-bin = "GPLv3+"
-LICENSE_${PN}-extra = "GPLv3+"
 LICENSE_${PN}-openssl = "GPLv3+"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://lib/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://libextra/COPYING;md5=d32239bcb673463ab874e80d47fae504"
+                    file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
 
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
-SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
 
 inherit autotools-brokensep binconfig pkgconfig gettext lib_package
 
-EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
-              --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
-              --with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
-              --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
+EXTRA_OECONF="--disable-rpath \
+              --with-included-libtasn1 \
+              --enable-local-libopts \
               --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
-              --with-libreadline-prefix=${STAGING_DIR_HOST}${prefix} \
               --with-libz-prefix=${STAGING_DIR_HOST}${prefix} \
-              --with-lzo --disable-guile \
+              --disable-guile \
               --without-p11-kit \
               "
+
 do_configure_prepend() {
-	for dir in . lib libextra; do
+	for dir in . lib; do
 		rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4
 	done
 }
 
-PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-xx"
+PACKAGES =+ "${PN}-openssl ${PN}-xx"
 
 FILES_${PN}-dev += "${bindir}/gnutls-cli-debug"
-FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
 FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
 FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
 

636 lines not on this page · raw message

106 lines not on this page · raw message

deleted file mode 100644
index 6567257..0000000
@@ -1,33 +0,0 @@
-From 467478d8ff08a3cb4be3034ff04c9d08a0ceba3e Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <[email protected]>
-Date: Wed, 12 Feb 2014 16:41:33 +0100
-Subject: [PATCH 1/5] Fixed bug that prevented the rejection of v1 intermediate
- CA certificates.
-
-Upstream-Status: Backport
-
-Signed-off-by: Karl Hiramoto <[email protected]>
-
----
- lib/x509/verify.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/x509/verify.c b/lib/x509/verify.c
-index 2efcebf..c9a6b0d 100644
---- a/lib/x509/verify.c
-+++ b/lib/x509/verify.c
-@@ -645,7 +645,10 @@ _gnutls_x509_verify_certificate (const gnutls_x509_crt_t * certificate_list,
-        * certificates can exist in a supplied chain.
-        */
-       if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT))
--        flags &= ~(GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
-+        {
-+          flags &= ~(GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
-+          flags |= GNUTLS_VERIFY_DO_NOT_ALLOW_X509_V1_CA_CRT;
-+        }
-       if ((ret =
-            _gnutls_verify_certificate2 (certificate_list[i - 1],
-                                         &certificate_list[i], 1, flags,
--- 
-1.8.3.2
-

51 lines not on this page · raw message

65 lines not on this page · raw message

index b8f0d72..5e452c5 100644
@@ -1,3 +1,8 @@
+From ae3370788ed3447bba16969d9eb1bf1b9631e1b7 Mon Sep 17 00:00:00 2001
+From: Valentin Popa <[email protected]>
+Date: Fri, 25 Apr 2014 13:58:55 +0300
+Subject: [PATCH] Correct rpl_gettimeofday signature
+
 Currently we fail on uclibc like below
 
 | In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0,

@@ -14,7 +19,6 @@ Currently we fail on uclibc like below
 | make[4]: *** [ex-cxx.o] Error 1
 | make[4]: *** Waiting for unfinished jobs....
 
-
 GCC detects that we call 'restrict' as param name in function
 signatures and complains since both params are called 'restrict'
 therefore we use __restrict to denote the C99 keywork

@@ -25,14 +29,17 @@ eglibc otherwise we will have same issue there too
 Signed-off-by: Khem Raj <[email protected]>
 
 Upstream-Status: Pending
+---
+ gl/sys_time.in.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: gnutls-2.12.14/gl/sys_time.in.h
-===================================================================
---- gnutls-2.12.14.orig/gl/sys_time.in.h	2012-01-15 10:54:39.517285351 -0800
-+++ gnutls-2.12.14/gl/sys_time.in.h	2012-01-15 10:59:23.773299108 -0800
-@@ -82,20 +82,20 @@
- #    define gettimeofday rpl_gettimeofday
- #   endif
+diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h
+index 84a17c9..6ceadc3 100644
+--- a/gl/sys_time.in.h
++++ b/gl/sys_time.in.h
+@@ -93,20 +93,20 @@ struct timeval
+ #   define gettimeofday rpl_gettimeofday
+ #  endif
  _GL_FUNCDECL_RPL (gettimeofday, int,
 -                  (struct timeval *restrict, void *restrict)
 +                  (struct timeval *__restrict, void *__restrict)

@@ -40,18 +47,21 @@ Index: gnutls-2.12.14/gl/sys_time.in.h
  _GL_CXXALIAS_RPL (gettimeofday, int,
 -                  (struct timeval *restrict, void *restrict));
 +                  (struct timeval *__restrict, void *__restrict));
- #  else
- #   if !@HAVE_GETTIMEOFDAY@
+ # else
+ #  if !@HAVE_GETTIMEOFDAY@
  _GL_FUNCDECL_SYS (gettimeofday, int,
 -                  (struct timeval *restrict, void *restrict)
 +                  (struct timeval *__restrict, void *__restrict)
                    _GL_ARG_NONNULL ((1)));
- #   endif
+ #  endif
  /* Need to cast, because on glibc systems, by default, the second argument is
                                                    struct timezone *.  */
  _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
 -                       (struct timeval *restrict, void *restrict));
 +                       (struct timeval *__restrict, void *__restrict));
- #  endif
+ # endif
  _GL_CXXALIASWARN (gettimeofday);
- # elif defined GNULIB_POSIXCHECK
+ #elif defined GNULIB_POSIXCHECK
+-- 
+1.9.1
+

46 lines not on this page · raw message

126 lines not on this page · raw message

deleted file mode 100644
index 2218242..0000000
@@ -1,16 +0,0 @@
-require gnutls.inc
-
-PR = "${INC_PR}.4"
-
-SRC_URI += "file://gnutls-openssl.patch \
-            file://correct_rpl_gettimeofday_signature.patch \
-            file://configure-fix.patch \
-            file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
-            file://CVE-2014-1959-rejection-of-v1-intermediate-cert.patch \
-            file://CVE-2014-0092-corrected-return-codes.patch \
-            file://25_updatedgdocfrommaster.diff \
-            ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \
-           "
-
-SRC_URI[md5sum] = "f3c1d34bd5f113395c4be0d5dfc2b7fe"
-SRC_URI[sha256sum] = "dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2"

new file mode 100644
index 0000000..97e2df2
@@ -0,0 +1,7 @@
+require gnutls.inc
+
+SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
+           "
+
+SRC_URI[md5sum] = "300e5f413054e2f4719c1c3b5179a611"
+SRC_URI[sha256sum] = "e83676218ba80c4d577d7027b5b087692280347a9b06f90a452403ba70faa604"

index 6eb3d2d..61c29ef 100644
@@ -6,7 +6,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
                     file://README;beginline=1;endline=56;md5=a07250b28e857455336bb59fc31cb845 \
                     file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=e8e021e30f3a6ab7c341b66b86626a5a"
-DEPENDS = "gnutls dbus libnl openssl"
+DEPENDS = "gnutls dbus libnl openssl libgcrypt"
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
 inherit systemd