diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-20 14:46:35 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-21 08:57:05 +0000 |
| commit | 9068d833c12cf96bd271cd0f84ec570305622caf (patch) | |
| tree | f2a298d2d2a7fddc40d864c7aa459bec7ddd8feb /main | |
| parent | a21474d49778ce456079e50f7359a8acaa8ac6a6 (diff) | |
| download | aports-9068d833c12cf96bd271cd0f84ec570305622caf.tar.bz2 aports-9068d833c12cf96bd271cd0f84ec570305622caf.tar.xz | |
aiccu: rebuild against gnutls-3.4
Diffstat (limited to 'main')
| -rw-r--r-- | main/aiccu/APKBUILD | 8 | ||||
| -rw-r--r-- | main/aiccu/gnutls-3.4.0.patch | 20 |
2 files changed, 26 insertions, 2 deletions
diff --git a/main/aiccu/APKBUILD b/main/aiccu/APKBUILD index 809456a84a..f260c9ee49 100644 --- a/main/aiccu/APKBUILD +++ b/main/aiccu/APKBUILD @@ -2,16 +2,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=aiccu pkgver=20070115 -pkgrel=1 +pkgrel=2 pkgdesc="Automatic IPv6 Connectivity Client Utility" url="https://www.sixxs.net/" arch="all" license="SixXS" depends="iproute2" -makedepends="gnutls-dev" +makedepends="gnutls-dev linux-headers" source="https://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz musl_does_not_have_res_ninit.patch fix_linking.patch + gnutls-3.4.0.patch aiccu.initd " subpackages="${pkgname}-doc" @@ -43,12 +44,15 @@ package() { md5sums="c9bcc83644ed788e22a7c3f3d4021350 aiccu_20070115.tar.gz 54a0045d766a1f0696c46800a39a8d92 musl_does_not_have_res_ninit.patch cb9060144aa68e3e2be394427a10f39f fix_linking.patch +592de37319b62e6a85129735a5dab564 gnutls-3.4.0.patch d34e071a9c8312f5cda899199e9e7095 aiccu.initd" sha256sums="2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760 aiccu_20070115.tar.gz f748e1df9ec8381709d983f60282c9dde839bd00eb3db551e45578e155e6772c musl_does_not_have_res_ninit.patch df7820a873e720badefe6bc71b658ce8e0c1c5ac2c16f04e5174f3a7d27b5053 fix_linking.patch +babc7016d964510df33e006ec806384a205f4385ee5c228296a4e4e139a423da gnutls-3.4.0.patch d8c57b5475ed191781f6ce564124320f4b9dabc47f25dbcd5b047afa271006d6 aiccu.initd" sha512sums="15b2f0dab51843e58abbd8a0cc13139e492057ee348e368e1b65476bb2760119e88982cd03ffc6ec2cb563a1b7a061e1f66a98861eaad15972d486ac17b7bc78 aiccu_20070115.tar.gz a13a112eb8bffe125cff9452f9643d516ba4d7168c23e2e15280da9c21e7fa373b8f40cbbf52d353a556820db6b528309055b3a67efc4366e914e4d8e0717aec musl_does_not_have_res_ninit.patch c131ec6d79caa38d315ac938718d0752c62dee148fe7200eb7ea908d2911ff2e99814505552207b676f0a6e25e36d3ecaa9e4ada59310e150cc3faa603662821 fix_linking.patch +f127cf5ba3a2e636fb1ef412a4a00ba4c02ad14cdd1fb1ffe09c5b68e627a6acafad6992ff18de2eede39ace8717a6fccddeb8cf0311b13927d1a69e7a6dd14a gnutls-3.4.0.patch 42bffa006170ee27f288446cb773d5d9bac6adeb1914e53a6ec563c21eafb98528f77bce1e5d2a17db50f628df6b526869b3e9d3446fa68cee321bd9bf939e9b aiccu.initd" diff --git a/main/aiccu/gnutls-3.4.0.patch b/main/aiccu/gnutls-3.4.0.patch new file mode 100644 index 0000000000..8eb1e4fa69 --- /dev/null +++ b/main/aiccu/gnutls-3.4.0.patch @@ -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); |