diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-28 09:32:03 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-28 13:11:27 +0000 |
| commit | ea030f6a562864dfa9b8caf4a6bed839dc7c9ad9 (patch) | |
| tree | 9e00e70d70fe45861f97be1907b0e5720737b637 /main | |
| parent | a83f8f0e0e03bbcb813d0b79e4302b9f588200b7 (diff) | |
| download | aports-ea030f6a562864dfa9b8caf4a6bed839dc7c9ad9.tar.bz2 aports-ea030f6a562864dfa9b8caf4a6bed839dc7c9ad9.tar.xz | |
main/freetds: use libressl
Diffstat (limited to 'main')
| -rw-r--r-- | main/freetds/APKBUILD | 12 | ||||
| -rw-r--r-- | main/freetds/libressl.patch | 35 |
2 files changed, 41 insertions, 6 deletions
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD index d4130c8200..8c06cfa896 100644 --- a/main/freetds/APKBUILD +++ b/main/freetds/APKBUILD @@ -2,17 +2,16 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=freetds pkgver=1.00.82 -pkgrel=0 +pkgrel=1 pkgdesc="Tabular Datastream Library" url="http://www.freetds.org/" arch="all" license="GPL-2.0+, LGPL-2.0+" -depends= -makedepends="unixodbc-dev readline-dev linux-headers openssl-dev" -install= +makedepends="unixodbc-dev readline-dev linux-headers libressl-dev" subpackages="$pkgname-doc $pkgname-dev" source="ftp://ftp.freetds.org/pub/freetds/stable/$pkgname-$pkgver.tar.gz - fix-includes.patch" + fix-includes.patch + libressl.patch" builddir="$srcdir/$pkgname-$pkgver" options="!check" # tests require running SQL server http://www.freetds.org/userguide/confirminstall.htm#TESTS @@ -43,4 +42,5 @@ package() { } sha512sums="a4703599620f028094677241fd8f571966902b88a5eb3cc49cadb0211f18dc255555ac2602948881861e159803d2aac251cd9a8ca59567fb5348998fd2c00692 freetds-1.00.82.tar.gz -d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch" +d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch +0c1e8d7e2e64551a55fc879173f1f6319fc1c79c8a3225af93ec77e95fac36d05b6b6a8ac79feb11dc7a9b771f38f2dde332efb85f803f4d22aedfb0ced4ab46 libressl.patch" diff --git a/main/freetds/libressl.patch b/main/freetds/libressl.patch new file mode 100644 index 0000000000..fdb2f672dd --- /dev/null +++ b/main/freetds/libressl.patch @@ -0,0 +1,35 @@ +diff --git a/src/tds/sec_negotiate_openssl.h b/src/tds/sec_negotiate_openssl.h +index 86af768..426d4a0 100644 +--- a/src/tds/sec_negotiate_openssl.h ++++ b/src/tds/sec_negotiate_openssl.h +@@ -40,7 +40,7 @@ + static inline const BIGNUM* + rsa_get_n(const RSA *rsa) + { +-#if OPENSSL_VERSION_NUMBER >= 0x1010000FL ++#if OPENSSL_VERSION_NUMBER >= 0x1010000FL && !defined(LIBRESSL_VERSION_NUMBER) + const BIGNUM *n, *e, *d; + RSA_get0_key(rsa, &n, &e, &d); + return n; +diff --git a/src/tds/tls.c b/src/tds/tls.c +index 2738a2c..670ecb1 100644 +--- a/src/tds/tls.c ++++ b/src/tds/tls.c +@@ -73,7 +73,7 @@ + #else + + /* some compatibility layer */ +-#if OPENSSL_VERSION_NUMBER < 0x1010000FL ++#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER) + static inline void + BIO_set_init(BIO *b, int init) + { +@@ -590,7 +590,7 @@ tds_ssl_free(BIO *a) + return 1; + } + +-#if OPENSSL_VERSION_NUMBER < 0x1010000FL ++#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER) + static BIO_METHOD tds_method_login[1] = { + { + BIO_TYPE_MEM, |