gnutls: remove old unpinned versions
PATCH 1/1 gnutls: remove old unpinned versions
* move LICENSE_${PN}-extra from recipe to .inc file
Signed-off-by Martin Jansa <[email protected]>
--- recipes/gnutls/gnutls-2.8.5/gnutls-openssl.patch | 149 --- .../gnutls-2.8.5/gnutls-replace-siginterrupt.patch | 51 - .../gettextize-with-gettext-0.18.patch | 1042 -------------------- recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch | 129 --- .../gnutls-2.8.6/gnutls-replace-siginterrupt.patch | 41 - recipes/gnutls/gnutls.inc | 1 + recipes/gnutls/gnutls_2.10.1.bb | 27 - recipes/gnutls/gnutls_2.10.4.bb | 2 - recipes/gnutls/gnutls_2.8.5.bb | 20 - recipes/gnutls/gnutls_2.8.6.bb | 16 - 10 files changed, 1 insertions(+), 1477 deletions(-) delete mode 100644 recipes/gnutls/gnutls-2.8.5/gnutls-openssl.patch delete mode 100644 recipes/gnutls/gnutls-2.8.5/gnutls-replace-siginterrupt.patch delete mode 100644 recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch delete mode 100644 recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch delete mode 100644 recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch delete mode 100644 recipes/gnutls/gnutls_2.10.1.bb delete mode 100644 recipes/gnutls/gnutls_2.8.5.bb delete mode 100644 recipes/gnutls/gnutls_2.8.6.bb
recipes/gnutls/gnutls-2.8.5/gnutls-openssl.patch deleted +0 -149
@@ -1,149 +0,0 @@ ---- - libextra/gnutls_openssl.c | 58 +++++++++++++++++++++++++++++++++++++ - libextra/includes/gnutls/openssl.h | 5 +++ - 2 files changed, 63 insertions(+) - ---- gnutls-2.8.5.orig/libextra/gnutls_openssl.c -+++ gnutls-2.8.5/libextra/gnutls_openssl.c -@@ -256,16 +256,21 @@ SSL_new (SSL_CTX * ctx) - ssl->options = ctx->options; - - ssl->rfd = (gnutls_transport_ptr_t) - 1; - ssl->wfd = (gnutls_transport_ptr_t) - 1; - -+ ssl->ssl_peek_buffer = NULL; -+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0; -+ - return ssl; - } - - void - SSL_free (SSL * ssl) - { -+ if (ssl->ssl_peek_buffer) -+ free(ssl->ssl_peek_buffer); - gnutls_certificate_free_credentials (ssl->gnutls_cred); - gnutls_deinit (ssl->gnutls_state); - free (ssl); - } - -@@ -285,10 +290,11 @@ SSL_get_error (SSL * ssl, int ret) - - int - SSL_set_fd (SSL * ssl, int fd) - { - gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd)); -+ ssl->rfd = ssl->wfd = fd; - return 1; - } - - int - SSL_set_rfd (SSL * ssl, int fd) -@@ -310,10 +316,21 @@ SSL_set_wfd (SSL * ssl, int fd) - gnutls_transport_set_ptr2 (ssl->gnutls_state, ssl->rfd, ssl->wfd); - - return 1; - } - -+int SSL_get_rfd(SSL *ssl) -+{ -+ return ssl->rfd; -+} -+ -+int SSL_get_wfd(SSL *ssl) -+{ -+ return ssl->wfd; -+} -+ -+ - void - SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio) - { - gnutls_transport_set_ptr2 (ssl->gnutls_state, rbio->fd, wbio->fd); - /* free(BIO); ? */ -@@ -325,10 +342,12 @@ SSL_set_connect_state (SSL * ssl) - } - - int - SSL_pending (SSL * ssl) - { -+ if (ssl->ssl_peek_avail) -+ return ssl->ssl_peek_avail; - return gnutls_record_check_pending (ssl->gnutls_state); - } - - void - SSL_set_verify (SSL * ssl, int verify_mode, -@@ -480,15 +499,54 @@ SSL_shutdown (SSL * ssl) - - /* FIXME */ - return 1; - } - -+int SSL_peek(SSL *ssl, void *buf, int len) -+{ -+ if (len > ssl->ssl_peek_buffer_size) { -+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len); -+ ssl->ssl_peek_buffer_size = len; -+ } -+ -+ if (ssl->ssl_peek_avail == 0) { -+ -+ int ret; -+ -+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len); -+ ssl->last_error = ret; -+ -+ if (ret > 0) -+ ssl->ssl_peek_avail += ret; -+ } -+ -+ if (len > ssl->ssl_peek_avail) -+ len = ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, len); -+ -+ return len; -+} -+ - int - SSL_read (SSL * ssl, void *buf, int len) - { - int ret; - -+ if (ssl->ssl_peek_avail) { -+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, n); -+ -+ if (ssl->ssl_peek_avail > n) -+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n); -+ -+ ssl->ssl_peek_avail -= n; -+ -+ return n; -+ } -+ - ret = gnutls_record_recv (ssl->gnutls_state, buf, len); - ssl->last_error = ret; - - if (ret < 0) - { ---- gnutls-2.8.5.orig/libextra/includes/gnutls/openssl.h -+++ gnutls-2.8.5/libextra/includes/gnutls/openssl.h -@@ -162,10 +162,15 @@ extern "C" - int (*verify_callback) (int, X509_STORE_CTX *); - int verify_mode; - - gnutls_transport_ptr_t rfd; - gnutls_transport_ptr_t wfd; -+ -+ char *ssl_peek_buffer; -+ size_t ssl_peek_buffer_size; -+ size_t ssl_peek_avail; -+ - }; - - #define rbio gnutls_state - - typedef struct {
recipes/gnutls/gnutls-2.8.5/gnutls-replace-siginterrupt.patch deleted +0 -51
51 lines not on this page · raw message
recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch deleted +0 -1042
1,042 lines not on this page · raw message
recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch deleted +0 -129
129 lines not on this page · raw message
recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch deleted +0 -41
41 lines not on this page · raw message
recipes/gnutls/gnutls.inc +1 -0
@@ -2,6 +2,7 @@ DESCRIPTION = "GNU Transport Layer Security Library" HOMEPAGE = "http://www.gnu.org/software/gnutls/" DEPENDS = "zlib libgcrypt lzo guile-native gtk-doc" LICENSE = "LGPL" +LICENSE_${PN}-extra = "GPLv3" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
recipes/gnutls/gnutls_2.10.1.bb deleted +0 -27
@@ -1,27 +0,0 @@ -require gnutls.inc - -PR = "${INC_PR}.3" - -LICENSE_${PN}-extra = "GPLv3" - -EXTRA_OECONF += " --without-libgcrypt-prefix " - -SRC_URI += "file://gettextize-with-gettext-0.18.patch \ - file://gnutls-openssl.patch \ - file://gnutls-replace-siginterrupt.patch \ - " - -do_configure_prepend() { - - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - - for i in ${MACROS}; do - rm -f m4/$i - rm -f lib/m4/$i - rm -f libextra/m4/$i - done - -} - -SRC_URI[gnutls.md5sum] = "b614448d7fb43ea0d4f727e6302bbf0f" -SRC_URI[gnutls.sha256sum] = "731078bc11661411ba47b20a65024abeca40d43a1b3c4526a6599b7905c302ee"
recipes/gnutls/gnutls_2.10.4.bb +0 -2
@@ -2,8 +2,6 @@ require gnutls.inc PR = "${INC_PR}.0" -LICENSE_${PN}-extra = "GPLv3" - EXTRA_OECONF += " --without-libgcrypt-prefix " SRC_URI += "file://gettextize-with-gettext-0.18.patch \
recipes/gnutls/gnutls_2.8.5.bb deleted +0 -20
@@ -1,20 +0,0 @@ -require gnutls.inc - -PR = "${INC_PR}.0" - -LICENSE_${PN}-extra = "GPLv3" - -SRC_URI += "\ - file://gnutls-openssl.patch \ - file://gnutls-replace-siginterrupt.patch \ - " - -EXTRA_OECONF += " --without-libgcrypt-prefix " - -do_configure_prepend() { - - cd ${S} && rm -rf m4/ aclocal.m4 lib/m4/libtool.m4 lib/m4/lt*m4 -} - -SRC_URI[gnutls.md5sum] = "e3b2788b79bfc82acbe717e3c54d4e92" -SRC_URI[gnutls.sha256sum] = "9249c29df71551e302e0186f4e1876dd6cc4c6cf2974b432c22525dde815cae8"
recipes/gnutls/gnutls_2.8.6.bb deleted +0 -16
@@ -1,16 +0,0 @@ -require gnutls.inc - -PR = "${INC_PR}.0" - -LICENSE_${PN}-extra = "GPLv3" - -EXTRA_OECONF += " --without-libgcrypt-prefix " - -SRC_URI += "file://gettextize-with-gettext-0.18.patch \ - file://gnutls-openssl.patch \ - file://gnutls-replace-siginterrupt.patch \ - " - -SRC_URI[gnutls.md5sum] = "eb0a6d7d3cb9ac684d971c14f9f6d3ba" -SRC_URI[gnutls.sha256sum] = "d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356" -
Signature · 1 line
1.7.4.rc2
Quoted 1 line · Martin Jansa
* move LICENSE_${PN}-extra from recipe to .inc file
Acked-by Otavio Salvador <[email protected]>
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 3 lines · Martin Jansa
* move LICENSE_${PN}-extra from recipe to .inc file
Signed-off-by Martin Jansa <[email protected]>
Acked-by Michael Smith <[email protected]>
Mike