diff --git a/testing/nut/APKBUILD b/testing/nut/APKBUILD index 427913b6f499b6b7f1efaccab39e74ed183dc968..c408966fbeb19508030ba188aa6620a2749f9a6e 100644 --- a/testing/nut/APKBUILD +++ b/testing/nut/APKBUILD @@ -2,22 +2,21 @@ # Contributor: Kozak Ivan <kozak-iv@yandex.ru> # Maintainer: Kozak Ivan <kozak-iv@yandex.ru> pkgname=nut -pkgver=2.7.4 -pkgrel=10 +pkgver=2.8.0 +pkgrel=0 pkgdesc="Network UPS tools" url="https://networkupstools.org/" arch="all" license="GPL-2.0-or-later" depends="hidapi eudev udev-init-scripts-openrc" # openssl1.1-compat-dev because of net-snmp -depends_dev="openssl1.1-compat-dev libusb-compat-dev net-snmp-dev neon-dev nss-dev" +depends_dev="openssl1.1-compat-dev libusb-dev net-snmp-dev neon-dev nss-dev" makedepends="$depends_dev libtool autoconf automake" pkgusers=$pkgname pkggroups=$pkgname install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion $pkgname-openrc" -source="https://networkupstools.org/source/2.7/nut-$pkgver.tar.gz - openssl-1.1.patch +source="https://networkupstools.org/source/${pkgver%.*}/nut-$pkgver.tar.gz upsd.initd upsmon.initd " @@ -81,8 +80,7 @@ package() { } sha512sums=" -320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a nut-2.7.4.tar.gz -2b6f5df0c7084a0e86474b36d4c567b995c76e2f8fda788a7dffa6d8ecd6b41698ca8376ac228cdbfd805e3406611e7f003e4492d98c74658ed785d7320ab866 openssl-1.1.patch +3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577 nut-2.8.0.tar.gz 5fce1247815e36a0e787f28dfec215077a42b046f6ce35a5ad3cf94479dfc26303d3cf4d5f760d5851ed5273ee398572c36cd354af0645cbebc1f1560414e222 upsd.initd 32470ae473fc363131787cd57f13d40763898947d56d032790ba7f3a5eaa8038b602f7e395ca44f6c5adce8ee5ec496e30ca0eaadb3c78a38015677aea751e12 upsmon.initd " diff --git a/testing/nut/openssl-1.1.patch b/testing/nut/openssl-1.1.patch deleted file mode 100644 index e7a28845830b65c066b5bd70e23136affa26bdf7..0000000000000000000000000000000000000000 --- a/testing/nut/openssl-1.1.patch +++ /dev/null @@ -1,70 +0,0 @@ -From fcbf18c92918ce5e81d0aab62a7aed5c2245ea4d Mon Sep 17 00:00:00 2001 -From: Eneas U de Queiroz <cote2004-github@yahoo.com> -Date: Fri, 1 Jun 2018 11:17:28 -0300 -Subject: [PATCH] Add compatibility with openssl 1.1.0 - -Minor adjustments were needed: -* Openssl 1.1 libs do not need to be initialized. -* TLSv*_method became TLS_*_method. - -Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> ---- - clients/upsclient.c | 5 ++++- - m4/nut_check_libopenssl.m4 | 2 +- - server/netssl.c | 7 +++++-- - 3 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/clients/upsclient.c b/clients/upsclient.c -index b90587b00..053d60fb0 100644 ---- a/clients/upsclient.c -+++ b/clients/upsclient.c -@@ -316,10 +316,13 @@ int upscli_init(int certverify, const char *certpath, - - #ifdef WITH_OPENSSL - -+# if OPENSSL_VERSION_NUMBER < 0x10100000L - SSL_library_init(); - SSL_load_error_strings(); -+# define TLS_client_method TLSv1_client_method -+# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - -- ssl_method = TLSv1_client_method(); -+ ssl_method = TLS_client_method(); - - if (!ssl_method) { - return 0; -diff --git a/m4/nut_check_libopenssl.m4 b/m4/nut_check_libopenssl.m4 -index 1b875077b..7eb401cd9 100644 ---- a/m4/nut_check_libopenssl.m4 -+++ b/m4/nut_check_libopenssl.m4 -@@ -58,7 +58,7 @@ if test -z "${nut_have_libopenssl_seen}"; then - - dnl check if openssl is usable - AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT]) -- AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no]) -+ AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no]) - - if test "${nut_have_openssl}" = "yes"; then - nut_with_ssl="yes" -diff --git a/server/netssl.c b/server/netssl.c -index c2f409899..0289e296f 100644 ---- a/server/netssl.c -+++ b/server/netssl.c -@@ -387,12 +387,15 @@ void ssl_init(void) - - #ifdef WITH_OPENSSL - -+# if OPENSSL_VERSION_NUMBER < 0x10100000L - SSL_load_error_strings(); - SSL_library_init(); -+# define TLS_server_method TLSv1_server_method -+# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - -- if ((ssl_method = TLSv1_server_method()) == NULL) { -+ if ((ssl_method = TLS_server_method()) == NULL) { - ssl_debug(); -- fatalx(EXIT_FAILURE, "TLSv1_server_method failed"); -+ fatalx(EXIT_FAILURE, "TLS_server_method failed"); - } - - if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {