From: Jonas Gorski <redacted>
Date: Sat, 3 Dec 2016 16:48:08 +0000 (+0100)
Subject: znc: allow running without modules
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6fccd8801eacc7cc59693cfa8c8076642893321e;p=openwrt-packages.git

znc: allow running without modules

Now that we don't ship any modules by default, znc might be started
without any modules. Unfortunately znc refuses to start without any
modules, so patch out the appropriate check.

Signed-off-by: Jonas Gorski <redacted>
---

diff --git a/net/znc/Makefile b/net/znc/Makefile
index feabd65c4..2d0c34d19 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=znc
 PKG_VERSION:=1.6.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://znc.in/releases \
diff --git a/net/znc/patches/104-disable-empty-modules-check.patch b/net/znc/patches/104-disable-empty-modules-check.patch
new file mode 100644
index 000000000..22b5c38f7
--- /dev/null
+++ b/net/znc/patches/104-disable-empty-modules-check.patch
@@ -0,0 +1,15 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -296,10 +296,12 @@ int main(int argc, char** argv) {
+ 			CUtils::PrintStatus(false, "");
+ 			CUtils::PrintError("No modules found. Perhaps you didn't install ZNC properly?");
+ 			CUtils::PrintError("Read http://wiki.znc.in/Installation for instructions.");
++#if 0
+ 			if (!CUtils::GetBoolInput("Do you really want to run ZNC without any modules?", false)) {
+ 				CZNC::DestroyInstance();
+ 				return 1;
+ 			}
++#endif
+ 		}
+ 		CUtils::PrintStatus(true, "");
+ 	}
diff --git a/net/znc/patches/110-add-playback-module.patch b/net/znc/patches/110-add-playback-module.patch
index 4da94cbf1..41a4f36c7 100644
--- a/net/znc/patches/110-add-playback-module.patch
+++ b/net/znc/patches/110-add-playback-module.patch
@@ -1,7 +1,5 @@
-Index: znc-1.6.3/modules/playback.cpp
-===================================================================
 --- /dev/null
-+++ znc-1.6.3/modules/playback.cpp
++++ b/modules/playback.cpp
 @@ -0,0 +1,288 @@
 +/*
 + * Copyright (C) 2015 J-P Nurmi