mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 05:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/freetds: rebuild against libressl-2.7

Browse Source
This commit is contained in:
Natanael Copa 2018-04-03 12:42:23 +00:00
parent 7cf47337c3
commit 7960a93cf1
2 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/freetds/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=freetds pkgname=freetds
pkgver=1.00.84 pkgver=1.00.84
pkgrel=0 pkgrel=1
pkgdesc="Tabular Datastream Library" pkgdesc="Tabular Datastream Library"
url="http://www.freetds.org" url="http://www.freetds.org"
arch="all" arch="all"
@ -11,7 +11,8 @@ makedepends="libressl-dev linux-headers readline-dev unixodbc-dev"
subpackages="$pkgname-doc $pkgname-dev" subpackages="$pkgname-doc $pkgname-dev"
source="http://www.freetds.org/files/stable/$pkgname-$pkgver.tar.gz source="http://www.freetds.org/files/stable/$pkgname-$pkgver.tar.gz
fix-includes.patch fix-includes.patch
libressl.patch" libressl.patch
"
builddir="$srcdir/$pkgname-$pkgver" builddir="$srcdir/$pkgname-$pkgver"
options="!check" # tests require running SQL server http://www.freetds.org/userguide/confirminstall.htm#TESTS options="!check" # tests require running SQL server http://www.freetds.org/userguide/confirminstall.htm#TESTS
@ -43,4 +44,4 @@ package() {
sha512sums="f5ff563132f19c48789ae559ee98adb33829f495da29c95deada6ff841b3e9bcef470e128fe1c38f8dec9d11e9507ef8bac0c7e17f312c3454c8690a0506f6ed freetds-1.00.84.tar.gz sha512sums="f5ff563132f19c48789ae559ee98adb33829f495da29c95deada6ff841b3e9bcef470e128fe1c38f8dec9d11e9507ef8bac0c7e17f312c3454c8690a0506f6ed freetds-1.00.84.tar.gz
d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch
0c1e8d7e2e64551a55fc879173f1f6319fc1c79c8a3225af93ec77e95fac36d05b6b6a8ac79feb11dc7a9b771f38f2dde332efb85f803f4d22aedfb0ced4ab46 libressl.patch" 2031cc9a7dac2b36d2b2b715c11a336a7a6ce05a5d4ccfcd714a8e2de0607da82bb867106872f54f9dd8fbf6118f67e19546ef7174fed585e14110b69d81ad4d libressl.patch"

39
main/freetds/libressl.patch
View File

@ -1,35 +1,14 @@
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 diff --git a/src/tds/tls.c b/src/tds/tls.c
index 2738a2c..670ecb1 100644 index b9b65e3..11546ff 100644
--- a/src/tds/tls.c --- a/src/tds/tls.c
+++ b/src/tds/tls.c +++ b/src/tds/tls.c
@@ -73,7 +73,7 @@ @@ -92,6 +92,9 @@ BIO_get_data(const BIO *b)
#else return b->ptr;
/* 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;
} }
#define TLS_client_method SSLv23_client_method
+#endif
+
+#ifndef TLS_ST_OK
#define TLS_ST_OK SSL_ST_OK
#endif
-#if OPENSSL_VERSION_NUMBER < 0x1010000FL
+#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
static BIO_METHOD tds_method_login[1] = {
{
BIO_TYPE_MEM,