1 |
commit: fc34c7250eef6b08068be471eedb6437d0f8e022 |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 3 16:09:11 2017 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 3 20:54:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc34c725 |
7 |
|
8 |
net-libs/net6: gnutls-3.4 + eapi bump |
9 |
|
10 |
Bug: 582812 |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
|
14 |
net-libs/net6/files/net6-1.3.14-gnutls-3.4.patch | 27 +++++++++++++++ |
15 |
net-libs/net6/net6-1.3.14-r2.ebuild | 43 ++++++++++++++++++++++++ |
16 |
2 files changed, 70 insertions(+) |
17 |
|
18 |
diff --git a/net-libs/net6/files/net6-1.3.14-gnutls-3.4.patch b/net-libs/net6/files/net6-1.3.14-gnutls-3.4.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..0eb43167632 |
21 |
--- /dev/null |
22 |
+++ b/net-libs/net6/files/net6-1.3.14-gnutls-3.4.patch |
23 |
@@ -0,0 +1,27 @@ |
24 |
+From 90154df3f1d504f0ebb3d70b889c1f0e30990588 Mon Sep 17 00:00:00 2001 |
25 |
+From: Carlos Alberto Lopez Perez <clopez@××××××.com> |
26 |
+Date: Thu, 28 Jul 2016 14:43:38 +0200 |
27 |
+Subject: [PATCH] Fix build with GnuTLS >= 3.4.0 |
28 |
+ |
29 |
+ * gnutls_kx_set_priority() has been removed in 3.4.0 and |
30 |
+ gnutls_priority_set_direct() should be used instead. |
31 |
+--- |
32 |
+ src/encrypt.cpp | 4 +--- |
33 |
+ 1 file changed, 1 insertion(+), 3 deletions(-) |
34 |
+ |
35 |
+diff --git a/src/encrypt.cpp b/src/encrypt.cpp |
36 |
+index 30f83a6..9223c35 100644 |
37 |
+--- a/src/encrypt.cpp |
38 |
++++ b/src/encrypt.cpp |
39 |
+@@ -175,10 +175,8 @@ net6::tcp_encrypted_socket_base:: |
40 |
+ gnutls_session_t sess): |
41 |
+ tcp_client_socket(cobj), session(sess), state(DEFAULT) |
42 |
+ { |
43 |
+- const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 }; |
44 |
+- |
45 |
+ gnutls_set_default_priority(session); |
46 |
+- gnutls_kx_set_priority(session, kx_prio); |
47 |
++ gnutls_priority_set_direct(session, "NORMAL:+ANON-DH", NULL); |
48 |
+ |
49 |
+ gnutls_transport_set_ptr( |
50 |
+ session, |
51 |
|
52 |
diff --git a/net-libs/net6/net6-1.3.14-r2.ebuild b/net-libs/net6/net6-1.3.14-r2.ebuild |
53 |
new file mode 100644 |
54 |
index 00000000000..2ddc4a143f4 |
55 |
--- /dev/null |
56 |
+++ b/net-libs/net6/net6-1.3.14-r2.ebuild |
57 |
@@ -0,0 +1,43 @@ |
58 |
+# Copyright 1999-2017 Gentoo Foundation |
59 |
+# Distributed under the terms of the GNU General Public License v2 |
60 |
+ |
61 |
+EAPI=6 |
62 |
+ |
63 |
+inherit eutils flag-o-matic multilib |
64 |
+ |
65 |
+DESCRIPTION="Network access framework for IPv4/IPv6 written in C++" |
66 |
+HOMEPAGE="http://gobby.0x539.de/" |
67 |
+SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz" |
68 |
+ |
69 |
+LICENSE="LGPL-2.1" |
70 |
+SLOT="0" |
71 |
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86" |
72 |
+IUSE="nls static-libs" |
73 |
+ |
74 |
+RDEPEND="dev-libs/libsigc++:2 |
75 |
+ >=net-libs/gnutls-1.2.10" |
76 |
+DEPEND="${RDEPEND} |
77 |
+ virtual/pkgconfig |
78 |
+ nls? ( sys-devel/gettext )" |
79 |
+ |
80 |
+DOCS=( AUTHORS ChangeLog NEWS README ) |
81 |
+PATCHES=( |
82 |
+ "${FILESDIR}/${P}-gnutls-3.4.patch" |
83 |
+) |
84 |
+ |
85 |
+src_configure() { |
86 |
+ append-cxxflags -std=c++11 |
87 |
+ econf $(use_enable nls) \ |
88 |
+ $(use_enable static-libs static) |
89 |
+} |
90 |
+ |
91 |
+src_install() { |
92 |
+ default |
93 |
+ prune_libtool_files |
94 |
+} |
95 |
+ |
96 |
+pkg_postinst() { |
97 |
+ elog "Please note that because of the use of C++ templates" |
98 |
+ elog "Gobby 0.4 has to be recompiled against the new ${PN}" |
99 |
+ elog "to pick up the changes." |
100 |
+} |