cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

znc: Update to 1.7.1

Browse Source 
Notable Changes:
 * New IRCv3.2 capabilities support on client and server side
 * Increased max line lengths
 * support for stripping color control codes
 * various bug fixes

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[jonas.gorski: add notable changes, switch to 1.7.1]
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
This commit is contained in:
Rosen Penev
2018-06-11 17:46:09 -07:00
committed by Jonas Gorski
parent 57c8664b31
commit cb202c0acb
4 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/znc/patches/100-move_rootcheck_after_config.patch
+46 -46
View File
@@ -1,52 +1,52 @@
From adf42357c9043c38d9a9b47544a1b46445bdae19 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
Date: Wed, 6 Apr 2011 04:10:23 +0200
Subject: [PATCH] Move the root check to after config parsing
---
src/main.cpp | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 6ea10ec..0bf028b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -312,19 +312,6 @@ int main(int argc, char** argv) {
CUtils::PrintStatus(true, "");
}
@@ -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 (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();
@@ -346,6 +333,20 @@ int main(int argc, char** argv) {
return 1;
}
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 (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: " + CString(iPid) + "]");
if (bForeground) {
int iPid = getpid();
CUtils::PrintMessage("Staying open for debugging [pid: " +
net/znc/patches/101-Reduce_rebuild_time.patch
+2 -2
View File
@@ -11,7 +11,7 @@ Subject: [PATCH] Don't rebuild everything when the Makefile's timestamp
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,7 +112,7 @@ clean:
@@ -128,7 +128,7 @@ clean:
distclean: clean
rm -rf $(DISTCLEAN)
@@ -22,7 +22,7 @@ Subject: [PATCH] Don't rebuild everything when the Makefile's timestamp
$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MD -MF .depend/$*.dep -MT $@
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -112,12 +112,12 @@ install_datadir:
@@ -127,12 +127,12 @@ install_datadir:
clean:
rm -rf $(CLEAN)
net/znc/patches/104-disable-empty-modules-check.patch
+13 -11
View File
@@ -1,15 +1,17 @@
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -304,10 +304,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.");
@@ -412,12 +412,14 @@ int main(int argc, char** argv) {
"No modules found. Perhaps you didn't install ZNC properly?");
CUtils::PrintError(
"Read https://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;
}
if (!CUtils::GetBoolInput(
"Do you really want to run ZNC without any modules?",
false)) {
CZNC::DestroyInstance();
return 1;
}
+#endif
}
CUtils::PrintStatus(true, "");
}
}
CUtils::PrintStatus(true, "");
}