include $(TOPDIR)/rules.mk
PKG_NAME:=znc
-PKG_VERSION:=1.0
+PKG_VERSION:=1.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://znc.in/releases \
http://znc.in/releases/archive
-PKG_MD5SUM:=23807ca830c27392cccb6774f542df6e
+PKG_MD5SUM:=ef18e5402a82cc3fcab5c2ac5c2e6f3b
PKG_BUILD_PARALLEL:=1
CATEGORY:=Network
TITLE:=ZNC
URL:=http://en.znc.in/
- MAINTAINER:=Jonas Gorski <jonas.gorski+openwrt@gmail.com>
+ MAINTAINER:=Jonas Gorski <jogo@openwrt.org>
endef
define Package/znc
$(eval $(call module,log,Log conversations to file.))
+$(eval $(call module,modules_online,This module fakes the online status of \
+ ZNC-*users.))
+
$(eval $(call module,nickserv,Auths you with NickServ.))
$(eval $(call module,notes,This modules stores and displays short notes using \
--- a/src/main.cpp
+++ b/src/main.cpp
-@@ -211,19 +211,6 @@ int main(int argc, char** argv) {
+@@ -243,19 +243,6 @@ int main(int argc, char** argv) {
+ CUtils::PrintStatus(true, "");
}
- #endif
- if (isRoot()) {
- CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
if (bMakeConf) {
if (!pZNC->WriteNewConfig(sConfig)) {
delete pZNC;
-@@ -244,6 +231,20 @@ int main(int argc, char** argv) {
+@@ -276,6 +263,20 @@ int main(int argc, char** argv) {
return 1;
}
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
-@@ -15,9 +15,11 @@
- #include <znc/Listener.h>
+@@ -20,6 +20,7 @@
#include <znc/IRCNetwork.h>
#include <znc/IRCSock.h>
-+#include <string>
- #include <sstream>
- #include <utility>
+using std::string;
using std::stringstream;
using std::make_pair;
using std::set;
-@@ -55,7 +57,7 @@ class CWebAdminMod : public CGlobalModul
+@@ -75,7 +76,7 @@ class CWebAdminMod : public CModule {
public:
- GLOBALMODCONSTRUCTOR(CWebAdminMod) {
+ MODCONSTRUCTOR(CWebAdminMod) {
VPair vParams;
- vParams.push_back(make_pair("user", ""));
+ vParams.push_back(make_pair((string)"user", (string)""));
--- a/Makefile.in
+++ b/Makefile.in
-@@ -96,7 +96,7 @@ clean:
+@@ -104,7 +104,7 @@ clean:
distclean: clean
rm -rf $(DISTCLEAN)
$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MD -MF .depend/$*.dep -MT $@
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
-@@ -114,12 +114,12 @@ install_datadir:
+@@ -117,12 +117,12 @@ install_datadir:
clean:
rm -rf $(CLEAN)
-%.so: %.o Makefile
+%.so: %.o
- $(E) Linking module $(notdir $(basename $@))...
+ $(E) "Linking module" $(notdir $(basename $@))...
$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))LDFLAGS) $(LIBS)