jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

openconnect: update to 7.07.

Browse source
This commit is contained in:
Duncaen 2016-07-13 15:21:16 +02:00
parent 5e9e026542
commit d51ab5615e
2 changed files with 62 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
srcpkgs/openconnect/patches/libressl.patch Normal file
View file

@ -0,0 +1,58 @@
diff --git openssl-esp.c openssl-esp.c
index 8b51832..d9cde85 100644
--- openssl-esp.c
+++ openssl-esp.c
@@ -27,7 +27,7 @@
#include <openssl/evp.h>
#include <openssl/rand.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define EVP_CIPHER_CTX_free(c) do { \
EVP_CIPHER_CTX_cleanup(c); \
@@ -85,7 +85,7 @@ static int init_esp_ciphers(struct openconnect_info *vpninfo, struct esp *esp,
}
EVP_CIPHER_CTX_set_padding(esp->cipher, 0);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
esp->hmac = malloc(sizeof(*esp->hmac));
esp->pkt_hmac = malloc(sizeof(*esp->pkt_hmac));
if (!esp->hmac || &esp->pkt_hmac) {
diff --git openssl.c openssl.c
index 785fd2a..6007cef 100644
--- openssl.c
+++ openssl.c
@@ -36,11 +36,11 @@
#include <openssl/ui.h>
#include <openssl/rsa.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define X509_up_ref(x) CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509)
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define EVP_MD_CTX_new EVP_MD_CTX_create
#define EVP_MD_CTX_free EVP_MD_CTX_destroy
#define X509_STORE_CTX_get0_chain(ctx) ((ctx)->chain)
@@ -991,7 +991,7 @@ static int set_peer_cert_hash(struct openconnect_info *vpninfo)
return 0;
}
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
static int match_hostname_elem(const char *hostname, int helem_len,
const char *match, int melem_len)
{
@@ -1653,7 +1653,7 @@ int openconnect_open_https(struct openconnect_info *vpninfo)
* 4fcdd66fff5fea0cfa1055c6680a76a4303f28a2
* cd6bd5ffda616822b52104fee0c4c7d623fd4f53
*/
-#if OPENSSL_VERSION_NUMBER >= 0x10001070
+#if OPENSSL_VERSION_NUMBER >= 0x10001070 || defined(LIBRESSL_VERSION_NUMBER)
if (string_is_hostname(vpninfo->hostname))
SSL_set_tlsext_host_name(https_ssl, vpninfo->hostname);
#endif

8
srcpkgs/openconnect/template
View file

@ -1,19 +1,19 @@
# Template file for 'openconnect'
pkgname=openconnect
version=7.06
revision=5
version=7.07
revision=1
build_style=gnu-configure
configure_args="--sbindir=/usr/bin
--with-vpnc-script=/usr/libexec/vpnc-scripts/vpnc-script"
hostmakedepends="pkg-config"
makedepends="libressl-devel libxml2-devel zlib-devel"
makedepends="libressl-devel libxml2-devel zlib-devel lz4-devel"
depends="vpnc-scripts"
short_desc="Free client for Cisco AnyConnect SSL VPN software"
maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="LGPL-2.1"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=facf695368dc4537a6a30e2147be90b1d77ee3cb2d269eaef070b6d9ddab70f2
checksum=f3ecfcd487dcd916748db38b4138c1e72c86347d6328b11dfe1d0af2821b8366
post_install() {
rm -f ${DESTDIR}/usr/lib/*.la