diff --git a/net/znc/Makefile b/net/znc/Makefile index 4611f09c6..cb3917f2e 100644 --- a/net/znc/Makefile +++ b/net/znc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=znc PKG_VERSION:=1.7.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://znc.in/releases \ diff --git a/net/znc/patches/100-move_rootcheck_after_config.patch b/net/znc/patches/100-move_rootcheck_after_config.patch deleted file mode 100644 index 6da68493d..000000000 --- a/net/znc/patches/100-move_rootcheck_after_config.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/main.cpp b/src/main.cpp -index 6ea10ec..0bf028b 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -422,23 +422,6 @@ int main(int argc, char** argv) { - CUtils::PrintStatus(true, ""); - } - -- if (isRoot()) { -- CUtils::PrintError( -- "You are running ZNC as root! Don't do that! There are not many " -- "valid"); -- CUtils::PrintError( -- "reasons for this and it can, in theory, cause great damage!"); -- if (!bAllowRoot) { -- CZNC::DestroyInstance(); -- return 1; -- } -- CUtils::PrintError("You have been warned."); -- CUtils::PrintError( -- "Hit CTRL+C now if you don't want to run ZNC as root."); -- CUtils::PrintError("ZNC will start in 30 seconds."); -- sleep(30); -- } -- - if (bMakeConf) { - if (!pZNC->WriteNewConfig(sConfig)) { - CZNC::DestroyInstance(); -@@ -460,6 +443,23 @@ int main(int argc, char** argv) { - return 1; - } - -+ if (isRoot()) { -+ CUtils::PrintError( -+ "You are running ZNC as root! Don't do that! There are not many " -+ "valid"); -+ CUtils::PrintError( -+ "reasons for this and it can, in theory, cause great damage!"); -+ if (!bAllowRoot) { -+ CZNC::DestroyInstance(); -+ return 1; -+ } -+ CUtils::PrintError("You have been warned."); -+ CUtils::PrintError( -+ "Hit CTRL+C now if you don't want to run ZNC as root."); -+ CUtils::PrintError("ZNC will start in 30 seconds."); -+ sleep(30); -+ } -+ - if (bForeground) { - int iPid = getpid(); - CUtils::PrintMessage("Staying open for debugging [pid: " +