From a567d60b9329f80f93b5249b8b82bbb60ea1622c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 2 Feb 2019 11:31:52 -0800 Subject: [PATCH] ngircd: Update to 25 Remove upstreamed patch. Switch to .xz archives for smaller size. Add PKG_BUILD_PARALLEL to speed up compilation. Remove maintainer. Signed-off-by: Rosen Penev --- net/ngircd/Makefile | 23 +++++----- ...tion-without-deprecated-OpenSSL-APIs.patch | 46 ------------------- 2 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 net/ngircd/patches/010-Fix-compilation-without-deprecated-OpenSSL-APIs.patch diff --git a/net/ngircd/Makefile b/net/ngircd/Makefile index 385d25cb4e..48773f4eae 100644 --- a/net/ngircd/Makefile +++ b/net/ngircd/Makefile @@ -8,22 +8,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ngircd -PKG_VERSION:=24 -PKG_RELEASE:=2 -PKG_MAINTAINER:=Claudio Leite +PKG_VERSION:=25 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://ngircd.barton.de/pub/ngircd +PKG_HASH:=c4997cae3e3dd6ff6a605ca274268f2b8c9ba0b1a96792c7402e5594222eee4e +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + +PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:= \ - http://ngircd.barton.de/pub/ngircd/ \ - ftp://ftp.berlios.de/pub/ngircd/ -PKG_HASH:=3e00a7da52c81fc1e02bb996a27bf43da905ba7037bf8c6bb3bd13321e0c85ab - +PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/package.mk define Package/ngircd/Default @@ -32,7 +31,7 @@ define Package/ngircd/Default SUBMENU:=Instant Messaging DEPENDS:=+zlib TITLE:=Next Generation IRC Server - URL:=http://ngircd.barton.de + URL:=https://ngircd.barton.de endef define Package/ngircd/Default/description diff --git a/net/ngircd/patches/010-Fix-compilation-without-deprecated-OpenSSL-APIs.patch b/net/ngircd/patches/010-Fix-compilation-without-deprecated-OpenSSL-APIs.patch deleted file mode 100644 index dbea14c0ec..0000000000 --- a/net/ngircd/patches/010-Fix-compilation-without-deprecated-OpenSSL-APIs.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d7bf6c919259a65d78b5bf67a3c75838f8894e91 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sun, 25 Nov 2018 19:59:49 -0800 -Subject: [PATCH] Fix compilation without deprecated OpenSSL APIs - ---- - src/ngircd/conf-ssl.h | 4 ++++ - src/ngircd/conn-ssl.c | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/ngircd/conf-ssl.h b/src/ngircd/conf-ssl.h -index c2373797..af715af8 100644 ---- a/src/ngircd/conf-ssl.h -+++ b/src/ngircd/conf-ssl.h -@@ -13,6 +13,10 @@ - #ifdef HAVE_LIBSSL - #define SSL_SUPPORT - #include -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#define OpenSSL_version SSLeay_version -+#define OPENSSL_VERSION SSLEAY_VERSION -+#endif - #endif - #ifdef HAVE_LIBGNUTLS - #define SSL_SUPPORT -diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c -index 705c29d5..ba47e513 100644 ---- a/src/ngircd/conn-ssl.c -+++ b/src/ngircd/conn-ssl.c -@@ -42,6 +42,7 @@ extern struct SSLOptions Conf_SSLOptions; - #ifdef HAVE_LIBSSL - #include - #include -+#include - - static SSL_CTX * ssl_ctx; - static DH *dh_params; -@@ -326,7 +327,7 @@ ConnSSL_InitLibrary( void ) - Verify_openssl); - SSL_CTX_free(ssl_ctx); - ssl_ctx = newctx; -- Log(LOG_INFO, "%s initialized.", SSLeay_version(SSLEAY_VERSION)); -+ Log(LOG_INFO, "%s initialized.", OpenSSL_version(OPENSSL_VERSION)); - return true; - out: - SSL_CTX_free(newctx); -- 2.30.2