From 1c6ab97d9fdeccbee8e63b701bbacc517b6a0096 Mon Sep 17 00:00:00 2001 From: Keiran Smith Date: Sat, 3 Nov 2012 13:27:46 +0000 Subject: [PATCH 1/7] Update to ZNC 1.0 --- znc-infobot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/znc-infobot.spec b/znc-infobot.spec index 37f1105..7f730f8 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,7 +1,7 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot -Version: 0.206 -Release: 2%{?dist} +Version: 1.0-0.1.alpha1 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com @@ -38,6 +38,9 @@ mv infobot.so %{buildroot}%{_libdir}/znc/ %{_libdir}/znc/infobot.so %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.0-0.1.alpha1-1 +- Rebuild for 1.0 + * Sun Jul 22 2012 Fedora Release Engineering - 0.206-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From f454f5761f22e9976c60e99ab2f77516d9935b11 Mon Sep 17 00:00:00 2001 From: Keiran Smith Date: Sat, 3 Nov 2012 13:28:54 +0000 Subject: [PATCH 2/7] Update to ZNC 1.0 --- znc-infobot.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/znc-infobot.spec b/znc-infobot.spec index 7f730f8..bdcfa7f 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,7 +1,7 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot -Version: 1.0-0.1.alpha1 -Release: 1%{?dist} +Version: 1.0 +Release: 0.1.alpha1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com @@ -38,7 +38,7 @@ mv infobot.so %{buildroot}%{_libdir}/znc/ %{_libdir}/znc/infobot.so %changelog -* Sun Jul 22 2012 Fedora Release Engineering - 1.0-0.1.alpha1-1 +* Sun Jul 22 2012 Fedora Release Engineering - 1.0-0.1.alpha1 - Rebuild for 1.0 * Sun Jul 22 2012 Fedora Release Engineering - 0.206-2 From d0a1a037f511fbe961a8d7764cac9987aeb376ea Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 28 Nov 2012 11:19:04 -0500 Subject: [PATCH 3/7] fix compile against znc 1.0 --- znc-infobot-1.0-znc1.patch | 44 ++++++++++++++++++++++++++++++++++++++ znc-infobot.spec | 13 +++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 znc-infobot-1.0-znc1.patch diff --git a/znc-infobot-1.0-znc1.patch b/znc-infobot-1.0-znc1.patch new file mode 100644 index 0000000..0db13a7 --- /dev/null +++ b/znc-infobot-1.0-znc1.patch @@ -0,0 +1,44 @@ +diff -up znc-infobot-0.202/infobot.cpp.znc1 znc-infobot-0.202/infobot.cpp +--- znc-infobot-0.202/infobot.cpp.znc1 2012-11-28 10:48:03.703592940 -0500 ++++ znc-infobot-0.202/infobot.cpp 2012-11-28 11:06:55.221609919 -0500 +@@ -14,6 +14,7 @@ + #include "znc.h" + #include "Chan.h" + #include "Modules.h" ++#include "IRCNetwork.h" + #include "User.h" + + #include +@@ -25,9 +26,9 @@ + + using namespace pcrecpp; + +-typedef map TEnabledChanMap; +-typedef map TColorsEnabledMap; +-typedef map TTriggerCharMap; ++typedef std::map TEnabledChanMap; ++typedef std::map TColorsEnabledMap; ++typedef std::map TTriggerCharMap; + + class CInfoBotModule : public CModule + { +@@ -1203,8 +1204,8 @@ void CInfoBotModule::SendMessage(const C + sText.Replace("%CLO%", ""); + } + +- m_pUser->PutIRC("PRIVMSG " + sSendTo + " :" + sText); +- m_pUser->PutUser(":" + m_pUser->GetIRCNick().GetNickMask() + " PRIVMSG " + sSendTo + " :" + sText); ++ m_pNetwork->PutIRC("PRIVMSG " + sSendTo + " :" + sText); ++ m_pNetwork->PutUser(":" + m_pNetwork->GetIRCNick().GetNickMask() + " PRIVMSG " + sSendTo + " :" + sText); + } + + void CInfoBotModule::OnModCommand(const CString& sCommand) +@@ -1484,7 +1485,7 @@ CInfoBotModule::EModRet CInfoBotModule:: + { + if(!sTarget.empty() && !isalnum(sTarget[0])) + { +- CheckLineForTrigger(sMessage, sTarget.AsLower(), m_pUser->GetIRCNick().GetNick()); ++ CheckLineForTrigger(sMessage, sTarget.AsLower(), m_pNetwork->GetIRCNick().GetNick()); + } + return CONTINUE; + } diff --git a/znc-infobot.spec b/znc-infobot.spec index bdcfa7f..bfb427c 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,12 +1,13 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot Version: 1.0 -Release: 0.1.alpha1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com Source0: znc-infobot-0.204.tar.gz # Had to generate tar.gz manually download source file : http://znc-msvc.googlecode.com/svn/trunk/flakes/infobot.cpp +Patch0: znc-infobot-1.0-znc1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: znc = %{version} @@ -22,9 +23,10 @@ channels with a multitude of bot commands %prep %setup -q -n %{name}-0.202 +%patch0 -p1 -b .znc1 %build -LIBS="-lpcrecpp -lpcre" znc-buildmod infobot.cpp +LIBS="-lpcrecpp -lpcre" INCLUDES="-I/usr/include/znc" znc-buildmod infobot.cpp %install mkdir -p %{buildroot}%{_libdir}/znc/ @@ -38,8 +40,11 @@ mv infobot.so %{buildroot}%{_libdir}/znc/ %{_libdir}/znc/infobot.so %changelog -* Sun Jul 22 2012 Fedora Release Engineering - 1.0-0.1.alpha1 -- Rebuild for 1.0 +* Wed Nov 28 2012 Tom Callaway - 1.0-2 +- it lives! + +* Tue Nov 13 2012 Nick Bebout - 1.0-1 +- Rebuild for znc 1.0 * Sun Jul 22 2012 Fedora Release Engineering - 0.206-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From c5d37569f4381163c9b93b29b697c0dcc5d8b67d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:16:31 -0500 Subject: [PATCH 4/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- znc-infobot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc-infobot.spec b/znc-infobot.spec index 47cc449..5a91c49 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,7 +1,7 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com @@ -35,6 +35,9 @@ mv infobot.so %{buildroot}%{_libdir}/znc/ %{_libdir}/znc/infobot.so %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Aug 26 2013 Mat Booth - 1.2-1 - Rebuild for znc 1.2 From 6d52a746af9ad230b21ed5118b9f7be58032c37f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 26 Jun 2014 19:01:26 -0500 Subject: [PATCH 5/7] Rebuild for znc 1.4 (#1106709) --- znc-infobot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/znc-infobot.spec b/znc-infobot.spec index 5a91c49..42a8b18 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,7 +1,7 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot -Version: 1.2 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com @@ -35,6 +35,9 @@ mv infobot.so %{buildroot}%{_libdir}/znc/ %{_libdir}/znc/infobot.so %changelog +* Wed Jun 11 2014 Yaakov Selkowitz - 1.4-1 +- Rebuild for znc 1.4 (#1106709) + * Sat Jun 07 2014 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e44f9f1b6cd8cf409a8088d932cd3f9ef6f3c17a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 14 Aug 2014 19:35:50 -0500 Subject: [PATCH 6/7] dead.package --- sources | 1 - znc-infobot-1.0-znc1.patch | 44 ---------------------- znc-infobot.spec | 77 -------------------------------------- 3 files changed, 122 deletions(-) delete mode 100644 sources delete mode 100644 znc-infobot-1.0-znc1.patch delete mode 100644 znc-infobot.spec diff --git a/sources b/sources deleted file mode 100644 index 9ae44e0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -80cadcba6988e66110406ad3f519c777 znc-infobot-0.204.tar.gz diff --git a/znc-infobot-1.0-znc1.patch b/znc-infobot-1.0-znc1.patch deleted file mode 100644 index 0db13a7..0000000 --- a/znc-infobot-1.0-znc1.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up znc-infobot-0.202/infobot.cpp.znc1 znc-infobot-0.202/infobot.cpp ---- znc-infobot-0.202/infobot.cpp.znc1 2012-11-28 10:48:03.703592940 -0500 -+++ znc-infobot-0.202/infobot.cpp 2012-11-28 11:06:55.221609919 -0500 -@@ -14,6 +14,7 @@ - #include "znc.h" - #include "Chan.h" - #include "Modules.h" -+#include "IRCNetwork.h" - #include "User.h" - - #include -@@ -25,9 +26,9 @@ - - using namespace pcrecpp; - --typedef map TEnabledChanMap; --typedef map TColorsEnabledMap; --typedef map TTriggerCharMap; -+typedef std::map TEnabledChanMap; -+typedef std::map TColorsEnabledMap; -+typedef std::map TTriggerCharMap; - - class CInfoBotModule : public CModule - { -@@ -1203,8 +1204,8 @@ void CInfoBotModule::SendMessage(const C - sText.Replace("%CLO%", ""); - } - -- m_pUser->PutIRC("PRIVMSG " + sSendTo + " :" + sText); -- m_pUser->PutUser(":" + m_pUser->GetIRCNick().GetNickMask() + " PRIVMSG " + sSendTo + " :" + sText); -+ m_pNetwork->PutIRC("PRIVMSG " + sSendTo + " :" + sText); -+ m_pNetwork->PutUser(":" + m_pNetwork->GetIRCNick().GetNickMask() + " PRIVMSG " + sSendTo + " :" + sText); - } - - void CInfoBotModule::OnModCommand(const CString& sCommand) -@@ -1484,7 +1485,7 @@ CInfoBotModule::EModRet CInfoBotModule:: - { - if(!sTarget.empty() && !isalnum(sTarget[0])) - { -- CheckLineForTrigger(sMessage, sTarget.AsLower(), m_pUser->GetIRCNick().GetNick()); -+ CheckLineForTrigger(sMessage, sTarget.AsLower(), m_pNetwork->GetIRCNick().GetNick()); - } - return CONTINUE; - } diff --git a/znc-infobot.spec b/znc-infobot.spec deleted file mode 100644 index 42a8b18..0000000 --- a/znc-infobot.spec +++ /dev/null @@ -1,77 +0,0 @@ -Summary: infobot module for ZNC IRC Bouncer -Name: znc-infobot -Version: 1.4 -Release: 1%{?dist} -License: GPLv2 -Group: System Environment/Daemons -URL: http://znc-msvc.googlecode.com -Source0: znc-infobot-0.204.tar.gz -# Had to generate tar.gz manually download source file : http://znc-msvc.googlecode.com/svn/trunk/flakes/infobot.cpp -Patch0: znc-infobot-1.0-znc1.patch - -BuildRequires: znc = %{version} -BuildRequires: znc-devel = %{version} -BuildRequires: c-ares c-ares-devel pcre-devel openssl-devel - -Requires: znc = %{version} -Requires: pcre - -%description -This is a user module for ZNC that provides joined -channels with a multitude of bot commands - -%prep -%setup -q -n %{name}-0.202 -%patch0 -p1 -b .znc1 - -%build -LIBS="-lpcrecpp -lpcre" INCLUDES="-I/usr/include/znc" znc-buildmod infobot.cpp - -%install -mkdir -p %{buildroot}%{_libdir}/znc/ -mv infobot.so %{buildroot}%{_libdir}/znc/ - -%files -%{_libdir}/znc/infobot.so - -%changelog -* Wed Jun 11 2014 Yaakov Selkowitz - 1.4-1 -- Rebuild for znc 1.4 (#1106709) - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Aug 26 2013 Mat Booth - 1.2-1 -- Rebuild for znc 1.2 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Nov 28 2012 Tom Callaway - 1.0-2 -- it lives! - -* Tue Nov 13 2012 Nick Bebout - 1.0-1 -- Rebuild for znc 1.0 - -* Sun Jul 22 2012 Fedora Release Engineering - 0.206-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Apr 21 2012 Nick Bebout - 0.206-1 -- Rebuild for znc 0.206 - -* Thu Feb 9 2012 Nick Bebout - 0.204-1 -- Rebuild for znc 0.204 - -* Sat Jan 14 2012 Fedora Release Engineering - 0.202-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Oct 18 2011 Nick Bebout - 0.202-1 -- ZNC is at 0.202 now -- Require same version of ZNC as module - -* Sun Sep 25 2011 Keiran "Affix" Smith - 0.200-1 -- Initial Package of 0.200 - From af7eb66e5e5a87c2097661093bbf1e6d655863c7 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Tue, 19 Aug 2014 20:01:57 +0200 Subject: [PATCH 7/7] 2014-08-19: Dead upstream since 2011 with unfixed bugs: https://fedorahosted.org/rel-eng/ticket/5968 --- .gitignore | 2 -- dead.package | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d508fb8..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/znc-infobot-0.202.tar.gz -/znc-infobot-0.204.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3bf34d0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +2014-08-19: Dead upstream since 2011 with unfixed bugs: https://fedorahosted.org/rel-eng/ticket/5968