Merge pull request #15036 from neheb/znc

znc: update to 1.8.2

net/znc/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=znc
-PKG_VERSION:=1.7.5
-PKG_RELEASE:=2
+PKG_VERSION:=1.8.2
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://znc.in/releases \
 		https://znc.in/releases/archive
-PKG_HASH:=a8941e1385c8654287a4428018d93459482e9d5eeedf86bef7b020ddc5f24721
+PKG_HASH:=ff238aae3f2ae0e44e683c4aee17dc8e4fdd261ca9379d83b48a7d422488de0d
 
 PKG_MAINTAINER:=Jonas Gorski <jonas.gorski@gmail.com>
 PKG_LICENSE:=Apache-2.0
@@ -22,7 +22,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:znc:znc
 
 PKG_USE_MIPS16:=0
-PKG_BUILD_PARALLEL:=1
 
 PKG_CONFIG_DEPENDS:= CONFIG_ZNC_ICU
 
@@ -58,7 +57,7 @@ endef
 
 define Package/znc/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/znc $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/znc $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/znc.init $(1)/etc/init.d/znc
 	$(INSTALL_DIR) $(1)/etc/config
@@ -83,11 +82,11 @@ define module
 
   define Package/znc-mod-$(strip $(1))/install
 	$(INSTALL_DIR) $$(1)/usr/lib/znc/
-	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/$(subst -,_,$(strip $(1))).so $$(1)/usr/lib/znc/
+	$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/znc/$(subst -,_,$(strip $(1))).so $$(1)/usr/lib/znc/
 	# include webadmin page templates if existing
-	if [ -d $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) ]; then \
+	if [ -d $$(PKG_INSTALL_DIR)/usr/share/znc/modules/$(subst -,_,$(strip $(1))) ]; then \
 		$(INSTALL_DIR) $$(1)/usr/share/znc/modules ;\
-		$(CP) $$(PKG_BUILD_DIR)/modules/data/$(subst -,_,$(strip $(1))) $$(1)/usr/share/znc/modules ;\
+		$(CP) $$(PKG_INSTALL_DIR)/usr/share/znc/modules/$(subst -,_,$(strip $(1))) $$(1)/usr/share/znc/modules ;\
 	fi
   endef
 
@@ -108,11 +107,11 @@ define webadmin
 
   define Package/znc-mod-webadmin/install
 	$(INSTALL_DIR) $$(1)/usr/lib/znc/
