diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-02 07:38:56 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:14 +0000 |
| commit | 1ba6915e4e6641df2d41dfa584ef319e636930a4 (patch) | |
| tree | 0f5f6229c35062613eed2cb4d6c4634f28f38be7 | |
| parent | a9d0d3b4a7e587902b7328be5f566b290bed8698 (diff) | |
| download | aports-1ba6915e4e6641df2d41dfa584ef319e636930a4.tar.bz2 aports-1ba6915e4e6641df2d41dfa584ef319e636930a4.tar.xz | |
community/heirloom-mailx: rebuild against openssl 1.1
| -rw-r--r-- | community/heirloom-mailx/APKBUILD | 6 | ||||
| -rw-r--r-- | community/heirloom-mailx/libressl.patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/community/heirloom-mailx/APKBUILD b/community/heirloom-mailx/APKBUILD index 6cf2863ace..0b4fc17395 100644 --- a/community/heirloom-mailx/APKBUILD +++ b/community/heirloom-mailx/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Isaac Dunham <ibid.ag@gmail.com> pkgname=heirloom-mailx pkgver=12.4 -pkgrel=5 +pkgrel=6 pkgdesc="A free clone of SysV mailx" url="http://heirloom.sourceforge.net/mailx.html" arch="all" license="BSD" -makedepends="libressl-dev krb5-dev" +makedepends="openssl-dev krb5-dev" subpackages="$pkgname-doc" source="https://sourceforge.net/projects/heirloom/files/heirloom-mailx/$pkgver/mailx-$pkgver.tar.bz2 12.4-to-12.5pre.patch @@ -40,4 +40,4 @@ fc5a22bf17e998c5228ff581388a3e2f8ffad9c70b46f7e94edc63d304e5e9576b59c57df07dc7e4 b10a5ec515ba447e828dbf4562b07b65bc2c812f0d731b244f77cc43152bf14200e40d218ebb080fd820dc18ed4666c4f66de579b562a9231d8a0e95b4c0bb25 0002-unpack-Disable-option-processing-for-email-addresses.patch c41ad1e90ebc6060ce0a7badfde5fc01b87c4c0c9eacf7e2f55444212cbd93097b37a3e426bcdcb4a565c1b0d16010996d9aca1d61c0d918a1d4acb41754d516 0003-fio_c-Unconditionally-require-wordexp-support.patch bee2afb9f691a5c7b715eaa9adb14afbde0694235bb22449741f464812276c3f44d1b90e8b07255d1378b941d2b14133161a1575c40605b0911d8e28afaf578a 0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch -54e71f2590760305f7a4a8cb934b01659d4b844e181271312f11c445d8f854e7c57815b3fee3ad53db0ef0bdc8341863573dd5c4ac3ca0df48137ab20bd2cf4b libressl.patch" +53ce1c5ac1e41d875e8dc77cf41d1843a8f1b9e49a6eb7990c984c54be123b686cfe8c0003ad1b6adab447a96349a2b5c12f3790145537f606363c5b82cf953e libressl.patch" diff --git a/community/heirloom-mailx/libressl.patch b/community/heirloom-mailx/libressl.patch index ab8696a242..992b576f4c 100644 --- a/community/heirloom-mailx/libressl.patch +++ b/community/heirloom-mailx/libressl.patch @@ -25,13 +25,13 @@ index b4e33fc..a7c57e7 100644 cp = ssl_method_string(uhp); if (cp != NULL) { -+#ifndef OPENSSL_NO_SSL2 ++#if !defined(OPENSSL_NO_SSL2) && OPENSSL_VERSION_NUMBER < 0x10100000L if (equal(cp, "ssl2")) method = SSLv2_client_method(); - else if (equal(cp, "ssl3")) + else +#endif -+#ifndef OPENSSL_NO_SSL3_METHOD ++#if !defined(OPENSSL_NO_SSL3_METHOD) + if (equal(cp, "ssl3")) method = SSLv3_client_method(); - else if (equal(cp, "tls1")) |