From a9c65a441f4361a9fe3d8378f87132cbee6e1e92 Mon Sep 17 00:00:00 2001 From: jogo Date: Mon, 23 Jan 2012 15:52:32 +0000 Subject: [PATCH] packages: znc: update to 0.204 git-svn-id: svn://svn.openwrt.org/openwrt/packages@29875 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/znc/Makefile | 12 ++++++------ .../patches/001-move_rootcheck_after_config.patch | 4 ++-- net/znc/patches/002-Uclibcpp_build_fix.patch | 2 +- net/znc/patches/003-Reduce_rebuild_time.patch | 2 +- net/znc/patches/004-fix_bouncedcc_crash.patch | 20 -------------------- 5 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 net/znc/patches/004-fix_bouncedcc_crash.patch diff --git a/net/znc/Makefile b/net/znc/Makefile index 36b3effcc..2ad7511f7 100644 --- a/net/znc/Makefile +++ b/net/znc/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=znc -PKG_VERSION:=0.202 -PKG_RELEASE:=2 +PKG_VERSION:=0.204 +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:=3c6ff4620e139e3d9745cd53111bab20 +PKG_MD5SUM:=7c7247423fc08b0c5c62759a50a9bca3 PKG_BUILD_PARALLEL:=1 @@ -137,9 +137,6 @@ $(eval $(call module,adminlog,Log user connects and disconnects and failed \ $(eval $(call module,autoattach,Reattaches you to channels on activity.)) -$(eval $(call module,autocycle,Cycles a channel when you are the only one in \ - there and you don't have op.)) - $(eval $(call module,autoop,Auto op the good guys.)) $(eval $(call module,autoreply,Gives a automatic reply if someone messages you \ @@ -215,6 +212,9 @@ $(eval $(call module,watch,Monitor activity for specific text patterns from \ $(eval $(call module,antiidle,Hides your idle time.,extra/)) +$(eval $(call module,autocycle,Cycles a channel when you are the only one in \ + there and you don't have op.,extra/)) + $(eval $(call module,autovoice,Autovoices everyone who joins some channel., \ extra/)) diff --git a/net/znc/patches/001-move_rootcheck_after_config.patch b/net/znc/patches/001-move_rootcheck_after_config.patch index b64f247d2..96ba8e3bb 100644 --- a/net/znc/patches/001-move_rootcheck_after_config.patch +++ b/net/znc/patches/001-move_rootcheck_after_config.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Move the root check to after config parsing --- a/main.cpp +++ b/main.cpp -@@ -194,19 +194,6 @@ int main(int argc, char** argv) { +@@ -211,19 +211,6 @@ int main(int argc, char** argv) { } #endif @@ -29,7 +29,7 @@ Subject: [PATCH] Move the root check to after config parsing if (bMakeConf) { if (!pZNC->WriteNewConfig(sConfig)) { delete pZNC; -@@ -227,6 +214,20 @@ int main(int argc, char** argv) { +@@ -244,6 +231,20 @@ int main(int argc, char** argv) { return 1; } diff --git a/net/znc/patches/002-Uclibcpp_build_fix.patch b/net/znc/patches/002-Uclibcpp_build_fix.patch index 505f03d28..1c484789c 100644 --- a/net/znc/patches/002-Uclibcpp_build_fix.patch +++ b/net/znc/patches/002-Uclibcpp_build_fix.patch @@ -23,7 +23,7 @@ Subject: [PATCH] Add a uClibc++ build workaround /* Stuff to be able to write this: // i will be name of local variable, see below -@@ -58,7 +60,7 @@ class CWebAdminMod : public CGlobalModul +@@ -55,7 +57,7 @@ class CWebAdminMod : public CGlobalModul public: GLOBALMODCONSTRUCTOR(CWebAdminMod) { VPair vParams; diff --git a/net/znc/patches/003-Reduce_rebuild_time.patch b/net/znc/patches/003-Reduce_rebuild_time.patch index 0f48c65f3..5c6fcd916 100644 --- a/net/znc/patches/003-Reduce_rebuild_time.patch +++ b/net/znc/patches/003-Reduce_rebuild_time.patch @@ -21,7 +21,7 @@ Subject: [PATCH] Don't rebuild everything when the Makefile's timestamp changed $(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep --- a/modules/Makefile.in +++ b/modules/Makefile.in -@@ -114,7 +114,7 @@ install_metadirs: create_install_dir +@@ -114,7 +114,7 @@ install_datadir: clean: rm -rf $(CLEAN) diff --git a/net/znc/patches/004-fix_bouncedcc_crash.patch b/net/znc/patches/004-fix_bouncedcc_crash.patch deleted file mode 100644 index 20e3a12c6..000000000 --- a/net/znc/patches/004-fix_bouncedcc_crash.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/modules/bouncedcc.cpp -+++ b/modules/bouncedcc.cpp -@@ -238,7 +238,7 @@ class CBounceDCCMod : public CModule { - CDCCBounce* pSock = (CDCCBounce*) *it; - - if (pSock->GetLocalPort() == uResumePort) { -- m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pClient->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001"); -+ m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pUser->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001"); - } - } - } else if (sType.Equals("ACCEPT")) { -@@ -248,7 +248,7 @@ class CBounceDCCMod : public CModule { - CDCCBounce* pSock = (CDCCBounce*) *it; - - if (pSock->GetUserPort() == sMessage.Token(3).ToUShort()) { -- m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pClient->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001"); -+ m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pUser->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001"); - } - } - } -- 2.11.0