Date: Friday, April 17, 2015 @ 23:18:02
Author: andyrtr
Revision: 131564
upgpkg: aiccu 20070115-5
gnutls rebuild
Added:
aiccu/trunk/gnutls-3.4.0.patch
Modified:
aiccu/trunk/PKGBUILD
--------------------+
PKGBUILD | 8 +++++---
gnutls-3.4.0.patch | 20 ++++++++++++++++++++
2 files changed, 25 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-17 21:12:21 UTC (rev 131563)
+++ PKGBUILD 2015-04-17 21:18:02 UTC (rev 131564)
@@ -3,7 +3,7 @@
pkgname=aiccu
pkgver=20070115
-pkgrel=4
+pkgrel=5
pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
arch=('i686' 'x86_64')
url='http://www.sixxs.net/tools/aiccu/'
@@ -16,7 +16,8 @@
'03-no-quiet-gcc.patch'
'04-skip-strip.patch'
'05-spelling-error.patch'
- '06-setup-script.patch')
+ '06-setup-script.patch'
+ 'gnutls-3.4.0.patch')
md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
'891b0fa527c1b847ce803dac047cf80d'
'b9b2c0e7186f3f96366caaa39252dccc'
@@ -23,7 +24,8 @@
'b38db1d95760cd9687330b7db5f4ea1d'
'6dfa2df27bb4859c7511bfea91337925'
'21a37c376ebfcf787c0e7ee8552053ac'
- '98e73756609f4e09c45c4e5139fd5aed')
+ '98e73756609f4e09c45c4e5139fd5aed'
+ '592de37319b62e6a85129735a5dab564')
prepare() {
cd $pkgname
Added: gnutls-3.4.0.patch
===================================================================
--- gnutls-3.4.0.patch (rev 0)
+++ gnutls-3.4.0.patch 2015-04-17 21:18:02 UTC (rev 131564)
@@ -0,0 +1,20 @@
+--- 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);
