[arch-commits] Commit in samba/trunk (2 files)
Tobias Powalowski
tpowa at archlinux.org
Mon Aug 29 06:54:40 UTC 2016
Date: Monday, August 29, 2016 @ 06:54:40
Author: tpowa
Revision: 274793
remove not needed patches
Deleted:
samba/trunk/0001-s4-lib-tls-use-gnutls_priority_set_direct.patch
samba/trunk/samba-4.0.3-fix_pidl_with_gcc48.patch
------------------------------------------------------+
0001-s4-lib-tls-use-gnutls_priority_set_direct.patch | 69 -----------------
samba-4.0.3-fix_pidl_with_gcc48.patch | 60 --------------
2 files changed, 129 deletions(-)
Deleted: 0001-s4-lib-tls-use-gnutls_priority_set_direct.patch
===================================================================
--- 0001-s4-lib-tls-use-gnutls_priority_set_direct.patch 2016-08-29 06:50:34 UTC (rev 274792)
+++ 0001-s4-lib-tls-use-gnutls_priority_set_direct.patch 2016-08-29 06:54:40 UTC (rev 274793)
@@ -1,69 +0,0 @@
-From 9d9b38b434b9d2e4b3bddd618cea944dfb960966 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Mon, 13 Apr 2015 22:03:14 +0300
-Subject: [PATCH] s4:lib/tls: use gnutls_priority_set_direct()
-
-gnutls_certificate_type_set_priority() was removed in GnuTLS 3.4.0.
----
- source4/lib/tls/tls.c | 4 +---
- source4/lib/tls/tls_tstream.c | 9 +--------
- 2 files changed, 2 insertions(+), 11 deletions(-)
-
-diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
-index b9182ad..2bcbb80 100644
---- a/source4/lib/tls/tls.c
-+++ b/source4/lib/tls/tls.c
-@@ -572,7 +572,6 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx,
- {
- struct tls_context *tls;
- int ret = 0;
-- const int cert_type_priority[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
- struct socket_context *new_sock;
- NTSTATUS nt_status;
-
-@@ -597,8 +596,7 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx,
- gnutls_certificate_allocate_credentials(&tls->xcred);
- gnutls_certificate_set_x509_trust_file(tls->xcred, ca_path, GNUTLS_X509_FMT_PEM);
- TLSCHECK(gnutls_init(&tls->session, GNUTLS_CLIENT));
-- TLSCHECK(gnutls_set_default_priority(tls->session));
-- gnutls_certificate_type_set_priority(tls->session, cert_type_priority);
-+ TLSCHECK(gnutls_priority_set_direct(tls->session, "NORMAL:+CTYPE-OPENPGP", NULL));
- TLSCHECK(gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE, tls->xcred));
-
- talloc_set_destructor(tls, tls_destructor);
-diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
-index f19f5c5..ff0e881 100644
---- a/source4/lib/tls/tls_tstream.c
-+++ b/source4/lib/tls/tls_tstream.c
-@@ -967,11 +967,6 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
- #if ENABLE_GNUTLS
- struct tstream_tls *tlss;
- int ret;
-- static const int cert_type_priority[] = {
-- GNUTLS_CRT_X509,
-- GNUTLS_CRT_OPENPGP,
-- 0
-- };
- #endif /* ENABLE_GNUTLS */
-
- req = tevent_req_create(mem_ctx, &state,
-@@ -1007,15 +1002,13 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
- return tevent_req_post(req, ev);
- }
-
-- ret = gnutls_set_default_priority(tlss->tls_session);
-+ ret = gnutls_priority_set_direct(tlss->tls_session, "NORMAL:+CTYPE-OPENPGP", NULL);
- if (ret != GNUTLS_E_SUCCESS) {
- DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
- tevent_req_error(req, EINVAL);
- return tevent_req_post(req, ev);
- }
-
-- gnutls_certificate_type_set_priority(tlss->tls_session, cert_type_priority);
--
- ret = gnutls_credentials_set(tlss->tls_session,
- GNUTLS_CRD_CERTIFICATE,
- tls_params->x509_cred);
---
-2.3.5
-
Deleted: samba-4.0.3-fix_pidl_with_gcc48.patch
===================================================================
--- samba-4.0.3-fix_pidl_with_gcc48.patch 2016-08-29 06:50:34 UTC (rev 274792)
+++ samba-4.0.3-fix_pidl_with_gcc48.patch 2016-08-29 06:54:40 UTC (rev 274793)
@@ -1,60 +0,0 @@
-From 1ac743a7d0d20e16fc325749d593edaaed89d706 Mon Sep 17 00:00:00 2001
-From: Alexander Bokovoy <ab at samba.org>
-Date: Wed, 6 Feb 2013 10:17:57 +0200
-Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output
-
-When PIDL calls out to C preprocessor to expand IDL files
-and parse the output, it filters out linemarkers and line control
-information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
-and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control
-
-With gcc 4.8 stdc-predef.h is included automatically and linemarker for the
-file has extended flags that PIDL couldn't parse ('system header that needs to
-be extern "C" protected for C++')
-
-Thanks to Jakub Jelinek <jakub at redhat.com> for explanation of the linemarker format.
-
-Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517
-
-Reviewed-by: Andreas Schneider <asn at samba.org>
-(cherry picked from commit 6ba7ab5c14801aecae96373d5a9db7ab82957526)
-
-Signed-off-by: Andreas Schneider <asn at samba.org>
----
- pidl/idl.yp | 4 +++-
- pidl/lib/Parse/Pidl/IDL.pm | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/pidl/idl.yp b/pidl/idl.yp
-index b5c5185..c8a65f6 100644
---- a/pidl/idl.yp
-+++ b/pidl/idl.yp
-@@ -610,7 +610,9 @@ again:
-
- for ($parser->YYData->{INPUT}) {
- if (/^\#/) {
-- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
-+ # Linemarker format is described at
-+ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
-+ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
- $parser->YYData->{LINE} = $1-1;
- $parser->YYData->{FILE} = $2;
- goto again;
-diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
-index d4820ff..6927c89 100644
---- a/pidl/lib/Parse/Pidl/IDL.pm
-+++ b/pidl/lib/Parse/Pidl/IDL.pm
-@@ -2576,7 +2576,9 @@ again:
-
- for ($parser->YYData->{INPUT}) {
- if (/^\#/) {
-- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
-+ # Linemarker format is described at
-+ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
-+ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
- $parser->YYData->{LINE} = $1-1;
- $parser->YYData->{FILE} = $2;
- goto again;
---
-1.8.1.1
-
More information about the arch-commits
mailing list