-	$(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/webadmin.so $$(1)/usr/lib/znc/
+	$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/znc/webadmin.so $$(1)/usr/lib/znc/
 	$(INSTALL_DIR) $$(1)/usr/share/znc/modules
-	$(CP) $$(PKG_BUILD_DIR)/modules/data/webadmin $$(1)/usr/share/znc/modules
+	$(CP) $$(PKG_INSTALL_DIR)/usr/share/znc/modules/webadmin $$(1)/usr/share/znc/modules
 	$(INSTALL_DIR) $$(1)/usr/share/znc/webskins/
-	$(CP) $$(PKG_BUILD_DIR)/webskins/_default_ $$(1)/usr/share/znc/webskins/
+	$(CP) $$(PKG_INSTALL_DIR)/usr/share/znc/webskins/_default_ $$(1)/usr/share/znc/webskins/
   endef
 
   ZNC_MODULES += znc-mod-webadmin
@@ -132,7 +131,7 @@ define webskin
 
   define Package/znc-webskin-$(strip $(1))/install
 	$(INSTALL_DIR) $$(1)/usr/share/znc/webskins/
-	$(CP) $$(PKG_BUILD_DIR)/webskins/$(strip $(1)) $$(1)/usr/share/znc/webskins/
+	$(CP) $$(PKG_INSTALL_DIR)/usr/share/znc/webskins/$(strip $(1)) $$(1)/usr/share/znc/webskins/
   endef
   ZNC_MODULES += znc-webskin-$(strip $(1))
 endef
@@ -232,16 +231,11 @@ $(eval $(call module,notes,This modules stores and displays short notes using \
 $(eval $(call module,notify-connect,Sends a notice to all admins when a user \
 	logs in or out.))
 
-$(eval $(call module,partyline,Allows ZNC users to join internal channels and \
-	query other ZNC users on the same ZNC.))
-
 $(eval $(call module,perform,Performs commands on connect.))
 
 $(eval $(call module,playback,Avoid repetitive playback buffers on re-connect \
 	with supported clients (e.g. mutter, colluquy)))
 
-$(eval $(call module,q,Auths you with Q (and a little more).))
-
 $(eval $(call module,raw,View all of the raw traffic.))
 
 $(eval $(call module,route-replies,Routes back answers to the right client \
@@ -278,26 +272,19 @@ $(eval $(call webskin,ice))
 PKG_CONFIG_DEPENDS += $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES))
 
 include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS += \
-	$(if $(CONFIG_ZNC_ICU), --enable-charset, --disable-charset) \
-	--disable-cyrus \
-	--disable-debug \
-	--enable-largefile \
-	--disable-perl \
-	--enable-poll \
-	--disable-python \
-	--enable-openssl \
-	--disable-swig \
-	--disable-tcl \
-	--enable-tdns \
-	--enable-zlib
-
-define Build/Compile
-	$(call Build/Compile/Default,znc)
-	+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/modules \
-		$(MAKE_FLAGS) $(ZNC_MODULE_TARGETS)
-endef
+include ../../devel/ninja/ninja-cmake.mk
+
+CMAKE_OPTIONS += \
+	-DWANT_ICU=O$(if $(CONFIG_ZNC_ICU),N,FF) \
+	-DWANT_I18N=OFF \
+	-DWANT_CYRUS=OFF \
+	-DWANT_PERL=OFF \
+	-DWANT_SYSTEMD=OFF \
+	-DWANT_PYTHON=OFF \
+	-DWANT_OPENSSL=ON \
+	-DWANT_SWIG=OFF \
+	-DWANT_TCL=OFF \
+	-DWANT_ZLIB=ON
 
 $(eval $(call BuildPackage,znc))
 $(foreach m,$(ZNC_MODULES),$(eval $(call BuildPackage,$(m))))

net/znc/patches/120-openssl-deprecated.patch

@@ -1,62 +0,0 @@
---- a/src/Utils.cpp
-+++ b/src/Utils.cpp
-@@ -29,7 +29,7 @@
- #include <openssl/ssl.h>
- #include <openssl/bn.h>
- #include <openssl/rsa.h>
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x20700000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
- #define X509_getm_notBefore X509_get_notBefore
- #define X509_getm_notAfter X509_get_notAfter
- #endif
---- a/third_party/Csocket/Csocket.cc
-+++ b/third_party/Csocket/Csocket.cc
-@@ -47,10 +47,16 @@
- #include <stdio.h>
- #include <openssl/ssl.h>
- #include <openssl/conf.h>
--#include <openssl/engine.h>
-+#include <openssl/bn.h>
-+#include <openssl/dh.h>
-+#include <openssl/dsa.h>
-+#include <openssl/rsa.h>
- #ifndef OPENSSL_NO_COMP
- #include <openssl/comp.h>
- #endif
-+#ifndef OPENSSL_NO_ENGINE
-+#include <openssl/engine.h>
-+#endif
- #define HAVE_ERR_REMOVE_STATE
- #ifdef OPENSSL_VERSION_NUMBER
- # if OPENSSL_VERSION_NUMBER >= 0x10000000
-@@ -583,6 +589,7 @@ bool InitCsocket()
- void ShutdownCsocket()
- {
- #ifdef HAVE_LIBSSL
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #if defined( HAVE_ERR_REMOVE_THREAD_STATE )
- 	ERR_remove_thread_state( NULL );
- #elif defined( HAVE_ERR_REMOVE_STATE )
-@@ -597,6 +604,7 @@ void ShutdownCsocket()
- 	ERR_free_strings();
- 	EVP_cleanup();
- 	CRYPTO_cleanup_all_ex_data();
-+#endif
- #endif /* HAVE_LIBSSL */
- #ifdef HAVE_C_ARES
- #if ARES_VERSION >= CREATE_ARES_VER( 1, 6, 1 )
-@@ -611,12 +619,14 @@ void ShutdownCsocket()
- #ifdef HAVE_LIBSSL
- bool InitSSL( ECompType eCompressionType )
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	SSL_load_error_strings();
- 	if( SSL_library_init() != 1 )
- 	{
- 		CS_DEBUG( "SSL_library_init() failed!" );
- 		return( false );
- 	}
-+#endif
- 
- #ifndef _WIN32
- 	if( access( "/dev/urandom", R_OK ) == 0 )