[gentoo-commits] repo/gentoo:master commit in: net-misc/aiccu/files/, net-misc/aiccu/

[Michael Weber]

commit:     9cced17d2a04989d6fede3141bcb90f3ea9b0914
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 23:39:53 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 23:40:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cced17d

net-misc/aiccu: fix for gnutls-3.4 and adjust dep (bug 549014, thanks spam and 
alpinelinux).

Package-Manager: portage-2.2.20

 net-misc/aiccu/aiccu-2007.01.15-r4.ebuild          |  3 +--
 ....01.15-r4.ebuild => aiccu-2007.01.15-r5.ebuild} |  5 +++--
 .../aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch  | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild 
b/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild
index 339ace8..d04136e 100644
--- a/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild
+++ b/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm hppa ppc sparc x86"
 IUSE="systemd"
 
-RDEPEND="
-       net-libs/gnutls
+RDEPEND="<net-libs/gnutls-3.4
        sys-apps/iproute2
        systemd? ( sys-apps/systemd )
 "

diff --git a/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild 
b/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
similarity index 90%
copy from net-misc/aiccu/aiccu-2007.01.15-r4.ebuild
copy to net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
index 339ace8..a1c209b 100644
--- a/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild
+++ b/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/${PN}_${PV//\./}.tar.gz";
 
 LICENSE="SixXS"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE="systemd"
 
 RDEPEND="
@@ -34,7 +34,8 @@ src_prepare() {
                "${FILESDIR}"/${P}-Makefile.patch \
                "${FILESDIR}"/${P}-setupscript.patch \
                "${FILESDIR}"/${P}-uclibc.patch \
-               "${FILESDIR}"/${P}-systemd.patch
+               "${FILESDIR}"/${P}-systemd.patch \
+               "${FILESDIR}"/${P}-gnutls-3.4.patch
 }
 
 src_compile() {

diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch 
b/net-misc/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch
new file mode 100644
index 0000000..ee637a7
--- /dev/null
+++ b/net-misc/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch
@@ -0,0 +1,22 @@
+from http://git.alpinelinux.org/cgit/aports/tree/main/aiccu
+
+--- aiccu/common/common.c      2015-04-17 23:08:32.543680010 +0200
++++ aiccu/common/common.c.new  2015-04-17 23:14:02.152457972 +0200
+@@ -272,7 +272,6 @@
+ {
+ #ifdef AICCU_GNUTLS
+       /* Allow connections to servers that have OpenPGP keys as well */
+-      const int       cert_type_priority[3] = { GNUTLS_CRT_X509, 
GNUTLS_CRT_OPENPGP, 0 };
+       int             ret;
+ #endif /* AICCU_GNUTLS*/
+ 
+@@ -300,8 +299,7 @@
+       gnutls_set_default_priority(sock->session);
+       /* XXX: Return value is not documented in GNUTLS documentation! */
+ 
+-      gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
+-      /* XXX: Return value is not documented in GNUTLS documentation! */
++      gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", 
NULL);
+ 
+       /* Configure the x509 credentials for the current session */
+       gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, 
g_aiccu->tls_cred);