diff options
| -rw-r--r-- | patches/irssi-1.1.1.local.patch (renamed from patches/irssi-1.0.4.local.patch) | 23 | ||||
| -rw-r--r-- | vars/build.vars | 4 |
2 files changed, 25 insertions, 2 deletions
diff --git a/patches/irssi-1.0.4.local.patch b/patches/irssi-1.1.1.local.patch index 0dfa06df..0c485b00 100644 --- a/patches/irssi-1.0.4.local.patch +++ b/patches/irssi-1.1.1.local.patch @@ -85,3 +85,26 @@ if (rec->target == NULL && interactive) rec->target_item = exec_wi_create(active_win, rec); +diff -ru irssi-1.1.1.orig/src/core/network-openssl.c irssi-1.1.1/src/core/network-openssl.c +--- irssi-1.1.1.orig/src/core/network-openssl.c 2018-02-15 00:53:44.000000000 +0100 ++++ irssi-1.1.1/src/core/network-openssl.c 2018-04-04 17:17:45.180379304 +0200 +@@ -35,7 +35,8 @@ + #include <openssl/err.h> + + /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */ +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* The two functions below could be already defined if OPENSSL_API_COMPAT is + * below the 1.1.0 version so let's do a clean start */ + #undef X509_get_notBefore +@@ -47,7 +48,8 @@ + + /* OpenSSL 1.1.0 also introduced some useful additions to the api */ + #if (OPENSSL_VERSION_NUMBER >= 0x10002000L) +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) && \ ++ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) + static int X509_STORE_up_ref(X509_STORE *vfy) + { + int n; diff --git a/vars/build.vars b/vars/build.vars index 4f4047cc..56f6218e 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1047,8 +1047,8 @@ mtr nginx openlitespeed openssh pacman rsync socat thttpd weechat wget whois"; : ${PKG_INETUTILS_VERSION:=1.9.4}; : ${PKG_INETUTILS_URL:=https://ftp.gnu.org/gnu/inetutils/inetutils-${PKG_INETUTILS_VERSION}.tar.xz}; : ${PKG_INETUTILS_CONFIGURE_ARGS_EXTRA:="--disable-ftpd --disable-inetd --disable-rexecd --disable-rlogind --disable-rshd --disable-syslogd --disable-talkd --disable-telnetd --disable-tftpd --disable-uucpd --disable-ftp --disable-dnsdomainname --disable-hostname --disable-ping --disable-ping6 --disable-rcp --disable-rexec --disable-rlogin --disable-rsh --disable-logger --disable-talk --enable-telnet --disable-tftp --disable-whois --disable-ifconfig --disable-traceroute"}; -: ${PKG_IRSSI_SHA256SUM:=48ff359f8abb706e729cbb8bc7bd93863e4e785f9a05d993a398310ac74beea8}; -: ${PKG_IRSSI_VERSION:=1.0.4}; +: ${PKG_IRSSI_SHA256SUM:=ea36959398f8c3d8f52065818e3c1500908390dd5d1125ece1a382e77cb84925}; +: ${PKG_IRSSI_VERSION:=1.1.1}; : ${PKG_IRSSI_URL:=https://github.com/irssi/irssi/releases/download/${PKG_IRSSI_VERSION}/irssi-${PKG_IRSSI_VERSION}.tar.gz}; : ${PKG_IRSSI_CONFIGURE_ARGS_EXTRA:=--with-ncurses=${PREFIX_NATIVE}}; : ${PKG_LDNS_SHA256SUM:=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc}; |