From 9de00a48ae95c1d7d3ac99956b4547010ebbf2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Mon, 13 Jul 2009 02:49:00 +0000 Subject: [PATCH 001/344] Initialize branch EL-5 for znc --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 5438afcc8d87b0b909aa749205bf76c037829161 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 13 Jul 2009 03:00:00 +0000 Subject: [PATCH 002/344] Initial commit of znc for fedora - devel --- .cvsignore | 1 + import.log | 1 + sources | 1 + znc-0.070-pkgconfigdir.diff | 12 ++++++ znc.spec | 82 +++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 import.log create mode 100644 znc-0.070-pkgconfigdir.diff create mode 100644 znc.spec diff --git a/.cvsignore b/.cvsignore index e69de29..564a6f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +znc-0.070.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..e01942a --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +znc-0_070-7_fc11:HEAD:znc-0.070-7.fc11.src.rpm:1247453867 diff --git a/sources b/sources index e69de29..db112f0 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +18bb813cb350c6db014a0d82ecdf85fe znc-0.070.tar.gz diff --git a/znc-0.070-pkgconfigdir.diff b/znc-0.070-pkgconfigdir.diff new file mode 100644 index 0000000..66becbc --- /dev/null +++ b/znc-0.070-pkgconfigdir.diff @@ -0,0 +1,12 @@ +diff -uNr znc-0.070/Makefile.in znc-0.070-nb/Makefile.in +--- znc-0.070/Makefile.in 2009-05-03 06:23:05.000000000 -0500 ++++ znc-0.070-nb/Makefile.in 2009-07-08 18:30:51.180801877 -0500 +@@ -18,7 +18,7 @@ + LIBS := @LIBS@ + LIBZNC := @LIBZNC@ + LIBZNCDIR:= @LIBZNCDIR@ +-PKGCONFIGDIR := $(prefix)/lib/pkgconfig ++PKGCONFIGDIR := @libdir@/pkgconfig + + LIB_SRCS := ZNCString.cpp Csocket.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \ + DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \ diff --git a/znc.spec b/znc.spec new file mode 100644 index 0000000..a20c067 --- /dev/null +++ b/znc.spec @@ -0,0 +1,82 @@ +Summary: An advanced IRC bouncer +Name: znc +Version: 0.070 +Release: 7%{?dist} +License: GPLv2 with exceptions +Group: System Environment/Daemons +URL: http://znc.sf.net/ +Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz +Patch0: %{name}-%{version}-pkgconfigdir.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: perl +BuildRequires: openssl-devel >= 0.9.8 +BuildRequires: cyrus-sasl-devel + +# The following line is necessary because this module +# is needed for Fedora, but not for EPEL. +%{?fedora:BuildRequires: perl-ExtUtils-Embed} + +%description +ZNC is an IRC bouncer with many advanced features like detaching, +multiple users, per channel playback buffer, SSL, IPv6, transparent +DCC bouncing, Perl and C++ module support to name a few. + +%package devel +Summary: Development files needed to compile ZNC modules +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} pkgconfig + +%description devel +All includes and program files you need to compile your own znc +modules. + +%prep +%setup -q +%patch0 -p1 +%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp +chmod -x modules/q.cpp + +%build +%configure \ + --with-module-prefix=%{_libdir}/znc \ + --enable-ipv6 +%__make %{?_smp_mflags} + +%install +%__rm -Rf "%{buildroot}" +%__make install DESTDIR="%{buildroot}" + +%clean +%__rm -Rf "%{buildroot}" + +%files +%defattr(-,root,root) +%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf +%{_bindir}/znc +%{_mandir}/man1/* +%{_libdir}/znc/ +%{_datadir}/znc/ + +%files devel +%defattr(-,root,root) +%{_bindir}/znc-buildmod +%{_bindir}/znc-config +%{_libdir}/pkgconfig/%{name}.pc +%{_includedir}/znc/ + +%changelog +* Sun Jul 12 2009 Nick Bebout - 0.070-7 +- Fix License: to be GPLv2 with exceptions +* Sat Jul 11 2009 Nick Bebout - 0.070-6 +- Fix permissions error in %%prep, not in source +* Sat Jul 11 2009 Nick Bebout - 0.070-5 +- Fix permissions error on q.cpp and add LICENSE.OpenSSL +* Sat Jul 11 2009 Nick Bebout - 0.070-4 +- Remove switch to enable debug, fix %%files section +* Fri Jul 10 2009 Nick Bebout - 0.070-3 +- Move fixfreenode and log into separate znc-extra package +- Move awayping into separate znc-awayping package +* Thu Jul 9 2009 Nick Bebout - 0.070-2 +- Include modules with main package +* Wed Jul 8 2009 Nick Bebout - 0.070-1 +- Initial Fedora package based on 0.070 of upstream From 546739c2114b82319a07e2a98994862e7c977959 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 13 Jul 2009 03:18:45 +0000 Subject: [PATCH 003/344] Initial import for EL-5 --- .cvsignore | 1 + import.log | 1 + sources | 1 + znc-0.070-pkgconfigdir.diff | 12 ++++++ znc.spec | 82 +++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 import.log create mode 100644 znc-0.070-pkgconfigdir.diff create mode 100644 znc.spec diff --git a/.cvsignore b/.cvsignore index e69de29..564a6f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +znc-0.070.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..9acfb8e --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +znc-0_070-7_el5:EL-5:znc-0.070-7.el5.src.rpm:1247454986 diff --git a/sources b/sources index e69de29..db112f0 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +18bb813cb350c6db014a0d82ecdf85fe znc-0.070.tar.gz diff --git a/znc-0.070-pkgconfigdir.diff b/znc-0.070-pkgconfigdir.diff new file mode 100644 index 0000000..66becbc --- /dev/null +++ b/znc-0.070-pkgconfigdir.diff @@ -0,0 +1,12 @@ +diff -uNr znc-0.070/Makefile.in znc-0.070-nb/Makefile.in +--- znc-0.070/Makefile.in 2009-05-03 06:23:05.000000000 -0500 ++++ znc-0.070-nb/Makefile.in 2009-07-08 18:30:51.180801877 -0500 +@@ -18,7 +18,7 @@ + LIBS := @LIBS@ + LIBZNC := @LIBZNC@ + LIBZNCDIR:= @LIBZNCDIR@ +-PKGCONFIGDIR := $(prefix)/lib/pkgconfig ++PKGCONFIGDIR := @libdir@/pkgconfig + + LIB_SRCS := ZNCString.cpp Csocket.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \ + DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \ diff --git a/znc.spec b/znc.spec new file mode 100644 index 0000000..a20c067 --- /dev/null +++ b/znc.spec @@ -0,0 +1,82 @@ +Summary: An advanced IRC bouncer +Name: znc +Version: 0.070 +Release: 7%{?dist} +License: GPLv2 with exceptions +Group: System Environment/Daemons +URL: http://znc.sf.net/ +Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz +Patch0: %{name}-%{version}-pkgconfigdir.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: perl +BuildRequires: openssl-devel >= 0.9.8 +BuildRequires: cyrus-sasl-devel + +# The following line is necessary because this module +# is needed for Fedora, but not for EPEL. +%{?fedora:BuildRequires: perl-ExtUtils-Embed} + +%description +ZNC is an IRC bouncer with many advanced features like detaching, +multiple users, per channel playback buffer, SSL, IPv6, transparent +DCC bouncing, Perl and C++ module support to name a few. + +%package devel +Summary: Development files needed to compile ZNC modules +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} pkgconfig + +%description devel +All includes and program files you need to compile your own znc +modules. + +%prep +%setup -q +%patch0 -p1 +%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp +chmod -x modules/q.cpp + +%build +%configure \ + --with-module-prefix=%{_libdir}/znc \ + --enable-ipv6 +%__make %{?_smp_mflags} + +%install +%__rm -Rf "%{buildroot}" +%__make install DESTDIR="%{buildroot}" + +%clean +%__rm -Rf "%{buildroot}" + +%files +%defattr(-,root,root) +%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf +%{_bindir}/znc +%{_mandir}/man1/* +%{_libdir}/znc/ +%{_datadir}/znc/ + +%files devel +%defattr(-,root,root) +%{_bindir}/znc-buildmod +%{_bindir}/znc-config +%{_libdir}/pkgconfig/%{name}.pc +%{_includedir}/znc/ + +%changelog +* Sun Jul 12 2009 Nick Bebout - 0.070-7 +- Fix License: to be GPLv2 with exceptions +* Sat Jul 11 2009 Nick Bebout - 0.070-6 +- Fix permissions error in %%prep, not in source +* Sat Jul 11 2009 Nick Bebout - 0.070-5 +- Fix permissions error on q.cpp and add LICENSE.OpenSSL +* Sat Jul 11 2009 Nick Bebout - 0.070-4 +- Remove switch to enable debug, fix %%files section +* Fri Jul 10 2009 Nick Bebout - 0.070-3 +- Move fixfreenode and log into separate znc-extra package +- Move awayping into separate znc-awayping package +* Thu Jul 9 2009 Nick Bebout - 0.070-2 +- Include modules with main package +* Wed Jul 8 2009 Nick Bebout - 0.070-1 +- Initial Fedora package based on 0.070 of upstream From ee96c63901799bba9889517358ec27ebc0311776 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 01:06:06 +0000 Subject: [PATCH 004/344] Updating to 0.072 - fixes security issue --- .cvsignore | 2 +- sources | 2 +- znc.spec | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 564a6f1..ad1e0ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.070.tar.gz +znc-0.072.tar.gz diff --git a/sources b/sources index db112f0..f8bb3d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18bb813cb350c6db014a0d82ecdf85fe znc-0.070.tar.gz +28791eb14f5a3129602dbab0ef6abbc6 znc-0.072.tar.gz diff --git a/znc.spec b/znc.spec index a20c067..05b1353 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,21 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.070 -Release: 7%{?dist} +Version: 0.072 +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz -Patch0: %{name}-%{version}-pkgconfigdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel +# the c-ares part of ZNC does not work on EPEL +# because the EPEL c-ares-devel does not install +# the .pc file for it +%{?fedora:BuildRequires: c-ares-devel} + # The following line is necessary because this module # is needed for Fedora, but not for EPEL. %{?fedora:BuildRequires: perl-ExtUtils-Embed} @@ -25,6 +29,7 @@ DCC bouncing, Perl and C++ module support to name a few. Summary: Development files needed to compile ZNC modules Group: Development/Libraries Requires: %{name} = %{version}-%{release} pkgconfig +BuildRequires: pkgconfig %description devel All includes and program files you need to compile your own znc @@ -32,14 +37,14 @@ modules. %prep %setup -q -%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -chmod -x modules/q.cpp +#chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 +%{!?fedora:--disable-c-ares \} + --enable-ipv6 --enable-sasl %__make %{?_smp_mflags} %install @@ -65,6 +70,8 @@ chmod -x modules/q.cpp %{_includedir}/znc/ %changelog +* Wed Jul 22 2009 Nick Bebout - 0.072-1 +- Upgrade to 0.072 of ZNC, fixes security issue in bug 513152 * Sun Jul 12 2009 Nick Bebout - 0.070-7 - Fix License: to be GPLv2 with exceptions * Sat Jul 11 2009 Nick Bebout - 0.070-6 From 062933ce17f1106b0397ca15911df9903d4e609a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 01:07:59 +0000 Subject: [PATCH 005/344] Removing old patch --- znc-0.070-pkgconfigdir.diff | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 znc-0.070-pkgconfigdir.diff diff --git a/znc-0.070-pkgconfigdir.diff b/znc-0.070-pkgconfigdir.diff deleted file mode 100644 index 66becbc..0000000 --- a/znc-0.070-pkgconfigdir.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr znc-0.070/Makefile.in znc-0.070-nb/Makefile.in ---- znc-0.070/Makefile.in 2009-05-03 06:23:05.000000000 -0500 -+++ znc-0.070-nb/Makefile.in 2009-07-08 18:30:51.180801877 -0500 -@@ -18,7 +18,7 @@ - LIBS := @LIBS@ - LIBZNC := @LIBZNC@ - LIBZNCDIR:= @LIBZNCDIR@ --PKGCONFIGDIR := $(prefix)/lib/pkgconfig -+PKGCONFIGDIR := @libdir@/pkgconfig - - LIB_SRCS := ZNCString.cpp Csocket.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \ - DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \ From fb563bbe2520dc2d56c87ba36d17230d11272e92 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 01:22:42 +0000 Subject: [PATCH 006/344] Updating to version 0.072 - fixes security bug 513152 --- .cvsignore | 2 +- sources | 2 +- znc-0.070-pkgconfigdir.diff | 12 ------------ znc.spec | 19 +++++++++++++------ 4 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 znc-0.070-pkgconfigdir.diff diff --git a/.cvsignore b/.cvsignore index 564a6f1..ad1e0ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.070.tar.gz +znc-0.072.tar.gz diff --git a/sources b/sources index db112f0..f8bb3d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18bb813cb350c6db014a0d82ecdf85fe znc-0.070.tar.gz +28791eb14f5a3129602dbab0ef6abbc6 znc-0.072.tar.gz diff --git a/znc-0.070-pkgconfigdir.diff b/znc-0.070-pkgconfigdir.diff deleted file mode 100644 index 66becbc..0000000 --- a/znc-0.070-pkgconfigdir.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr znc-0.070/Makefile.in znc-0.070-nb/Makefile.in ---- znc-0.070/Makefile.in 2009-05-03 06:23:05.000000000 -0500 -+++ znc-0.070-nb/Makefile.in 2009-07-08 18:30:51.180801877 -0500 -@@ -18,7 +18,7 @@ - LIBS := @LIBS@ - LIBZNC := @LIBZNC@ - LIBZNCDIR:= @LIBZNCDIR@ --PKGCONFIGDIR := $(prefix)/lib/pkgconfig -+PKGCONFIGDIR := @libdir@/pkgconfig - - LIB_SRCS := ZNCString.cpp Csocket.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \ - DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \ diff --git a/znc.spec b/znc.spec index a20c067..05b1353 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,21 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.070 -Release: 7%{?dist} +Version: 0.072 +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz -Patch0: %{name}-%{version}-pkgconfigdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel +# the c-ares part of ZNC does not work on EPEL +# because the EPEL c-ares-devel does not install +# the .pc file for it +%{?fedora:BuildRequires: c-ares-devel} + # The following line is necessary because this module # is needed for Fedora, but not for EPEL. %{?fedora:BuildRequires: perl-ExtUtils-Embed} @@ -25,6 +29,7 @@ DCC bouncing, Perl and C++ module support to name a few. Summary: Development files needed to compile ZNC modules Group: Development/Libraries Requires: %{name} = %{version}-%{release} pkgconfig +BuildRequires: pkgconfig %description devel All includes and program files you need to compile your own znc @@ -32,14 +37,14 @@ modules. %prep %setup -q -%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -chmod -x modules/q.cpp +#chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 +%{!?fedora:--disable-c-ares \} + --enable-ipv6 --enable-sasl %__make %{?_smp_mflags} %install @@ -65,6 +70,8 @@ chmod -x modules/q.cpp %{_includedir}/znc/ %changelog +* Wed Jul 22 2009 Nick Bebout - 0.072-1 +- Upgrade to 0.072 of ZNC, fixes security issue in bug 513152 * Sun Jul 12 2009 Nick Bebout - 0.070-7 - Fix License: to be GPLv2 with exceptions * Sat Jul 11 2009 Nick Bebout - 0.070-6 From b069636e4082534e69b8ab761c77644da1b2f710 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 01:56:02 +0000 Subject: [PATCH 007/344] Adding patch to fix webadmin issue --- znc-0.072-webadmin.diff | 20 ++++++++++++++++++++ znc.spec | 8 ++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 znc-0.072-webadmin.diff diff --git a/znc-0.072-webadmin.diff b/znc-0.072-webadmin.diff new file mode 100644 index 0000000..6cdecca --- /dev/null +++ b/znc-0.072-webadmin.diff @@ -0,0 +1,20 @@ +--- znc-0.072/modules/webadmin.cpp 2009-07-21 13:36:33.000000000 -0500 ++++ /home/nb/fedora-git/znc-upstream/modules/webadmin.cpp 2009-07-22 20:36:44.736103981 -0500 +@@ -253,13 +253,13 @@ + + CString CWebAdminSock::GetSkinDir() { + CString sAvailSkins = GetAvailSkinsDir(); +- CString sSkinDir = sAvailSkins + GetModule()->GetSkinName() + "/"; +- CString sDir = CDir::CheckPathPrefix("./", sSkinDir, "/"); ++ CString sSkinDir = GetModule()->GetSkinName() + "/"; ++ CString sDir = CDir::CheckPathPrefix(sAvailSkins, sSkinDir, "/"); + + // Via CheckPrefix() we check if someone tries to use e.g. a skin name + // with embed .. or such evilness. +- if (!sDir.empty() && CFile::IsDir(sSkinDir)) { +- return sSkinDir; ++ if (!sDir.empty() && CFile::IsDir(sDir)) { ++ return sDir + "/"; + } + + return m_pModule->GetModDataDir() + "/skins/default/"; diff --git a/znc.spec b/znc.spec index 05b1353..c1cabd0 100644 --- a/znc.spec +++ b/znc.spec @@ -6,6 +6,7 @@ License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz +Patch0: %{name}-%{version}-webadmin.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 @@ -37,8 +38,9 @@ modules. %prep %setup -q +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -#chmod -x modules/q.cpp +chmod -x modules/q.cpp %build %configure \ @@ -70,8 +72,10 @@ modules. %{_includedir}/znc/ %changelog +* Web Jul 22 2009 Nick Bebout - 0.072-2 +- Backport patch to fix webadmin skins issue introduced in 0.072 * Wed Jul 22 2009 Nick Bebout - 0.072-1 -- Upgrade to 0.072 of ZNC, fixes security issue in bug 513152 +- Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152 * Sun Jul 12 2009 Nick Bebout - 0.070-7 - Fix License: to be GPLv2 with exceptions * Sat Jul 11 2009 Nick Bebout - 0.070-6 From 668107b6816464397fca7df4ae72ff80d68e968d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 01:57:24 +0000 Subject: [PATCH 008/344] Bump release --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index c1cabd0..f33edec 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.072 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ From c652e56d168bd7984050e07c717e89bf71fab840 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 02:00:10 +0000 Subject: [PATCH 009/344] Updating to 0.072-2 --- znc-0.072-webadmin.diff | 20 ++++++++++++++++++++ znc.spec | 10 +++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 znc-0.072-webadmin.diff diff --git a/znc-0.072-webadmin.diff b/znc-0.072-webadmin.diff new file mode 100644 index 0000000..6cdecca --- /dev/null +++ b/znc-0.072-webadmin.diff @@ -0,0 +1,20 @@ +--- znc-0.072/modules/webadmin.cpp 2009-07-21 13:36:33.000000000 -0500 ++++ /home/nb/fedora-git/znc-upstream/modules/webadmin.cpp 2009-07-22 20:36:44.736103981 -0500 +@@ -253,13 +253,13 @@ + + CString CWebAdminSock::GetSkinDir() { + CString sAvailSkins = GetAvailSkinsDir(); +- CString sSkinDir = sAvailSkins + GetModule()->GetSkinName() + "/"; +- CString sDir = CDir::CheckPathPrefix("./", sSkinDir, "/"); ++ CString sSkinDir = GetModule()->GetSkinName() + "/"; ++ CString sDir = CDir::CheckPathPrefix(sAvailSkins, sSkinDir, "/"); + + // Via CheckPrefix() we check if someone tries to use e.g. a skin name + // with embed .. or such evilness. +- if (!sDir.empty() && CFile::IsDir(sSkinDir)) { +- return sSkinDir; ++ if (!sDir.empty() && CFile::IsDir(sDir)) { ++ return sDir + "/"; + } + + return m_pModule->GetModDataDir() + "/skins/default/"; diff --git a/znc.spec b/znc.spec index 05b1353..f33edec 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.072 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz +Patch0: %{name}-%{version}-webadmin.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 @@ -37,8 +38,9 @@ modules. %prep %setup -q +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -#chmod -x modules/q.cpp +chmod -x modules/q.cpp %build %configure \ @@ -70,8 +72,10 @@ modules. %{_includedir}/znc/ %changelog +* Web Jul 22 2009 Nick Bebout - 0.072-2 +- Backport patch to fix webadmin skins issue introduced in 0.072 * Wed Jul 22 2009 Nick Bebout - 0.072-1 -- Upgrade to 0.072 of ZNC, fixes security issue in bug 513152 +- Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152 * Sun Jul 12 2009 Nick Bebout - 0.070-7 - Fix License: to be GPLv2 with exceptions * Sat Jul 11 2009 Nick Bebout - 0.070-6 From fd08392c14a1711899f6d77a07886a882cb6b8a2 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 02:53:18 +0000 Subject: [PATCH 010/344] Fixing configure options in spec --- znc.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/znc.spec b/znc.spec index f33edec..fe624c2 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.072 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -12,11 +12,6 @@ BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -# the c-ares part of ZNC does not work on EPEL -# because the EPEL c-ares-devel does not install -# the .pc file for it -%{?fedora:BuildRequires: c-ares-devel} - # The following line is necessary because this module # is needed for Fedora, but not for EPEL. %{?fedora:BuildRequires: perl-ExtUtils-Embed} @@ -45,8 +40,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ -%{!?fedora:--disable-c-ares \} - --enable-ipv6 --enable-sasl + --enable-ipv6 --enable-sasl --disable-c-ares %__make %{?_smp_mflags} %install @@ -72,7 +66,9 @@ chmod -x modules/q.cpp %{_includedir}/znc/ %changelog -* Web Jul 22 2009 Nick Bebout - 0.072-2 +* Wed Jul 22 2009 Nick Bebout - 0.072-3 +- Fix date in changelog, disable c-ares +* Wed Jul 22 2009 Nick Bebout - 0.072-2 - Backport patch to fix webadmin skins issue introduced in 0.072 * Wed Jul 22 2009 Nick Bebout - 0.072-1 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152 From d45d947f390da0eba15ab18269830c38f799c0b7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 02:56:55 +0000 Subject: [PATCH 011/344] Fixing configure options in spec file - disable c-ares --- znc.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/znc.spec b/znc.spec index f33edec..fe624c2 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.072 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -12,11 +12,6 @@ BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -# the c-ares part of ZNC does not work on EPEL -# because the EPEL c-ares-devel does not install -# the .pc file for it -%{?fedora:BuildRequires: c-ares-devel} - # The following line is necessary because this module # is needed for Fedora, but not for EPEL. %{?fedora:BuildRequires: perl-ExtUtils-Embed} @@ -45,8 +40,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ -%{!?fedora:--disable-c-ares \} - --enable-ipv6 --enable-sasl + --enable-ipv6 --enable-sasl --disable-c-ares %__make %{?_smp_mflags} %install @@ -72,7 +66,9 @@ chmod -x modules/q.cpp %{_includedir}/znc/ %changelog -* Web Jul 22 2009 Nick Bebout - 0.072-2 +* Wed Jul 22 2009 Nick Bebout - 0.072-3 +- Fix date in changelog, disable c-ares +* Wed Jul 22 2009 Nick Bebout - 0.072-2 - Backport patch to fix webadmin skins issue introduced in 0.072 * Wed Jul 22 2009 Nick Bebout - 0.072-1 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152 From 280b6ccdbc96b414e60f0f108ca9ad1b675cb07a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 18:10:45 +0000 Subject: [PATCH 012/344] Updating to 0.074-1 --- .cvsignore | 2 +- sources | 2 +- znc-0.072-webadmin.diff | 20 -------------------- znc.spec | 13 +++++++------ 4 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 znc-0.072-webadmin.diff diff --git a/.cvsignore b/.cvsignore index ad1e0ee..6bace73 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.072.tar.gz +znc-0.074.tar.gz diff --git a/sources b/sources index f8bb3d2..e7673be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28791eb14f5a3129602dbab0ef6abbc6 znc-0.072.tar.gz +378187acd114769f8f97ef2d4b19da25 znc-0.074.tar.gz diff --git a/znc-0.072-webadmin.diff b/znc-0.072-webadmin.diff deleted file mode 100644 index 6cdecca..0000000 --- a/znc-0.072-webadmin.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- znc-0.072/modules/webadmin.cpp 2009-07-21 13:36:33.000000000 -0500 -+++ /home/nb/fedora-git/znc-upstream/modules/webadmin.cpp 2009-07-22 20:36:44.736103981 -0500 -@@ -253,13 +253,13 @@ - - CString CWebAdminSock::GetSkinDir() { - CString sAvailSkins = GetAvailSkinsDir(); -- CString sSkinDir = sAvailSkins + GetModule()->GetSkinName() + "/"; -- CString sDir = CDir::CheckPathPrefix("./", sSkinDir, "/"); -+ CString sSkinDir = GetModule()->GetSkinName() + "/"; -+ CString sDir = CDir::CheckPathPrefix(sAvailSkins, sSkinDir, "/"); - - // Via CheckPrefix() we check if someone tries to use e.g. a skin name - // with embed .. or such evilness. -- if (!sDir.empty() && CFile::IsDir(sSkinDir)) { -- return sSkinDir; -+ if (!sDir.empty() && CFile::IsDir(sDir)) { -+ return sDir + "/"; - } - - return m_pModule->GetModDataDir() + "/skins/default/"; diff --git a/znc.spec b/znc.spec index fe624c2..8573994 100644 --- a/znc.spec +++ b/znc.spec @@ -1,16 +1,16 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.072 -Release: 3%{?dist} +Version: 0.074 +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz -Patch0: %{name}-%{version}-webadmin.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel +BuildRequires: c-ares-devel # The following line is necessary because this module # is needed for Fedora, but not for EPEL. @@ -33,14 +33,13 @@ modules. %prep %setup -q -%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -chmod -x modules/q.cpp +#chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl --disable-c-ares + --enable-ipv6 --enable-sasl %__make %{?_smp_mflags} %install @@ -66,6 +65,8 @@ chmod -x modules/q.cpp %{_includedir}/znc/ %changelog +* Thu Jul 23 2009 Nick Bebout - 0.074-1 +- Update to 0.074 * Wed Jul 22 2009 Nick Bebout - 0.072-3 - Fix date in changelog, disable c-ares * Wed Jul 22 2009 Nick Bebout - 0.072-2 From 391760d7a031ace6e4f82fd56307669f4d2e11fd Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Jul 2009 18:12:47 +0000 Subject: [PATCH 013/344] Update to 0.074-1 --- .cvsignore | 2 +- sources | 2 +- znc-0.072-webadmin.diff | 20 -------------------- znc.spec | 13 +++++++------ 4 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 znc-0.072-webadmin.diff diff --git a/.cvsignore b/.cvsignore index ad1e0ee..6bace73 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.072.tar.gz +znc-0.074.tar.gz diff --git a/sources b/sources index f8bb3d2..e7673be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28791eb14f5a3129602dbab0ef6abbc6 znc-0.072.tar.gz +378187acd114769f8f97ef2d4b19da25 znc-0.074.tar.gz diff --git a/znc-0.072-webadmin.diff b/znc-0.072-webadmin.diff deleted file mode 100644 index 6cdecca..0000000 --- a/znc-0.072-webadmin.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- znc-0.072/modules/webadmin.cpp 2009-07-21 13:36:33.000000000 -0500 -+++ /home/nb/fedora-git/znc-upstream/modules/webadmin.cpp 2009-07-22 20:36:44.736103981 -0500 -@@ -253,13 +253,13 @@ - - CString CWebAdminSock::GetSkinDir() { - CString sAvailSkins = GetAvailSkinsDir(); -- CString sSkinDir = sAvailSkins + GetModule()->GetSkinName() + "/"; -- CString sDir = CDir::CheckPathPrefix("./", sSkinDir, "/"); -+ CString sSkinDir = GetModule()->GetSkinName() + "/"; -+ CString sDir = CDir::CheckPathPrefix(sAvailSkins, sSkinDir, "/"); - - // Via CheckPrefix() we check if someone tries to use e.g. a skin name - // with embed .. or such evilness. -- if (!sDir.empty() && CFile::IsDir(sSkinDir)) { -- return sSkinDir; -+ if (!sDir.empty() && CFile::IsDir(sDir)) { -+ return sDir + "/"; - } - - return m_pModule->GetModDataDir() + "/skins/default/"; diff --git a/znc.spec b/znc.spec index fe624c2..8573994 100644 --- a/znc.spec +++ b/znc.spec @@ -1,16 +1,16 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.072 -Release: 3%{?dist} +Version: 0.074 +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz -Patch0: %{name}-%{version}-webadmin.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel +BuildRequires: c-ares-devel # The following line is necessary because this module # is needed for Fedora, but not for EPEL. @@ -33,14 +33,13 @@ modules. %prep %setup -q -%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -chmod -x modules/q.cpp +#chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl --disable-c-ares + --enable-ipv6 --enable-sasl %__make %{?_smp_mflags} %install @@ -66,6 +65,8 @@ chmod -x modules/q.cpp %{_includedir}/znc/ %changelog +* Thu Jul 23 2009 Nick Bebout - 0.074-1 +- Update to 0.074 * Wed Jul 22 2009 Nick Bebout - 0.072-3 - Fix date in changelog, disable c-ares * Wed Jul 22 2009 Nick Bebout - 0.072-2 From 3c2da34d5b960cd92208eeb5e2076a5201964d5f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 09:04:26 +0000 Subject: [PATCH 014/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 8573994..8e81940 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.074 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -65,6 +65,9 @@ modules. %{_includedir}/znc/ %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.074-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jul 23 2009 Nick Bebout - 0.074-1 - Update to 0.074 * Wed Jul 22 2009 Nick Bebout - 0.072-3 From 3c910e2c46d0a1aace14add3c0ef109948ce21d9 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 3 Aug 2009 16:59:27 +0000 Subject: [PATCH 015/344] Bump release to fix failed push --- znc.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 8573994..35bf97c 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.074 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -65,6 +65,8 @@ modules. %{_includedir}/znc/ %changelog +* Mon Aug 3 2009 Nick Bebout - 0.074-2 +- Bump release to fix failed push * Thu Jul 23 2009 Nick Bebout - 0.074-1 - Update to 0.074 * Wed Jul 22 2009 Nick Bebout - 0.072-3 From 7f55076a4162139259ece0436af2619fae05c265 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 8 Aug 2009 04:33:34 +0000 Subject: [PATCH 016/344] Upgrade to ZNC 0.075.20090807svn1594 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 21 ++++++++++++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6bace73..eee4709 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.074.tar.gz +znc-0.075.20090807svn1594.tar.bz2 diff --git a/sources b/sources index e7673be..a0537ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -378187acd114769f8f97ef2d4b19da25 znc-0.074.tar.gz +89bacd3c6ff894c485cdef29cc8f278b znc-0.075.20090807svn1594.tar.bz2 diff --git a/znc.spec b/znc.spec index 8e81940..6d5750b 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,13 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.074 -Release: 2%{?dist} +Version: 0.075 +Release: 1.20090807svn1594%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz +# SVN 1594 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ +Source0: znc-0.075.20090807svn1594.tar.bz2 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 @@ -65,29 +67,42 @@ modules. %{_includedir}/znc/ %changelog +* Fri Aug 7 2009 Nick Bebout - 0.075-1.20090807svn1594 +- Upgrade to svn 1594 + * Mon Jul 27 2009 Fedora Release Engineering - 0.074-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Thu Jul 23 2009 Nick Bebout - 0.074-1 - Update to 0.074 + * Wed Jul 22 2009 Nick Bebout - 0.072-3 - Fix date in changelog, disable c-ares + * Wed Jul 22 2009 Nick Bebout - 0.072-2 - Backport patch to fix webadmin skins issue introduced in 0.072 + * Wed Jul 22 2009 Nick Bebout - 0.072-1 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152 + * Sun Jul 12 2009 Nick Bebout - 0.070-7 - Fix License: to be GPLv2 with exceptions + * Sat Jul 11 2009 Nick Bebout - 0.070-6 - Fix permissions error in %%prep, not in source + * Sat Jul 11 2009 Nick Bebout - 0.070-5 - Fix permissions error on q.cpp and add LICENSE.OpenSSL + * Sat Jul 11 2009 Nick Bebout - 0.070-4 - Remove switch to enable debug, fix %%files section + * Fri Jul 10 2009 Nick Bebout - 0.070-3 - Move fixfreenode and log into separate znc-extra package - Move awayping into separate znc-awayping package + * Thu Jul 9 2009 Nick Bebout - 0.070-2 - Include modules with main package + * Wed Jul 8 2009 Nick Bebout - 0.070-1 - Initial Fedora package based on 0.070 of upstream From 45498f14f4207fe5dcb746281d330faa821d5ddb Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 8 Aug 2009 04:43:08 +0000 Subject: [PATCH 017/344] Fix broken source tarball --- .cvsignore | 2 +- sources | 2 +- znc.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index eee4709..3909074 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.075.20090807svn1594.tar.bz2 +znc-0.075-2.20090807svn1594.tar.bz2 diff --git a/sources b/sources index a0537ce..97a61d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89bacd3c6ff894c485cdef29cc8f278b znc-0.075.20090807svn1594.tar.bz2 +813421017497d34ca371e61bfd248410 znc-0.075-2.20090807svn1594.tar.bz2 diff --git a/znc.spec b/znc.spec index 6d5750b..8afd9b1 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.075 -Release: 1.20090807svn1594%{?dist} +Release: 2.20090807svn1594%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -67,6 +67,9 @@ modules. %{_includedir}/znc/ %changelog +* Fri Aug 7 2009 Nick Bebout - 0.075-2.20090807svn1594 +- Fix broken source tarball + * Fri Aug 7 2009 Nick Bebout - 0.075-1.20090807svn1594 - Upgrade to svn 1594 From 62bd1ef03b66d1c07b287e3da54dc2f1b3681234 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 8 Aug 2009 04:45:34 +0000 Subject: [PATCH 018/344] Fix spec file --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 8afd9b1..4f88748 100644 --- a/znc.spec +++ b/znc.spec @@ -6,7 +6,7 @@ License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ # SVN 1594 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ -Source0: znc-0.075.20090807svn1594.tar.bz2 +Source0: znc-0.075-2.20090807svn1594.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl From 611837af2535fa4990a9f8baf1eb00e2c4a666e8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 8 Aug 2009 05:34:02 +0000 Subject: [PATCH 019/344] Modify source tarball name --- .cvsignore | 2 +- sources | 2 +- znc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3909074..eee4709 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.075-2.20090807svn1594.tar.bz2 +znc-0.075.20090807svn1594.tar.bz2 diff --git a/sources b/sources index 97a61d9..a81f6ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -813421017497d34ca371e61bfd248410 znc-0.075-2.20090807svn1594.tar.bz2 +813421017497d34ca371e61bfd248410 znc-0.075.20090807svn1594.tar.bz2 diff --git a/znc.spec b/znc.spec index 4f88748..4ee5ee4 100644 --- a/znc.spec +++ b/znc.spec @@ -1,12 +1,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.075 -Release: 2.20090807svn1594%{?dist} +Release: 3.20090807svn1594%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ # SVN 1594 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ -Source0: znc-0.075-2.20090807svn1594.tar.bz2 +Source0: znc-0.075.20090807svn1594.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -67,6 +67,9 @@ modules. %{_includedir}/znc/ %changelog +* Sat Aug 8 2009 Nick Bebout - 0.075-3.20090807svn1594 +- Fix source filename + * Fri Aug 7 2009 Nick Bebout - 0.075-2.20090807svn1594 - Fix broken source tarball From 2d5b6d1f3d601fd62f891780886615dc93a1edea Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 Aug 2009 04:25:14 +0000 Subject: [PATCH 020/344] Upgrade Rawhide to ZNC 0.075 20090817svn1602 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index eee4709..f79d12e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.075.20090807svn1594.tar.bz2 +znc-0.075.20090818svn1602.tar.bz2 diff --git a/sources b/sources index a81f6ba..278ee30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -813421017497d34ca371e61bfd248410 znc-0.075.20090807svn1594.tar.bz2 +43899b05816ce74bb9da8e4e82480e15 znc-0.075.20090818svn1602.tar.bz2 diff --git a/znc.spec b/znc.spec index 4ee5ee4..1f1be0e 100644 --- a/znc.spec +++ b/znc.spec @@ -1,12 +1,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.075 -Release: 3.20090807svn1594%{?dist} +Release: 4.20090818svn1602%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -# SVN 1594 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ -Source0: znc-0.075.20090807svn1594.tar.bz2 +# SVN 1602 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ +Source0: znc-0.075.20090818svn1602.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -67,6 +67,9 @@ modules. %{_includedir}/znc/ %changelog +* Tue Aug 18 2009 Nick Bebout - 0.075-4.20090818svn1602 +- Upgrade to svn 1602 + * Sat Aug 8 2009 Nick Bebout - 0.075-3.20090807svn1594 - Fix source filename From 4ec811ab19ee0586200758f480e6ffb6a2b7dcf9 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 21 Aug 2009 05:20:21 +0000 Subject: [PATCH 021/344] Update to latest SVN 1608 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 69 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index f79d12e..f79430a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.075.20090818svn1602.tar.bz2 +znc-0.075.svn1608.tar.bz2 diff --git a/sources b/sources index 278ee30..4c4779e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43899b05816ce74bb9da8e4e82480e15 znc-0.075.20090818svn1602.tar.bz2 +61546bb28c7d325259346ebe59b41f42 znc-0.075.svn1608.tar.bz2 diff --git a/znc.spec b/znc.spec index 1f1be0e..6c58a30 100644 --- a/znc.spec +++ b/znc.spec @@ -1,12 +1,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.075 -Release: 4.20090818svn1602%{?dist} +Release: 5.svn1608%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -# SVN 1602 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ -Source0: znc-0.075.20090818svn1602.tar.bz2 +# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ +Source0: znc-0.075.svn1608.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -33,6 +33,14 @@ BuildRequires: pkgconfig All includes and program files you need to compile your own znc modules. +%package extra +Summary: Extra modules for ZNC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description extra +Extra modules for ZNC + %prep %setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp @@ -41,7 +49,7 @@ modules. %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl + --enable-ipv6 --enable-sasl --enable-extra %__make %{?_smp_mflags} %install @@ -56,7 +64,41 @@ modules. %doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf %{_bindir}/znc %{_mandir}/man1/* -%{_libdir}/znc/ +#%{_libdir}/znc/ +%{_libdir}/znc/admin.so +%{_libdir}/znc/adminlog.so +%{_libdir}/znc/autoattach.so +%{_libdir}/znc/autocycle.so +%{_libdir}/znc/autoop.so +%{_libdir}/znc/autoreply.so +%{_libdir}/znc/away.so +%{_libdir}/znc/awaynick.so +%{_libdir}/znc/buffextras.so +%{_libdir}/znc/chansaver.so +%{_libdir}/znc/crypt.so +%{_libdir}/znc/email.so +%{_libdir}/znc/fail2ban.so +%{_libdir}/znc/fixfreenode.so +%{_libdir}/znc/imapauth.so +%{_libdir}/znc/keepnick.so +%{_libdir}/znc/kickrejoin.so +%{_libdir}/znc/modperl.pm +%{_libdir}/znc/modperl.so +%{_libdir}/znc/nickserv.so +%{_libdir}/znc/partyline.so +%{_libdir}/znc/perform.so +%{_libdir}/znc/q.so +%{_libdir}/znc/raw.so +%{_libdir}/znc/route_replies.so +%{_libdir}/znc/sample.so +%{_libdir}/znc/saslauth.so +%{_libdir}/znc/savebuff.so +%{_libdir}/znc/schat.so +%{_libdir}/znc/shell.so +%{_libdir}/znc/simple_away.so +%{_libdir}/znc/stickychan.so +%{_libdir}/znc/watch.so +%{_libdir}/znc/webadmin.so %{_datadir}/znc/ %files devel @@ -66,7 +108,27 @@ modules. %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/znc/ +%files extra +%defattr(-,root,root) +%{_libdir}/znc/antiidle.so +%{_libdir}/znc/autovoice.so +%{_libdir}/znc/blockuser.so +%{_libdir}/znc/connect_throttle.so +%{_libdir}/znc/ctcpflood.so +%{_libdir}/znc/discon_kick.so +%{_libdir}/znc/droproot.so +%{_libdir}/znc/fakeonline.so +%{_libdir}/znc/lastseen.so +%{_libdir}/znc/listsockets.so +%{_libdir}/znc/log.so +%{_libdir}/znc/motdfile.so +%{_libdir}/znc/notify_connect.so +%{_libdir}/znc/send_raw.so + %changelog +* Thu Aug 20 2009 Nick Bebout - 0.075-5.svn1608 +- Upgrade to svn 1608 + * Tue Aug 18 2009 Nick Bebout - 0.075-4.20090818svn1602 - Upgrade to svn 1602 From 2aec4d00c00d9278805c3d76f2b25b99f67de593 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 21 Aug 2009 05:23:31 +0000 Subject: [PATCH 022/344] Update to tarball from svn export instead of svn checkout --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 4c4779e..d855888 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61546bb28c7d325259346ebe59b41f42 znc-0.075.svn1608.tar.bz2 +9c4932f49424638f136de9c1e9d9fb9d znc-0.075.svn1608.tar.bz2 From 0c0f64826126a18031d0ba4178d3368159c5df9c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 21 Aug 2009 05:56:05 +0000 Subject: [PATCH 023/344] Update to SVN 1608 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 101 +++++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 96 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6bace73..f79430a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.074.tar.gz +znc-0.075.svn1608.tar.bz2 diff --git a/sources b/sources index e7673be..d855888 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -378187acd114769f8f97ef2d4b19da25 znc-0.074.tar.gz +9c4932f49424638f136de9c1e9d9fb9d znc-0.075.svn1608.tar.bz2 diff --git a/znc.spec b/znc.spec index 35bf97c..6c58a30 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,13 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.074 -Release: 2%{?dist} +Version: 0.075 +Release: 5.svn1608%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz +# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ +Source0: znc-0.075.svn1608.tar.bz2 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl BuildRequires: openssl-devel >= 0.9.8 @@ -31,6 +33,14 @@ BuildRequires: pkgconfig All includes and program files you need to compile your own znc modules. +%package extra +Summary: Extra modules for ZNC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description extra +Extra modules for ZNC + %prep %setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp @@ -39,7 +49,7 @@ modules. %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl + --enable-ipv6 --enable-sasl --enable-extra %__make %{?_smp_mflags} %install @@ -54,7 +64,41 @@ modules. %doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf %{_bindir}/znc %{_mandir}/man1/* -%{_libdir}/znc/ +#%{_libdir}/znc/ +%{_libdir}/znc/admin.so +%{_libdir}/znc/adminlog.so +%{_libdir}/znc/autoattach.so +%{_libdir}/znc/autocycle.so +%{_libdir}/znc/autoop.so +%{_libdir}/znc/autoreply.so +%{_libdir}/znc/away.so +%{_libdir}/znc/awaynick.so +%{_libdir}/znc/buffextras.so +%{_libdir}/znc/chansaver.so +%{_libdir}/znc/crypt.so +%{_libdir}/znc/email.so +%{_libdir}/znc/fail2ban.so +%{_libdir}/znc/fixfreenode.so +%{_libdir}/znc/imapauth.so +%{_libdir}/znc/keepnick.so +%{_libdir}/znc/kickrejoin.so +%{_libdir}/znc/modperl.pm +%{_libdir}/znc/modperl.so +%{_libdir}/znc/nickserv.so +%{_libdir}/znc/partyline.so +%{_libdir}/znc/perform.so +%{_libdir}/znc/q.so +%{_libdir}/znc/raw.so +%{_libdir}/znc/route_replies.so +%{_libdir}/znc/sample.so +%{_libdir}/znc/saslauth.so +%{_libdir}/znc/savebuff.so +%{_libdir}/znc/schat.so +%{_libdir}/znc/shell.so +%{_libdir}/znc/simple_away.so +%{_libdir}/znc/stickychan.so +%{_libdir}/znc/watch.so +%{_libdir}/znc/webadmin.so %{_datadir}/znc/ %files devel @@ -64,29 +108,72 @@ modules. %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/znc/ +%files extra +%defattr(-,root,root) +%{_libdir}/znc/antiidle.so +%{_libdir}/znc/autovoice.so +%{_libdir}/znc/blockuser.so +%{_libdir}/znc/connect_throttle.so +%{_libdir}/znc/ctcpflood.so +%{_libdir}/znc/discon_kick.so +%{_libdir}/znc/droproot.so +%{_libdir}/znc/fakeonline.so +%{_libdir}/znc/lastseen.so +%{_libdir}/znc/listsockets.so +%{_libdir}/znc/log.so +%{_libdir}/znc/motdfile.so +%{_libdir}/znc/notify_connect.so +%{_libdir}/znc/send_raw.so + %changelog -* Mon Aug 3 2009 Nick Bebout - 0.074-2 -- Bump release to fix failed push +* Thu Aug 20 2009 Nick Bebout - 0.075-5.svn1608 +- Upgrade to svn 1608 + +* Tue Aug 18 2009 Nick Bebout - 0.075-4.20090818svn1602 +- Upgrade to svn 1602 + +* Sat Aug 8 2009 Nick Bebout - 0.075-3.20090807svn1594 +- Fix source filename + +* Fri Aug 7 2009 Nick Bebout - 0.075-2.20090807svn1594 +- Fix broken source tarball + +* Fri Aug 7 2009 Nick Bebout - 0.075-1.20090807svn1594 +- Upgrade to svn 1594 + +* Mon Jul 27 2009 Fedora Release Engineering - 0.074-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jul 23 2009 Nick Bebout - 0.074-1 - Update to 0.074 + * Wed Jul 22 2009 Nick Bebout - 0.072-3 - Fix date in changelog, disable c-ares + * Wed Jul 22 2009 Nick Bebout - 0.072-2 - Backport patch to fix webadmin skins issue introduced in 0.072 + * Wed Jul 22 2009 Nick Bebout - 0.072-1 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152 + * Sun Jul 12 2009 Nick Bebout - 0.070-7 - Fix License: to be GPLv2 with exceptions + * Sat Jul 11 2009 Nick Bebout - 0.070-6 - Fix permissions error in %%prep, not in source + * Sat Jul 11 2009 Nick Bebout - 0.070-5 - Fix permissions error on q.cpp and add LICENSE.OpenSSL + * Sat Jul 11 2009 Nick Bebout - 0.070-4 - Remove switch to enable debug, fix %%files section + * Fri Jul 10 2009 Nick Bebout - 0.070-3 - Move fixfreenode and log into separate znc-extra package - Move awayping into separate znc-awayping package + * Thu Jul 9 2009 Nick Bebout - 0.070-2 - Include modules with main package + * Wed Jul 8 2009 Nick Bebout - 0.070-1 - Initial Fedora package based on 0.070 of upstream From f05869e1374504d9683359b12bd58b4c4babcc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 21 Aug 2009 16:38:39 +0000 Subject: [PATCH 024/344] - rebuilt with new openssl --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 6c58a30..6552c3f 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.075 -Release: 5.svn1608%{?dist} +Release: 6.svn1608%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -126,6 +126,9 @@ Extra modules for ZNC %{_libdir}/znc/send_raw.so %changelog +* Fri Aug 21 2009 Tomas Mraz - 0.075-6.svn1608 +- rebuilt with new openssl + * Thu Aug 20 2009 Nick Bebout - 0.075-5.svn1608 - Upgrade to svn 1608 From fbbcf0fa796231584a620020a088419c2a77a127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Wed, 26 Aug 2009 15:31:37 +0000 Subject: [PATCH 025/344] - rebuilt with new openssl --- znc-0.075-openssl.patch | 15 +++++++++++++++ znc.spec | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 znc-0.075-openssl.patch diff --git a/znc-0.075-openssl.patch b/znc-0.075-openssl.patch new file mode 100644 index 0000000..f5dbbbc --- /dev/null +++ b/znc-0.075-openssl.patch @@ -0,0 +1,15 @@ +diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h +--- znc-0.075/Csocket.h.openssl 2009-06-30 11:56:01.000000000 +0200 ++++ znc-0.075/Csocket.h 2009-08-26 17:29:37.000000000 +0200 +@@ -990,7 +990,11 @@ private: + CS_STRING m_sSSLBuffer; + SSL *m_ssl; + SSL_CTX *m_ssl_ctx; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *m_ssl_method; ++#else + SSL_METHOD *m_ssl_method; ++#endif + unsigned int m_iRequireClientCertFlags; + + FPCertVerifyCB m_pCerVerifyCB; diff --git a/znc.spec b/znc.spec index 6552c3f..db45b7e 100644 --- a/znc.spec +++ b/znc.spec @@ -7,6 +7,7 @@ Group: System Environment/Daemons URL: http://znc.sf.net/ # SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ Source0: znc-0.075.svn1608.tar.bz2 +Patch1: znc-0.075-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -43,6 +44,7 @@ Extra modules for ZNC %prep %setup -q +%patch1 -p1 -b .openssl %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp #chmod -x modules/q.cpp @@ -126,7 +128,7 @@ Extra modules for ZNC %{_libdir}/znc/send_raw.so %changelog -* Fri Aug 21 2009 Tomas Mraz - 0.075-6.svn1608 +* Wed Aug 26 2009 Tomas Mraz - 0.075-6.svn1608 - rebuilt with new openssl * Thu Aug 20 2009 Nick Bebout - 0.075-5.svn1608 From 00a397d8baf7712d233aa2954d9aa399aede63ae Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 28 Aug 2009 07:36:51 +0000 Subject: [PATCH 026/344] Upgrade to svn1613 and add tmraz's patch for new openssl --- .cvsignore | 2 +- sources | 2 +- znc.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index f79430a..8e591ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.075.svn1608.tar.bz2 +znc-0.075.svn1613.tar.bz2 diff --git a/sources b/sources index d855888..28aabd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c4932f49424638f136de9c1e9d9fb9d znc-0.075.svn1608.tar.bz2 +285799b069c452182d9a342aaaf1de1d znc-0.075.svn1613.tar.bz2 diff --git a/znc.spec b/znc.spec index db45b7e..7979a50 100644 --- a/znc.spec +++ b/znc.spec @@ -1,12 +1,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.075 -Release: 6.svn1608%{?dist} +Release: 8.svn1613%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ -Source0: znc-0.075.svn1608.tar.bz2 +# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ +Source0: znc-0.075.svn1613.tar.bz2 Patch1: znc-0.075-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -46,7 +46,7 @@ Extra modules for ZNC %setup -q %patch1 -p1 -b .openssl %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -#chmod -x modules/q.cpp +chmod -x modules/q.cpp %build %configure \ @@ -128,6 +128,11 @@ Extra modules for ZNC %{_libdir}/znc/send_raw.so %changelog +* Fri Aug 28 2009 Nick Bebout - 0.075-8.svn1613 +- Rebuild with new openssl and svn 1613 +- build 0.075-7.svn1610 existed but I had to remove it from the spec because +- the date was earlier than the date tmraz build the new openssl one + * Wed Aug 26 2009 Tomas Mraz - 0.075-6.svn1608 - rebuilt with new openssl From 072105660f9bcb046408a3a271b9597c03adb76d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 28 Aug 2009 07:42:17 +0000 Subject: [PATCH 027/344] Upgrade the rest of the branches to svn1613 with new openssl --- .cvsignore | 2 +- sources | 2 +- znc-0.075-openssl.patch | 15 +++++++++++++++ znc.spec | 18 ++++++++++++++---- 4 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 znc-0.075-openssl.patch diff --git a/.cvsignore b/.cvsignore index f79430a..8e591ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.075.svn1608.tar.bz2 +znc-0.075.svn1613.tar.bz2 diff --git a/sources b/sources index d855888..28aabd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c4932f49424638f136de9c1e9d9fb9d znc-0.075.svn1608.tar.bz2 +285799b069c452182d9a342aaaf1de1d znc-0.075.svn1613.tar.bz2 diff --git a/znc-0.075-openssl.patch b/znc-0.075-openssl.patch new file mode 100644 index 0000000..f5dbbbc --- /dev/null +++ b/znc-0.075-openssl.patch @@ -0,0 +1,15 @@ +diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h +--- znc-0.075/Csocket.h.openssl 2009-06-30 11:56:01.000000000 +0200 ++++ znc-0.075/Csocket.h 2009-08-26 17:29:37.000000000 +0200 +@@ -990,7 +990,11 @@ private: + CS_STRING m_sSSLBuffer; + SSL *m_ssl; + SSL_CTX *m_ssl_ctx; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *m_ssl_method; ++#else + SSL_METHOD *m_ssl_method; ++#endif + unsigned int m_iRequireClientCertFlags; + + FPCertVerifyCB m_pCerVerifyCB; diff --git a/znc.spec b/znc.spec index 6c58a30..7979a50 100644 --- a/znc.spec +++ b/znc.spec @@ -1,12 +1,13 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.075 -Release: 5.svn1608%{?dist} +Release: 8.svn1613%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ -Source0: znc-0.075.svn1608.tar.bz2 +# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ +Source0: znc-0.075.svn1613.tar.bz2 +Patch1: znc-0.075-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -43,8 +44,9 @@ Extra modules for ZNC %prep %setup -q +%patch1 -p1 -b .openssl %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -#chmod -x modules/q.cpp +chmod -x modules/q.cpp %build %configure \ @@ -126,6 +128,14 @@ Extra modules for ZNC %{_libdir}/znc/send_raw.so %changelog +* Fri Aug 28 2009 Nick Bebout - 0.075-8.svn1613 +- Rebuild with new openssl and svn 1613 +- build 0.075-7.svn1610 existed but I had to remove it from the spec because +- the date was earlier than the date tmraz build the new openssl one + +* Wed Aug 26 2009 Tomas Mraz - 0.075-6.svn1608 +- rebuilt with new openssl + * Thu Aug 20 2009 Nick Bebout - 0.075-5.svn1608 - Upgrade to svn 1608 From 01137f4cd733c59b60357232b7f68aba2bd8d104 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 25 Sep 2009 06:01:11 +0000 Subject: [PATCH 028/344] Upgrade to ZNC 0.076 --- .cvsignore | 2 +- sources | 2 +- znc-0.075-openssl.patch | 15 --------------- znc.spec | 15 +++++++++------ 4 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 znc-0.075-openssl.patch diff --git a/.cvsignore b/.cvsignore index 8e591ef..c28c3cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.075.svn1613.tar.bz2 +znc-0.076.tar.gz diff --git a/sources b/sources index 28aabd4..f72444d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -285799b069c452182d9a342aaaf1de1d znc-0.075.svn1613.tar.bz2 +03c2804b91225e83884f06078f6db568 znc-0.076.tar.gz diff --git a/znc-0.075-openssl.patch b/znc-0.075-openssl.patch deleted file mode 100644 index f5dbbbc..0000000 --- a/znc-0.075-openssl.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h ---- znc-0.075/Csocket.h.openssl 2009-06-30 11:56:01.000000000 +0200 -+++ znc-0.075/Csocket.h 2009-08-26 17:29:37.000000000 +0200 -@@ -990,7 +990,11 @@ private: - CS_STRING m_sSSLBuffer; - SSL *m_ssl; - SSL_CTX *m_ssl_ctx; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ const SSL_METHOD *m_ssl_method; -+#else - SSL_METHOD *m_ssl_method; -+#endif - unsigned int m_iRequireClientCertFlags; - - FPCertVerifyCB m_pCerVerifyCB; diff --git a/znc.spec b/znc.spec index 7979a50..edb1d80 100644 --- a/znc.spec +++ b/znc.spec @@ -1,13 +1,12 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.075 -Release: 8.svn1613%{?dist} +Version: 0.076 +Release: 1 License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ -Source0: znc-0.075.svn1613.tar.bz2 -Patch1: znc-0.075-openssl.patch +Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +#Patch1: znc-0.076-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -44,7 +43,7 @@ Extra modules for ZNC %prep %setup -q -%patch1 -p1 -b .openssl +#%patch1 -p1 -b .openssl %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -128,6 +127,10 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog +* Fri Sep 25 2009 Nick Bebout - 0.076 +- Upgrade to ZNC 0.076 +- http://en.znc.in/wiki/ChangeLog/0.076 + * Fri Aug 28 2009 Nick Bebout - 0.075-8.svn1613 - Rebuild with new openssl and svn 1613 - build 0.075-7.svn1610 existed but I had to remove it from the spec because From d4381b07c7146a7d7706c03dcfd2f928f54ab5c3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 25 Sep 2009 06:08:55 +0000 Subject: [PATCH 029/344] Fix missing dist tag --- znc.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index edb1d80..6a01f20 100644 --- a/znc.spec +++ b/znc.spec @@ -1,12 +1,11 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.076 -Release: 1 +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz -#Patch1: znc-0.076-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -43,7 +42,6 @@ Extra modules for ZNC %prep %setup -q -#%patch1 -p1 -b .openssl %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -127,7 +125,10 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog -* Fri Sep 25 2009 Nick Bebout - 0.076 +* Fri Sep 25 2009 Nick Bebout - 0.076-2 +- Fix missing dist tag + +* Fri Sep 25 2009 Nick Bebout - 0.076-1 - Upgrade to ZNC 0.076 - http://en.znc.in/wiki/ChangeLog/0.076 From 51236f8e72008e85433309180a98220c5192209f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 25 Sep 2009 06:14:57 +0000 Subject: [PATCH 030/344] Upgrade to ZNC 0.076 --- .cvsignore | 2 +- sources | 2 +- znc-0.075-openssl.patch | 15 --------------- znc.spec | 16 ++++++++++------ 4 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 znc-0.075-openssl.patch diff --git a/.cvsignore b/.cvsignore index 8e591ef..c28c3cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.075.svn1613.tar.bz2 +znc-0.076.tar.gz diff --git a/sources b/sources index 28aabd4..f72444d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -285799b069c452182d9a342aaaf1de1d znc-0.075.svn1613.tar.bz2 +03c2804b91225e83884f06078f6db568 znc-0.076.tar.gz diff --git a/znc-0.075-openssl.patch b/znc-0.075-openssl.patch deleted file mode 100644 index f5dbbbc..0000000 --- a/znc-0.075-openssl.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h ---- znc-0.075/Csocket.h.openssl 2009-06-30 11:56:01.000000000 +0200 -+++ znc-0.075/Csocket.h 2009-08-26 17:29:37.000000000 +0200 -@@ -990,7 +990,11 @@ private: - CS_STRING m_sSSLBuffer; - SSL *m_ssl; - SSL_CTX *m_ssl_ctx; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ const SSL_METHOD *m_ssl_method; -+#else - SSL_METHOD *m_ssl_method; -+#endif - unsigned int m_iRequireClientCertFlags; - - FPCertVerifyCB m_pCerVerifyCB; diff --git a/znc.spec b/znc.spec index 7979a50..6a01f20 100644 --- a/znc.spec +++ b/znc.spec @@ -1,13 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.075 -Release: 8.svn1613%{?dist} +Version: 0.076 +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/ -Source0: znc-0.075.svn1613.tar.bz2 -Patch1: znc-0.075-openssl.patch +Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -44,7 +42,6 @@ Extra modules for ZNC %prep %setup -q -%patch1 -p1 -b .openssl %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -128,6 +125,13 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog +* Fri Sep 25 2009 Nick Bebout - 0.076-2 +- Fix missing dist tag + +* Fri Sep 25 2009 Nick Bebout - 0.076-1 +- Upgrade to ZNC 0.076 +- http://en.znc.in/wiki/ChangeLog/0.076 + * Fri Aug 28 2009 Nick Bebout - 0.075-8.svn1613 - Rebuild with new openssl and svn 1613 - build 0.075-7.svn1610 existed but I had to remove it from the spec because From a2b82d1cd2503569d72e854d9cfde73cf15c28b6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:20 +0000 Subject: [PATCH 031/344] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93a31d5..a283000 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := znc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c80f7b933a4da4dc1fb67c483c49cac26d55a75f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:58 +0000 Subject: [PATCH 032/344] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93a31d5..a283000 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := znc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e75ede6bb4e3e7f7644e3fefdd92a53a6f85246d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:58 +0000 Subject: [PATCH 033/344] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93a31d5..a283000 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := znc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 57d7984982df7fa3a9a8220d87b4ed27e670e3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Sun, 6 Dec 2009 23:41:29 +0000 Subject: [PATCH 034/344] - rebuild against perl 5.10.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 6a01f20..dadf930 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.076 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -125,6 +125,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog +* Fri Dec 4 2009 Stepan Kasal - 0.076-3 +- rebuild against perl 5.10.1 + * Fri Sep 25 2009 Nick Bebout - 0.076-2 - Fix missing dist tag From 544317477e794647af82382d5133c82afaee8cc3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 16:17:00 +0000 Subject: [PATCH 035/344] Update to svn1672 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 36 +++++++++++++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c28c3cf..d6b7048 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.076.tar.gz +znc-0.077-1.svn1672.tar.bz2 diff --git a/sources b/sources index f72444d..6493758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03c2804b91225e83884f06078f6db568 znc-0.076.tar.gz +7d264293123b4d3572dbbac757bddf7d znc-0.077-1.svn1672.tar.bz2 diff --git a/znc.spec b/znc.spec index dadf930..72e6f90 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,14 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.076 -Release: 3%{?dist} +Version: 0.077 +Release: 1.svn1672%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +#Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 +# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 +Source0: znc-0.077-1.svn1672.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -125,6 +128,33 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog + +* Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 +- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) +- Users cloned via the admin module no longer automatically connect into IRC. (r1653) +- Inform new clients about their /away status. (r1655) +- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660) +- Rewrite znc.conf on SIGUSR1. (r1666) +- ISpoofFormat now supports ExpandString. (r1670) +- Allow specifing port and password for delserver. (r1640) +- Write the config file on restart and shutdown. (r1641) +- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645) +- blockuser was missing an admin check. (r1648) +- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659) +- Include a more portable header for uint32_t in SHA256.h. (r1665) +- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668) +- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669) +- Away allowed to accidentally execute IRC commands. (r1672) +- Comment out some weird code in Client.cpp. (r1646) +- Remove connect_throttle since it's obsoleted by fail2ban. (r1649) +- Remove outdated sample znc.conf. (r1654) +- route_replies now got a higher timeout before it generates a "BUG" message. (r1657) +- Documented the signals on which znc reacts better. (r1667) +- New module hook OnIRCConnecting(). (r1638) +- Remove obsolete CUtils::GetHashPass(). (r1642) +- A module's GetDescription() now returns a C-String. (r1661) (r1662) +- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) + * Fri Dec 4 2009 Stepan Kasal - 0.076-3 - rebuild against perl 5.10.1 From c3fc63d363c47d4ab1e2cdf8d523007ae4cc3248 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 16:25:58 +0000 Subject: [PATCH 036/344] Fix broken spec --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 72e6f90..d0b936d 100644 --- a/znc.spec +++ b/znc.spec @@ -44,7 +44,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.077-1.svn1672 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From dc6793e9aca78008c3b0539f4212a19c3bfc83c8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 16:34:28 +0000 Subject: [PATCH 037/344] Remove znc.conf from spec --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d0b936d..f740b24 100644 --- a/znc.spec +++ b/znc.spec @@ -63,7 +63,7 @@ chmod -x modules/q.cpp %files %defattr(-,root,root) -%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf +%doc AUTHORS LICENSE LICENSE.OpenSSL README %{_bindir}/znc %{_mandir}/man1/* #%{_libdir}/znc/ From 4ecab1285ea848766bd719be9bc154db352d857a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 16:42:03 +0000 Subject: [PATCH 038/344] Remove connect_throttle.so from spec --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index f740b24..46a6c86 100644 --- a/znc.spec +++ b/znc.spec @@ -115,7 +115,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/blockuser.so -%{_libdir}/znc/connect_throttle.so +#%{_libdir}/znc/connect_throttle.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so From d0b4f38f936b07cd06d9d4623c7877c3615b5af6 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 17:00:25 +0000 Subject: [PATCH 039/344] update to svn1672 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 45 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index c28c3cf..d6b7048 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.076.tar.gz +znc-0.077-1.svn1672.tar.bz2 diff --git a/sources b/sources index f72444d..6493758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03c2804b91225e83884f06078f6db568 znc-0.076.tar.gz +7d264293123b4d3572dbbac757bddf7d znc-0.077-1.svn1672.tar.bz2 diff --git a/znc.spec b/znc.spec index 6a01f20..46a6c86 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,14 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.076 -Release: 2%{?dist} +Version: 0.077 +Release: 1.svn1672%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +#Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 +# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 +Source0: znc-0.077-1.svn1672.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -41,7 +44,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.077-1.svn1672 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -60,7 +63,7 @@ chmod -x modules/q.cpp %files %defattr(-,root,root) -%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf +%doc AUTHORS LICENSE LICENSE.OpenSSL README %{_bindir}/znc %{_mandir}/man1/* #%{_libdir}/znc/ @@ -112,7 +115,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/blockuser.so -%{_libdir}/znc/connect_throttle.so +#%{_libdir}/znc/connect_throttle.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so @@ -125,6 +128,36 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog + +* Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 +- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) +- Users cloned via the admin module no longer automatically connect into IRC. (r1653) +- Inform new clients about their /away status. (r1655) +- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660) +- Rewrite znc.conf on SIGUSR1. (r1666) +- ISpoofFormat now supports ExpandString. (r1670) +- Allow specifing port and password for delserver. (r1640) +- Write the config file on restart and shutdown. (r1641) +- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645) +- blockuser was missing an admin check. (r1648) +- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659) +- Include a more portable header for uint32_t in SHA256.h. (r1665) +- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668) +- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669) +- Away allowed to accidentally execute IRC commands. (r1672) +- Comment out some weird code in Client.cpp. (r1646) +- Remove connect_throttle since it's obsoleted by fail2ban. (r1649) +- Remove outdated sample znc.conf. (r1654) +- route_replies now got a higher timeout before it generates a "BUG" message. (r1657) +- Documented the signals on which znc reacts better. (r1667) +- New module hook OnIRCConnecting(). (r1638) +- Remove obsolete CUtils::GetHashPass(). (r1642) +- A module's GetDescription() now returns a C-String. (r1661) (r1662) +- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) + +* Fri Dec 4 2009 Stepan Kasal - 0.076-3 +- rebuild against perl 5.10.1 + * Fri Sep 25 2009 Nick Bebout - 0.076-2 - Fix missing dist tag From ec6f4696cd9a4f8a08d19a974c4315dab5a7d804 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 17:11:01 +0000 Subject: [PATCH 040/344] update to svn1672 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 45 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index c28c3cf..d6b7048 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.076.tar.gz +znc-0.077-1.svn1672.tar.bz2 diff --git a/sources b/sources index f72444d..6493758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03c2804b91225e83884f06078f6db568 znc-0.076.tar.gz +7d264293123b4d3572dbbac757bddf7d znc-0.077-1.svn1672.tar.bz2 diff --git a/znc.spec b/znc.spec index 6a01f20..46a6c86 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,14 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.076 -Release: 2%{?dist} +Version: 0.077 +Release: 1.svn1672%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +#Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 +# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 +Source0: znc-0.077-1.svn1672.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -41,7 +44,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.077-1.svn1672 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -60,7 +63,7 @@ chmod -x modules/q.cpp %files %defattr(-,root,root) -%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf +%doc AUTHORS LICENSE LICENSE.OpenSSL README %{_bindir}/znc %{_mandir}/man1/* #%{_libdir}/znc/ @@ -112,7 +115,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/blockuser.so -%{_libdir}/znc/connect_throttle.so +#%{_libdir}/znc/connect_throttle.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so @@ -125,6 +128,36 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog + +* Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 +- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) +- Users cloned via the admin module no longer automatically connect into IRC. (r1653) +- Inform new clients about their /away status. (r1655) +- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660) +- Rewrite znc.conf on SIGUSR1. (r1666) +- ISpoofFormat now supports ExpandString. (r1670) +- Allow specifing port and password for delserver. (r1640) +- Write the config file on restart and shutdown. (r1641) +- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645) +- blockuser was missing an admin check. (r1648) +- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659) +- Include a more portable header for uint32_t in SHA256.h. (r1665) +- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668) +- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669) +- Away allowed to accidentally execute IRC commands. (r1672) +- Comment out some weird code in Client.cpp. (r1646) +- Remove connect_throttle since it's obsoleted by fail2ban. (r1649) +- Remove outdated sample znc.conf. (r1654) +- route_replies now got a higher timeout before it generates a "BUG" message. (r1657) +- Documented the signals on which znc reacts better. (r1667) +- New module hook OnIRCConnecting(). (r1638) +- Remove obsolete CUtils::GetHashPass(). (r1642) +- A module's GetDescription() now returns a C-String. (r1661) (r1662) +- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) + +* Fri Dec 4 2009 Stepan Kasal - 0.076-3 +- rebuild against perl 5.10.1 + * Fri Sep 25 2009 Nick Bebout - 0.076-2 - Fix missing dist tag From 03c2bb0b89d8219417cb73bb855562939163d3af Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 14 Dec 2009 05:48:28 +0000 Subject: [PATCH 041/344] Update to 0.078-rc1 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6b7048..30add97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.077-1.svn1672.tar.bz2 +znc-0.078-rc1.tar.gz diff --git a/sources b/sources index 6493758..8095693 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d264293123b4d3572dbbac757bddf7d znc-0.077-1.svn1672.tar.bz2 +57002305905f3e389492d46629bc7f40 znc-0.078-rc1.tar.gz diff --git a/znc.spec b/znc.spec index 46a6c86..75244cc 100644 --- a/znc.spec +++ b/znc.spec @@ -1,14 +1,15 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.077 -Release: 1.svn1672%{?dist} +Version: 0.078 +Release: 0.2.rc1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz # To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 # Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 -Source0: znc-0.077-1.svn1672.tar.bz2 +# Source0: znc-0.077-1.svn1672.tar.bz2 +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.078-rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -44,7 +45,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.077-1.svn1672 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -129,6 +130,8 @@ chmod -x modules/q.cpp %changelog +* Sun Dec 13 2009 Nick Bebout - 0.078-0.1.rc1 +- Update to znc 0.078.rc1 * Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) - Users cloned via the admin module no longer automatically connect into IRC. (r1653) From f6ae170479a46a8f65ed9fbcfabccd14519dba7a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 30 Dec 2009 20:52:34 +0000 Subject: [PATCH 042/344] Upgrade to ZNC 0.078 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 30add97..f695a8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.078-rc1.tar.gz +znc-0.078.tar.gz diff --git a/sources b/sources index 8095693..0e8d150 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -57002305905f3e389492d46629bc7f40 znc-0.078-rc1.tar.gz +b1379bd6609353ebbc8df7ec19bd004f znc-0.078.tar.gz diff --git a/znc.spec b/znc.spec index 75244cc..6c8d331 100644 --- a/znc.spec +++ b/znc.spec @@ -1,18 +1,14 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.078 -Release: 0.2.rc1%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz -# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 -# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 -# Source0: znc-0.077-1.svn1672.tar.bz2 -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.078-rc1.tar.gz +Source0: http://downloads.sourceforge.net/znc/znc-0.078.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl +BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel @@ -130,8 +126,12 @@ chmod -x modules/q.cpp %changelog +* Wed Dec 30 2009 Nick Bebout - 0.078-1 +- Update to znc 0.078 + * Sun Dec 13 2009 Nick Bebout - 0.078-0.1.rc1 - Update to znc 0.078.rc1 + * Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) - Users cloned via the admin module no longer automatically connect into IRC. (r1653) From 200fb44551bbdf22bdf4a845059b4e18b63a204f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 30 Dec 2009 21:06:31 +0000 Subject: [PATCH 043/344] Upgrade to ZNC 0.078 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6b7048..f695a8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.077-1.svn1672.tar.bz2 +znc-0.078.tar.gz diff --git a/sources b/sources index 6493758..0e8d150 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d264293123b4d3572dbbac757bddf7d znc-0.077-1.svn1672.tar.bz2 +b1379bd6609353ebbc8df7ec19bd004f znc-0.078.tar.gz diff --git a/znc.spec b/znc.spec index 46a6c86..6c8d331 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,14 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.077 -Release: 1.svn1672%{?dist} +Version: 0.078 +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz -# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 -# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 -Source0: znc-0.077-1.svn1672.tar.bz2 +Source0: http://downloads.sourceforge.net/znc/znc-0.078.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl +BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel @@ -44,7 +41,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.077-1.svn1672 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -129,6 +126,12 @@ chmod -x modules/q.cpp %changelog +* Wed Dec 30 2009 Nick Bebout - 0.078-1 +- Update to znc 0.078 + +* Sun Dec 13 2009 Nick Bebout - 0.078-0.1.rc1 +- Update to znc 0.078.rc1 + * Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) - Users cloned via the admin module no longer automatically connect into IRC. (r1653) From 0be8bd65fdb0dd4e3bfd7a5812afda328de70519 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 30 Dec 2009 21:06:32 +0000 Subject: [PATCH 044/344] Upgrade to ZNC 0.078 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6b7048..f695a8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.077-1.svn1672.tar.bz2 +znc-0.078.tar.gz diff --git a/sources b/sources index 6493758..0e8d150 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d264293123b4d3572dbbac757bddf7d znc-0.077-1.svn1672.tar.bz2 +b1379bd6609353ebbc8df7ec19bd004f znc-0.078.tar.gz diff --git a/znc.spec b/znc.spec index 46a6c86..6c8d331 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,14 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.077 -Release: 1.svn1672%{?dist} +Version: 0.078 +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz -# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 -# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 -Source0: znc-0.077-1.svn1672.tar.bz2 +Source0: http://downloads.sourceforge.net/znc/znc-0.078.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl +BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel @@ -44,7 +41,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.077-1.svn1672 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -129,6 +126,12 @@ chmod -x modules/q.cpp %changelog +* Wed Dec 30 2009 Nick Bebout - 0.078-1 +- Update to znc 0.078 + +* Sun Dec 13 2009 Nick Bebout - 0.078-0.1.rc1 +- Update to znc 0.078.rc1 + * Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) - Users cloned via the admin module no longer automatically connect into IRC. (r1653) From 2fcab81e0b7298cee974ce417faeb6b7455cfeb3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 18 Feb 2010 19:07:59 +0000 Subject: [PATCH 045/344] Upgrade to ZNC 0.080 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f695a8e..9d0efb2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.078.tar.gz +znc-0.080.tar.gz diff --git a/sources b/sources index 0e8d150..b00f3b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1379bd6609353ebbc8df7ec19bd004f znc-0.078.tar.gz +4f8b64705315dd5733f2a47a70c89ffa znc-0.080.tar.gz diff --git a/znc.spec b/znc.spec index 6c8d331..22d2fac 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.078 +Version: 0.080 Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.078.tar.gz +Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -74,6 +74,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/awaynick.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/chansaver.so +%{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so %{_libdir}/znc/email.so %{_libdir}/znc/fail2ban.so @@ -112,11 +113,12 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/blockuser.so -#%{_libdir}/znc/connect_throttle.so +%{_libdir}/znc/block_motd.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so %{_libdir}/znc/fakeonline.so +%{_libdir}/znc/flooddetach.so %{_libdir}/znc/lastseen.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so @@ -126,6 +128,9 @@ chmod -x modules/q.cpp %changelog +* Thu Feb 18 2010 Nick Bebout - 0.080-1 +- Update to znc 0.080 + * Wed Dec 30 2009 Nick Bebout - 0.078-1 - Update to znc 0.078 From bf82905be80b35b4849ebaca949e877ffa806dfe Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 18 Feb 2010 19:10:49 +0000 Subject: [PATCH 046/344] Upgrade to ZNC 0.080 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f695a8e..9d0efb2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.078.tar.gz +znc-0.080.tar.gz diff --git a/sources b/sources index 0e8d150..b00f3b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1379bd6609353ebbc8df7ec19bd004f znc-0.078.tar.gz +4f8b64705315dd5733f2a47a70c89ffa znc-0.080.tar.gz diff --git a/znc.spec b/znc.spec index 6c8d331..22d2fac 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.078 +Version: 0.080 Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.078.tar.gz +Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -74,6 +74,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/awaynick.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/chansaver.so +%{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so %{_libdir}/znc/email.so %{_libdir}/znc/fail2ban.so @@ -112,11 +113,12 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/blockuser.so -#%{_libdir}/znc/connect_throttle.so +%{_libdir}/znc/block_motd.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so %{_libdir}/znc/fakeonline.so +%{_libdir}/znc/flooddetach.so %{_libdir}/znc/lastseen.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so @@ -126,6 +128,9 @@ chmod -x modules/q.cpp %changelog +* Thu Feb 18 2010 Nick Bebout - 0.080-1 +- Update to znc 0.080 + * Wed Dec 30 2009 Nick Bebout - 0.078-1 - Update to znc 0.078 From cf530734c23cdfbbfd914150af9f80cd7d3464b7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 18 Feb 2010 19:16:12 +0000 Subject: [PATCH 047/344] Upgrade to ZNC 0.080 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f695a8e..9d0efb2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.078.tar.gz +znc-0.080.tar.gz diff --git a/sources b/sources index 0e8d150..b00f3b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1379bd6609353ebbc8df7ec19bd004f znc-0.078.tar.gz +4f8b64705315dd5733f2a47a70c89ffa znc-0.080.tar.gz diff --git a/znc.spec b/znc.spec index 6c8d331..22d2fac 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.078 +Version: 0.080 Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.078.tar.gz +Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -74,6 +74,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/awaynick.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/chansaver.so +%{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so %{_libdir}/znc/email.so %{_libdir}/znc/fail2ban.so @@ -112,11 +113,12 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/blockuser.so -#%{_libdir}/znc/connect_throttle.so +%{_libdir}/znc/block_motd.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so %{_libdir}/znc/fakeonline.so +%{_libdir}/znc/flooddetach.so %{_libdir}/znc/lastseen.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so @@ -126,6 +128,9 @@ chmod -x modules/q.cpp %changelog +* Thu Feb 18 2010 Nick Bebout - 0.080-1 +- Update to znc 0.080 + * Wed Dec 30 2009 Nick Bebout - 0.078-1 - Update to znc 0.078 From 77820b1facaf2d27bd68239ec2f738a157c0a329 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 30 Mar 2010 03:50:06 +0000 Subject: [PATCH 048/344] Update to znc 0.081 svn1850 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index b00f3b4..449009c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f8b64705315dd5733f2a47a70c89ffa znc-0.080.tar.gz +3917784e50dde825b459ba08102ce77b znc-0.081-svn1850.tar.bz2 From 0067daa24d7d23a85109d32321c0c821bffa75ad Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 30 Mar 2010 03:55:54 +0000 Subject: [PATCH 049/344] Update to znc 0.081 svn1850 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 14 +++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9d0efb2..943f0b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.080.tar.gz +znc-0.081-svn1850.tar.bz2 diff --git a/sources b/sources index 449009c..aacb07a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3917784e50dde825b459ba08102ce77b znc-0.081-svn1850.tar.bz2 +bcb0111bb4edf174577b8e2788e95a95 znc-0.081-svn1850.tar.bz2 diff --git a/znc.spec b/znc.spec index 22d2fac..186a5e4 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,16 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.080 -Release: 1%{?dist} +Version: 0.081 +Release: 1.svn1850%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz +#Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz +Source0: znc-0.081-svn1850.tar.bz2 +# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc +# mv znc znc-0.081-svn1850 +# tar cjvf znc-0.081-svn1850.tar.bz2 znc-0.081-svn1850/ + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -128,6 +133,9 @@ chmod -x modules/q.cpp %changelog +* Mon Mar 29 2010 Nick Bebout - 0.081-1.svn1850 +- Update to znc 0.081.svn1850 + * Thu Feb 18 2010 Nick Bebout - 0.080-1 - Update to znc 0.080 From a5764c7908dbb59fcbabdf9d1be81e57a612cac2 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 30 Mar 2010 04:06:57 +0000 Subject: [PATCH 050/344] Fix spec --- znc.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/znc.spec b/znc.spec index 186a5e4..64fc659 100644 --- a/znc.spec +++ b/znc.spec @@ -90,6 +90,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/modperl.pm %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so +%{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so %{_libdir}/znc/perform.so %{_libdir}/znc/q.so @@ -104,6 +105,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so +%{_libdir}/znc/webchat.so +%{_libdir}/znc/webskins/ +%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel From 1fd0a81258fc11a76b49b09549095593a2459d66 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 30 Mar 2010 04:15:20 +0000 Subject: [PATCH 051/344] Update to latest SVN --- .cvsignore | 2 +- sources | 2 +- znc.spec | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9d0efb2..943f0b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.080.tar.gz +znc-0.081-svn1850.tar.bz2 diff --git a/sources b/sources index b00f3b4..aacb07a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f8b64705315dd5733f2a47a70c89ffa znc-0.080.tar.gz +bcb0111bb4edf174577b8e2788e95a95 znc-0.081-svn1850.tar.bz2 diff --git a/znc.spec b/znc.spec index 22d2fac..64fc659 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,16 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.080 -Release: 1%{?dist} +Version: 0.081 +Release: 1.svn1850%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz +#Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz +Source0: znc-0.081-svn1850.tar.bz2 +# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc +# mv znc znc-0.081-svn1850 +# tar cjvf znc-0.081-svn1850.tar.bz2 znc-0.081-svn1850/ + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -85,6 +90,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/modperl.pm %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so +%{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so %{_libdir}/znc/perform.so %{_libdir}/znc/q.so @@ -99,6 +105,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so +%{_libdir}/znc/webchat.so +%{_libdir}/znc/webskins/ +%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -128,6 +137,9 @@ chmod -x modules/q.cpp %changelog +* Mon Mar 29 2010 Nick Bebout - 0.081-1.svn1850 +- Update to znc 0.081.svn1850 + * Thu Feb 18 2010 Nick Bebout - 0.080-1 - Update to znc 0.080 From 69053d4df492c7bd14007f32d5df74bb2a4cd3a0 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 30 Mar 2010 04:15:21 +0000 Subject: [PATCH 052/344] Update to latest SVN --- .cvsignore | 2 +- sources | 2 +- znc.spec | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9d0efb2..943f0b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.080.tar.gz +znc-0.081-svn1850.tar.bz2 diff --git a/sources b/sources index b00f3b4..aacb07a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f8b64705315dd5733f2a47a70c89ffa znc-0.080.tar.gz +bcb0111bb4edf174577b8e2788e95a95 znc-0.081-svn1850.tar.bz2 diff --git a/znc.spec b/znc.spec index 22d2fac..64fc659 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,16 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.080 -Release: 1%{?dist} +Version: 0.081 +Release: 1.svn1850%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz +#Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz +Source0: znc-0.081-svn1850.tar.bz2 +# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc +# mv znc znc-0.081-svn1850 +# tar cjvf znc-0.081-svn1850.tar.bz2 znc-0.081-svn1850/ + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -85,6 +90,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/modperl.pm %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so +%{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so %{_libdir}/znc/perform.so %{_libdir}/znc/q.so @@ -99,6 +105,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so +%{_libdir}/znc/webchat.so +%{_libdir}/znc/webskins/ +%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -128,6 +137,9 @@ chmod -x modules/q.cpp %changelog +* Mon Mar 29 2010 Nick Bebout - 0.081-1.svn1850 +- Update to znc 0.081.svn1850 + * Thu Feb 18 2010 Nick Bebout - 0.080-1 - Update to znc 0.080 From adbbc765a3f27df096a78954319aae499dca6e42 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 8 Apr 2010 01:33:40 +0000 Subject: [PATCH 053/344] Update to svn 1897 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 943f0b1..f383640 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.081-svn1850.tar.bz2 +znc-0.081-svn1897.tar.bz2 diff --git a/sources b/sources index aacb07a..9c79a01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcb0111bb4edf174577b8e2788e95a95 znc-0.081-svn1850.tar.bz2 +d07e5e8ba75998cd0f10c00eb12a44c2 znc-0.081-svn1897.tar.bz2 diff --git a/znc.spec b/znc.spec index 64fc659..61f1d2c 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,15 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.081 -Release: 1.svn1850%{?dist} +Release: 2.svn1897%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.081-svn1850.tar.bz2 +Source0: znc-0.081-svn1897.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.081-svn1850 -# tar cjvf znc-0.081-svn1850.tar.bz2 znc-0.081-svn1850/ +# mv znc znc-0.081-svn1897 +# tar cjvf znc-0.081-svn1897.tar.bz2 znc-0.081-svn1897/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -137,6 +137,9 @@ chmod -x modules/q.cpp %changelog +* Wed Apr 7 2010 Nick Bebout - 0.081-2.svn1897 +- Update to znc 0.081.svn1897 + * Mon Mar 29 2010 Nick Bebout - 0.081-1.svn1850 - Update to znc 0.081.svn1850 From b96efbe2846a3f125988c1718262655c6b11404c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 26 Apr 2010 02:56:57 +0000 Subject: [PATCH 054/344] Update to znc 0.089-svn1944 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 32 +++++++++++++++++--------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index f383640..67306d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.081-svn1897.tar.bz2 +znc-0.089-svn1944.tar.bz2 diff --git a/sources b/sources index 9c79a01..0c3d709 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d07e5e8ba75998cd0f10c00eb12a44c2 znc-0.081-svn1897.tar.bz2 +6bf5ad6be6d2267664c063bb6a153c85 znc-0.089-svn1944.tar.bz2 diff --git a/znc.spec b/znc.spec index 61f1d2c..df8f0a0 100644 --- a/znc.spec +++ b/znc.spec @@ -1,16 +1,15 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.081 -Release: 2.svn1897%{?dist} +Version: 0.089 +Release: 1.svn1944%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.081-svn1897.tar.bz2 +Source0: znc-0.089-svn1944.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.081-svn1897 -# tar cjvf znc-0.081-svn1897.tar.bz2 znc-0.081-svn1897/ - +# mv znc znc-0.089 +# tar cjvf znc-0.089-svn1944.tar.bz2 znc-0.089/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -53,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl --enable-extra + --enable-ipv6 --enable-extra --disable-perl %__make %{?_smp_mflags} %install @@ -77,16 +76,17 @@ chmod -x modules/q.cpp %{_libdir}/znc/autoreply.so %{_libdir}/znc/away.so %{_libdir}/znc/awaynick.so +%{_libdir}/znc/blockuser.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/chansaver.so %{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so -%{_libdir}/znc/email.so +%{_libdir}/znc/disconkick.so %{_libdir}/znc/fail2ban.so %{_libdir}/znc/fixfreenode.so -%{_libdir}/znc/imapauth.so %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so +%{_libdir}/znc/lastseen.so %{_libdir}/znc/modperl.pm %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so @@ -100,14 +100,13 @@ chmod -x modules/q.cpp %{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so -%{_libdir}/znc/shell.so %{_libdir}/znc/simple_away.so %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so -%{_libdir}/znc/webchat.so +#%{_libdir}/znc/webchat.so %{_libdir}/znc/webskins/ -%{_libdir}/znc/www/ +#%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -121,22 +120,25 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so -%{_libdir}/znc/blockuser.so %{_libdir}/znc/block_motd.so %{_libdir}/znc/ctcpflood.so -%{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so +%{_libdir}/znc/email.so %{_libdir}/znc/fakeonline.so %{_libdir}/znc/flooddetach.so -%{_libdir}/znc/lastseen.so +%{_libdir}/znc/imapchat.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so %{_libdir}/znc/send_raw.so +%{_libdir}/znc/shell.so %changelog +* Sun Apr 25 2010 Nick Bebout - 0.081-2.svn1897 - Update to znc 0.081.svn1897 From d1da58710ab9c1ad67edf668f800a7a60f8ce587 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 26 Apr 2010 02:58:44 +0000 Subject: [PATCH 055/344] Update SPEC --- znc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/znc.spec b/znc.spec index df8f0a0..7ffb25d 100644 --- a/znc.spec +++ b/znc.spec @@ -87,8 +87,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so %{_libdir}/znc/lastseen.so -%{_libdir}/znc/modperl.pm -%{_libdir}/znc/modperl.so +#%{_libdir}/znc/modperl.pm +#%{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so %{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so @@ -97,7 +97,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so -%{_libdir}/znc/saslauth.so +#%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so %{_libdir}/znc/simple_away.so From 83adccfcd45433e09f8e484b8597f1cfc6db7c79 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 26 Apr 2010 03:05:52 +0000 Subject: [PATCH 056/344] Update SPEC --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 7ffb25d..39bdfaa 100644 --- a/znc.spec +++ b/znc.spec @@ -126,7 +126,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/email.so %{_libdir}/znc/fakeonline.so %{_libdir}/znc/flooddetach.so -%{_libdir}/znc/imapchat.so +%{_libdir}/znc/imapauth.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so From f305229608ddf7d791e3b3a5b1515e9d24fcd45e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:30:19 +0000 Subject: [PATCH 057/344] Initialize branch EL-6 for znc --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 67e92bd6209b64a4bdf3eb998e51a325b2487711 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 02:33:16 +0000 Subject: [PATCH 058/344] Update to ZNC 0.089.svn2000 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 67306d7..2831b5f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.089-svn1944.tar.bz2 +znc-0.089-svn2000.tar.bz2 diff --git a/sources b/sources index 0c3d709..936963c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6bf5ad6be6d2267664c063bb6a153c85 znc-0.089-svn1944.tar.bz2 +a3e729a2962d0fd398ab43ed0416abca znc-0.089-svn2000.tar.bz2 diff --git a/znc.spec b/znc.spec index 39bdfaa..bb99dd7 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,15 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 1.svn1944%{?dist} +Release: 4.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.089-svn1944.tar.bz2 +Source0: znc-0.089-svn2000.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc # mv znc znc-0.089 -# tar cjvf znc-0.089-svn1944.tar.bz2 znc-0.089/ +# tar cjvf znc-0.089-svn2000.tar.bz2 znc-0.089/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -105,7 +105,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so #%{_libdir}/znc/webchat.so -%{_libdir}/znc/webskins/ +#%{_libdir}/znc/webskins/ #%{_libdir}/znc/www/ %{_datadir}/znc/ @@ -121,6 +121,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/block_motd.so +%{_libdir}/znc/charset.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/droproot.so %{_libdir}/znc/email.so @@ -131,12 +132,16 @@ chmod -x modules/q.cpp %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so +#%(_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so %changelog -* Sun Apr 25 2010 Nick Bebout - 0.089-4.svn2000 +- Update to znc 0.089.svn2000 + +* Sun Apr 25 2010 Nick Bebout - 0.089-3.svn1944 - Update to znc 0.089.svn1944 * Wed Apr 7 2010 Nick Bebout - 0.081-2.svn1897 From e3ae4f432ef386fd10dbdad15609e340fdd7b90f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 02:40:59 +0000 Subject: [PATCH 059/344] Add send_raw and shell to modules --- znc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/znc.spec b/znc.spec index bb99dd7..8a31c31 100644 --- a/znc.spec +++ b/znc.spec @@ -100,6 +100,8 @@ chmod -x modules/q.cpp #%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so +%{_libdir}/znc/send_raw.so +%{_libdir}/znc/shell.so %{_libdir}/znc/simple_away.so %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so From 3abbb3e877f6c77027623b9e92b789ccc560b547 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 02:49:20 +0000 Subject: [PATCH 060/344] Re-enable modperl --- znc.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index 8a31c31..8851ea3 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 4.svn2000%{?dist} +Release: 5.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -52,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --disable-perl + --enable-ipv6 --enable-extra %__make %{?_smp_mflags} %install @@ -87,8 +87,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so %{_libdir}/znc/lastseen.so -#%{_libdir}/znc/modperl.pm -#%{_libdir}/znc/modperl.so +%{_libdir}/znc/modperl.pm +%{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so %{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so @@ -140,6 +140,9 @@ chmod -x modules/q.cpp %changelog +* Tue May 18 2010 Nick Bebout - 0.089-5.svn2000 +- Re-enable modperl + * Tue May 18 2010 Nick Bebout - 0.089-4.svn2000 - Update to znc 0.089.svn2000 From e1fbe214535d7784c3738569827db12502f50aee Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:00:46 +0000 Subject: [PATCH 061/344] Re-enable modperl --- .cvsignore | 2 +- sources | 2 +- znc.spec | 47 +++++++++++++++++++++++++++++++---------------- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 943f0b1..2831b5f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.081-svn1850.tar.bz2 +znc-0.089-svn2000.tar.bz2 diff --git a/sources b/sources index aacb07a..936963c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcb0111bb4edf174577b8e2788e95a95 znc-0.081-svn1850.tar.bz2 +a3e729a2962d0fd398ab43ed0416abca znc-0.089-svn2000.tar.bz2 diff --git a/znc.spec b/znc.spec index 64fc659..8851ea3 100644 --- a/znc.spec +++ b/znc.spec @@ -1,16 +1,15 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.081 -Release: 1.svn1850%{?dist} +Version: 0.089 +Release: 5.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.081-svn1850.tar.bz2 +Source0: znc-0.089-svn2000.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.081-svn1850 -# tar cjvf znc-0.081-svn1850.tar.bz2 znc-0.081-svn1850/ - +# mv znc znc-0.089 +# tar cjvf znc-0.089-svn2000.tar.bz2 znc-0.089/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -53,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl --enable-extra + --enable-ipv6 --enable-extra %__make %{?_smp_mflags} %install @@ -77,16 +76,17 @@ chmod -x modules/q.cpp %{_libdir}/znc/autoreply.so %{_libdir}/znc/away.so %{_libdir}/znc/awaynick.so +%{_libdir}/znc/blockuser.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/chansaver.so %{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so -%{_libdir}/znc/email.so +%{_libdir}/znc/disconkick.so %{_libdir}/znc/fail2ban.so %{_libdir}/znc/fixfreenode.so -%{_libdir}/znc/imapauth.so %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so +%{_libdir}/znc/lastseen.so %{_libdir}/znc/modperl.pm %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so @@ -97,17 +97,18 @@ chmod -x modules/q.cpp %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so -%{_libdir}/znc/saslauth.so +#%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so +%{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so %{_libdir}/znc/simple_away.so %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so -%{_libdir}/znc/webchat.so -%{_libdir}/znc/webskins/ -%{_libdir}/znc/www/ +#%{_libdir}/znc/webchat.so +#%{_libdir}/znc/webskins/ +#%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -121,22 +122,36 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so -%{_libdir}/znc/blockuser.so %{_libdir}/znc/block_motd.so +%{_libdir}/znc/charset.so %{_libdir}/znc/ctcpflood.so -%{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so +%{_libdir}/znc/email.so %{_libdir}/znc/fakeonline.so %{_libdir}/znc/flooddetach.so -%{_libdir}/znc/lastseen.so +%{_libdir}/znc/imapauth.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so +#%(_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so +%{_libdir}/znc/shell.so %changelog +* Tue May 18 2010 Nick Bebout - 0.089-5.svn2000 +- Re-enable modperl + +* Tue May 18 2010 Nick Bebout - 0.089-4.svn2000 +- Update to znc 0.089.svn2000 + +* Sun Apr 25 2010 Nick Bebout - 0.089-3.svn1944 +- Update to znc 0.089.svn1944 + +* Wed Apr 7 2010 Nick Bebout - 0.081-2.svn1897 +- Update to znc 0.081.svn1897 + * Mon Mar 29 2010 Nick Bebout - 0.081-1.svn1850 - Update to znc 0.081.svn1850 From 282abf7ed8f94ff09277b5ff14de77119c38d869 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:00:47 +0000 Subject: [PATCH 062/344] Re-enable modperl --- znc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 8851ea3..0078de8 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 5.svn2000%{?dist} +Release: 6.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -52,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra + --enable-ipv6 --enable-extra --enable-sasl %__make %{?_smp_mflags} %install @@ -140,6 +140,9 @@ chmod -x modules/q.cpp %changelog +* Tue May 18 2010 Nick Bebout - 0.089-6.svn2000 +- Re-enable saslauth + * Tue May 18 2010 Nick Bebout - 0.089-5.svn2000 - Re-enable modperl From 8366dd1066fc7caa94f665659e932d2024df61fd Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:06:25 +0000 Subject: [PATCH 063/344] Re-enable saslauth module --- znc.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/znc.spec b/znc.spec index 8851ea3..14fcdbe 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 5.svn2000%{?dist} +Release: 6.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -52,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra + --enable-ipv6 --enable-extra --enable-sasl %__make %{?_smp_mflags} %install @@ -67,7 +67,6 @@ chmod -x modules/q.cpp %doc AUTHORS LICENSE LICENSE.OpenSSL README %{_bindir}/znc %{_mandir}/man1/* -#%{_libdir}/znc/ %{_libdir}/znc/admin.so %{_libdir}/znc/adminlog.so %{_libdir}/znc/autoattach.so @@ -97,7 +96,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so -#%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so %{_libdir}/znc/send_raw.so @@ -106,9 +104,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so -#%{_libdir}/znc/webchat.so -#%{_libdir}/znc/webskins/ -#%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -134,12 +129,15 @@ chmod -x modules/q.cpp %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so -#%(_libdir}/znc/saslauth.so +%(_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so %changelog +* Tue May 18 2010 Nick Bebout - 0.089-6.svn2000 +- Re-enable saslauth + * Tue May 18 2010 Nick Bebout - 0.089-5.svn2000 - Re-enable modperl From 698e5e65f6151dfafb6e425e4e1117340f8e503d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:06:25 +0000 Subject: [PATCH 064/344] Re-enable saslauth module --- znc.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/znc.spec b/znc.spec index 0078de8..14fcdbe 100644 --- a/znc.spec +++ b/znc.spec @@ -67,7 +67,6 @@ chmod -x modules/q.cpp %doc AUTHORS LICENSE LICENSE.OpenSSL README %{_bindir}/znc %{_mandir}/man1/* -#%{_libdir}/znc/ %{_libdir}/znc/admin.so %{_libdir}/znc/adminlog.so %{_libdir}/znc/autoattach.so @@ -97,7 +96,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so -#%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so %{_libdir}/znc/send_raw.so @@ -106,9 +104,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so -#%{_libdir}/znc/webchat.so -#%{_libdir}/znc/webskins/ -#%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -134,7 +129,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so -#%(_libdir}/znc/saslauth.so +%(_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so From baec478d21cf1eb51e373e79355d3e1d050daa7c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:24:38 +0000 Subject: [PATCH 065/344] Fix typo in re-enabling saslauth module --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 14fcdbe..c4c30c7 100644 --- a/znc.spec +++ b/znc.spec @@ -129,7 +129,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so -%(_libdir}/znc/saslauth.so +%{_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so From 55f0bc399956fc10350a64a63e80f12189505a84 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:24:39 +0000 Subject: [PATCH 066/344] Fix typo in re-enabling saslauth module --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 14fcdbe..c4c30c7 100644 --- a/znc.spec +++ b/znc.spec @@ -129,7 +129,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so -%(_libdir}/znc/saslauth.so +%{_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so From e0276452ba77985f6e25e8511ea1b7af5dd6874d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:27:34 +0000 Subject: [PATCH 067/344] Update to svn2000 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 47 ++++++++++++++++++++++++++++++----------------- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.cvsignore b/.cvsignore index 943f0b1..2831b5f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.081-svn1850.tar.bz2 +znc-0.089-svn2000.tar.bz2 diff --git a/sources b/sources index aacb07a..936963c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcb0111bb4edf174577b8e2788e95a95 znc-0.081-svn1850.tar.bz2 +a3e729a2962d0fd398ab43ed0416abca znc-0.089-svn2000.tar.bz2 diff --git a/znc.spec b/znc.spec index 64fc659..c4c30c7 100644 --- a/znc.spec +++ b/znc.spec @@ -1,16 +1,15 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.081 -Release: 1.svn1850%{?dist} +Version: 0.089 +Release: 6.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.081-svn1850.tar.bz2 +Source0: znc-0.089-svn2000.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.081-svn1850 -# tar cjvf znc-0.081-svn1850.tar.bz2 znc-0.081-svn1850/ - +# mv znc znc-0.089 +# tar cjvf znc-0.089-svn2000.tar.bz2 znc-0.089/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -53,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl --enable-extra + --enable-ipv6 --enable-extra --enable-sasl %__make %{?_smp_mflags} %install @@ -68,7 +67,6 @@ chmod -x modules/q.cpp %doc AUTHORS LICENSE LICENSE.OpenSSL README %{_bindir}/znc %{_mandir}/man1/* -#%{_libdir}/znc/ %{_libdir}/znc/admin.so %{_libdir}/znc/adminlog.so %{_libdir}/znc/autoattach.so @@ -77,16 +75,17 @@ chmod -x modules/q.cpp %{_libdir}/znc/autoreply.so %{_libdir}/znc/away.so %{_libdir}/znc/awaynick.so +%{_libdir}/znc/blockuser.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/chansaver.so %{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so -%{_libdir}/znc/email.so +%{_libdir}/znc/disconkick.so %{_libdir}/znc/fail2ban.so %{_libdir}/znc/fixfreenode.so -%{_libdir}/znc/imapauth.so %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so +%{_libdir}/znc/lastseen.so %{_libdir}/znc/modperl.pm %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so @@ -97,17 +96,14 @@ chmod -x modules/q.cpp %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so -%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so +%{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so %{_libdir}/znc/simple_away.so %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so -%{_libdir}/znc/webchat.so -%{_libdir}/znc/webskins/ -%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -121,22 +117,39 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so -%{_libdir}/znc/blockuser.so %{_libdir}/znc/block_motd.so +%{_libdir}/znc/charset.so %{_libdir}/znc/ctcpflood.so -%{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so +%{_libdir}/znc/email.so %{_libdir}/znc/fakeonline.so %{_libdir}/znc/flooddetach.so -%{_libdir}/znc/lastseen.so +%{_libdir}/znc/imapauth.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so +%{_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so +%{_libdir}/znc/shell.so %changelog +* Tue May 18 2010 Nick Bebout - 0.089-6.svn2000 +- Re-enable saslauth + +* Tue May 18 2010 Nick Bebout - 0.089-5.svn2000 +- Re-enable modperl + +* Tue May 18 2010 Nick Bebout - 0.089-4.svn2000 +- Update to znc 0.089.svn2000 + +* Sun Apr 25 2010 Nick Bebout - 0.089-3.svn1944 +- Update to znc 0.089.svn1944 + +* Wed Apr 7 2010 Nick Bebout - 0.081-2.svn1897 +- Update to znc 0.081.svn1897 + * Mon Mar 29 2010 Nick Bebout - 0.081-1.svn1850 - Update to znc 0.081.svn1850 From 3cdc30e32f961a7b207d7f7fe6cab3a303236ec3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:44:15 +0000 Subject: [PATCH 068/344] Require perl-ExtUtils-Embed on EL-6 --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index c4c30c7..a63a5da 100644 --- a/znc.spec +++ b/znc.spec @@ -16,6 +16,7 @@ BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel +BuildRequires: perl-ExtUtils-Embed # The following line is necessary because this module # is needed for Fedora, but not for EPEL. From 6a84a6119e1f2a6c0b5f93133fa60a1e6b1cd37e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:46:18 +0000 Subject: [PATCH 069/344] Require perl-ExtUtils-Embed on EL-6 --- znc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index a63a5da..1b6c80f 100644 --- a/znc.spec +++ b/znc.spec @@ -16,11 +16,12 @@ BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel -BuildRequires: perl-ExtUtils-Embed # The following line is necessary because this module # is needed for Fedora, but not for EPEL. %{?fedora:BuildRequires: perl-ExtUtils-Embed} +# This is needed for EL-6 also +%{?el6:BuildRequires: perl-ExtUtils-Embed} %description ZNC is an IRC bouncer with many advanced features like detaching, From 9c49b80ed0286a3a0db93d499551bda819296fda Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 28 May 2010 02:18:00 +0000 Subject: [PATCH 070/344] Update to znc 0.089-7.svn2004 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2831b5f..6886a72 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.089-svn2000.tar.bz2 +znc-0.089-svn2004.tar.bz2 diff --git a/sources b/sources index 936963c..b02a455 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3e729a2962d0fd398ab43ed0416abca znc-0.089-svn2000.tar.bz2 +41a2282c10a1e99bb6e377ff675ecfa0 znc-0.089-svn2004.tar.bz2 diff --git a/znc.spec b/znc.spec index c4c30c7..2d86449 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,15 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 6.svn2000%{?dist} +Release: 7.svn2004%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.089-svn2000.tar.bz2 +Source0: znc-0.089-svn2004.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc # mv znc znc-0.089 -# tar cjvf znc-0.089-svn2000.tar.bz2 znc-0.089/ +# tar cjvf znc-0.089-svn2004.tar.bz2 znc-0.089/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -135,6 +135,9 @@ chmod -x modules/q.cpp %changelog +* Thu May 27 2010 Nick Bebout - 0.089-7.svn2004 +- Update to znc 0.089.svn2004 + * Tue May 18 2010 Nick Bebout - 0.089-6.svn2000 - Re-enable saslauth From 137fd377560ffc46114e4b6594a2d12041d8d3d4 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 28 May 2010 03:56:59 +0000 Subject: [PATCH 071/344] Update to ZNC 0.090-rc1 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6886a72..dfc1974 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.089-svn2004.tar.bz2 +znc-0.090-rc1.tar.gz diff --git a/sources b/sources index b02a455..ee48d8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41a2282c10a1e99bb6e377ff675ecfa0 znc-0.089-svn2004.tar.bz2 +914b8c2aef7b9582a1884bf42e6c2c93 znc-0.090-rc1.tar.gz diff --git a/znc.spec b/znc.spec index 2d86449..e52618a 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.089 -Release: 7.svn2004%{?dist} +Version: 0.090 +Release: 0.1.rc1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.089-svn2004.tar.bz2 -# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.089 -# tar cjvf znc-0.089-svn2004.tar.bz2 znc-0.089/ +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.090-rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -45,7 +41,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.090-rc1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -135,6 +131,9 @@ chmod -x modules/q.cpp %changelog +* Thu May 27 2010 Nick Bebout - 0.090-0.1.rc1 +- Update to znc 0.090-rc1 + * Thu May 27 2010 Nick Bebout - 0.089-7.svn2004 - Update to znc 0.089.svn2004 From da66c96d74b4c2c9cc77e8c735cc7742e9d28cce Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 28 May 2010 04:21:48 +0000 Subject: [PATCH 072/344] Update to ZNC 0.090-rc1 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2831b5f..dfc1974 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.089-svn2000.tar.bz2 +znc-0.090-rc1.tar.gz diff --git a/sources b/sources index 936963c..ee48d8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3e729a2962d0fd398ab43ed0416abca znc-0.089-svn2000.tar.bz2 +914b8c2aef7b9582a1884bf42e6c2c93 znc-0.090-rc1.tar.gz diff --git a/znc.spec b/znc.spec index c4c30c7..e52618a 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.089 -Release: 6.svn2000%{?dist} +Version: 0.090 +Release: 0.1.rc1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.089-svn2000.tar.bz2 -# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.089 -# tar cjvf znc-0.089-svn2000.tar.bz2 znc-0.089/ +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.090-rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -45,7 +41,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.090-rc1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -135,6 +131,12 @@ chmod -x modules/q.cpp %changelog +* Thu May 27 2010 Nick Bebout - 0.090-0.1.rc1 +- Update to znc 0.090-rc1 + +* Thu May 27 2010 Nick Bebout - 0.089-7.svn2004 +- Update to znc 0.089.svn2004 + * Tue May 18 2010 Nick Bebout - 0.089-6.svn2000 - Re-enable saslauth From 7029f9a6b04cf6dd8cf285e9a7697d7df8048b0f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 28 May 2010 04:21:49 +0000 Subject: [PATCH 073/344] Update to ZNC 0.090-rc1 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2831b5f..dfc1974 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.089-svn2000.tar.bz2 +znc-0.090-rc1.tar.gz diff --git a/sources b/sources index 936963c..ee48d8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3e729a2962d0fd398ab43ed0416abca znc-0.089-svn2000.tar.bz2 +914b8c2aef7b9582a1884bf42e6c2c93 znc-0.090-rc1.tar.gz diff --git a/znc.spec b/znc.spec index 1b6c80f..e52618a 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.089 -Release: 6.svn2000%{?dist} +Version: 0.090 +Release: 0.1.rc1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.089-svn2000.tar.bz2 -# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.089 -# tar cjvf znc-0.089-svn2000.tar.bz2 znc-0.089/ +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.090-rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -20,8 +16,6 @@ BuildRequires: c-ares-devel # The following line is necessary because this module # is needed for Fedora, but not for EPEL. %{?fedora:BuildRequires: perl-ExtUtils-Embed} -# This is needed for EL-6 also -%{?el6:BuildRequires: perl-ExtUtils-Embed} %description ZNC is an IRC bouncer with many advanced features like detaching, @@ -47,7 +41,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.090-rc1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -137,6 +131,12 @@ chmod -x modules/q.cpp %changelog +* Thu May 27 2010 Nick Bebout - 0.090-0.1.rc1 +- Update to znc 0.090-rc1 + +* Thu May 27 2010 Nick Bebout - 0.089-7.svn2004 +- Update to znc 0.089.svn2004 + * Tue May 18 2010 Nick Bebout - 0.089-6.svn2000 - Re-enable saslauth From 6f7ec227b9800b714565daef3302d11c8016f72a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 30 May 2010 00:56:19 +0000 Subject: [PATCH 074/344] Update to znc-0.090-rc1 --- znc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index e52618a..4fe2ff2 100644 --- a/znc.spec +++ b/znc.spec @@ -11,11 +11,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel +BuildRequires: c-ares-devel perl-ExtUtils-Embed # The following line is necessary because this module # is needed for Fedora, but not for EPEL. -%{?fedora:BuildRequires: perl-ExtUtils-Embed} +#%{?fedora:BuildRequires: perl-ExtUtils-Embed} %description ZNC is an IRC bouncer with many advanced features like detaching, From 6385b7c3c93bf121c9078d5c7a21d6fe56bed58c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 6 Jun 2010 23:02:07 +0000 Subject: [PATCH 075/344] Upgrade to ZNC 0.090 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index dfc1974..697a95d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.090-rc1.tar.gz +znc-0.090.tar.gz diff --git a/sources b/sources index ee48d8b..a0f9d9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -914b8c2aef7b9582a1884bf42e6c2c93 znc-0.090-rc1.tar.gz +d3ffe4f53211e5a425c7b87e9ca41e84 znc-0.090.tar.gz diff --git a/znc.spec b/znc.spec index e52618a..db71acd 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.090 -Release: 0.1.rc1%{?dist} +#Release: 0.1.rc1%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.090-rc1.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -41,7 +42,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.090-rc1 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -130,6 +131,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Sun Jun 06 2010 Nick Bebout - 0.090-1 +- Update to znc 0.090 * Thu May 27 2010 Nick Bebout - 0.090-0.1.rc1 - Update to znc 0.090-rc1 From 3665e2f00a8b4ddbf7f2ba38db83f4b28752c5eb Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 6 Jun 2010 23:02:07 +0000 Subject: [PATCH 076/344] Upgrade to ZNC 0.090 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index dfc1974..697a95d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.090-rc1.tar.gz +znc-0.090.tar.gz diff --git a/sources b/sources index ee48d8b..a0f9d9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -914b8c2aef7b9582a1884bf42e6c2c93 znc-0.090-rc1.tar.gz +d3ffe4f53211e5a425c7b87e9ca41e84 znc-0.090.tar.gz diff --git a/znc.spec b/znc.spec index 4fe2ff2..db71acd 100644 --- a/znc.spec +++ b/znc.spec @@ -1,21 +1,22 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.090 -Release: 0.1.rc1%{?dist} +#Release: 0.1.rc1%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.090-rc1.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel perl-ExtUtils-Embed +BuildRequires: c-ares-devel # The following line is necessary because this module # is needed for Fedora, but not for EPEL. -#%{?fedora:BuildRequires: perl-ExtUtils-Embed} +%{?fedora:BuildRequires: perl-ExtUtils-Embed} %description ZNC is an IRC bouncer with many advanced features like detaching, @@ -41,7 +42,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.090-rc1 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -130,6 +131,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Sun Jun 06 2010 Nick Bebout - 0.090-1 +- Update to znc 0.090 * Thu May 27 2010 Nick Bebout - 0.090-0.1.rc1 - Update to znc 0.090-rc1 From cc4c1cb9aaebf3a9204d775672a00398447af708 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 6 Jun 2010 23:02:09 +0000 Subject: [PATCH 077/344] Upgrade to ZNC 0.090 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index dfc1974..697a95d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.090-rc1.tar.gz +znc-0.090.tar.gz diff --git a/sources b/sources index ee48d8b..a0f9d9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -914b8c2aef7b9582a1884bf42e6c2c93 znc-0.090-rc1.tar.gz +d3ffe4f53211e5a425c7b87e9ca41e84 znc-0.090.tar.gz diff --git a/znc.spec b/znc.spec index e52618a..db71acd 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.090 -Release: 0.1.rc1%{?dist} +#Release: 0.1.rc1%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.090-rc1.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -41,7 +42,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.090-rc1 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -130,6 +131,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Sun Jun 06 2010 Nick Bebout - 0.090-1 +- Update to znc 0.090 * Thu May 27 2010 Nick Bebout - 0.090-0.1.rc1 - Update to znc 0.090-rc1 From 33c06aaefe4810d0686de48411dcdc836a570c9b Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Jun 2010 00:09:35 +0000 Subject: [PATCH 078/344] Fix perl(ExtUtils::Embed) BuildRequires to not break on EL-5/EL-6 --- znc.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index db71acd..53464bc 100644 --- a/znc.spec +++ b/znc.spec @@ -13,10 +13,7 @@ BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel - -# The following line is necessary because this module -# is needed for Fedora, but not for EPEL. -%{?fedora:BuildRequires: perl-ExtUtils-Embed} +BuildRequires: perl(ExtUtils::Embed) %description ZNC is an IRC bouncer with many advanced features like detaching, From 5963a52afa550c2e47867ecdc08f0fc374e39092 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Jun 2010 00:09:35 +0000 Subject: [PATCH 079/344] Fix perl(ExtUtils::Embed) BuildRequires to not break on EL-5/EL-6 --- znc.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index db71acd..53464bc 100644 --- a/znc.spec +++ b/znc.spec @@ -13,10 +13,7 @@ BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel - -# The following line is necessary because this module -# is needed for Fedora, but not for EPEL. -%{?fedora:BuildRequires: perl-ExtUtils-Embed} +BuildRequires: perl(ExtUtils::Embed) %description ZNC is an IRC bouncer with many advanced features like detaching, From 8ac01f8b7c16df25b85fa07f21c8e6257ff20d99 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Jun 2010 00:09:35 +0000 Subject: [PATCH 080/344] Fix perl(ExtUtils::Embed) BuildRequires to not break on EL-5/EL-6 --- znc.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index db71acd..53464bc 100644 --- a/znc.spec +++ b/znc.spec @@ -13,10 +13,7 @@ BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel - -# The following line is necessary because this module -# is needed for Fedora, but not for EPEL. -%{?fedora:BuildRequires: perl-ExtUtils-Embed} +BuildRequires: perl(ExtUtils::Embed) %description ZNC is an IRC bouncer with many advanced features like detaching, From 144e94435514a50a9d2552fffc73057a93b131d7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 16 Jun 2010 21:57:20 +0000 Subject: [PATCH 081/344] Backport r2026 of ZNC subversion repo to fix bug 603915 znc: NULL pointer dereference flaw leads to segfault under certain conditions --- znc-trafficstats.patch | 31 +++++++++++++++++++++++++++++++ znc.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 znc-trafficstats.patch diff --git a/znc-trafficstats.patch b/znc-trafficstats.patch new file mode 100644 index 0000000..da04c8e --- /dev/null +++ b/znc-trafficstats.patch @@ -0,0 +1,31 @@ +--- znc-0.090/znc.cpp 2010-05-10 12:45:15.000000000 -0500 ++++ trunk/znc.cpp 2010-06-16 16:43:48.706323545 -0500 +@@ -1914,18 +1914,18 @@ + } + + for (CSockManager::const_iterator it = m_Manager.begin(); it != m_Manager.end(); ++it) { ++ CUser *pUser = NULL; + if ((*it)->GetSockName().Left(5) == "IRC::") { +- CIRCSock *p = (CIRCSock *) *it; +- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); +- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); +- uiUsers_in += p->GetBytesRead(); +- uiUsers_out += p->GetBytesWritten(); ++ pUser = ((CIRCSock *) *it)->GetUser(); + } else if ((*it)->GetSockName().Left(5) == "USR::") { +- CClient *p = (CClient *) *it; +- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); +- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); +- uiUsers_in += p->GetBytesRead(); +- uiUsers_out += p->GetBytesWritten(); ++ pUser = ((CClient*) *it)->GetUser(); ++ } ++ ++ if (pUser) { ++ ret[pUser->GetUserName()].first += (*it)->GetBytesRead(); ++ ret[pUser->GetUserName()].second += (*it)->GetBytesWritten(); ++ uiUsers_in += (*it)->GetBytesRead(); ++ uiUsers_out += (*it)->GetBytesWritten(); + } else { + uiZNC_in += (*it)->GetBytesRead(); + uiZNC_out += (*it)->GetBytesWritten(); diff --git a/znc.spec b/znc.spec index 53464bc..3c1ed84 100644 --- a/znc.spec +++ b/znc.spec @@ -2,11 +2,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.090 #Release: 0.1.rc1%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -40,6 +41,7 @@ Extra modules for ZNC %prep %setup -q +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -128,6 +130,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Wed Jun 16 2010 Nick Bebout - 0.090-2 +- Backport r2026 of ZNC subversion repo to fix +- Bug 603915 - znc: NULL pointer dereference flaw leads to segfault under certain conditions * Sun Jun 06 2010 Nick Bebout - 0.090-1 - Update to znc 0.090 From 8d8e2079ea096caa67b16e2f3dc6f38c1a5853d7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 16 Jun 2010 22:08:21 +0000 Subject: [PATCH 082/344] Update spec changelog --- znc.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 3c1ed84..5482783 100644 --- a/znc.spec +++ b/znc.spec @@ -131,8 +131,9 @@ chmod -x modules/q.cpp %changelog * Wed Jun 16 2010 Nick Bebout - 0.090-2 -- Backport r2026 of ZNC subversion repo to fix -- Bug 603915 - znc: NULL pointer dereference flaw leads to segfault under certain conditions +- Backport r2026 of ZNC subversion repo to fix bug 603915 +- NULL pointer dereference flaw leads to segfault under certain conditions + * Sun Jun 06 2010 Nick Bebout - 0.090-1 - Update to znc 0.090 From b604954661bccdd6e0bd412373f1b92fe10bd06a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 16 Jun 2010 22:09:48 +0000 Subject: [PATCH 083/344] Backport r2026 of ZNC subversion repo to fix bug 603915 znc: NULL pointer dereference flaw leads to segfault under certain conditions --- znc.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 53464bc..5482783 100644 --- a/znc.spec +++ b/znc.spec @@ -2,11 +2,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.090 #Release: 0.1.rc1%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -40,6 +41,7 @@ Extra modules for ZNC %prep %setup -q +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -128,6 +130,10 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Wed Jun 16 2010 Nick Bebout - 0.090-2 +- Backport r2026 of ZNC subversion repo to fix bug 603915 +- NULL pointer dereference flaw leads to segfault under certain conditions + * Sun Jun 06 2010 Nick Bebout - 0.090-1 - Update to znc 0.090 From bee8bd8327af21c4c40a48346518a53ab2bccdd1 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 16 Jun 2010 22:09:49 +0000 Subject: [PATCH 084/344] Backport r2026 of ZNC subversion repo to fix bug 603915 znc: NULL pointer dereference flaw leads to segfault under certain conditions --- znc.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 53464bc..5482783 100644 --- a/znc.spec +++ b/znc.spec @@ -2,11 +2,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.090 #Release: 0.1.rc1%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -40,6 +41,7 @@ Extra modules for ZNC %prep %setup -q +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -128,6 +130,10 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Wed Jun 16 2010 Nick Bebout - 0.090-2 +- Backport r2026 of ZNC subversion repo to fix bug 603915 +- NULL pointer dereference flaw leads to segfault under certain conditions + * Sun Jun 06 2010 Nick Bebout - 0.090-1 - Update to znc 0.090 From f79a160c962d4473ea020ab9b94adde4c3323c67 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 16 Jun 2010 22:16:37 +0000 Subject: [PATCH 085/344] Really add znc-trafficstats.patch this time --- znc-trafficstats.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 znc-trafficstats.patch diff --git a/znc-trafficstats.patch b/znc-trafficstats.patch new file mode 100644 index 0000000..da04c8e --- /dev/null +++ b/znc-trafficstats.patch @@ -0,0 +1,31 @@ +--- znc-0.090/znc.cpp 2010-05-10 12:45:15.000000000 -0500 ++++ trunk/znc.cpp 2010-06-16 16:43:48.706323545 -0500 +@@ -1914,18 +1914,18 @@ + } + + for (CSockManager::const_iterator it = m_Manager.begin(); it != m_Manager.end(); ++it) { ++ CUser *pUser = NULL; + if ((*it)->GetSockName().Left(5) == "IRC::") { +- CIRCSock *p = (CIRCSock *) *it; +- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); +- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); +- uiUsers_in += p->GetBytesRead(); +- uiUsers_out += p->GetBytesWritten(); ++ pUser = ((CIRCSock *) *it)->GetUser(); + } else if ((*it)->GetSockName().Left(5) == "USR::") { +- CClient *p = (CClient *) *it; +- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); +- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); +- uiUsers_in += p->GetBytesRead(); +- uiUsers_out += p->GetBytesWritten(); ++ pUser = ((CClient*) *it)->GetUser(); ++ } ++ ++ if (pUser) { ++ ret[pUser->GetUserName()].first += (*it)->GetBytesRead(); ++ ret[pUser->GetUserName()].second += (*it)->GetBytesWritten(); ++ uiUsers_in += (*it)->GetBytesRead(); ++ uiUsers_out += (*it)->GetBytesWritten(); + } else { + uiZNC_in += (*it)->GetBytesRead(); + uiZNC_out += (*it)->GetBytesWritten(); From 30ee5a6b26523a559b9d4d8367d7f87c70507b88 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 16 Jun 2010 22:16:37 +0000 Subject: [PATCH 086/344] Really add znc-trafficstats.patch this time --- znc-trafficstats.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 znc-trafficstats.patch diff --git a/znc-trafficstats.patch b/znc-trafficstats.patch new file mode 100644 index 0000000..da04c8e --- /dev/null +++ b/znc-trafficstats.patch @@ -0,0 +1,31 @@ +--- znc-0.090/znc.cpp 2010-05-10 12:45:15.000000000 -0500 ++++ trunk/znc.cpp 2010-06-16 16:43:48.706323545 -0500 +@@ -1914,18 +1914,18 @@ + } + + for (CSockManager::const_iterator it = m_Manager.begin(); it != m_Manager.end(); ++it) { ++ CUser *pUser = NULL; + if ((*it)->GetSockName().Left(5) == "IRC::") { +- CIRCSock *p = (CIRCSock *) *it; +- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); +- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); +- uiUsers_in += p->GetBytesRead(); +- uiUsers_out += p->GetBytesWritten(); ++ pUser = ((CIRCSock *) *it)->GetUser(); + } else if ((*it)->GetSockName().Left(5) == "USR::") { +- CClient *p = (CClient *) *it; +- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); +- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); +- uiUsers_in += p->GetBytesRead(); +- uiUsers_out += p->GetBytesWritten(); ++ pUser = ((CClient*) *it)->GetUser(); ++ } ++ ++ if (pUser) { ++ ret[pUser->GetUserName()].first += (*it)->GetBytesRead(); ++ ret[pUser->GetUserName()].second += (*it)->GetBytesWritten(); ++ uiUsers_in += (*it)->GetBytesRead(); ++ uiUsers_out += (*it)->GetBytesWritten(); + } else { + uiZNC_in += (*it)->GetBytesRead(); + uiZNC_out += (*it)->GetBytesWritten(); From 8094560ebad5442ad8085d0810b90a6f440575ac Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 14 Jul 2010 05:32:40 +0000 Subject: [PATCH 087/344] Update to znc 0.092 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 697a95d..05901f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.090.tar.gz +znc-0.092.tar.gz diff --git a/sources b/sources index a0f9d9a..e4be904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3ffe4f53211e5a425c7b87e9ca41e84 znc-0.090.tar.gz +e800a70c932dd13bc09b63569b49db3a znc-0.092.tar.gz diff --git a/znc.spec b/znc.spec index 5482783..8743ff8 100644 --- a/znc.spec +++ b/znc.spec @@ -1,13 +1,13 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.090 +Version: 0.092 #Release: 0.1.rc1%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: znc-trafficstats.patch +#Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -130,6 +130,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Wed Jul 14 2010 Nick Bebout - 0.092-1 +- Update to znc 0.092 + * Wed Jun 16 2010 Nick Bebout - 0.090-2 - Backport r2026 of ZNC subversion repo to fix bug 603915 - NULL pointer dereference flaw leads to segfault under certain conditions From 8c5829950fbb64f55046ca1fb714dbfadd34b04b Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 23 Jul 2010 03:00:33 +0000 Subject: [PATCH 088/344] Update to ZNC 0.092 --- znc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/znc.spec b/znc.spec index 8743ff8..1ab0103 100644 --- a/znc.spec +++ b/znc.spec @@ -41,7 +41,6 @@ Extra modules for ZNC %prep %setup -q -%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From 2ee3aad475b2f28711a10ed27b15bcc1df511f69 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 23 Jul 2010 03:12:33 +0000 Subject: [PATCH 089/344] Update to ZNC 0.092 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 697a95d..05901f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.090.tar.gz +znc-0.092.tar.gz diff --git a/sources b/sources index a0f9d9a..e4be904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3ffe4f53211e5a425c7b87e9ca41e84 znc-0.090.tar.gz +e800a70c932dd13bc09b63569b49db3a znc-0.092.tar.gz diff --git a/znc.spec b/znc.spec index 5482783..1ab0103 100644 --- a/znc.spec +++ b/znc.spec @@ -1,13 +1,13 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.090 +Version: 0.092 #Release: 0.1.rc1%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: znc-trafficstats.patch +#Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -41,7 +41,6 @@ Extra modules for ZNC %prep %setup -q -%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -130,6 +129,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Wed Jul 14 2010 Nick Bebout - 0.092-1 +- Update to znc 0.092 + * Wed Jun 16 2010 Nick Bebout - 0.090-2 - Backport r2026 of ZNC subversion repo to fix bug 603915 - NULL pointer dereference flaw leads to segfault under certain conditions From 32fa22b8ad6e6253679d983ba6ca59319bb63808 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 23 Jul 2010 03:12:33 +0000 Subject: [PATCH 090/344] Update to ZNC 0.092 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 697a95d..05901f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.090.tar.gz +znc-0.092.tar.gz diff --git a/sources b/sources index a0f9d9a..e4be904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3ffe4f53211e5a425c7b87e9ca41e84 znc-0.090.tar.gz +e800a70c932dd13bc09b63569b49db3a znc-0.092.tar.gz diff --git a/znc.spec b/znc.spec index 5482783..1ab0103 100644 --- a/znc.spec +++ b/znc.spec @@ -1,13 +1,13 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.090 +Version: 0.092 #Release: 0.1.rc1%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: znc-trafficstats.patch +#Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -41,7 +41,6 @@ Extra modules for ZNC %prep %setup -q -%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -130,6 +129,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Wed Jul 14 2010 Nick Bebout - 0.092-1 +- Update to znc 0.092 + * Wed Jun 16 2010 Nick Bebout - 0.090-2 - Backport r2026 of ZNC subversion repo to fix bug 603915 - NULL pointer dereference flaw leads to segfault under certain conditions From eb166c6a579c56a2cf3093a5af86900eff0a33ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:32:22 +0000 Subject: [PATCH 091/344] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a283000..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: znc -# $Id$ -NAME := znc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 diff --git a/import.log b/import.log deleted file mode 100644 index 9acfb8e..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -znc-0_070-7_el5:EL-5:znc-0.070-7.el5.src.rpm:1247454986 From abde845561ab269d1fd31005f48c4d6cbf6c5b68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:32:24 +0000 Subject: [PATCH 092/344] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a283000..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: znc -# $Id$ -NAME := znc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index e01942a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -znc-0_070-7_fc11:HEAD:znc-0.070-7.fc11.src.rpm:1247453867 From 20cb9e769ea384f4418a0bbfd4b95ffb17332c0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:32:26 +0000 Subject: [PATCH 093/344] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a283000..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: znc -# $Id$ -NAME := znc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index e01942a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -znc-0_070-7_fc11:HEAD:znc-0.070-7.fc11.src.rpm:1247453867 From fa6a42859bb0aa96be8817eb253c4a9cbf2b13cc Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 3 Aug 2010 14:03:55 -0400 Subject: [PATCH 094/344] Update to znc 0.093.svn2098 --- .gitignore | 1 + sources | 2 +- znc.spec | 17 +++++++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 05901f4..5f7ccc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ znc-0.092.tar.gz +znc-0.093.svn2098.tar.bz2 diff --git a/sources b/sources index e4be904..26a003a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e800a70c932dd13bc09b63569b49db3a znc-0.092.tar.gz +8691a1c6417bed41e6a75a600dafd41b znc-0.093.svn2098.tar.bz2 diff --git a/znc.spec b/znc.spec index 1ab0103..2429a9e 100644 --- a/znc.spec +++ b/znc.spec @@ -1,12 +1,17 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.092 +Version: 0.093 +Release: 1.svn2098%{?dist} #Release: 0.1.rc1%{?dist} -Release: 1%{?dist} +#Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: znc-0.093.svn2098.tar.bz2 +# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.093.svn2098 +# tar jcvf znc-0.093.svn2098.tar.bz2 znc-0.093.svn2098/ #Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -40,7 +45,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.093.svn2098 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -72,6 +77,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/awaynick.so %{_libdir}/znc/blockuser.so %{_libdir}/znc/buffextras.so +%{_libdir}/znc/certauth.so %{_libdir}/znc/chansaver.so %{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so @@ -129,6 +135,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Tue Aug 3 2010 Nick Bebout - 0.093-1.svn2098 +- Update to znc 0.093 svn2098 + * Wed Jul 14 2010 Nick Bebout - 0.092-1 - Update to znc 0.092 From fe20d167ca620d6fc6ec16af368f6d1e0abbb68c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 10 Aug 2010 20:06:44 -0400 Subject: [PATCH 095/344] Update to znc-0.093.svn2101 to fix two CVE's --- .gitignore | 1 + sources | 2 +- znc.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5f7ccc6..09fc48a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ znc-0.092.tar.gz znc-0.093.svn2098.tar.bz2 +znc-0.093.svn2101.tar.bz2 diff --git a/sources b/sources index 26a003a..5bd07db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8691a1c6417bed41e6a75a600dafd41b znc-0.093.svn2098.tar.bz2 +c3a67b46669774cf02c31156f03c4643 znc-0.093.svn2101.tar.bz2 diff --git a/znc.spec b/znc.spec index 2429a9e..d075c6c 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.093 -Release: 1.svn2098%{?dist} +Release: 2.svn2101%{?dist} #Release: 0.1.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.093.svn2098.tar.bz2 -# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.093.svn2098 -# tar jcvf znc-0.093.svn2098.tar.bz2 znc-0.093.svn2098/ +Source0: znc-0.093.svn2101.tar.bz2 +# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.093.svn2101 +# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/ #Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -135,6 +135,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Tue Aug 10 2010 Nick Bebout - 0.093-2.svn2101 +- Update to znc 0.093.svn2101 to fix CVE-2010-2812 and CVE-2010-2934 + * Tue Aug 3 2010 Nick Bebout - 0.093-1.svn2098 - Update to znc 0.093 svn2098 From f95c44a291aaf7326d08a5d2b22309e0a415f022 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 10 Aug 2010 20:15:01 -0400 Subject: [PATCH 096/344] Fix build error --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d075c6c..7725f4b 100644 --- a/znc.spec +++ b/znc.spec @@ -45,7 +45,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.093.svn2098 +%setup -q -n znc-0.093.svn2101 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From c240a1a9cee3548d048aabe7f3353dc8a87fd5a7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 10 Sep 2010 20:23:39 -0400 Subject: [PATCH 097/344] Update to 0.094 --- .gitignore | 1 + sources | 2 +- znc.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 09fc48a..6db2470 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ znc-0.092.tar.gz znc-0.093.svn2098.tar.bz2 znc-0.093.svn2101.tar.bz2 +/znc-0.094.tar.gz diff --git a/sources b/sources index 5bd07db..a552814 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3a67b46669774cf02c31156f03c4643 znc-0.093.svn2101.tar.bz2 +db101f7a7756285d824b59e3b33e3ad5 znc-0.094.tar.gz diff --git a/znc.spec b/znc.spec index 7725f4b..86cef9d 100644 --- a/znc.spec +++ b/znc.spec @@ -1,14 +1,14 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.093 -Release: 2.svn2101%{?dist} +Version: 0.094 +#Release: 2.svn2101%{?dist} #Release: 0.1.rc1%{?dist} -#Release: 1%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.093.svn2101.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +#Source0: znc-0.093.svn2101.tar.bz2 # svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk # mv trunk znc-0.093.svn2101 # tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/ @@ -135,6 +135,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Fri Sep 10 2010 Nick Bebout - 0.094-1 +- Update to znc 0.094 + * Tue Aug 10 2010 Nick Bebout - 0.093-2.svn2101 - Update to znc 0.093.svn2101 to fix CVE-2010-2812 and CVE-2010-2934 From 4be524e1a205dd12ac62139be0881882c44b99d7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 10 Sep 2010 20:41:17 -0400 Subject: [PATCH 098/344] Fix setup --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 86cef9d..577fbb6 100644 --- a/znc.spec +++ b/znc.spec @@ -45,7 +45,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.093.svn2101 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From fecc964ee0e2e1e5456c0b5eb934b621f1d477ad Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 24 Sep 2010 20:30:49 -0400 Subject: [PATCH 099/344] Fix .gitignore --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6db2470..e6db9a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -znc-0.092.tar.gz -znc-0.093.svn2098.tar.bz2 -znc-0.093.svn2101.tar.bz2 -/znc-0.094.tar.gz +znc-0.094.tar.gz From 428c95dbda8bd9d78e336e2184eed7822791e4fb Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 24 Sep 2010 20:31:01 -0400 Subject: [PATCH 100/344] Fix .gitignore --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6db2470..e6db9a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -znc-0.092.tar.gz -znc-0.093.svn2098.tar.bz2 -znc-0.093.svn2101.tar.bz2 -/znc-0.094.tar.gz +znc-0.094.tar.gz From 05dc82646892183a232d172bcd7600662d81361f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 24 Sep 2010 20:31:57 -0400 Subject: [PATCH 101/344] Merge master into el5 --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3319075..e6db9a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -<<<<<<< HEAD -znc-0.093.svn2101.tar.bz2 -======= znc-0.094.tar.gz ->>>>>>> master From 31dd9427fd2c54a869588e3a65154e1d34e074cc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 8 Oct 2010 17:08:07 -0700 Subject: [PATCH 102/344] Rebuild for gcc bug 634757 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 577fbb6..59121c7 100644 --- a/znc.spec +++ b/znc.spec @@ -3,7 +3,7 @@ Name: znc Version: 0.094 #Release: 2.svn2101%{?dist} #Release: 0.1.rc1%{?dist} -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -135,6 +135,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Fri Oct 08 2010 Jesse Keating - 0.094-1.1 +- Rebuild for gcc bug 634757 + * Fri Sep 10 2010 Nick Bebout - 0.094-1 - Update to znc 0.094 From d3dc5c46a5ec2eefacca9e1b4e28e8b3c6e4842c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 6 Nov 2010 22:22:58 -0400 Subject: [PATCH 103/344] Upgrade to znc 0.096 --- .gitignore | 1 + sources | 2 +- znc.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e6db9a6..610bf84 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ znc-0.094.tar.gz +/znc-0.096.tar.gz diff --git a/sources b/sources index a552814..5a3f25f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db101f7a7756285d824b59e3b33e3ad5 znc-0.094.tar.gz +38eec4f1911a68b4d2fc704170e7cbf6 znc-0.096.tar.gz diff --git a/znc.spec b/znc.spec index 577fbb6..1f9aa5e 100644 --- a/znc.spec +++ b/znc.spec @@ -1,6 +1,6 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.094 +Version: 0.096 #Release: 2.svn2101%{?dist} #Release: 0.1.rc1%{?dist} Release: 1%{?dist} @@ -135,6 +135,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Sat Nov 6 2010 Nick Bebout - 0.096-1 +- Update to znc 0.096 + * Fri Sep 10 2010 Nick Bebout - 0.094-1 - Update to znc 0.094 From dc9857995ac56f20e3ac9581ff08dfc40bb4172c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 6 Nov 2010 22:50:16 -0400 Subject: [PATCH 104/344] Upgrade to 0.096 --- znc.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/znc.spec b/znc.spec index 1f9aa5e..5c3674c 100644 --- a/znc.spec +++ b/znc.spec @@ -19,7 +19,7 @@ BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel -BuildRequires: perl(ExtUtils::Embed) +BuildRequires: perl(ExtUtils::Embed) swig %description ZNC is an IRC bouncer with many advanced features like detaching, @@ -52,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl + --enable-ipv6 --enable-extra --enable-sasl --enable-perl %__make %{?_smp_mflags} %install @@ -87,7 +87,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so %{_libdir}/znc/lastseen.so -%{_libdir}/znc/modperl.pm +%{_libdir}/znc/modperl/ %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so %{_libdir}/znc/notes.so @@ -120,6 +120,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/autovoice.so %{_libdir}/znc/block_motd.so %{_libdir}/znc/charset.so +%{_libdir}/znc/clearbufferonmsg.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/droproot.so %{_libdir}/znc/email.so From 6b214a13cf0f5a6a2bebbed93da909d69b5619a2 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 7 Nov 2010 16:07:20 -0500 Subject: [PATCH 105/344] Move modperl and modtcl to separate subpackages Enable modtcl --- znc.spec | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/znc.spec b/znc.spec index 5c3674c..6efab90 100644 --- a/znc.spec +++ b/znc.spec @@ -3,7 +3,7 @@ Name: znc Version: 0.096 #Release: 2.svn2101%{?dist} #Release: 0.1.rc1%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -19,7 +19,7 @@ BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel -BuildRequires: perl(ExtUtils::Embed) swig +BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %description ZNC is an IRC bouncer with many advanced features like detaching, @@ -44,6 +44,24 @@ Requires: %{name} = %{version}-%{release} %description extra Extra modules for ZNC +%package modtcl +Summary: TCL module for ZNC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: tcl + +%description modtcl +TCL module for ZNC + +%package modperl +Summary: perl module for ZNC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: perl + +%description modperl +perl module for ZNC + %prep %setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp @@ -52,7 +70,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl + --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl %__make %{?_smp_mflags} %install @@ -87,8 +105,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so %{_libdir}/znc/lastseen.so -%{_libdir}/znc/modperl/ -%{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so %{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so @@ -135,7 +151,19 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so +%files modtcl +%defattr(-,root,root) +%{_libdir}/znc/modtcl.so + +%files modperl +%defattr(-,root,root) +%{_libdir}/znc/modperl/ +%{_libdir}/znc/modperl.so + %changelog +* Sun Nov 7 2010 Nick Bebout - 0.096-2 +- Build TCL module, move modperl and modtcl to separate subpackages + * Sat Nov 6 2010 Nick Bebout - 0.096-1 - Update to znc 0.096 From 38cff24207cee84f264fcd6a55b05d7898251b76 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 22 Dec 2010 20:30:07 -0600 Subject: [PATCH 106/344] Update to 0.097.svn2197 which also adds modpython --- .gitignore | 2 ++ sources | 2 +- znc-0.097.svn2197-modules.patch | 41 ++++++++++++++++++++++++++++++ znc.spec | 44 ++++++++++++++++++++++++--------- 4 files changed, 77 insertions(+), 12 deletions(-) create mode 100644 znc-0.097.svn2197-modules.patch diff --git a/.gitignore b/.gitignore index 610bf84..eb0235f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ znc-0.094.tar.gz /znc-0.096.tar.gz +/znc-0.097.svn2196.tar.bz2 +/znc-0.097.svn2197.tar.bz2 diff --git a/sources b/sources index 5a3f25f..dbaf86f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38eec4f1911a68b4d2fc704170e7cbf6 znc-0.096.tar.gz +7da9ce26c0853257610d86c8f8cc9a70 znc-0.097.svn2197.tar.bz2 diff --git a/znc-0.097.svn2197-modules.patch b/znc-0.097.svn2197-modules.patch new file mode 100644 index 0000000..c1a1519 --- /dev/null +++ b/znc-0.097.svn2197-modules.patch @@ -0,0 +1,41 @@ +--- znc-0.097.svn2197-original/modules/Makefile.in 2010-12-22 19:35:56.464484000 -0600 ++++ znc-0.097.svn2197/modules/Makefile.in 2010-12-22 20:06:45.859414524 -0600 +@@ -180,15 +180,15 @@ + $(Q)$(PERL) $(srcdir)/modpython/codegen.pl $< $@ + + modperl_install: create_install_dir install_metadirs +- +for i in $(srcdir)/*.pm; do \ +- test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ ++ for i in $(srcdir)/*.pm; do \ ++ test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); true; \ + done + for a in $(srcdir)/*; do \ + if [ -d $$a ] && [ -f $${a}.pm ]; then \ + cp -Rp $$a $(DESTDIR)$(DATADIR); \ + fi \ + done +- +test -r $(srcdir)/modperl/ZNC.pm && cp -p $(srcdir)/modperl/ZNC.pm modperl/ ++ test -r $(srcdir)/modperl/ZNC.pm && cp -p $(srcdir)/modperl/ZNC.pm modperl/; true + rm -rf $(DESTDIR)$(DATADIR)/modperl + mkdir -p $(DESTDIR)$(MODDIR)/modperl + $(INSTALL_PROGRAM) modperl/ZNC.so $(DESTDIR)$(MODDIR)/modperl +@@ -199,14 +199,14 @@ + $(CXX) $(PYTHONCOMMON) -o $@ $< + + modpython_compilepyc: modpython/compiler +- +cp -p $(srcdir)/*.py ./ +- +cp -p $(srcdir)/*.pyc ./ +- +cp -p $(srcdir)/modpython/znc*.py modpython/ ++ cp -p $(srcdir)/*.py ./; true ++ cp -p $(srcdir)/*.pyc ./; true ++ cp -p $(srcdir)/modpython/znc*.py modpython/; true + $< + + modpython_install: create_install_dir install_metadirs modpython_compilepyc +- +for i in *.pyc; do \ +- test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ ++ for i in *.pyc; do \ ++ test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); true; \ + done + for a in $(srcdir)/*; do \ + if [ -d $$a ]; then \ diff --git a/znc.spec b/znc.spec index 6efab90..6736d05 100644 --- a/znc.spec +++ b/znc.spec @@ -1,24 +1,25 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.096 -#Release: 2.svn2101%{?dist} +Version: 0.097 +Release: 1.svn2197%{?dist} #Release: 0.1.rc1%{?dist} -Release: 2%{?dist} +#Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -#Source0: znc-0.093.svn2101.tar.bz2 -# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.093.svn2101 -# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/ +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: znc-0.097.svn2197.tar.bz2 +# svn export -r 2197 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2197 +# tar jcvf znc-0.097.svn2197.tar.bz2 znc-0.097.svn2197/ #Patch0: znc-trafficstats.patch +Patch0: znc-0.097.svn2197-modules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel +BuildRequires: c-ares-devel python3-devel BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %description @@ -62,15 +63,28 @@ Requires: perl %description modperl perl module for ZNC +%package modpython +Summary: python module for ZNC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python3 + +%description modpython +python module for ZNC + + %prep -%setup -q +#%setup -q +%setup -q -n znc-0.097.svn2197 +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl + --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \ + --enable-python %__make %{?_smp_mflags} %install @@ -160,7 +174,15 @@ chmod -x modules/q.cpp %{_libdir}/znc/modperl/ %{_libdir}/znc/modperl.so +%files modpython +%defattr(-,root,root) +%{_libdir}/znc/modpython/ +%{_libdir}/znc/modpython.so + %changelog +* Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2197 +- Update to znc 0.097-svn2197 which also adds modpython + * Sun Nov 7 2010 Nick Bebout - 0.096-2 - Build TCL module, move modperl and modtcl to separate subpackages From 5d0c4c98464e6c4b71cf07df2ec25c54b8ffcd7b Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 23 Dec 2010 17:25:21 -0600 Subject: [PATCH 107/344] Upgrade to 0.097 svn2202 which adds modpython --- .gitignore | 1 + sources | 2 +- znc.spec | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index eb0235f..4b6b5b1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ znc-0.094.tar.gz /znc-0.096.tar.gz /znc-0.097.svn2196.tar.bz2 /znc-0.097.svn2197.tar.bz2 +/znc-0.097.svn2202.tar.bz2 diff --git a/sources b/sources index dbaf86f..c141658 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7da9ce26c0853257610d86c8f8cc9a70 znc-0.097.svn2197.tar.bz2 +8d7bf907e76d1ba569ab5a52b851b63a znc-0.097.svn2202.tar.bz2 diff --git a/znc.spec b/znc.spec index 6736d05..a2c2779 100644 --- a/znc.spec +++ b/znc.spec @@ -1,19 +1,19 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 1.svn2197%{?dist} +Release: 1.svn2202%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2197.tar.bz2 -# svn export -r 2197 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2197 -# tar jcvf znc-0.097.svn2197.tar.bz2 znc-0.097.svn2197/ +Source0: znc-0.097.svn2202.tar.bz2 +# svn export -r 2202 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2202 +# tar jcvf znc-0.097.svn2202.tar.bz2 znc-0.097.svn2202/ #Patch0: znc-trafficstats.patch -Patch0: znc-0.097.svn2197-modules.patch +#Patch0: znc-0.097.svn2202-modules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -75,8 +75,8 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2197 -%patch0 -p1 +%setup -q -n znc-0.097.svn2202 +#%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -180,8 +180,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog -* Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2197 -- Update to znc 0.097-svn2197 which also adds modpython +* Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2202 +- Update to znc 0.097-svn2202 which also adds modpython * Sun Nov 7 2010 Nick Bebout - 0.096-2 - Build TCL module, move modperl and modtcl to separate subpackages From f12196f16f02087039e4e8a6450735d1cedf72a8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 24 Dec 2010 23:04:00 -0600 Subject: [PATCH 108/344] Upgrade to svn2213 --- .gitignore | 1 + sources | 2 +- znc-0.097.svn2197-modules.patch | 41 ------------------------------- znc-0.097.svn2213-modpython.patch | 23 +++++++++++++++++ znc-trafficstats.patch | 31 ----------------------- znc.spec | 21 ++++++++-------- 6 files changed, 35 insertions(+), 84 deletions(-) delete mode 100644 znc-0.097.svn2197-modules.patch create mode 100644 znc-0.097.svn2213-modpython.patch delete mode 100644 znc-trafficstats.patch diff --git a/.gitignore b/.gitignore index 4b6b5b1..f1c0820 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ znc-0.094.tar.gz /znc-0.097.svn2196.tar.bz2 /znc-0.097.svn2197.tar.bz2 /znc-0.097.svn2202.tar.bz2 +/znc-0.097.svn2213.tar.bz2 diff --git a/sources b/sources index c141658..f6da24c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d7bf907e76d1ba569ab5a52b851b63a znc-0.097.svn2202.tar.bz2 +b9872c8307dc91c40112c990f4bebdb2 znc-0.097.svn2213.tar.bz2 diff --git a/znc-0.097.svn2197-modules.patch b/znc-0.097.svn2197-modules.patch deleted file mode 100644 index c1a1519..0000000 --- a/znc-0.097.svn2197-modules.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- znc-0.097.svn2197-original/modules/Makefile.in 2010-12-22 19:35:56.464484000 -0600 -+++ znc-0.097.svn2197/modules/Makefile.in 2010-12-22 20:06:45.859414524 -0600 -@@ -180,15 +180,15 @@ - $(Q)$(PERL) $(srcdir)/modpython/codegen.pl $< $@ - - modperl_install: create_install_dir install_metadirs -- +for i in $(srcdir)/*.pm; do \ -- test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ -+ for i in $(srcdir)/*.pm; do \ -+ test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); true; \ - done - for a in $(srcdir)/*; do \ - if [ -d $$a ] && [ -f $${a}.pm ]; then \ - cp -Rp $$a $(DESTDIR)$(DATADIR); \ - fi \ - done -- +test -r $(srcdir)/modperl/ZNC.pm && cp -p $(srcdir)/modperl/ZNC.pm modperl/ -+ test -r $(srcdir)/modperl/ZNC.pm && cp -p $(srcdir)/modperl/ZNC.pm modperl/; true - rm -rf $(DESTDIR)$(DATADIR)/modperl - mkdir -p $(DESTDIR)$(MODDIR)/modperl - $(INSTALL_PROGRAM) modperl/ZNC.so $(DESTDIR)$(MODDIR)/modperl -@@ -199,14 +199,14 @@ - $(CXX) $(PYTHONCOMMON) -o $@ $< - - modpython_compilepyc: modpython/compiler -- +cp -p $(srcdir)/*.py ./ -- +cp -p $(srcdir)/*.pyc ./ -- +cp -p $(srcdir)/modpython/znc*.py modpython/ -+ cp -p $(srcdir)/*.py ./; true -+ cp -p $(srcdir)/*.pyc ./; true -+ cp -p $(srcdir)/modpython/znc*.py modpython/; true - $< - - modpython_install: create_install_dir install_metadirs modpython_compilepyc -- +for i in *.pyc; do \ -- test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ -+ for i in *.pyc; do \ -+ test -r $$i && $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); true; \ - done - for a in $(srcdir)/*; do \ - if [ -d $$a ]; then \ diff --git a/znc-0.097.svn2213-modpython.patch b/znc-0.097.svn2213-modpython.patch new file mode 100644 index 0000000..cce800b --- /dev/null +++ b/znc-0.097.svn2213-modpython.patch @@ -0,0 +1,23 @@ +--- znc-0.097.svn2213/modules/modpython/compiler.cpp 2010-12-22 08:52:53.106613000 -0600 ++++ znc-0.097.svn2213-fixed/modules/modpython/compiler.cpp 2010-12-24 22:49:47.076861076 -0600 +@@ -8,9 +8,18 @@ + + #include + +-int main() { ++int main(int argc, char** argv) { + Py_Initialize(); +- int res = PyRun_SimpleString("import compileall; print('Optimizing python files for later use...'); compileall.compile_dir('.')"); ++ int res = PyRun_SimpleString( ++ "import compileall\n" ++ "print('Optimizing python files for later use...')\n" ++ "import sys\n" ++ "if sys.version_info < (3, 2):\n" ++ " compileall.compile_dir('.')\n" ++ "else:\n" ++ " compileall.compile_dir('.', legacy=True)\n" ++ ); + Py_Finalize(); + return res; + } ++ diff --git a/znc-trafficstats.patch b/znc-trafficstats.patch deleted file mode 100644 index da04c8e..0000000 --- a/znc-trafficstats.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- znc-0.090/znc.cpp 2010-05-10 12:45:15.000000000 -0500 -+++ trunk/znc.cpp 2010-06-16 16:43:48.706323545 -0500 -@@ -1914,18 +1914,18 @@ - } - - for (CSockManager::const_iterator it = m_Manager.begin(); it != m_Manager.end(); ++it) { -+ CUser *pUser = NULL; - if ((*it)->GetSockName().Left(5) == "IRC::") { -- CIRCSock *p = (CIRCSock *) *it; -- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); -- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); -- uiUsers_in += p->GetBytesRead(); -- uiUsers_out += p->GetBytesWritten(); -+ pUser = ((CIRCSock *) *it)->GetUser(); - } else if ((*it)->GetSockName().Left(5) == "USR::") { -- CClient *p = (CClient *) *it; -- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); -- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); -- uiUsers_in += p->GetBytesRead(); -- uiUsers_out += p->GetBytesWritten(); -+ pUser = ((CClient*) *it)->GetUser(); -+ } -+ -+ if (pUser) { -+ ret[pUser->GetUserName()].first += (*it)->GetBytesRead(); -+ ret[pUser->GetUserName()].second += (*it)->GetBytesWritten(); -+ uiUsers_in += (*it)->GetBytesRead(); -+ uiUsers_out += (*it)->GetBytesWritten(); - } else { - uiZNC_in += (*it)->GetBytesRead(); - uiZNC_out += (*it)->GetBytesWritten(); diff --git a/znc.spec b/znc.spec index a2c2779..668c9f2 100644 --- a/znc.spec +++ b/znc.spec @@ -1,19 +1,18 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 1.svn2202%{?dist} +Release: 1.svn2213%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2202.tar.bz2 -# svn export -r 2202 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2202 -# tar jcvf znc-0.097.svn2202.tar.bz2 znc-0.097.svn2202/ -#Patch0: znc-trafficstats.patch -#Patch0: znc-0.097.svn2202-modules.patch +Source0: znc-0.097.svn2213.tar.bz2 +# svn export -r 2213 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2213 +# tar jcvf znc-0.097.svn2213.tar.bz2 znc-0.097.svn2213/ +Patch0: znc-0.097.svn2213-modpython.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -75,8 +74,8 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2202 -#%patch0 -p1 +%setup -q -n znc-0.097.svn2213 +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -180,8 +179,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog -* Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2202 -- Update to znc 0.097-svn2202 which also adds modpython +* Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2213 +- Update to znc 0.097-svn2213 which also adds modpython * Sun Nov 7 2010 Nick Bebout - 0.096-2 - Build TCL module, move modperl and modtcl to separate subpackages From b4ac474a73f7e6716028fa399b4147fabf3445b8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 24 Dec 2010 23:07:29 -0600 Subject: [PATCH 109/344] Patch has been upstreamed, update to 2214 --- .gitignore | 1 + sources | 2 +- znc.spec | 17 +++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index f1c0820..5b0cf33 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ znc-0.094.tar.gz /znc-0.097.svn2197.tar.bz2 /znc-0.097.svn2202.tar.bz2 /znc-0.097.svn2213.tar.bz2 +/znc-0.097.svn2214.tar.bz2 diff --git a/sources b/sources index f6da24c..c4512cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9872c8307dc91c40112c990f4bebdb2 znc-0.097.svn2213.tar.bz2 +a61e6fd9bac0a9cbbd17d352dab7b70c znc-0.097.svn2214.tar.bz2 diff --git a/znc.spec b/znc.spec index 668c9f2..ad35ca5 100644 --- a/znc.spec +++ b/znc.spec @@ -1,18 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 1.svn2213%{?dist} +Release: 2.svn2214%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2213.tar.bz2 -# svn export -r 2213 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2213 -# tar jcvf znc-0.097.svn2213.tar.bz2 znc-0.097.svn2213/ -Patch0: znc-0.097.svn2213-modpython.patch +Source0: znc-0.097.svn2214.tar.bz2 +# svn export -r 2214 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2214 +# tar jcvf znc-0.097.svn2214.tar.bz2 znc-0.097.svn2214/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -74,8 +73,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2213 -%patch0 -p1 +%setup -q -n znc-0.097.svn2214 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -179,6 +177,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2214 +- Patch has been upstreamed, update to svn2214 + * Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2213 - Update to znc 0.097-svn2213 which also adds modpython From e17a3df3719c3129222b84b68f5017940791f1f6 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Mon, 3 Jan 2011 19:03:46 -0500 Subject: [PATCH 110/344] rebuild for newer python3 (see rhbz#666429) --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index ad35ca5..369e6a0 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 2.svn2214%{?dist} +Release: 3.svn2214%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions @@ -177,6 +177,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Mon Jan 3 2011 David Malcolm - 0.097-3.svn2214 +- rebuild for newer python3 (see rhbz#666429) + * Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2214 - Patch has been upstreamed, update to svn2214 From 4b7d7ba796815897a3130f192617acb95c98bffe Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 7 Jan 2011 18:22:23 -0600 Subject: [PATCH 111/344] Update to svn2255 --- .gitignore | 1 + sources | 2 +- znc.spec | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5b0cf33..b735e9e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ znc-0.094.tar.gz /znc-0.097.svn2202.tar.bz2 /znc-0.097.svn2213.tar.bz2 /znc-0.097.svn2214.tar.bz2 +/znc-0.097.svn2255.tar.bz2 diff --git a/sources b/sources index c4512cc..94bd0ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a61e6fd9bac0a9cbbd17d352dab7b70c znc-0.097.svn2214.tar.bz2 +d2bb2fc0845c9500e0d0ef1532cb80a5 znc-0.097.svn2255.tar.bz2 diff --git a/znc.spec b/znc.spec index ad35ca5..82fe7d6 100644 --- a/znc.spec +++ b/znc.spec @@ -1,20 +1,20 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 2.svn2214%{?dist} +Release: 2.svn2255%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2214.tar.bz2 -# svn export -r 2214 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2214 -# tar jcvf znc-0.097.svn2214.tar.bz2 znc-0.097.svn2214/ +Source0: znc-0.097.svn2255.tar.bz2 +# svn export -r 2255 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2255 +# tar jcvf znc-0.097.svn2255.tar.bz2 znc-0.097.svn2255/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl gcc-c++ +BuildRequires: perl gcc-c++ automake BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel python3-devel @@ -73,11 +73,12 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2214 +%setup -q -n znc-0.097.svn2255 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp %build +./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \ @@ -177,8 +178,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog -* Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2214 -- Patch has been upstreamed, update to svn2214 +* Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2255 +- Patch has been upstreamed, update to svn2255 * Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2213 - Update to znc 0.097-svn2213 which also adds modpython From 09cb7a54c6a8c57300c299610e5a174c4767d2d1 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 7 Jan 2011 18:28:30 -0600 Subject: [PATCH 112/344] Fix merge --- znc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/znc.spec b/znc.spec index a6210cb..d91a888 100644 --- a/znc.spec +++ b/znc.spec @@ -178,7 +178,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog -<<<<<<< HEAD * Fri Jan 7 2011 Nick Bebout - 0.097-4.svn2255 - Update to svn2255 From 89a8e46cb2b3e1bc158ab1a6eff24074ea82626d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 17 Jan 2011 16:30:29 -0600 Subject: [PATCH 113/344] Update to svn2269 --- .gitignore | 1 + sources | 2 +- znc.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b735e9e..2da7e4e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ znc-0.094.tar.gz /znc-0.097.svn2213.tar.bz2 /znc-0.097.svn2214.tar.bz2 /znc-0.097.svn2255.tar.bz2 +/znc-0.097.svn2269.tar.bz2 diff --git a/sources b/sources index 94bd0ce..f0dfae3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2bb2fc0845c9500e0d0ef1532cb80a5 znc-0.097.svn2255.tar.bz2 +87004ac3d7b571cb4f57b162fed4679e znc-0.097.svn2269.tar.bz2 diff --git a/znc.spec b/znc.spec index d91a888..01aa8e8 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 4.svn2255%{?dist} +Release: 5.svn2269%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2255.tar.bz2 -# svn export -r 2255 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2255 -# tar jcvf znc-0.097.svn2255.tar.bz2 znc-0.097.svn2255/ +Source0: znc-0.097.svn2269.tar.bz2 +# svn export -r 2269 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2269 +# tar jcvf znc-0.097.svn2269.tar.bz2 znc-0.097.svn2269/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ automake @@ -73,7 +73,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2255 +%setup -q -n znc-0.097.svn2269 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -178,6 +178,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Mon Jan 17 2011 Nick Bebout - 0.097-5.svn2269 +- Update to svn2269 + * Fri Jan 7 2011 Nick Bebout - 0.097-4.svn2255 - Update to svn2255 From 0393dbd7ba1db193640c48751d89bb51a2d66463 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 24 Jan 2011 11:22:13 -0600 Subject: [PATCH 114/344] Upgrade to svn2272 --- .gitignore | 1 + sources | 2 +- znc.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2da7e4e..cdb7727 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ znc-0.094.tar.gz /znc-0.097.svn2214.tar.bz2 /znc-0.097.svn2255.tar.bz2 /znc-0.097.svn2269.tar.bz2 +/znc-0.097.svn2272.tar.xz diff --git a/sources b/sources index f0dfae3..1de5ab7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87004ac3d7b571cb4f57b162fed4679e znc-0.097.svn2269.tar.bz2 +efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz diff --git a/znc.spec b/znc.spec index 01aa8e8..9b9e144 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 5.svn2269%{?dist} +Release: 6.svn2272%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2269.tar.bz2 -# svn export -r 2269 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2269 -# tar jcvf znc-0.097.svn2269.tar.bz2 znc-0.097.svn2269/ +Source0: znc-0.097.svn2272.tar.xz +# svn export -r 2272 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2272 +# tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ automake @@ -73,7 +73,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2269 +%setup -q -n znc-0.097.svn2272 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -178,6 +178,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 +- Update to svn2272 + * Mon Jan 17 2011 Nick Bebout - 0.097-5.svn2269 - Update to svn2269 From abe48fa44ff6e367dfde7834524883c7c55b63a3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 9 Feb 2011 20:20:09 +0000 Subject: [PATCH 115/344] Upgrade to svn2277 --- .gitignore | 1 + sources | 2 +- znc.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index cdb7727..01d61ce 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ znc-0.094.tar.gz /znc-0.097.svn2255.tar.bz2 /znc-0.097.svn2269.tar.bz2 /znc-0.097.svn2272.tar.xz +/znc-0.097.svn2277.tar.xz diff --git a/sources b/sources index 1de5ab7..9f310c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz +9a1ee24e4d38c5adabb761fa586c3830 znc-0.097.svn2277.tar.xz diff --git a/znc.spec b/znc.spec index 9b9e144..02fb14a 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 6.svn2272%{?dist} +Release: 7.svn2277%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2272.tar.xz -# svn export -r 2272 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2272 -# tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/ +Source0: znc-0.097.svn2277.tar.xz +# svn export -r 2277 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2277 +# tar Jcvf znc-0.097.svn2277.tar.xz znc-0.097.svn2277/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ automake @@ -73,7 +73,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2272 +%setup -q -n znc-0.097.svn2277 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -178,6 +178,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Wed Feb 09 2011 Nick Bebout - 0.097-7.svn2277 +- Update to svn2277 + * Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 - Update to svn2272 From eda4c45211c9f94660a05d5922a0b4a555031fc8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 9 Feb 2011 21:05:17 +0000 Subject: [PATCH 116/344] Revert "Move modperl and modtcl to separate subpackages" This reverts commit 6b214a13cf0f5a6a2bebbed93da909d69b5619a2. Conflicts: znc.spec --- .gitignore | 9 -------- sources | 2 +- znc.spec | 64 +++++++++++------------------------------------------- 3 files changed, 14 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 01d61ce..610bf84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,2 @@ znc-0.094.tar.gz /znc-0.096.tar.gz -/znc-0.097.svn2196.tar.bz2 -/znc-0.097.svn2197.tar.bz2 -/znc-0.097.svn2202.tar.bz2 -/znc-0.097.svn2213.tar.bz2 -/znc-0.097.svn2214.tar.bz2 -/znc-0.097.svn2255.tar.bz2 -/znc-0.097.svn2269.tar.bz2 -/znc-0.097.svn2272.tar.xz -/znc-0.097.svn2277.tar.xz diff --git a/sources b/sources index 9f310c6..5a3f25f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a1ee24e4d38c5adabb761fa586c3830 znc-0.097.svn2277.tar.xz +38eec4f1911a68b4d2fc704170e7cbf6 znc-0.096.tar.gz diff --git a/znc.spec b/znc.spec index 02fb14a..6efab90 100644 --- a/znc.spec +++ b/znc.spec @@ -1,23 +1,24 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.097 -Release: 7.svn2277%{?dist} +Version: 0.096 +#Release: 2.svn2101%{?dist} #Release: 0.1.rc1%{?dist} -#Release: 2%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2277.tar.xz -# svn export -r 2277 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2277 -# tar Jcvf znc-0.097.svn2277.tar.xz znc-0.097.svn2277/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +#Source0: znc-0.093.svn2101.tar.bz2 +# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.093.svn2101 +# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/ +#Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl gcc-c++ automake +BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel python3-devel +BuildRequires: c-ares-devel BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %description @@ -61,28 +62,15 @@ Requires: perl %description modperl perl module for ZNC -%package modpython -Summary: python module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: python3 - -%description modpython -python module for ZNC - - %prep -#%setup -q -%setup -q -n znc-0.097.svn2277 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp %build -./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \ - --enable-python + --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl %__make %{?_smp_mflags} %install @@ -172,33 +160,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/modperl/ %{_libdir}/znc/modperl.so -%files modpython -%defattr(-,root,root) -%{_libdir}/znc/modpython/ -%{_libdir}/znc/modpython.so - %changelog -* Wed Feb 09 2011 Nick Bebout - 0.097-7.svn2277 -- Update to svn2277 - -* Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 -- Update to svn2272 - -* Mon Jan 17 2011 Nick Bebout - 0.097-5.svn2269 -- Update to svn2269 - -* Fri Jan 7 2011 Nick Bebout - 0.097-4.svn2255 -- Update to svn2255 - -* Mon Jan 3 2011 David Malcolm - 0.097-3.svn2214 -- rebuild for newer python3 (see rhbz#666429) - -* Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2214 -- Patch has been upstreamed, update to svn2214 - -* Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2213 -- Update to znc 0.097-svn2213 which also adds modpython - * Sun Nov 7 2010 Nick Bebout - 0.096-2 - Build TCL module, move modperl and modtcl to separate subpackages From 914652fbd7c0762e037b2b023404ffba335a206f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 9 Feb 2011 21:06:30 +0000 Subject: [PATCH 117/344] Revert to 0.096-2 --- .gitignore | 9 -------- sources | 2 +- znc.spec | 64 +++++++++++------------------------------------------- 3 files changed, 14 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 01d61ce..610bf84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,2 @@ znc-0.094.tar.gz /znc-0.096.tar.gz -/znc-0.097.svn2196.tar.bz2 -/znc-0.097.svn2197.tar.bz2 -/znc-0.097.svn2202.tar.bz2 -/znc-0.097.svn2213.tar.bz2 -/znc-0.097.svn2214.tar.bz2 -/znc-0.097.svn2255.tar.bz2 -/znc-0.097.svn2269.tar.bz2 -/znc-0.097.svn2272.tar.xz -/znc-0.097.svn2277.tar.xz diff --git a/sources b/sources index 9f310c6..5a3f25f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a1ee24e4d38c5adabb761fa586c3830 znc-0.097.svn2277.tar.xz +38eec4f1911a68b4d2fc704170e7cbf6 znc-0.096.tar.gz diff --git a/znc.spec b/znc.spec index 02fb14a..6efab90 100644 --- a/znc.spec +++ b/znc.spec @@ -1,23 +1,24 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.097 -Release: 7.svn2277%{?dist} +Version: 0.096 +#Release: 2.svn2101%{?dist} #Release: 0.1.rc1%{?dist} -#Release: 2%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2277.tar.xz -# svn export -r 2277 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2277 -# tar Jcvf znc-0.097.svn2277.tar.xz znc-0.097.svn2277/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +#Source0: znc-0.093.svn2101.tar.bz2 +# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.093.svn2101 +# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/ +#Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl gcc-c++ automake +BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel python3-devel +BuildRequires: c-ares-devel BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %description @@ -61,28 +62,15 @@ Requires: perl %description modperl perl module for ZNC -%package modpython -Summary: python module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: python3 - -%description modpython -python module for ZNC - - %prep -#%setup -q -%setup -q -n znc-0.097.svn2277 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp %build -./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \ - --enable-python + --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl %__make %{?_smp_mflags} %install @@ -172,33 +160,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/modperl/ %{_libdir}/znc/modperl.so -%files modpython -%defattr(-,root,root) -%{_libdir}/znc/modpython/ -%{_libdir}/znc/modpython.so - %changelog -* Wed Feb 09 2011 Nick Bebout - 0.097-7.svn2277 -- Update to svn2277 - -* Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 -- Update to svn2272 - -* Mon Jan 17 2011 Nick Bebout - 0.097-5.svn2269 -- Update to svn2269 - -* Fri Jan 7 2011 Nick Bebout - 0.097-4.svn2255 -- Update to svn2255 - -* Mon Jan 3 2011 David Malcolm - 0.097-3.svn2214 -- rebuild for newer python3 (see rhbz#666429) - -* Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2214 -- Patch has been upstreamed, update to svn2214 - -* Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2213 -- Update to znc 0.097-svn2213 which also adds modpython - * Sun Nov 7 2010 Nick Bebout - 0.096-2 - Build TCL module, move modperl and modtcl to separate subpackages From 5db4107b37af78bd2884ecf44d82d779c5bb56d3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 11 Feb 2011 20:24:39 -0600 Subject: [PATCH 118/344] Upgrade to svn2277 --- .gitignore | 1 + sources | 2 +- znc.spec | 29 ++++++++--------------------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index cdb7727..01d61ce 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ znc-0.094.tar.gz /znc-0.097.svn2255.tar.bz2 /znc-0.097.svn2269.tar.bz2 /znc-0.097.svn2272.tar.xz +/znc-0.097.svn2277.tar.xz diff --git a/sources b/sources index 1de5ab7..4d0c99d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz +70c06d4f5f6d0bc70dc35a3477e5c15b znc-0.097.svn2277.tar.xz diff --git a/znc.spec b/znc.spec index 9b9e144..297da18 100644 --- a/znc.spec +++ b/znc.spec @@ -1,14 +1,14 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 6.svn2272%{?dist} +Release: 7.svn2277%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2272.tar.xz +Source0: znc-0.097.svn2277.tar.xz # svn export -r 2272 https://znc.svn.sourceforge.net/svnroot/znc/trunk # mv trunk znc-0.097.svn2272 # tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/ @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ automake BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel python3-devel +BuildRequires: c-ares-devel BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %description @@ -61,19 +61,9 @@ Requires: perl %description modperl perl module for ZNC -%package modpython -Summary: python module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: python3 - -%description modpython -python module for ZNC - - %prep #%setup -q -%setup -q -n znc-0.097.svn2272 +%setup -q -n znc-0.097.svn2277 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -81,8 +71,7 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \ - --enable-python + --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl %__make %{?_smp_mflags} %install @@ -172,12 +161,10 @@ chmod -x modules/q.cpp %{_libdir}/znc/modperl/ %{_libdir}/znc/modperl.so -%files modpython -%defattr(-,root,root) -%{_libdir}/znc/modpython/ -%{_libdir}/znc/modpython.so - %changelog +* Fri Feb 11 2011 Nick Bebout - 0.097-7.svn2277 +- Update to svn2277 + * Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 - Update to svn2272 From 82c7dfc65645bcd9649c2066752136a5aa705781 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 15 Feb 2011 18:25:29 -0600 Subject: [PATCH 119/344] Update to latest git --- .gitignore | 1 + sources | 2 +- znc.spec | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cdb7727..7e9929f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ znc-0.094.tar.gz /znc-0.097.svn2255.tar.bz2 /znc-0.097.svn2269.tar.bz2 /znc-0.097.svn2272.tar.xz +/znc-0.097.tar.xz diff --git a/sources b/sources index 1de5ab7..44b78f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz +ef4368c196707c6cd93ef8591332bb30 znc-0.097.tar.xz diff --git a/znc.spec b/znc.spec index 9b9e144..5c0efb6 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 6.svn2272%{?dist} +Release: 8.20110215git%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons -URL: http://znc.sf.net/ +URL: http://znc.in #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2272.tar.xz -# svn export -r 2272 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2272 -# tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/ +Source0: znc-0.097.tar.xz +# git clone https://github.com/znc/znc.git +# cd znc +# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ automake @@ -73,7 +73,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2272 +%setup -q -n %{name} %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -94,7 +94,7 @@ chmod -x modules/q.cpp %files %defattr(-,root,root) -%doc AUTHORS LICENSE LICENSE.OpenSSL README +%doc AUTHORS LICENSE LICENSE.OpenSSL README.md %{_bindir}/znc %{_mandir}/man1/* %{_libdir}/znc/admin.so @@ -178,6 +178,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Tue Feb 15 2011 Nick Bebout - 0.097-8.20110215git +- Update to latest git + * Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 - Update to svn2272 From 5815cb3eb411a26a11153e4cc72e1062f27922b9 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 15 Feb 2011 19:18:48 -0600 Subject: [PATCH 120/344] Remove duplicate Release --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index a0cf634..f79054d 100644 --- a/znc.spec +++ b/znc.spec @@ -3,7 +3,7 @@ Name: znc Version: 0.097 Release: 8.20110215git%{?dist} #Release: 0.1.rc1%{?dist} -Release: 2%{?dist} +#Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in From 63305656f7f11e19652c2f2704dbceb77cd83ad0 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 15 Feb 2011 19:29:56 -0600 Subject: [PATCH 121/344] Run autogen.sh before configure --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index f79054d..05fe94f 100644 --- a/znc.spec +++ b/znc.spec @@ -68,6 +68,7 @@ perl module for ZNC chmod -x modules/q.cpp %build +./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl From 3a7df484120c66c80f08e3a9fa980a2a3a7e7f0e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 15 Feb 2011 20:32:57 -0600 Subject: [PATCH 122/344] Add automake to BuildRequires --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 05fe94f..595dc34 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel +BuildRequires: c-ares-devel automake BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %description From ed87c40397208423309e81cfb1503fa361d005f8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 24 Feb 2011 18:32:20 -0600 Subject: [PATCH 123/344] Remove old patches, update to 0.098-alpha1 --- znc-0.097.svn2213-modpython.patch | 23 ----------------------- znc.spec | 26 +++++++++++++++----------- 2 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 znc-0.097.svn2213-modpython.patch diff --git a/znc-0.097.svn2213-modpython.patch b/znc-0.097.svn2213-modpython.patch deleted file mode 100644 index cce800b..0000000 --- a/znc-0.097.svn2213-modpython.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- znc-0.097.svn2213/modules/modpython/compiler.cpp 2010-12-22 08:52:53.106613000 -0600 -+++ znc-0.097.svn2213-fixed/modules/modpython/compiler.cpp 2010-12-24 22:49:47.076861076 -0600 -@@ -8,9 +8,18 @@ - - #include - --int main() { -+int main(int argc, char** argv) { - Py_Initialize(); -- int res = PyRun_SimpleString("import compileall; print('Optimizing python files for later use...'); compileall.compile_dir('.')"); -+ int res = PyRun_SimpleString( -+ "import compileall\n" -+ "print('Optimizing python files for later use...')\n" -+ "import sys\n" -+ "if sys.version_info < (3, 2):\n" -+ " compileall.compile_dir('.')\n" -+ "else:\n" -+ " compileall.compile_dir('.', legacy=True)\n" -+ ); - Py_Finalize(); - return res; - } -+ diff --git a/znc.spec b/znc.spec index 220c810..51d98ae 100644 --- a/znc.spec +++ b/znc.spec @@ -1,23 +1,24 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.097 -Release: 8.20110215git%{?dist} -#Release: 0.1.rc1%{?dist} +Version: 0.098 +#Release: 8.20110215git%{?dist} +Release: 0.1.alpha1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.tar.xz +#Source0: znc-0.097.tar.xz +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-alpha1.tar.gz # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl gcc-c++ automake +BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 -BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel python3-devel +BuildRequires: cyrus-sasl-devel python3-devel +BuildRequires: c-ares-devel automake BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %description @@ -70,10 +71,9 @@ Requires: python3 %description modpython python module for ZNC - %prep #%setup -q -%setup -q -n %{name} +%setup -q -n %{name}-%{version}-alpha1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -81,8 +81,8 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \ - --enable-python + --enable-ipv6 --enable-extra --enable-sasl --enable-perl \ + --enable-tcl --enable-python %__make %{?_smp_mflags} %install @@ -171,6 +171,7 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/modperl/ %{_libdir}/znc/modperl.so +%{_libdir}/znc/perleval.pm %files modpython %defattr(-,root,root) @@ -178,6 +179,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Wed Feb 23 2011 Nick Bebout - 0.098-0.1.alpha1 +- Update to znc 0.098-alpha1 + * Tue Feb 15 2011 Nick Bebout - 0.097-8.20110215git - Update to latest git From 0a5ad7b0f0740b5f4b397a119702a9c9baed054d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 24 Feb 2011 19:17:05 -0600 Subject: [PATCH 124/344] Oops, I should probably update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 86cd0ba..f917da8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ znc-0.094.tar.gz /znc-0.097.svn2272.tar.xz /znc-0.097.svn2277.tar.xz /znc-0.097.tar.xz +/znc-0.098-alpha1.tar.gz diff --git a/sources b/sources index 44b78f1..0d08cba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef4368c196707c6cd93ef8591332bb30 znc-0.097.tar.xz +88b3bf579bdceb763bc7d863049cccf2 znc-0.098-alpha1.tar.gz From cdb56272da75af32f79c70f78de8718f4ca47e00 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 24 Feb 2011 20:13:36 -0600 Subject: [PATCH 125/344] modperl can't be built on el5 --- znc.spec | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/znc.spec b/znc.spec index 0ace99b..d817d5b 100644 --- a/znc.spec +++ b/znc.spec @@ -15,11 +15,11 @@ Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-alpha1.tar. # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl gcc-c++ +BuildRequires: gcc-c++ perl BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel automake -BuildRequires: perl(ExtUtils::Embed) swig tcl-devel +BuildRequires: tcl-devel %description ZNC is an IRC bouncer with many advanced features like detaching, @@ -53,15 +53,6 @@ Requires: tcl %description modtcl TCL module for ZNC -%package modperl -Summary: perl module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: perl - -%description modperl -perl module for ZNC - %prep #%setup -q %setup -q -n %{name}-%{version}-alpha1 @@ -71,7 +62,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl + --enable-ipv6 --enable-extra --enable-sasl --disable-perl --enable-tcl %__make %{?_smp_mflags} %install @@ -156,12 +147,6 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/modtcl.so -%files modperl -%defattr(-,root,root) -%{_libdir}/znc/modperl/ -%{_libdir}/znc/modperl.so -%{_libdir}/znc/perleval.pm - %changelog * Wed Feb 23 2011 Nick Bebout - 0.098-0.1.alpha1 - Update to znc 0.098-alpha1 From 657a45ff3830a31f9f15a29f6fea0e7f02ad969a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 3 Mar 2011 16:32:31 -0600 Subject: [PATCH 126/344] Upgrade to 0.098-beta --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f917da8..21692d4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ znc-0.094.tar.gz /znc-0.097.svn2277.tar.xz /znc-0.097.tar.xz /znc-0.098-alpha1.tar.gz +/znc-0.098-beta.tar.gz diff --git a/sources b/sources index 0d08cba..eaa5888 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88b3bf579bdceb763bc7d863049cccf2 znc-0.098-alpha1.tar.gz +ee2d1bc0a1d02521d37ab71728eeee31 znc-0.098-beta.tar.gz diff --git a/znc.spec b/znc.spec index 51d98ae..e17cb0f 100644 --- a/znc.spec +++ b/znc.spec @@ -2,14 +2,14 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.098 #Release: 8.20110215git%{?dist} -Release: 0.1.alpha1%{?dist} +Release: 0.2.beta%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Source0: znc-0.097.tar.xz -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-alpha1.tar.gz +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-beta.tar.gz # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -73,7 +73,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n %{name}-%{version}-alpha1 +%setup -q -n %{name}-%{version}-beta %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -179,6 +179,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Wed Mar 02 2011 Nick Bebout - 0.098-0.2.beta +- Update to znc-0.098-beta + * Wed Feb 23 2011 Nick Bebout - 0.098-0.1.alpha1 - Update to znc 0.098-alpha1 From bfb86d836c714140774e161949900e77059b031c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 3 Mar 2011 17:12:20 -0600 Subject: [PATCH 127/344] Add patch so znc's version doesn't get messed up with prereleases --- znc-release.patch | 11 +++++++++++ znc.spec | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 znc-release.patch diff --git a/znc-release.patch b/znc-release.patch new file mode 100644 index 0000000..bcd9147 --- /dev/null +++ b/znc-release.patch @@ -0,0 +1,11 @@ +--- znc-0.098-beta-original/znc.cpp 2011-03-02 07:45:07.000000000 -0600 ++++ znc-0.098-beta/znc.cpp 2011-03-03 16:48:07.752119484 -0600 +@@ -96,7 +96,7 @@ + } + + char szBuf[128]; +- snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - http://znc.in", VERSION); ++ snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f - http://znc.in", VERSION); + // If snprintf overflows (which I doubt), we want to be on the safe side + szBuf[sizeof(szBuf) - 1] = '\0'; + diff --git a/znc.spec b/znc.spec index e17cb0f..31cfd49 100644 --- a/znc.spec +++ b/znc.spec @@ -10,6 +10,7 @@ URL: http://znc.in #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Source0: znc-0.097.tar.xz Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-beta.tar.gz +Patch0: znc-release.patch # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -74,6 +75,7 @@ python module for ZNC %prep #%setup -q %setup -q -n %{name}-%{version}-beta +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From a52b503877cea2850f02d13ab968af298209a276 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 12 Mar 2011 13:25:07 -0600 Subject: [PATCH 128/344] Update to znc 0.098-rc1 --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 21692d4..d9ac684 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ znc-0.094.tar.gz /znc-0.097.tar.xz /znc-0.098-alpha1.tar.gz /znc-0.098-beta.tar.gz +/znc-0.098-rc1.tar.gz diff --git a/sources b/sources index eaa5888..3884a29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee2d1bc0a1d02521d37ab71728eeee31 znc-0.098-beta.tar.gz +4ed07ff97ff33b76c5396d4416e96d1c znc-0.098-rc1.tar.gz diff --git a/znc.spec b/znc.spec index 31cfd49..adc68fe 100644 --- a/znc.spec +++ b/znc.spec @@ -2,14 +2,14 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.098 #Release: 8.20110215git%{?dist} -Release: 0.2.beta%{?dist} +Release: 0.3.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Source0: znc-0.097.tar.xz -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-beta.tar.gz +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-rc1.tar.gz Patch0: znc-release.patch # git clone https://github.com/znc/znc.git # cd znc @@ -74,7 +74,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n %{name}-%{version}-beta +%setup -q -n %{name}-%{version}-rc1 %patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -181,6 +181,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Sat Mar 12 2011 Nick Bebout - 0.098-0.3.rc1 +- Update to znc-0.098-rc1 + * Wed Mar 02 2011 Nick Bebout - 0.098-0.2.beta - Update to znc-0.098-beta From b9b77f79620d01f72f2d2aa0d99bccb9ac124975 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 1 Apr 2011 23:00:18 +0000 Subject: [PATCH 129/344] Upgrade to 0.098 --- .gitignore | 1 + sources | 2 +- znc.spec | 16 ++++++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d9ac684..dab5bd1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ znc-0.094.tar.gz /znc-0.098-alpha1.tar.gz /znc-0.098-beta.tar.gz /znc-0.098-rc1.tar.gz +/znc-0.098.tar.gz diff --git a/sources b/sources index 3884a29..fce376f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ed07ff97ff33b76c5396d4416e96d1c znc-0.098-rc1.tar.gz +5667b4acb1f01309d6eded77abac700c znc-0.098.tar.gz diff --git a/znc.spec b/znc.spec index adc68fe..6d7ebcc 100644 --- a/znc.spec +++ b/znc.spec @@ -2,15 +2,16 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.098 #Release: 8.20110215git%{?dist} -Release: 0.3.rc1%{?dist} -#Release: 2%{?dist} +#Release: 0.3.rc1%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Source0: znc-0.097.tar.xz -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-rc1.tar.gz -Patch0: znc-release.patch +#Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-rc1.tar.gz +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz +#Patch0: znc-release.patch # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -74,8 +75,8 @@ python module for ZNC %prep #%setup -q -%setup -q -n %{name}-%{version}-rc1 -%patch0 -p1 +#%setup -q -n %{name}-%{version}-rc1 +#%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -181,6 +182,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Tue Mar 29 2011 Nick Bebout - 0.098-1 +- Update to znc-0.098 + * Sat Mar 12 2011 Nick Bebout - 0.098-0.3.rc1 - Update to znc-0.098-rc1 From 5ab3382b53f8947947dffc7e528ed69a188f4cb2 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 1 Apr 2011 23:09:35 +0000 Subject: [PATCH 130/344] Fix --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 6d7ebcc..38cf4cb 100644 --- a/znc.spec +++ b/znc.spec @@ -74,7 +74,7 @@ Requires: python3 python module for ZNC %prep -#%setup -q +%setup -q #%setup -q -n %{name}-%{version}-rc1 #%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp From 2a6fea2c111d02f235e503e853f099960ee00444 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 3 Apr 2011 02:15:57 +0000 Subject: [PATCH 131/344] Make znc-modperl provide ZNC::Module --- znc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 38cf4cb..d22270c 100644 --- a/znc.spec +++ b/znc.spec @@ -3,7 +3,7 @@ Name: znc Version: 0.098 #Release: 8.20110215git%{?dist} #Release: 0.3.rc1%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in @@ -60,6 +60,7 @@ Summary: perl module for ZNC Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: perl +Provides: perl(ZNC::Module) = %{version}-%{release} %description modperl perl module for ZNC @@ -182,6 +183,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Sat Apr 2 2011 Nick Bebout - 0.098-2 +- Add provides for ZNC::Module to znc-modperl + * Tue Mar 29 2011 Nick Bebout - 0.098-1 - Update to znc-0.098 From aeec889ecaae7b17e536402f15a5a1198bd409b4 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 5 Aug 2011 17:48:44 -0500 Subject: [PATCH 132/344] Upgrade to 0.2-alpha1 --- .gitignore | 2 ++ sources | 2 +- znc-modperl.patch | 11 +++++++++++ znc-modpython.patch | 11 +++++++++++ znc-release.patch | 8 ++++---- znc.spec | 37 +++++++++++++++++++++++++------------ 6 files changed, 54 insertions(+), 17 deletions(-) create mode 100644 znc-modperl.patch create mode 100644 znc-modpython.patch diff --git a/.gitignore b/.gitignore index dab5bd1..92ed405 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ znc-0.094.tar.gz /znc-0.098-beta.tar.gz /znc-0.098-rc1.tar.gz /znc-0.098.tar.gz +/znc-0.099.tar.xz +/znc-0.2-alpha1.tar.gz diff --git a/sources b/sources index fce376f..ee39203 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5667b4acb1f01309d6eded77abac700c znc-0.098.tar.gz +44f8c2f2a06c83c00cc57cfe9cb600ec znc-0.2-alpha1.tar.gz diff --git a/znc-modperl.patch b/znc-modperl.patch new file mode 100644 index 0000000..cd4276f --- /dev/null +++ b/znc-modperl.patch @@ -0,0 +1,11 @@ +--- znc-0.2-alpha1-original/modules/modperl/Makefile.inc 2011-08-05 16:27:44.000000000 -0500 ++++ znc-0.2-alpha1/modules/modperl/Makefile.inc 2011-08-05 17:24:25.658100254 -0500 +@@ -43,7 +43,7 @@ + @mkdir -p modperl + $(Q)$(PERL) $(srcdir)/modperl/codegen.pl $< $@ + +-modperl_install: create_install_dir modperl.so ++modperl_install: install_datadir modperl.so + for i in $(wildcard $(srcdir)/*.pm); do \ + $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ + done diff --git a/znc-modpython.patch b/znc-modpython.patch new file mode 100644 index 0000000..c113c2e --- /dev/null +++ b/znc-modpython.patch @@ -0,0 +1,11 @@ +--- znc-0.2-alpha1-original/modules/modpython/Makefile.inc 2011-08-05 16:27:44.000000000 -0500 ++++ znc-0.2-alpha1/modules/modpython/Makefile.inc 2011-08-05 17:24:07.317001140 -0500 +@@ -58,7 +58,7 @@ + $(E) Building optimizer for python files... + $(Q)$(CXX) $(PYTHONCOMMON) -o $@ $< $(PY_LDFLAGS) + +-modpython_install: create_install_dir modpython_all ++modpython_install: install_datadir modpython_all + -for i in *.pyc; do \ + $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ + done diff --git a/znc-release.patch b/znc-release.patch index bcd9147..6e8c727 100644 --- a/znc-release.patch +++ b/znc-release.patch @@ -1,10 +1,10 @@ ---- znc-0.098-beta-original/znc.cpp 2011-03-02 07:45:07.000000000 -0600 -+++ znc-0.098-beta/znc.cpp 2011-03-03 16:48:07.752119484 -0600 -@@ -96,7 +96,7 @@ +--- znc-0.2-alpha1-original/znc.cpp 2011-08-05 16:27:44.000000000 -0500 ++++ znc-0.2-alpha1/znc.cpp 2011-08-05 17:14:15.293147148 -0500 +@@ -84,7 +84,7 @@ } char szBuf[128]; -- snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - http://znc.in", VERSION); +- snprintf(szBuf, sizeof(szBuf), "ZNC %1.1f"VERSION_EXTRA" - http://znc.in", VERSION); + snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f - http://znc.in", VERSION); // If snprintf overflows (which I doubt), we want to be on the safe side szBuf[sizeof(szBuf) - 1] = '\0'; diff --git a/znc.spec b/znc.spec index d22270c..7fe2bf7 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,18 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.098 -#Release: 8.20110215git%{?dist} -#Release: 0.3.rc1%{?dist} -Release: 2%{?dist} +Version: 0.2 +#Release: 0.1.20110801git%{?dist} +Release: 0.1.alpha1%{?dist} +#Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -#Source0: znc-0.097.tar.xz -#Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-rc1.tar.gz -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz -#Patch0: znc-release.patch +#Source0: znc-0.099.tar.xz +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.2-alpha1.tar.gz +#Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz +Patch0: znc-release.patch +Patch1: znc-modperl.patch +Patch2: znc-modpython.patch # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -75,9 +76,12 @@ Requires: python3 python module for ZNC %prep -%setup -q +#%setup -q -n %{name}-alpha1 +%setup -q -n znc-0.2-alpha1 #%setup -q -n %{name}-%{version}-rc1 -#%patch0 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -110,14 +114,16 @@ chmod -x modules/q.cpp %{_libdir}/znc/away.so %{_libdir}/znc/awaynick.so %{_libdir}/znc/blockuser.so +%{_libdir}/znc/bouncedcc.so %{_libdir}/znc/buffextras.so +%{_libdir}/znc/cert.so %{_libdir}/znc/certauth.so %{_libdir}/znc/chansaver.so %{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so %{_libdir}/znc/disconkick.so %{_libdir}/znc/fail2ban.so -%{_libdir}/znc/fixfreenode.so +%{_libdir}/znc/identfile.so %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so %{_libdir}/znc/lastseen.so @@ -154,6 +160,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/charset.so %{_libdir}/znc/clearbufferonmsg.so %{_libdir}/znc/ctcpflood.so +%{_libdir}/znc/dcc.so %{_libdir}/znc/droproot.so %{_libdir}/znc/email.so %{_libdir}/znc/fakeonline.so @@ -183,6 +190,12 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Fri Aug 5 2011 Nick Bebout - 0.2-0.1.alpha1 +- Update to 0.2-alpha1 + +* Mon Aug 1 2011 Nick Bebout - 0.099-0.1.20110801git +- Update to latest git + * Sat Apr 2 2011 Nick Bebout - 0.098-2 - Add provides for ZNC::Module to znc-modperl From 6e31f8201d01b2e12f9d36ef954e21dfaa5efb3e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 6 Aug 2011 19:46:18 -0500 Subject: [PATCH 133/344] Update to 0.2-beta1 --- .gitignore | 1 + sources | 2 +- znc.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 92ed405..9b349ed 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ znc-0.094.tar.gz /znc-0.098.tar.gz /znc-0.099.tar.xz /znc-0.2-alpha1.tar.gz +/znc-0.2-beta1.tar.gz diff --git a/sources b/sources index ee39203..9aba4f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44f8c2f2a06c83c00cc57cfe9cb600ec znc-0.2-alpha1.tar.gz +fc93f5a66ace23aa6d8b289a50213008 znc-0.2-beta1.tar.gz diff --git a/znc.spec b/znc.spec index 7fe2bf7..d1d3728 100644 --- a/znc.spec +++ b/znc.spec @@ -8,11 +8,11 @@ License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in #Source0: znc-0.099.tar.xz -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.2-alpha1.tar.gz +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.2-beta1.tar.gz #Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz Patch0: znc-release.patch -Patch1: znc-modperl.patch -Patch2: znc-modpython.patch +#Patch1: znc-modperl.patch +#Patch2: znc-modpython.patch # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -77,11 +77,11 @@ python module for ZNC %prep #%setup -q -n %{name}-alpha1 -%setup -q -n znc-0.2-alpha1 +%setup -q -n znc-0.2-beta1 #%setup -q -n %{name}-%{version}-rc1 %patch0 -p1 -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -190,6 +190,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Sat Aug 6 2011 Nick Bebout - 0.2-0.2.beta1 +- Update to 0.2-beta1 + * Fri Aug 5 2011 Nick Bebout - 0.2-0.1.alpha1 - Update to 0.2-alpha1 From de0b54bf52d3c787e55b73f1411240a8852d70b6 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 6 Aug 2011 19:49:19 -0500 Subject: [PATCH 134/344] Fix release --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d1d3728..0ba2037 100644 --- a/znc.spec +++ b/znc.spec @@ -2,7 +2,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.2 #Release: 0.1.20110801git%{?dist} -Release: 0.1.alpha1%{?dist} +Release: 0.2.beta1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons From d3ceae92af50a7757f79edd0ddea762b1584c69e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 6 Aug 2011 20:14:18 -0500 Subject: [PATCH 135/344] Update to 0.2-beta1, disable modperl --- znc.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/znc.spec b/znc.spec index aa6fe53..1d5e547 100644 --- a/znc.spec +++ b/znc.spec @@ -56,15 +56,15 @@ Requires: tcl %description modtcl TCL module for ZNC -%package modperl -Summary: perl module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: perl -Provides: perl(ZNC::Module) = %{version}-%{release} +#%package modperl +#Summary: perl module for ZNC +#Group: Development/Libraries +#Requires: %{name} = %{version}-%{release} +#Requires: perl +#Provides: perl(ZNC::Module) = %{version}-%{release} -%description modperl -perl module for ZNC +#%description modperl +#perl module for ZNC %prep #%setup -q -n %{name}-alpha1 @@ -80,7 +80,7 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl + --enable-ipv6 --enable-extra --enable-sasl --disable-perl --enable-tcl %__make %{?_smp_mflags} %install @@ -168,15 +168,15 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/modtcl.so -%files modperl -%defattr(-,root,root) -%{_libdir}/znc/modperl/ -%{_libdir}/znc/modperl.so -%{_libdir}/znc/perleval.pm +#%files modperl +#%defattr(-,root,root) +#%{_libdir}/znc/modperl/ +#%{_libdir}/znc/modperl.so +#%{_libdir}/znc/perleval.pm %changelog * Sat Aug 6 2011 Nick Bebout - 0.2-0.2.beta1 -- Update to 0.2-beta1 +- Update to 0.2-beta1, disable perl for now * Fri Aug 5 2011 Nick Bebout - 0.2-0.1.alpha1 - Update to 0.2-alpha1 From c378a2e0c021be1870e8d0a932796d2c4c70c1c3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 13 Aug 2011 16:56:51 -0500 Subject: [PATCH 136/344] Rediff patch --- znc-release.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/znc-release.patch b/znc-release.patch index 6e8c727..cacd27c 100644 --- a/znc-release.patch +++ b/znc-release.patch @@ -1,10 +1,10 @@ ---- znc-0.2-alpha1-original/znc.cpp 2011-08-05 16:27:44.000000000 -0500 -+++ znc-0.2-alpha1/znc.cpp 2011-08-05 17:14:15.293147148 -0500 +--- znc-0.200-rc1-orig/znc.cpp 2011-08-13 01:36:13.000000000 -0500 ++++ znc-0.200-rc1/znc.cpp 2011-08-13 16:56:21.118177776 -0500 @@ -84,7 +84,7 @@ } char szBuf[128]; -- snprintf(szBuf, sizeof(szBuf), "ZNC %1.1f"VERSION_EXTRA" - http://znc.in", VERSION); +- snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - http://znc.in", VERSION); + snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f - http://znc.in", VERSION); // If snprintf overflows (which I doubt), we want to be on the safe side szBuf[sizeof(szBuf) - 1] = '\0'; From fa53c07e29d2776760fb6261e4520655115d652b Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 13 Aug 2011 17:34:31 -0500 Subject: [PATCH 137/344] Add systemd file for znc --- .gitignore | 1 + sources | 2 +- znc.init | 90 ++++++++++++++++++++++++++++++++++++++ znc.service | 11 +++++ znc.spec | 122 +++++++++++++++++++++++++++++++++++----------------- 5 files changed, 186 insertions(+), 40 deletions(-) create mode 100644 znc.init create mode 100644 znc.service diff --git a/.gitignore b/.gitignore index 9b349ed..53eabc6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ znc-0.094.tar.gz /znc-0.099.tar.xz /znc-0.2-alpha1.tar.gz /znc-0.2-beta1.tar.gz +/znc-0.200-rc1.tar.gz diff --git a/sources b/sources index 9aba4f9..a8fb2bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc93f5a66ace23aa6d8b289a50213008 znc-0.2-beta1.tar.gz +40b99830fac3f5ee813d3ab04b4b9e74 znc-0.200-rc1.tar.gz diff --git a/znc.init b/znc.init new file mode 100644 index 0000000..64880df --- /dev/null +++ b/znc.init @@ -0,0 +1,90 @@ +#!/bin/sh +# +# znc - Advanced IRC Bouncer INIT script for Fedora # +# chkconfig: 35 99 14 +# description: An Advanced IRC bouncer INIT script for +# Fedora-CentOS Variants +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/bin/znc +prog=znc +config=/home/znc/.znc +runas=znc + +lockfile=/var/lock/subsys/$prog + +start() { +[ -x $exec ] || exit 5 +echo -n $"Starting $prog: " +# if not running, start it up here, usually something like "daemon $exec" +daemon --user $runas "$exec -d $config >/dev/null 2>&1" +# If you're reckless with your system, comment the line above and +# uncomment this one below... I just don't get it why +# daemon "$exec -r -d $config >/dev/null 2>&1" +retval=$? +echo +[ $retval -eq 0 ] && touch $lockfile +return $retval +} + +stop() { +echo -n $"Stopping $prog: " +# stop it here, often "killproc $prog" +killproc $prog -TERM +retval=$? +echo +[ $retval -eq 0 ] && rm -f $lockfile +return $retval +} + +reload() { +echo -n $"Reloading $prog: " +# stop it here, often "killproc $prog" +killproc $prog -HUP +retval=$? +echo +} + +restart() { +stop +start +} + +rh_status() { +# run checks to determine if the service is running or use generic status +status $prog +} + +rh_status_q() { +rh_status >/dev/null 2>&1 +} + +case "$1" in +start) +rh_status_q && exit 0 +$1 +;; +stop) +rh_status_q || exit 0 +$1 +;; +restart) +$1 +;; +reload) +rh_status_q || exit 7 +$1 +;; +status) +rh_status +;; +condrestart|try-restart) +rh_status_q || exit 0 +restart +;; +*) +echo $"Usage: $0 {start|stop|status|reload|restart|condrestart|try-restart}" +exit 2 +esac +exit $? diff --git a/znc.service b/znc.service new file mode 100644 index 0000000..e2c92b2 --- /dev/null +++ b/znc.service @@ -0,0 +1,11 @@ +[Unit] +Description=Daemon to do something +After=network.target + +[Service] +ExecStart=/usr/bin/znc +User=znc +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/znc.spec b/znc.spec index 0ba2037..0f5145a 100644 --- a/znc.spec +++ b/znc.spec @@ -1,14 +1,24 @@ +# Define variables to use in conditionals +%define use_systemd 0 + +%if 0%{?fedora} >= 15 +%define use_systemd 1 +%endif + Summary: An advanced IRC bouncer Name: znc -Version: 0.2 +Version: 0.200 #Release: 0.1.20110801git%{?dist} -Release: 0.2.beta1%{?dist} +Release: 0.1.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in #Source0: znc-0.099.tar.xz -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.2-beta1.tar.gz +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.200-rc1.tar.gz +%if %{use_systemd} +Source1: znc.service +%endif #Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz Patch0: znc-release.patch #Patch1: znc-modperl.patch @@ -20,9 +30,19 @@ Patch0: znc-release.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 -BuildRequires: cyrus-sasl-devel python3-devel +BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel automake BuildRequires: perl(ExtUtils::Embed) swig tcl-devel +%if %{use_systemd} +BuildRequires: systemd-units +%endif +Requires(pre): shadow-utils +%if %{use_systemd} +Requires(post): systemd-units +Requires(post): systemd-sysv +Requires(preun): systemd-units +Requires(postun): systemd-units +%endif %description ZNC is an IRC bouncer with many advanced features like detaching, @@ -56,32 +76,19 @@ Requires: tcl %description modtcl TCL module for ZNC -%package modperl -Summary: perl module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: perl -Provides: perl(ZNC::Module) = %{version}-%{release} +#%package modperl +#Summary: perl module for ZNC +#Group: Development/Libraries +#Requires: %{name} = %{version}-%{release} +#Requires: perl +#Provides: perl(ZNC::Module) = %{version}-%{release} -%description modperl -perl module for ZNC - -%package modpython -Summary: python module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: python3 - -%description modpython -python module for ZNC +#%description modperl +#perl module for ZNC %prep -#%setup -q -n %{name}-alpha1 -%setup -q -n znc-0.2-beta1 -#%setup -q -n %{name}-%{version}-rc1 +%setup -q -n %{name}-%{version}-rc1 %patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -89,17 +96,53 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl \ - --enable-tcl --enable-python + --enable-ipv6 --enable-extra --enable-sasl --disable-perl --enable-tcl %__make %{?_smp_mflags} +%pre +getent group znc >/dev/null || groupadd -r znc +getent passwd znc >/dev/null || \ + useradd -r -g znc -d /home/znc -s /sbin/nologin \ + -c "Account for ZNC to run as" znc +exit 0 + %install %__rm -Rf "%{buildroot}" %__make install DESTDIR="%{buildroot}" +%if %{use_systemd} +mkdir -p %buildroot%{_unitdir} +install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service +%endif %clean %__rm -Rf "%{buildroot}" +%post +%if %{use_systemd} +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi +%endif + +%postun +%if %{use_systemd} +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart znc.service >/dev/null 2>&1 || : +fi +%endif + +%preun +%if %{use_systemd} +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable znc.service > /dev/null 2>&1 || : + /bin/systemctl stop znc.service > /dev/null 2>&1 || : +fi +%endif + %files %defattr(-,root,root) %doc AUTHORS LICENSE LICENSE.OpenSSL README.md @@ -144,6 +187,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so %{_datadir}/znc/ +%if %{use_systemd} +%{_unitdir}/znc.service +%endif %files devel %defattr(-,root,root) @@ -178,20 +224,18 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/modtcl.so -%files modperl -%defattr(-,root,root) -%{_libdir}/znc/modperl/ -%{_libdir}/znc/modperl.so -%{_libdir}/znc/perleval.pm - -%files modpython -%defattr(-,root,root) -%{_libdir}/znc/modpython/ -%{_libdir}/znc/modpython.so +#%files modperl +#%defattr(-,root,root) +#%{_libdir}/znc/modperl/ +#%{_libdir}/znc/modperl.so +#%{_libdir}/znc/perleval.pm %changelog +* Sat Aug 13 2011 Nick Bebout - 0.200-0.1.rc1 +- Update to 0.200-rc1 + * Sat Aug 6 2011 Nick Bebout - 0.2-0.2.beta1 -- Update to 0.2-beta1 +- Update to 0.2-beta1, disable perl for now * Fri Aug 5 2011 Nick Bebout - 0.2-0.1.alpha1 - Update to 0.2-alpha1 From 3848b960cd9fb36db07b3ad3e1303c45538f33e3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 14 Aug 2011 15:06:56 -0500 Subject: [PATCH 138/344] Create /home/znc when installed --- znc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0f5145a..93053b2 100644 --- a/znc.spec +++ b/znc.spec @@ -9,7 +9,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.200 #Release: 0.1.20110801git%{?dist} -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons @@ -104,6 +104,8 @@ getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ useradd -r -g znc -d /home/znc -s /sbin/nologin \ -c "Account for ZNC to run as" znc +mkdir -p /home/znc +chown znc:znc /home/znc exit 0 %install @@ -231,6 +233,9 @@ fi #%{_libdir}/znc/perleval.pm %changelog +* Sun Aug 14 2011 Nick Bebout - 0.200-0.2.rc1 +- Create /home/znc upon install + * Sat Aug 13 2011 Nick Bebout - 0.200-0.1.rc1 - Update to 0.200-rc1 From ebf1137280cce589daaeb09debd30f1d71ad7664 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 14 Aug 2011 15:06:56 -0500 Subject: [PATCH 139/344] Create /home/znc when installed --- znc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0f5145a..93053b2 100644 --- a/znc.spec +++ b/znc.spec @@ -9,7 +9,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.200 #Release: 0.1.20110801git%{?dist} -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons @@ -104,6 +104,8 @@ getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ useradd -r -g znc -d /home/znc -s /sbin/nologin \ -c "Account for ZNC to run as" znc +mkdir -p /home/znc +chown znc:znc /home/znc exit 0 %install @@ -231,6 +233,9 @@ fi #%{_libdir}/znc/perleval.pm %changelog +* Sun Aug 14 2011 Nick Bebout - 0.200-0.2.rc1 +- Create /home/znc upon install + * Sat Aug 13 2011 Nick Bebout - 0.200-0.1.rc1 - Update to 0.200-rc1 From 7559684903379fddf2c6478afdb8c567b24011c7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 14 Aug 2011 15:27:53 -0500 Subject: [PATCH 140/344] Re-enable modperl and modpython --- znc.spec | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/znc.spec b/znc.spec index 93053b2..e68cfe7 100644 --- a/znc.spec +++ b/znc.spec @@ -9,7 +9,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.200 #Release: 0.1.20110801git%{?dist} -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons @@ -31,7 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel automake +BuildRequires: c-ares-devel automake python3-devel BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %if %{use_systemd} BuildRequires: systemd-units @@ -76,15 +76,24 @@ Requires: tcl %description modtcl TCL module for ZNC -#%package modperl -#Summary: perl module for ZNC -#Group: Development/Libraries -#Requires: %{name} = %{version}-%{release} -#Requires: perl -#Provides: perl(ZNC::Module) = %{version}-%{release} +%package modperl +Summary: perl module for ZNC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: perl +Provides: perl(ZNC::Module) = %{version}-%{release} -#%description modperl -#perl module for ZNC +%description modperl +perl module for ZNC + +%package modpython +Summary: python3 module for ZNC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python3 + +%description modpython +python3 module for ZNC %prep %setup -q -n %{name}-%{version}-rc1 @@ -96,7 +105,7 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --disable-perl --enable-tcl + --enable-ipv6 --enable-extra --enable-sasl --enable-python --enable-perl --enable-tcl %__make %{?_smp_mflags} %pre @@ -226,13 +235,22 @@ fi %defattr(-,root,root) %{_libdir}/znc/modtcl.so -#%files modperl -#%defattr(-,root,root) -#%{_libdir}/znc/modperl/ -#%{_libdir}/znc/modperl.so -#%{_libdir}/znc/perleval.pm +%files modperl +%defattr(-,root,root) +%{_libdir}/znc/modperl/ +%{_libdir}/znc/modperl.so +%{_libdir}/znc/perleval.pm + +%files modpython +%defattr(-,root,root) +%{_libdir}/znc/modpython/ +%{_libdir}/znc/modpython.so %changelog +* Sun Aug 14 2011 Nick Bebout - 0.200-0.3.rc1 +- Re-add modpython, it somehow got disabled accidentally +- Also re-add modperl, it works now + * Sun Aug 14 2011 Nick Bebout - 0.200-0.2.rc1 - Create /home/znc upon install From 4eb31d129263f6a6242804affadb27de1549e380 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 15 Aug 2011 13:05:20 -0500 Subject: [PATCH 141/344] Change znc's homedir to /var/lib/znc --- znc.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index e68cfe7..a477e25 100644 --- a/znc.spec +++ b/znc.spec @@ -9,7 +9,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.200 #Release: 0.1.20110801git%{?dist} -Release: 0.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons @@ -111,10 +111,10 @@ chmod -x modules/q.cpp %pre getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ - useradd -r -g znc -d /home/znc -s /sbin/nologin \ + useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \ -c "Account for ZNC to run as" znc -mkdir -p /home/znc -chown znc:znc /home/znc +mkdir -p /var/lib/znc +chown znc:znc /var/lib/znc exit 0 %install @@ -247,6 +247,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Aug 15 2011 Nick Bebout - 0.200-0.4.rc1 +- Change znc's homedir to /var/lib/znc + * Sun Aug 14 2011 Nick Bebout - 0.200-0.3.rc1 - Re-add modpython, it somehow got disabled accidentally - Also re-add modperl, it works now From 485cb0fb01316ed9f0d42848e95eaddfd88cd7dc Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 15 Aug 2011 13:05:20 -0500 Subject: [PATCH 142/344] Change znc's homedir to /var/lib/znc --- znc.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index e68cfe7..a477e25 100644 --- a/znc.spec +++ b/znc.spec @@ -9,7 +9,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.200 #Release: 0.1.20110801git%{?dist} -Release: 0.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons @@ -111,10 +111,10 @@ chmod -x modules/q.cpp %pre getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ - useradd -r -g znc -d /home/znc -s /sbin/nologin \ + useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \ -c "Account for ZNC to run as" znc -mkdir -p /home/znc -chown znc:znc /home/znc +mkdir -p /var/lib/znc +chown znc:znc /var/lib/znc exit 0 %install @@ -247,6 +247,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Aug 15 2011 Nick Bebout - 0.200-0.4.rc1 +- Change znc's homedir to /var/lib/znc + * Sun Aug 14 2011 Nick Bebout - 0.200-0.3.rc1 - Re-add modpython, it somehow got disabled accidentally - Also re-add modperl, it works now From 5ba8a87dfaadcbe3ab48c60018bfdd8a2df52fcb Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 15 Aug 2011 20:59:18 -0500 Subject: [PATCH 143/344] Disable modpython on epel6 --- znc.spec | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/znc.spec b/znc.spec index a477e25..a95d0c8 100644 --- a/znc.spec +++ b/znc.spec @@ -31,7 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel automake python3-devel +BuildRequires: c-ares-devel automake BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %if %{use_systemd} BuildRequires: systemd-units @@ -86,15 +86,6 @@ Provides: perl(ZNC::Module) = %{version}-%{release} %description modperl perl module for ZNC -%package modpython -Summary: python3 module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: python3 - -%description modpython -python3 module for ZNC - %prep %setup -q -n %{name}-%{version}-rc1 %patch0 -p1 @@ -105,7 +96,7 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-python --enable-perl --enable-tcl + --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl %__make %{?_smp_mflags} %pre @@ -241,11 +232,6 @@ fi %{_libdir}/znc/modperl.so %{_libdir}/znc/perleval.pm -%files modpython -%defattr(-,root,root) -%{_libdir}/znc/modpython/ -%{_libdir}/znc/modpython.so - %changelog * Mon Aug 15 2011 Nick Bebout - 0.200-0.4.rc1 - Change znc's homedir to /var/lib/znc From 98bb697e809e47975025c00ff1f1ee1cf4419f97 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 15 Aug 2011 21:11:44 -0500 Subject: [PATCH 144/344] disable modperl on el5 --- znc.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/znc.spec b/znc.spec index dc16b07..4441aa7 100644 --- a/znc.spec +++ b/znc.spec @@ -32,7 +32,7 @@ BuildRequires: gcc-c++ perl BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel automake -BuildRequires: perl(ExtUtils::Embed) swig tcl-devel +BuildRequires: tcl-devel %if %{use_systemd} BuildRequires: systemd-units %endif @@ -76,16 +76,6 @@ Requires: tcl %description modtcl TCL module for ZNC -%package modperl -Summary: perl module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: perl -Provides: perl(ZNC::Module) = %{version}-%{release} - -%description modperl -perl module for ZNC - %prep %setup -q -n %{name}-%{version}-rc1 %patch0 -p1 From c2f07caf68a2ea9b7201ffa09cdde28246aa43f6 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 15 Aug 2011 21:18:55 -0500 Subject: [PATCH 145/344] Don't create the znc user unless use_systemd is set --- znc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/znc.spec b/znc.spec index a477e25..b41fbfc 100644 --- a/znc.spec +++ b/znc.spec @@ -109,6 +109,7 @@ chmod -x modules/q.cpp %__make %{?_smp_mflags} %pre +%if %{use_systemd} getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \ @@ -116,6 +117,7 @@ getent passwd znc >/dev/null || \ mkdir -p /var/lib/znc chown znc:znc /var/lib/znc exit 0 +%endif %install %__rm -Rf "%{buildroot}" From fa6140c70408ef29d28dba48a0be977108c881e6 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 15 Aug 2011 21:20:51 -0500 Subject: [PATCH 146/344] Bump release --- znc.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/znc.spec b/znc.spec index b41fbfc..d1fb780 100644 --- a/znc.spec +++ b/znc.spec @@ -9,7 +9,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.200 #Release: 0.1.20110801git%{?dist} -Release: 0.4.rc1%{?dist} +Release: 0.5.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons @@ -21,8 +21,6 @@ Source1: znc.service %endif #Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz Patch0: znc-release.patch -#Patch1: znc-modperl.patch -#Patch2: znc-modpython.patch # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -249,6 +247,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Aug 15 2011 Nick Bebout - 0.200-0.5.rc1 +- Don't create the znc user on Fedora 14 and lower and on EPEL + * Mon Aug 15 2011 Nick Bebout - 0.200-0.4.rc1 - Change znc's homedir to /var/lib/znc From 9c7184c188302293601dacecc5b27afa403cbf72 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 23 Aug 2011 16:57:41 -0500 Subject: [PATCH 147/344] Update to 0.200 --- .gitignore | 1 + sources | 2 +- znc.spec | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a74dc14..dd91901 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /znc-0.2-alpha1.tar.gz /znc-0.2-beta1.tar.gz /znc-0.200-rc1.tar.gz +/znc-0.200.tar.gz diff --git a/sources b/sources index a8fb2bf..e2755a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40b99830fac3f5ee813d3ab04b4b9e74 znc-0.200-rc1.tar.gz +da5b690bc31b007474a77aae70c9c049 znc-0.200.tar.gz diff --git a/znc.spec b/znc.spec index d1fb780..d6d13fb 100644 --- a/znc.spec +++ b/znc.spec @@ -9,18 +9,15 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.200 #Release: 0.1.20110801git%{?dist} -Release: 0.5.rc1%{?dist} +Release: 1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -#Source0: znc-0.099.tar.xz -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.200-rc1.tar.gz +Source0: http://znc.in/releases/znc-0.200.tar.gz %if %{use_systemd} Source1: znc.service %endif -#Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz -Patch0: znc-release.patch # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -94,7 +91,7 @@ Requires: python3 python3 module for ZNC %prep -%setup -q -n %{name}-%{version}-rc1 +%setup -q -n %{name}-%{version} %patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -247,6 +244,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Tue Aug 23 2011 Nick Bebout - 0.200-1 +- Update to 0.200 + * Mon Aug 15 2011 Nick Bebout - 0.200-0.5.rc1 - Don't create the znc user on Fedora 14 and lower and on EPEL From 5709cc86860a97a3de3c084a27c0db6f841a40f0 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 23 Aug 2011 17:04:26 -0500 Subject: [PATCH 148/344] remove patch0 --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d6d13fb..e5fdc96 100644 --- a/znc.spec +++ b/znc.spec @@ -92,7 +92,7 @@ python3 module for ZNC %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +#%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From e2a77476fc400c55c687d254c086a21144580e64 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 25 Sep 2011 15:17:26 -0500 Subject: [PATCH 149/344] Upgrade to 0.202 --- .gitignore | 1 + sources | 2 +- znc.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd91901..904fa8a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /znc-0.2-beta1.tar.gz /znc-0.200-rc1.tar.gz /znc-0.200.tar.gz +/znc-0.202.tar.gz diff --git a/sources b/sources index e2755a2..324e4e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da5b690bc31b007474a77aae70c9c049 znc-0.200.tar.gz +3c6ff4620e139e3d9745cd53111bab20 znc-0.202.tar.gz diff --git a/znc.spec b/znc.spec index e5fdc96..445729d 100644 --- a/znc.spec +++ b/znc.spec @@ -5,16 +5,18 @@ %define use_systemd 1 %endif +%global __python %{__python3} + Summary: An advanced IRC bouncer Name: znc -Version: 0.200 +Version: 0.202 #Release: 0.1.20110801git%{?dist} Release: 1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-0.200.tar.gz +Source0: http://znc.in/releases/znc-0.202.tar.gz %if %{use_systemd} Source1: znc.service %endif @@ -244,6 +246,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Sun Sep 25 2011 Nick Bebout - 0.202-1 +- Update to 0.202 + * Tue Aug 23 2011 Nick Bebout - 0.200-1 - Update to 0.200 From 31f566fe5f22f20fe8a9a31ab522b7a8c10bcc36 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 9 Jan 2012 10:00:30 -0600 Subject: [PATCH 150/344] Add glibc-devel, openssl-devel, c-ares-devel to requires for znc-devel so znc-buildmod will work --- znc.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/znc.spec b/znc.spec index 445729d..6d2d4be 100644 --- a/znc.spec +++ b/znc.spec @@ -50,6 +50,7 @@ DCC bouncing, Perl and C++ module support to name a few. Summary: Development files needed to compile ZNC modules Group: Development/Libraries Requires: %{name} = %{version}-%{release} pkgconfig +Requires: openssl-devel c-ares-devel glibc-devel BuildRequires: pkgconfig %description devel @@ -246,6 +247,10 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Jan 09 2012 Nick Bebout - 0.202-2 +- Add glibc-devel, openssl-devel, c-ares-devel to requires for +- znc-devel so znc-buildmod will work + * Sun Sep 25 2011 Nick Bebout - 0.202-1 - Update to 0.202 From 21eecfee92581025e7562c4b829a9ad423563092 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 9 Jan 2012 10:01:17 -0600 Subject: [PATCH 151/344] Forgot to bump release --- znc.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 6d2d4be..f1b2587 100644 --- a/znc.spec +++ b/znc.spec @@ -11,8 +11,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.202 #Release: 0.1.20110801git%{?dist} -Release: 1%{?dist} -#Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in From afe2435ba275e0c3565277d44174e45a3a7445c1 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jan 2012 11:12:50 -0600 Subject: [PATCH 152/344] Update to 0.204 to fix CVE-2012-0033 --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 904fa8a..648e71a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /znc-0.200-rc1.tar.gz /znc-0.200.tar.gz /znc-0.202.tar.gz +/znc-0.204.tar.gz diff --git a/sources b/sources index 324e4e0..5bb2922 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c6ff4620e139e3d9745cd53111bab20 znc-0.202.tar.gz +7c7247423fc08b0c5c62759a50a9bca3 znc-0.204.tar.gz diff --git a/znc.spec b/znc.spec index f1b2587..dcee908 100644 --- a/znc.spec +++ b/znc.spec @@ -9,13 +9,13 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.202 +Version: 0.204 #Release: 0.1.20110801git%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-0.202.tar.gz +Source0: http://znc.in/releases/znc-0.204.tar.gz %if %{use_systemd} Source1: znc.service %endif @@ -246,6 +246,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Jan 23 2012 Nick Bebout - 0.204-1 +- Update to 0.204 to fix security issue CVE-2012-0033 + * Mon Jan 09 2012 Nick Bebout - 0.202-2 - Add glibc-devel, openssl-devel, c-ares-devel to requires for - znc-devel so znc-buildmod will work From 4ae235b5ea5e8863993546fb2746d442af485a47 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jan 2012 14:13:36 -0600 Subject: [PATCH 153/344] Add init script for epel --- znc.spec | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 6 deletions(-) diff --git a/znc.spec b/znc.spec index 9889c64..21cbdd3 100644 --- a/znc.spec +++ b/znc.spec @@ -11,14 +11,20 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.204 #Release: 0.1.20110801git%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in Source0: http://znc.in/releases/znc-0.204.tar.gz + %if %{use_systemd} Source1: znc.service %endif + +%if !%{use_systemd} +Source1: znc.init +%endif + # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -27,7 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel automake +BuildRequires: c-ares-devel automake python3-devel BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %if %{use_systemd} BuildRequires: systemd-units @@ -40,6 +46,13 @@ Requires(preun): systemd-units Requires(postun): systemd-units %endif +%if !%{use_systemd} +Requires(post): chkconfig +Requires(preun): chkconfig +# This is for /sbin/service +Requires(preun): initscripts +%endif + %description ZNC is an IRC bouncer with many advanced features like detaching, multiple users, per channel playback buffer, SSL, IPv6, transparent @@ -83,6 +96,15 @@ Provides: perl(ZNC::Module) = %{version}-%{release} %description modperl perl module for ZNC +%package modpython +Summary: python3 module for ZNC +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python3 + +%description modpython +python3 module for ZNC + %prep %setup -q -n %{name}-%{version} #%patch0 -p1 @@ -93,19 +115,19 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl + --enable-ipv6 --enable-extra --enable-sasl --enable-python --enable-perl --enable-tcl %__make %{?_smp_mflags} %pre -%if %{use_systemd} +#%if %{use_systemd} getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \ -c "Account for ZNC to run as" znc mkdir -p /var/lib/znc chown znc:znc /var/lib/znc -exit 0 -%endif +#exit 0 +#%endif %install %__rm -Rf "%{buildroot}" @@ -114,11 +136,16 @@ exit 0 mkdir -p %buildroot%{_unitdir} install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service %endif +%if !%{use_systemd} +mkdir -p %buildroot%{_initrddir} +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/znc +%endif %clean %__rm -Rf "%{buildroot}" %post + %if %{use_systemd} if [ $1 -eq 1 ] ; then # Initial installation @@ -126,7 +153,13 @@ if [ $1 -eq 1 ] ; then fi %endif +%if !%{use_systemd} +# This adds the proper /etc/rc*.d links for the script +/sbin/chkconfig --add znc +%endif + %postun + %if %{use_systemd} /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then @@ -135,7 +168,14 @@ if [ $1 -ge 1 ] ; then fi %endif +%if !%{use_systemd} +if [ "$1" -ge "1" ] ; then + /sbin/service znc condrestart >/dev/null 2>&1 || : +fi +%endif + %preun + %if %{use_systemd} if [ $1 -eq 0 ] ; then # Package removal, not upgrade @@ -144,6 +184,13 @@ if [ $1 -eq 0 ] ; then fi %endif +%if !%{use_systemd} +if [ $1 -eq 0 ] ; then + /sbin/service znc stop >/dev/null 2>&1 + /sbin/chkconfig --del znc +fi +%endif + %files %defattr(-,root,root) %doc AUTHORS LICENSE LICENSE.OpenSSL README.md @@ -191,6 +238,9 @@ fi %if %{use_systemd} %{_unitdir}/znc.service %endif +%if !%{use_systemd} +%{_initrddir}/znc +%endif %files devel %defattr(-,root,root) @@ -231,7 +281,15 @@ fi %{_libdir}/znc/modperl.so %{_libdir}/znc/perleval.pm +%files modpython +%defattr(-,root,root) +%{_libdir}/znc/modpython/ +%{_libdir}/znc/modpython.so + %changelog +* Mon Jan 23 2012 Nick Bebout - 0.204-2 +- Add init script for EPEL + * Mon Jan 23 2012 Nick Bebout - 0.204-1 - Update to 0.204 to fix security issue CVE-2012-0033 From 6639e7c03bc63ec4a5bcd6888371c73c29f3b535 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jan 2012 14:24:08 -0600 Subject: [PATCH 154/344] Remove python3 from epel --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 21cbdd3..b3c527b 100644 --- a/znc.spec +++ b/znc.spec @@ -33,7 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel automake python3-devel +BuildRequires: c-ares-devel automake BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %if %{use_systemd} BuildRequires: systemd-units From 785f51b8d61e0b573f36d3889696c3101313e237 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jan 2012 14:48:21 -0600 Subject: [PATCH 155/344] Disable python el6 --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index b3c527b..f6ba8f7 100644 --- a/znc.spec +++ b/znc.spec @@ -115,7 +115,7 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-python --enable-perl --enable-tcl + --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl %__make %{?_smp_mflags} %pre From 740cba30f276d0450ba9d917f08d1e50a9b9c03a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jan 2012 14:55:33 -0600 Subject: [PATCH 156/344] Disable python el6 --- znc.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/znc.spec b/znc.spec index f6ba8f7..d12bab3 100644 --- a/znc.spec +++ b/znc.spec @@ -96,15 +96,6 @@ Provides: perl(ZNC::Module) = %{version}-%{release} %description modperl perl module for ZNC -%package modpython -Summary: python3 module for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: python3 - -%description modpython -python3 module for ZNC - %prep %setup -q -n %{name}-%{version} #%patch0 -p1 @@ -281,11 +272,6 @@ fi %{_libdir}/znc/modperl.so %{_libdir}/znc/perleval.pm -%files modpython -%defattr(-,root,root) -%{_libdir}/znc/modpython/ -%{_libdir}/znc/modpython.so - %changelog * Mon Jan 23 2012 Nick Bebout - 0.204-2 - Add init script for EPEL From e7fa718ebc14654cdb8773c1cbae61df270c8087 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jan 2012 15:08:27 -0600 Subject: [PATCH 157/344] Commit changes --- znc.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.init b/znc.init index 64880df..aaabbd0 100644 --- a/znc.init +++ b/znc.init @@ -9,7 +9,7 @@ exec=/usr/bin/znc prog=znc -config=/home/znc/.znc +config=/var/lib/znc runas=znc lockfile=/var/lock/subsys/$prog From 62132cff81765d0cded934557521c69f8f54406f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jan 2012 15:10:00 -0600 Subject: [PATCH 158/344] Add init file to use for EL6 and EL5 --- znc.init | 2 +- znc.spec | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/znc.init b/znc.init index 64880df..aaabbd0 100644 --- a/znc.init +++ b/znc.init @@ -9,7 +9,7 @@ exec=/usr/bin/znc prog=znc -config=/home/znc/.znc +config=/var/lib/znc runas=znc lockfile=/var/lock/subsys/$prog diff --git a/znc.spec b/znc.spec index dcee908..21cbdd3 100644 --- a/znc.spec +++ b/znc.spec @@ -11,14 +11,20 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.204 #Release: 0.1.20110801git%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in Source0: http://znc.in/releases/znc-0.204.tar.gz + %if %{use_systemd} Source1: znc.service %endif + +%if !%{use_systemd} +Source1: znc.init +%endif + # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -40,6 +46,13 @@ Requires(preun): systemd-units Requires(postun): systemd-units %endif +%if !%{use_systemd} +Requires(post): chkconfig +Requires(preun): chkconfig +# This is for /sbin/service +Requires(preun): initscripts +%endif + %description ZNC is an IRC bouncer with many advanced features like detaching, multiple users, per channel playback buffer, SSL, IPv6, transparent @@ -106,15 +119,15 @@ chmod -x modules/q.cpp %__make %{?_smp_mflags} %pre -%if %{use_systemd} +#%if %{use_systemd} getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \ -c "Account for ZNC to run as" znc mkdir -p /var/lib/znc chown znc:znc /var/lib/znc -exit 0 -%endif +#exit 0 +#%endif %install %__rm -Rf "%{buildroot}" @@ -123,11 +136,16 @@ exit 0 mkdir -p %buildroot%{_unitdir} install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service %endif +%if !%{use_systemd} +mkdir -p %buildroot%{_initrddir} +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/znc +%endif %clean %__rm -Rf "%{buildroot}" %post + %if %{use_systemd} if [ $1 -eq 1 ] ; then # Initial installation @@ -135,7 +153,13 @@ if [ $1 -eq 1 ] ; then fi %endif +%if !%{use_systemd} +# This adds the proper /etc/rc*.d links for the script +/sbin/chkconfig --add znc +%endif + %postun + %if %{use_systemd} /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then @@ -144,7 +168,14 @@ if [ $1 -ge 1 ] ; then fi %endif +%if !%{use_systemd} +if [ "$1" -ge "1" ] ; then + /sbin/service znc condrestart >/dev/null 2>&1 || : +fi +%endif + %preun + %if %{use_systemd} if [ $1 -eq 0 ] ; then # Package removal, not upgrade @@ -153,6 +184,13 @@ if [ $1 -eq 0 ] ; then fi %endif +%if !%{use_systemd} +if [ $1 -eq 0 ] ; then + /sbin/service znc stop >/dev/null 2>&1 + /sbin/chkconfig --del znc +fi +%endif + %files %defattr(-,root,root) %doc AUTHORS LICENSE LICENSE.OpenSSL README.md @@ -200,6 +238,9 @@ fi %if %{use_systemd} %{_unitdir}/znc.service %endif +%if !%{use_systemd} +%{_initrddir}/znc +%endif %files devel %defattr(-,root,root) @@ -246,6 +287,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Jan 23 2012 Nick Bebout - 0.204-2 +- Add init script for EPEL + * Mon Jan 23 2012 Nick Bebout - 0.204-1 - Update to 0.204 to fix security issue CVE-2012-0033 From 97507d9a7f4068d5e367c6ae70b496c556c9e289 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jan 2012 15:12:12 -0600 Subject: [PATCH 159/344] Bump release --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 21cbdd3..44f68fb 100644 --- a/znc.spec +++ b/znc.spec @@ -11,7 +11,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.204 #Release: 0.1.20110801git%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in From bf0dd5f6672ed15e74bd850fb88fb5e289d509aa Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 24 Jan 2012 19:10:21 -0600 Subject: [PATCH 160/344] Catch scriptlet errors in preun --- znc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 44f68fb..0152915 100644 --- a/znc.spec +++ b/znc.spec @@ -186,8 +186,8 @@ fi %if !%{use_systemd} if [ $1 -eq 0 ] ; then - /sbin/service znc stop >/dev/null 2>&1 - /sbin/chkconfig --del znc + /sbin/service znc stop >/dev/null 2>&1 || : + /sbin/chkconfig --del znc || : fi %endif From d1cf0566b337f55e8286f29bfd4a42300f736968 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 14:43:13 -0600 Subject: [PATCH 161/344] - Rebuilt for c++ ABI breakage --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0152915..00a40d5 100644 --- a/znc.spec +++ b/znc.spec @@ -11,7 +11,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.204 #Release: 0.1.20110801git%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in @@ -287,6 +287,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 0.204-4 +- Rebuilt for c++ ABI breakage + * Mon Jan 23 2012 Nick Bebout - 0.204-2 - Add init script for EPEL From 7ce2352cc789b198840567f9302e281c850a1843 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 16 Apr 2012 23:03:50 -0500 Subject: [PATCH 162/344] Upgrade to 0.206 --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 648e71a..c141172 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /znc-0.200.tar.gz /znc-0.202.tar.gz /znc-0.204.tar.gz +/znc-0.206.tar.gz diff --git a/sources b/sources index 5bb2922..1a4c637 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c7247423fc08b0c5c62759a50a9bca3 znc-0.204.tar.gz +b7d3f21da81abaeb553066b0e10beb53 znc-0.206.tar.gz diff --git a/znc.spec b/znc.spec index 0152915..32e7548 100644 --- a/znc.spec +++ b/znc.spec @@ -9,13 +9,13 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.204 +Version: 0.206 #Release: 0.1.20110801git%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-0.204.tar.gz +Source0: http://znc.in/releases/znc-0.206.tar.gz %if %{use_systemd} Source1: znc.service @@ -287,6 +287,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Apr 16 2012 Nick Bebout - 0.206-1 +- Upgrade to 0.206 + * Mon Jan 23 2012 Nick Bebout - 0.204-2 - Add init script for EPEL From 6ed29b1c96e6a6db6a1c858be4e9c2e318c99d14 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 03:29:43 -0500 Subject: [PATCH 163/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 216261d..85cf74c 100644 --- a/znc.spec +++ b/znc.spec @@ -11,7 +11,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.206 #Release: 0.1.20110801git%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in @@ -287,6 +287,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.206-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Apr 16 2012 Nick Bebout - 0.206-1 - Upgrade to 0.206 From 8edc3f1d0ecbeafc41392cdf77db4af24cf6c8e4 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 13 Sep 2012 20:13:57 -0500 Subject: [PATCH 164/344] Update to 1.0-alpha1 --- .gitignore | 1 + sources | 2 +- znc.spec | 68 +++++++++++++++++++++++------------------------------- 3 files changed, 31 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index c141172..75cc4f0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /znc-0.202.tar.gz /znc-0.204.tar.gz /znc-0.206.tar.gz +/znc-1.0-alpha1.tar.gz diff --git a/sources b/sources index 1a4c637..f2f1bd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7d3f21da81abaeb553066b0e10beb53 znc-0.206.tar.gz +c2287115826d2e226ae60f437de69833 znc-1.0-alpha1.tar.gz diff --git a/znc.spec b/znc.spec index 85cf74c..ca77d20 100644 --- a/znc.spec +++ b/znc.spec @@ -9,20 +9,20 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.206 +Version: 1.0 #Release: 0.1.20110801git%{?dist} -Release: 2%{?dist} +Release: 0.1.alpha1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-0.206.tar.gz +Source0: http://znc.in/releases/znc-1.0-alpha1.tar.gz %if %{use_systemd} Source1: znc.service %endif %if !%{use_systemd} -Source1: znc.init +Source1: znc.init %endif # git clone https://github.com/znc/znc.git @@ -35,6 +35,8 @@ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel automake python3-devel BuildRequires: perl(ExtUtils::Embed) swig tcl-devel +Obsoletes: znc-extra <= %{version}-%{release} + %if %{use_systemd} BuildRequires: systemd-units %endif @@ -69,14 +71,6 @@ BuildRequires: pkgconfig All includes and program files you need to compile your own znc modules. -%package extra -Summary: Extra modules for ZNC -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description extra -Extra modules for ZNC - %package modtcl Summary: TCL module for ZNC Group: Development/Libraries @@ -106,7 +100,8 @@ Requires: python3 python3 module for ZNC %prep -%setup -q -n %{name}-%{version} +#%setup -q -n %{name}-%{version} +%setup -q -n znc-1.0-alpha1 #%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -115,7 +110,7 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-python --enable-perl --enable-tcl + --enable-ipv6 --enable-sasl --enable-python --enable-perl --enable-tcl %__make %{?_smp_mflags} %pre @@ -196,36 +191,50 @@ fi %doc AUTHORS LICENSE LICENSE.OpenSSL README.md %{_bindir}/znc %{_mandir}/man1/* -%{_libdir}/znc/admin.so %{_libdir}/znc/adminlog.so %{_libdir}/znc/autoattach.so %{_libdir}/znc/autocycle.so %{_libdir}/znc/autoop.so %{_libdir}/znc/autoreply.so -%{_libdir}/znc/away.so +%{_libdir}/znc/autovoice.so %{_libdir}/znc/awaynick.so +%{_libdir}/znc/awaystore.so +%{_libdir}/znc/block_motd.so %{_libdir}/znc/blockuser.so %{_libdir}/znc/bouncedcc.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/cert.so %{_libdir}/znc/certauth.so %{_libdir}/znc/chansaver.so +%{_libdir}/znc/charset.so +%{_libdir}/znc/clearbufferonmsg.so %{_libdir}/znc/clientnotify.so +%{_libdir}/znc/controlpanel.so %{_libdir}/znc/crypt.so +%{_libdir}/znc/ctcpflood.so +#%{_libdir}/znc/cyrusauth.so +%{_libdir}/znc/dcc.so %{_libdir}/znc/disconkick.so %{_libdir}/znc/fail2ban.so +%{_libdir}/znc/flooddetach.so %{_libdir}/znc/identfile.so +%{_libdir}/znc/imapauth.so %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so %{_libdir}/znc/lastseen.so +%{_libdir}/znc/listsockets.so +%{_libdir}/znc/log.so +%{_libdir}/znc/missingmotd.so %{_libdir}/znc/nickserv.so %{_libdir}/znc/notes.so +%{_libdir}/znc/notify_connect.so %{_libdir}/znc/partyline.so %{_libdir}/znc/perform.so %{_libdir}/znc/q.so %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so +%{_libdir}/znc/sasl.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so %{_libdir}/znc/send_raw.so @@ -245,32 +254,10 @@ fi %files devel %defattr(-,root,root) %{_bindir}/znc-buildmod -%{_bindir}/znc-config +#%{_bindir}/znc-config %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/znc/ -%files extra -%defattr(-,root,root) -%{_libdir}/znc/antiidle.so -%{_libdir}/znc/autovoice.so -%{_libdir}/znc/block_motd.so -%{_libdir}/znc/charset.so -%{_libdir}/znc/clearbufferonmsg.so -%{_libdir}/znc/ctcpflood.so -%{_libdir}/znc/dcc.so -%{_libdir}/znc/droproot.so -%{_libdir}/znc/email.so -%{_libdir}/znc/fakeonline.so -%{_libdir}/znc/flooddetach.so -%{_libdir}/znc/imapauth.so -%{_libdir}/znc/listsockets.so -%{_libdir}/znc/log.so -%{_libdir}/znc/motdfile.so -%{_libdir}/znc/notify_connect.so -%{_libdir}/znc/saslauth.so -%{_libdir}/znc/send_raw.so -%{_libdir}/znc/shell.so - %files modtcl %defattr(-,root,root) %{_libdir}/znc/modtcl.so @@ -287,6 +274,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Thu Sep 13 2012 Nick Bebout - 1.0-0.1.alpha1 +- Update to 1.0-alpha1 + * Sun Jul 22 2012 Fedora Release Engineering - 0.206-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From fad86bba58db11df58edae70ccba2525d0fab41e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 13 Sep 2012 20:29:10 -0500 Subject: [PATCH 165/344] Disable python3 on el6 --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index aa8eaa6..4370270 100644 --- a/znc.spec +++ b/znc.spec @@ -101,7 +101,7 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl --enable-python --enable-perl --enable-tcl + --enable-ipv6 --enable-sasl --disable-python --enable-perl --enable-tcl %__make %{?_smp_mflags} %pre From 3523649a68c8b865bc82e7b739dbf2d3bf2b8fe7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 18 Oct 2012 19:12:44 -0500 Subject: [PATCH 166/344] Upgrade to 1.0-beta1 --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 75cc4f0..b439f28 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /znc-0.204.tar.gz /znc-0.206.tar.gz /znc-1.0-alpha1.tar.gz +/znc-1.0-beta1.tar.gz diff --git a/sources b/sources index f2f1bd3..fb33106 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2287115826d2e226ae60f437de69833 znc-1.0-alpha1.tar.gz +cfe8f76b4c5f5fb30426c0ccad3e98d0 znc-1.0-beta1.tar.gz diff --git a/znc.spec b/znc.spec index ca77d20..8bb8d01 100644 --- a/znc.spec +++ b/znc.spec @@ -11,11 +11,11 @@ Summary: An advanced IRC bouncer Name: znc Version: 1.0 #Release: 0.1.20110801git%{?dist} -Release: 0.1.alpha1%{?dist} +Release: 0.2.beta1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-1.0-alpha1.tar.gz +Source0: http://znc.in/releases/znc-1.0-beta1.tar.gz %if %{use_systemd} Source1: znc.service @@ -101,7 +101,7 @@ python3 module for ZNC %prep #%setup -q -n %{name}-%{version} -%setup -q -n znc-1.0-alpha1 +%setup -q -n znc-1.0-beta1 #%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -274,6 +274,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Thu Oct 18 2012 Nick Bebout - 1.0-0.2.beta1 +- Update to 1.0-beta1 + * Thu Sep 13 2012 Nick Bebout - 1.0-0.1.alpha1 - Update to 1.0-alpha1 From 36bc878a3a7a2d8619a185bbbb3742cf75721ffd Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 13 Nov 2012 17:41:56 -0600 Subject: [PATCH 167/344] Update to 1.0 --- .gitignore | 1 + sources | 2 +- znc.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b439f28..df97e3f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /znc-0.206.tar.gz /znc-1.0-alpha1.tar.gz /znc-1.0-beta1.tar.gz +/znc-1.0.tar.gz diff --git a/sources b/sources index fb33106..8fd8235 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cfe8f76b4c5f5fb30426c0ccad3e98d0 znc-1.0-beta1.tar.gz +23807ca830c27392cccb6774f542df6e znc-1.0.tar.gz diff --git a/znc.spec b/znc.spec index 8bb8d01..0e2b3d9 100644 --- a/znc.spec +++ b/znc.spec @@ -11,11 +11,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 1.0 #Release: 0.1.20110801git%{?dist} -Release: 0.2.beta1%{?dist} +#Release: 0.2.beta1%{?dist} +Release: 1 License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-1.0-beta1.tar.gz +Source0: http://znc.in/releases/znc-1.0.tar.gz %if %{use_systemd} Source1: znc.service @@ -100,8 +101,8 @@ Requires: python3 python3 module for ZNC %prep -#%setup -q -n %{name}-%{version} -%setup -q -n znc-1.0-beta1 +%setup -q -n %{name}-%{version} +#%setup -q -n znc-1.0-beta1 #%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -274,6 +275,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Tue Nov 13 2012 Nick Bebout - 1.0-1 +- Update to 1.0 + * Thu Oct 18 2012 Nick Bebout - 1.0-0.2.beta1 - Update to 1.0-beta1 From 5f84d7e718942c012e12f51aa51279f879106096 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 13 Nov 2012 17:55:16 -0600 Subject: [PATCH 168/344] Add dist tag back --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0e2b3d9..b33f459 100644 --- a/znc.spec +++ b/znc.spec @@ -12,7 +12,7 @@ Name: znc Version: 1.0 #Release: 0.1.20110801git%{?dist} #Release: 0.2.beta1%{?dist} -Release: 1 +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in From 7814ab569aaba78fe9e9980471dd80091f2fb786 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:23:41 -0600 Subject: [PATCH 169/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index b33f459..2f21bf5 100644 --- a/znc.spec +++ b/znc.spec @@ -12,7 +12,7 @@ Name: znc Version: 1.0 #Release: 0.1.20110801git%{?dist} #Release: 0.2.beta1%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in @@ -275,6 +275,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Nov 13 2012 Nick Bebout - 1.0-1 - Update to 1.0 From 4791326b3c2c86cdfdda1ca4782762259d589045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 15:30:12 +0200 Subject: [PATCH 170/344] Perl 5.18 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 2f21bf5..ef2d508 100644 --- a/znc.spec +++ b/znc.spec @@ -12,7 +12,7 @@ Name: znc Version: 1.0 #Release: 0.1.20110801git%{?dist} #Release: 0.2.beta1%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in @@ -275,6 +275,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Wed Jul 17 2013 Petr Pisar - 1.0-3 +- Perl 5.18 rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 9c0644c3dcf30eae7bb80356aa350a091e4de2b3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 28 Jul 2013 16:45:10 -0500 Subject: [PATCH 171/344] Upgrade to 1.2-alpha1 --- .gitignore | 1 + sources | 2 +- znc.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index df97e3f..8207028 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /znc-1.0-alpha1.tar.gz /znc-1.0-beta1.tar.gz /znc-1.0.tar.gz +/znc-1.2-alpha1.tar.gz diff --git a/sources b/sources index 8fd8235..1141e76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23807ca830c27392cccb6774f542df6e znc-1.0.tar.gz +4ed75f8a9d2685ec823db42983dc54fe znc-1.2-alpha1.tar.gz diff --git a/znc.spec b/znc.spec index ef2d508..2b6ff63 100644 --- a/znc.spec +++ b/znc.spec @@ -9,14 +9,14 @@ Summary: An advanced IRC bouncer Name: znc -Version: 1.0 +Version: 1.2 #Release: 0.1.20110801git%{?dist} -#Release: 0.2.beta1%{?dist} -Release: 3%{?dist} +Release: 0.1.alpha1%{?dist} +#Release: 3%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-1.0.tar.gz +Source0: http://znc.in/releases/znc-1.2-alpha1.tar.gz %if %{use_systemd} Source1: znc.service @@ -101,8 +101,8 @@ Requires: python3 python3 module for ZNC %prep -%setup -q -n %{name}-%{version} -#%setup -q -n znc-1.0-beta1 +#%setup -q -n %{name}-%{version} +%setup -q -n znc-1.2-alpha1 #%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -275,6 +275,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Sun Jul 28 2013 Nick Bebout - 1.2-0.1.alpha1 +- Upgrade to 1.2-alpha1 + * Wed Jul 17 2013 Petr Pisar - 1.0-3 - Perl 5.18 rebuild From 99363cd73ce212f96ff5390ea3bec1db483da1f4 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 28 Jul 2013 17:00:07 -0500 Subject: [PATCH 172/344] Add gettext-devel to BuildRequires --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 2b6ff63..d6a8629 100644 --- a/znc.spec +++ b/znc.spec @@ -33,7 +33,7 @@ Source1: znc.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 -BuildRequires: cyrus-sasl-devel +BuildRequires: cyrus-sasl-devel gettext-devel BuildRequires: c-ares-devel automake python3-devel BuildRequires: perl(ExtUtils::Embed) swig tcl-devel Obsoletes: znc-extra <= %{version}-%{release} From d31e2f3ee3f6227cc8981bfaec75acb835fdf936 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 28 Jul 2013 21:24:24 -0500 Subject: [PATCH 173/344] Fix license --- znc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index d6a8629..30a690a 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Version: 1.2 #Release: 0.1.20110801git%{?dist} Release: 0.1.alpha1%{?dist} #Release: 3%{?dist} -License: GPLv2 with exceptions +License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in Source0: http://znc.in/releases/znc-1.2-alpha1.tar.gz @@ -189,7 +189,7 @@ fi %files %defattr(-,root,root) -%doc AUTHORS LICENSE LICENSE.OpenSSL README.md +%doc AUTHORS LICENSE README.md %{_bindir}/znc %{_mandir}/man1/* %{_libdir}/znc/adminlog.so From bc3630e17c0d37221dafd78a24a30ef2ed82ab75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Sat, 3 Aug 2013 14:57:04 +0200 Subject: [PATCH 174/344] Perl 5.18 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 30a690a..846afae 100644 --- a/znc.spec +++ b/znc.spec @@ -11,7 +11,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 1.2 #Release: 0.1.20110801git%{?dist} -Release: 0.1.alpha1%{?dist} +Release: 0.2.alpha1%{?dist} #Release: 3%{?dist} License: ASL 2.0 Group: System Environment/Daemons @@ -275,6 +275,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Sat Aug 03 2013 Petr Pisar - 1.2-0.2.alpha1 +- Perl 5.18 rebuild + * Sun Jul 28 2013 Nick Bebout - 1.2-0.1.alpha1 - Upgrade to 1.2-alpha1 From f458dc8dd03b787acee9b14894fe39b971f8aa29 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 7 Aug 2013 16:40:16 -0500 Subject: [PATCH 175/344] Minor changes to spec --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 846afae..1d11d2a 100644 --- a/znc.spec +++ b/znc.spec @@ -28,7 +28,7 @@ Source1: znc.init # git clone https://github.com/znc/znc.git # cd znc -# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz +# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ From 9b8ecd133e9f9be97c026b7a5c822cb092f2764c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 26 Sep 2013 17:13:30 -0500 Subject: [PATCH 176/344] Upgrade to znc 1.2-beta1 --- .gitignore | 1 + sources | 2 +- znc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8207028..e345ea9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /znc-1.0-beta1.tar.gz /znc-1.0.tar.gz /znc-1.2-alpha1.tar.gz +/znc-1.2-beta1.tar.gz diff --git a/sources b/sources index 1141e76..64a00dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ed75f8a9d2685ec823db42983dc54fe znc-1.2-alpha1.tar.gz +26c5135fb1e6380f960020b66166f758 znc-1.2-beta1.tar.gz diff --git a/znc.spec b/znc.spec index 1d11d2a..f53afe0 100644 --- a/znc.spec +++ b/znc.spec @@ -11,12 +11,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 1.2 #Release: 0.1.20110801git%{?dist} -Release: 0.2.alpha1%{?dist} +Release: 0.3.beta1%{?dist} #Release: 3%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-1.2-alpha1.tar.gz +Source0: http://znc.in/releases/znc-1.2-beta1.tar.gz %if %{use_systemd} Source1: znc.service @@ -275,6 +275,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Thu Sep 26 2013 Nick Bebout - 1.2-0.3.beta1 +- Upgrade to 1.2-beta1 + * Sat Aug 03 2013 Petr Pisar - 1.2-0.2.alpha1 - Perl 5.18 rebuild From 4ba75e886bb039c7f12649825312881925a24d76 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 26 Sep 2013 17:19:10 -0500 Subject: [PATCH 177/344] Oops, forgot to change alpha to beta --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index f53afe0..b8097b5 100644 --- a/znc.spec +++ b/znc.spec @@ -102,7 +102,7 @@ python3 module for ZNC %prep #%setup -q -n %{name}-%{version} -%setup -q -n znc-1.2-alpha1 +%setup -q -n znc-1.2-beta1 #%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From a451907be0491f2dd12a3e79f9ec89708d942101 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 26 Sep 2013 17:32:12 -0500 Subject: [PATCH 178/344] Add modules_online.so --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index b8097b5..bf78d2a 100644 --- a/znc.spec +++ b/znc.spec @@ -226,6 +226,7 @@ fi %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so %{_libdir}/znc/missingmotd.so +%{_libdir}/znc/modules_online.so %{_libdir}/znc/nickserv.so %{_libdir}/znc/notes.so %{_libdir}/znc/notify_connect.so From a6eeb143540ba2996f69bc9d7766c67d05e9b4f9 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 25 Oct 2013 20:04:51 -0500 Subject: [PATCH 179/344] Upgrade to 1.2-rc2 --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e345ea9..b327170 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /znc-1.0.tar.gz /znc-1.2-alpha1.tar.gz /znc-1.2-beta1.tar.gz +/znc-1.2-rc2.tar.gz diff --git a/sources b/sources index 64a00dd..3d2ee95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26c5135fb1e6380f960020b66166f758 znc-1.2-beta1.tar.gz +38eb9496b74cabcd1d6dbc585ef872e8 znc-1.2-rc2.tar.gz diff --git a/znc.spec b/znc.spec index bf78d2a..71de104 100644 --- a/znc.spec +++ b/znc.spec @@ -11,12 +11,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 1.2 #Release: 0.1.20110801git%{?dist} -Release: 0.3.beta1%{?dist} +Release: 0.4.rc2%{?dist} #Release: 3%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-1.2-beta1.tar.gz +Source0: http://znc.in/releases/znc-1.2-rc2.tar.gz %if %{use_systemd} Source1: znc.service @@ -102,7 +102,7 @@ python3 module for ZNC %prep #%setup -q -n %{name}-%{version} -%setup -q -n znc-1.2-beta1 +%setup -q -n znc-1.2-rc2 #%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -276,6 +276,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Fri Oct 25 2013 Nick Bebout - 1.2-0.4.rc2 +- Upgrade to 1.2-rc2 + * Thu Sep 26 2013 Nick Bebout - 1.2-0.3.beta1 - Upgrade to 1.2-beta1 From 278948aae610f027edbc0522ad6db0b758346af6 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 11 Nov 2013 10:53:21 -0600 Subject: [PATCH 180/344] Upgrade to 1.2 --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b327170..9d9777b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /znc-1.2-alpha1.tar.gz /znc-1.2-beta1.tar.gz /znc-1.2-rc2.tar.gz +/znc-1.2.tar.gz diff --git a/sources b/sources index 3d2ee95..54f73f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38eb9496b74cabcd1d6dbc585ef872e8 znc-1.2-rc2.tar.gz +ef18e5402a82cc3fcab5c2ac5c2e6f3b znc-1.2.tar.gz diff --git a/znc.spec b/znc.spec index 71de104..27fe2d0 100644 --- a/znc.spec +++ b/znc.spec @@ -11,12 +11,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 1.2 #Release: 0.1.20110801git%{?dist} -Release: 0.4.rc2%{?dist} -#Release: 3%{?dist} +#Release: 0.4.rc2%{?dist} +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-1.2-rc2.tar.gz +Source0: http://znc.in/releases/znc-1.2.tar.gz %if %{use_systemd} Source1: znc.service @@ -276,6 +276,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Nov 11 2013 Nick Bebout - 1.2-1 +- Upgrade to 1.2 + * Fri Oct 25 2013 Nick Bebout - 1.2-0.4.rc2 - Upgrade to 1.2-rc2 From b0ce3e5b1f8b5c3b6452cbc5925308d63567902f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 11 Nov 2013 10:55:04 -0600 Subject: [PATCH 181/344] Fix build --- znc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 27fe2d0..0f458b6 100644 --- a/znc.spec +++ b/znc.spec @@ -101,8 +101,8 @@ Requires: python3 python3 module for ZNC %prep -#%setup -q -n %{name}-%{version} -%setup -q -n znc-1.2-rc2 +%setup -q -n %{name}-%{version} +#%setup -q -n znc-1.2-rc2 #%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From 5526916761533ec8f7d17c7142aa167ea0c031c9 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 11 Nov 2013 17:30:20 -0600 Subject: [PATCH 182/344] Fix various bugs --- znc.service | 2 +- znc.spec | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/znc.service b/znc.service index e2c92b2..55bb678 100644 --- a/znc.service +++ b/znc.service @@ -1,5 +1,5 @@ [Unit] -Description=Daemon to do something +Description=ZNC - an advanced IRC bouncer After=network.target [Service] diff --git a/znc.spec b/znc.spec index 0f458b6..1db1168 100644 --- a/znc.spec +++ b/znc.spec @@ -5,6 +5,8 @@ %define use_systemd 1 %endif +%global _hardened_build 1 + %global __python %{__python3} Summary: An advanced IRC bouncer @@ -12,7 +14,7 @@ Name: znc Version: 1.2 #Release: 0.1.20110801git%{?dist} #Release: 0.4.rc2%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in @@ -143,10 +145,7 @@ install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/znc %post %if %{use_systemd} -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post znc.service %endif %if !%{use_systemd} @@ -157,11 +156,7 @@ fi %postun %if %{use_systemd} -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart znc.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart znc.service %endif %if !%{use_systemd} @@ -173,11 +168,7 @@ fi %preun %if %{use_systemd} -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable znc.service > /dev/null 2>&1 || : - /bin/systemctl stop znc.service > /dev/null 2>&1 || : -fi +%systemd_preun znc.service %endif %if !%{use_systemd} @@ -276,6 +267,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Nov 11 2013 Nick Bebout - 1.2-2 +- Enable PIE, Fix systemd description, use systemd macros + * Mon Nov 11 2013 Nick Bebout - 1.2-1 - Upgrade to 1.2 From 6c87763726ebc122bf643822bcd37607ed1e28aa Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 14 Apr 2014 20:29:03 -0500 Subject: [PATCH 183/344] Add patch to fix crash bug --- znc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 1db1168..263c488 100644 --- a/znc.spec +++ b/znc.spec @@ -14,11 +14,12 @@ Name: znc Version: 1.2 #Release: 0.1.20110801git%{?dist} #Release: 0.4.rc2%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in Source0: http://znc.in/releases/znc-1.2.tar.gz +Patch0: znc-crashbug.patch %if %{use_systemd} Source1: znc.service @@ -105,7 +106,7 @@ python3 module for ZNC %prep %setup -q -n %{name}-%{version} #%setup -q -n znc-1.2-rc2 -#%patch0 -p1 +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -267,6 +268,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Mon Apr 14 2014 Nick Bebout - 1.2-3 +- Fix potential crash bug when adding channels + * Mon Nov 11 2013 Nick Bebout - 1.2-2 - Enable PIE, Fix systemd description, use systemd macros From 221c8ed9c1f7df18ee8d20fc974315dc9e009538 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 14 Apr 2014 21:08:15 -0500 Subject: [PATCH 184/344] Add patch --- znc-crashbug.patch | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 znc-crashbug.patch diff --git a/znc-crashbug.patch b/znc-crashbug.patch new file mode 100644 index 0000000..0995b80 --- /dev/null +++ b/znc-crashbug.patch @@ -0,0 +1,37 @@ +diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp +index 40a28d3..90ddfd2 100644 +--- a/modules/webadmin.cpp ++++ b/modules/webadmin.cpp +@@ -668,13 +668,19 @@ class CWebAdminMod : public CModule { + return true; + } + +- if (pNetwork->FindChan(sChanName.Token(0))) { +- WebSock.PrintErrorPage("Channel [" + sChanName.Token(0) + "] already exists"); ++ // This could change the channel name and e.g. add a "#" prefix ++ pChan = new CChan(sChanName, pNetwork, true); ++ ++ if (pNetwork->FindChan(pChan->GetName())) { ++ WebSock.PrintErrorPage("Channel [" + pChan->GetName() + "] already exists"); ++ delete pChan; + return true; + } + +- pChan = new CChan(sChanName, pNetwork, true); +- pNetwork->AddChan(pChan); ++ if (!pNetwork->AddChan(pChan)) { ++ WebSock.PrintErrorPage("Could not add channel [" + pChan->GetName() + "]"); ++ return true; ++ } + } + + pChan->SetBufferCount(WebSock.GetParam("buffercount").ToUInt(), spSession->IsAdmin()); +@@ -700,7 +706,7 @@ class CWebAdminMod : public CModule { + + CTemplate TmplMod; + TmplMod["User"] = pUser->GetUserName(); +- TmplMod["ChanName"] = sChanName; ++ TmplMod["ChanName"] = pChan->GetName(); + TmplMod["WebadminAction"] = "change"; + FOR_EACH_MODULE(it, pNetwork) { + (*it)->OnEmbeddedWebRequest(WebSock, "webadmin/channel", TmplMod); From ac94eac6caca1e2f4a123ace62b989feaa0a03bf Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 15 May 2014 20:21:58 -0500 Subject: [PATCH 185/344] Update to 1.4 --- .gitignore | 1 + sources | 2 +- znc.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9d9777b..96a6b25 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /znc-1.2-beta1.tar.gz /znc-1.2-rc2.tar.gz /znc-1.2.tar.gz +/znc-1.4.tar.gz diff --git a/sources b/sources index 54f73f6..35f76e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef18e5402a82cc3fcab5c2ac5c2e6f3b znc-1.2.tar.gz +630cb74db34d2d5451ba30b47869f6bb znc-1.4.tar.gz diff --git a/znc.spec b/znc.spec index 263c488..37890c7 100644 --- a/znc.spec +++ b/znc.spec @@ -11,15 +11,15 @@ Summary: An advanced IRC bouncer Name: znc -Version: 1.2 +Version: 1.4 #Release: 0.1.20110801git%{?dist} #Release: 0.4.rc2%{?dist} -Release: 3%{?dist} +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in -Source0: http://znc.in/releases/znc-1.2.tar.gz -Patch0: znc-crashbug.patch +Source0: http://znc.in/releases/znc-1.4.tar.gz +#Patch0: znc-crashbug.patch %if %{use_systemd} Source1: znc.service @@ -106,7 +106,7 @@ python3 module for ZNC %prep %setup -q -n %{name}-%{version} #%setup -q -n znc-1.2-rc2 -%patch0 -p1 +#%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From 4b89ef37434618bf3e82553bf68246c05ffe29e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 21 May 2014 12:46:51 +0200 Subject: [PATCH 186/344] - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 37890c7..fe52151 100644 --- a/znc.spec +++ b/znc.spec @@ -14,7 +14,7 @@ Name: znc Version: 1.4 #Release: 0.1.20110801git%{?dist} #Release: 0.4.rc2%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in @@ -268,6 +268,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Wed May 21 2014 Jaroslav Škarvada - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + * Mon Apr 14 2014 Nick Bebout - 1.2-3 - Fix potential crash bug when adding channels From 36a7753febe72e95b219d0a86e57194b46441136 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 28 May 2014 15:31:31 +0200 Subject: [PATCH 187/344] Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index fe52151..09ed479 100644 --- a/znc.spec +++ b/znc.spec @@ -14,7 +14,7 @@ Name: znc Version: 1.4 #Release: 0.1.20110801git%{?dist} #Release: 0.4.rc2%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in @@ -268,6 +268,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Wed May 28 2014 Kalev Lember - 1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + * Wed May 21 2014 Jaroslav Škarvada - 1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 From 28c14be16bddd74dfaa32e5dce4ee71bd890149b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:16:09 -0500 Subject: [PATCH 188/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 09ed479..c5aaa46 100644 --- a/znc.spec +++ b/znc.spec @@ -14,7 +14,7 @@ Name: znc Version: 1.4 #Release: 0.1.20110801git%{?dist} #Release: 0.4.rc2%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Group: System Environment/Daemons URL: http://znc.in @@ -268,6 +268,9 @@ fi %{_libdir}/znc/modpython.so %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed May 28 2014 Kalev Lember - 1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 From 9f106b2b1fc979fa1a0fdaec4be3ada5bb524afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 3 Aug 2014 20:52:29 +0200 Subject: [PATCH 189/344] skip the python-subpkg on EPEL <= 7 replaced %%define with %%global removed %%defattr, since it is not needed for recent releases conditionalized stuff for el <= 5 small cleanups purged unused patches --- znc-crashbug.patch | 37 -------- znc-modperl.patch | 11 --- znc-modpython.patch | 11 --- znc-release.patch | 11 --- znc.spec | 203 ++++++++++++++++++++++++++------------------ 5 files changed, 120 insertions(+), 153 deletions(-) delete mode 100644 znc-crashbug.patch delete mode 100644 znc-modperl.patch delete mode 100644 znc-modpython.patch delete mode 100644 znc-release.patch diff --git a/znc-crashbug.patch b/znc-crashbug.patch deleted file mode 100644 index 0995b80..0000000 --- a/znc-crashbug.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp -index 40a28d3..90ddfd2 100644 ---- a/modules/webadmin.cpp -+++ b/modules/webadmin.cpp -@@ -668,13 +668,19 @@ class CWebAdminMod : public CModule { - return true; - } - -- if (pNetwork->FindChan(sChanName.Token(0))) { -- WebSock.PrintErrorPage("Channel [" + sChanName.Token(0) + "] already exists"); -+ // This could change the channel name and e.g. add a "#" prefix -+ pChan = new CChan(sChanName, pNetwork, true); -+ -+ if (pNetwork->FindChan(pChan->GetName())) { -+ WebSock.PrintErrorPage("Channel [" + pChan->GetName() + "] already exists"); -+ delete pChan; - return true; - } - -- pChan = new CChan(sChanName, pNetwork, true); -- pNetwork->AddChan(pChan); -+ if (!pNetwork->AddChan(pChan)) { -+ WebSock.PrintErrorPage("Could not add channel [" + pChan->GetName() + "]"); -+ return true; -+ } - } - - pChan->SetBufferCount(WebSock.GetParam("buffercount").ToUInt(), spSession->IsAdmin()); -@@ -700,7 +706,7 @@ class CWebAdminMod : public CModule { - - CTemplate TmplMod; - TmplMod["User"] = pUser->GetUserName(); -- TmplMod["ChanName"] = sChanName; -+ TmplMod["ChanName"] = pChan->GetName(); - TmplMod["WebadminAction"] = "change"; - FOR_EACH_MODULE(it, pNetwork) { - (*it)->OnEmbeddedWebRequest(WebSock, "webadmin/channel", TmplMod); diff --git a/znc-modperl.patch b/znc-modperl.patch deleted file mode 100644 index cd4276f..0000000 --- a/znc-modperl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- znc-0.2-alpha1-original/modules/modperl/Makefile.inc 2011-08-05 16:27:44.000000000 -0500 -+++ znc-0.2-alpha1/modules/modperl/Makefile.inc 2011-08-05 17:24:25.658100254 -0500 -@@ -43,7 +43,7 @@ - @mkdir -p modperl - $(Q)$(PERL) $(srcdir)/modperl/codegen.pl $< $@ - --modperl_install: create_install_dir modperl.so -+modperl_install: install_datadir modperl.so - for i in $(wildcard $(srcdir)/*.pm); do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ - done diff --git a/znc-modpython.patch b/znc-modpython.patch deleted file mode 100644 index c113c2e..0000000 --- a/znc-modpython.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- znc-0.2-alpha1-original/modules/modpython/Makefile.inc 2011-08-05 16:27:44.000000000 -0500 -+++ znc-0.2-alpha1/modules/modpython/Makefile.inc 2011-08-05 17:24:07.317001140 -0500 -@@ -58,7 +58,7 @@ - $(E) Building optimizer for python files... - $(Q)$(CXX) $(PYTHONCOMMON) -o $@ $< $(PY_LDFLAGS) - --modpython_install: create_install_dir modpython_all -+modpython_install: install_datadir modpython_all - -for i in *.pyc; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \ - done diff --git a/znc-release.patch b/znc-release.patch deleted file mode 100644 index cacd27c..0000000 --- a/znc-release.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- znc-0.200-rc1-orig/znc.cpp 2011-08-13 01:36:13.000000000 -0500 -+++ znc-0.200-rc1/znc.cpp 2011-08-13 16:56:21.118177776 -0500 -@@ -84,7 +84,7 @@ - } - - char szBuf[128]; -- snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - http://znc.in", VERSION); -+ snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f - http://znc.in", VERSION); - // If snprintf overflows (which I doubt), we want to be on the safe side - szBuf[sizeof(szBuf) - 1] = '\0'; - diff --git a/znc.spec b/znc.spec index c5aaa46..c530084 100644 --- a/znc.spec +++ b/znc.spec @@ -1,69 +1,72 @@ -# Define variables to use in conditionals -%define use_systemd 0 - -%if 0%{?fedora} >= 15 -%define use_systemd 1 -%endif - +# ZNC is a daemon application and that's why needs hardening %global _hardened_build 1 -%global __python %{__python3} +# Define variables to use in conditionals +%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 +%global use_systemd 1 +%endif # 0%{?fedora} >= 15 || 0%{?rhel} >= 7 + +%if 0%{?fedora} || 0%{?rhel} >= 6 +%global with_modperl 1 +%endif # 0%{?fedora} || 0%{?rhel} >= 6 + +%if 0%{?fedora} >= 13 || 0%{?rhel} >= 8 +%global with_modpython 1 +%endif # 0%{?fedora} >= 13 || 0%{?rhel} >= 8 -Summary: An advanced IRC bouncer Name: znc Version: 1.4 -#Release: 0.1.20110801git%{?dist} -#Release: 0.4.rc2%{?dist} -Release: 4%{?dist} -License: ASL 2.0 +Release: 5%{?dist} +Summary: An advanced IRC bouncer Group: System Environment/Daemons + +License: ASL 2.0 URL: http://znc.in -Source0: http://znc.in/releases/znc-1.4.tar.gz -#Patch0: znc-crashbug.patch +Source0: %{url}/releases/%{name}-%{version}.tar.gz -%if %{use_systemd} +%if 0%{?use_systemd} Source1: znc.service -%endif - -%if !%{use_systemd} +%else # 0%{?use_systemd} Source1: znc.init -%endif +%endif # 0%{?use_systemd} -# git clone https://github.com/znc/znc.git -# cd znc -# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.gz +%if 0%{?rhel} && 0%{?rhel} <= 5 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%endif # 0%{?rhel} && 0%{?rhel} <= 5 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl gcc-c++ +BuildRequires: automake +BuildRequires: c-ares-devel +BuildRequires: cyrus-sasl-devel +BuildRequires: gettext-devel BuildRequires: openssl-devel >= 0.9.8 -BuildRequires: cyrus-sasl-devel gettext-devel -BuildRequires: c-ares-devel automake python3-devel -BuildRequires: perl(ExtUtils::Embed) swig tcl-devel -Obsoletes: znc-extra <= %{version}-%{release} +BuildRequires: perl(ExtUtils::Embed) -%if %{use_systemd} +%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) +Obsoletes: znc-extra <= %{version}-%{release} +%endif # (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) + +%if 0%{?use_systemd} BuildRequires: systemd-units %endif Requires(pre): shadow-utils -%if %{use_systemd} +%if 0%{?use_systemd} Requires(post): systemd-units Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units -%endif - -%if !%{use_systemd} +%else # 0%{?use_systemd} Requires(post): chkconfig Requires(preun): chkconfig # This is for /sbin/service Requires(preun): initscripts -%endif +%endif # 0%{?use_systemd} %description ZNC is an IRC bouncer with many advanced features like detaching, multiple users, per channel playback buffer, SSL, IPv6, transparent DCC bouncing, Perl and C++ module support to name a few. + %package devel Summary: Development files needed to compile ZNC modules Group: Development/Libraries @@ -75,112 +78,138 @@ BuildRequires: pkgconfig All includes and program files you need to compile your own znc modules. + %package modtcl Summary: TCL module for ZNC Group: Development/Libraries + +BuildRequires: tcl-devel + Requires: %{name} = %{version}-%{release} Requires: tcl %description modtcl TCL module for ZNC + +%if 0%{?with_modperl} %package modperl Summary: perl module for ZNC Group: Development/Libraries + +BuildRequires: perl-devel +BuildRequires: swig + Requires: %{name} = %{version}-%{release} Requires: perl + Provides: perl(ZNC::Module) = %{version}-%{release} %description modperl perl module for ZNC +%endif # 0%{?with_modperl} + +%if 0%{?with_modpython} %package modpython Summary: python3 module for ZNC Group: Development/Libraries + +BuildRequires: python3-devel +BuildRequires: swig + Requires: %{name} = %{version}-%{release} Requires: python3 %description modpython python3 module for ZNC +%endif # 0%{?with_modpython} + %prep -%setup -q -n %{name}-%{version} -#%setup -q -n znc-1.2-rc2 -#%patch0 -p1 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp + %build ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl --enable-python --enable-perl --enable-tcl +%if 0%{?with_modperl} + --enable-perl +%else + --disable-perl +%endif # 0%{?with_modperl} +%if 0%{?with_modpython} + --enable-python \ +%else # 0%{?with_modpython} + --disable-python \ +%endif # 0%{?with_modpython} + --enable-ipv6 --enable-sasl --enable-tcl %__make %{?_smp_mflags} + +%install +%if 0%{?rhel} && 0%{?rhel} <= 5 +%__rm -Rf "%{buildroot}" +%endif # 0%{?rhel} && 0%{?rhel} <= 5 +%__make install DESTDIR="%{buildroot}" +%if 0%{?use_systemd} +mkdir -p %buildroot%{_unitdir} +install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service +%else # 0%{?use_systemd} +mkdir -p %buildroot%{_initrddir} +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/znc +%endif # 0%{?use_systemd} + + +%if 0%{?rhel} && 0%{?rhel} <= 5 +%clean +%__rm -Rf "%{buildroot}" +%endif # 0%{?rhel} && 0%{?rhel} <= 5 + + %pre -#%if %{use_systemd} getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \ -c "Account for ZNC to run as" znc mkdir -p /var/lib/znc chown znc:znc /var/lib/znc -#exit 0 -#%endif -%install -%__rm -Rf "%{buildroot}" -%__make install DESTDIR="%{buildroot}" -%if %{use_systemd} -mkdir -p %buildroot%{_unitdir} -install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service -%endif -%if !%{use_systemd} -mkdir -p %buildroot%{_initrddir} -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/znc -%endif - -%clean -%__rm -Rf "%{buildroot}" %post - -%if %{use_systemd} +%if 0%{?use_systemd} %systemd_post znc.service -%endif - -%if !%{use_systemd} +%else # 0%{?use_systemd} # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add znc -%endif +%endif # 0%{?use_systemd} + %postun - -%if %{use_systemd} +%if 0%{?use_systemd} %systemd_postun_with_restart znc.service -%endif - -%if !%{use_systemd} +%else # 0%{?use_systemd} if [ "$1" -ge "1" ] ; then /sbin/service znc condrestart >/dev/null 2>&1 || : fi -%endif +%endif # 0%{?use_systemd} + %preun - -%if %{use_systemd} +%if 0%{?use_systemd} %systemd_preun znc.service -%endif - -%if !%{use_systemd} +%else # 0%{?use_systemd} if [ $1 -eq 0 ] ; then /sbin/service znc stop >/dev/null 2>&1 || : /sbin/chkconfig --del znc || : fi -%endif +%endif # 0%{?use_systemd} + %files -%defattr(-,root,root) %doc AUTHORS LICENSE README.md %{_bindir}/znc %{_mandir}/man1/* @@ -238,36 +267,44 @@ fi %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so %{_datadir}/znc/ -%if %{use_systemd} +%if 0%{?use_systemd} %{_unitdir}/znc.service -%endif -%if !%{use_systemd} +%else # 0%{?use_systemd} %{_initrddir}/znc -%endif +%endif # 0%{?use_systemd} %files devel -%defattr(-,root,root) %{_bindir}/znc-buildmod #%{_bindir}/znc-config %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/znc/ %files modtcl -%defattr(-,root,root) %{_libdir}/znc/modtcl.so +%if 0%{?with_modperl} %files modperl -%defattr(-,root,root) %{_libdir}/znc/modperl/ %{_libdir}/znc/modperl.so %{_libdir}/znc/perleval.pm +%endif # 0%{?with_modperl} +%if 0%{?with_modpython} %files modpython -%defattr(-,root,root) %{_libdir}/znc/modpython/ %{_libdir}/znc/modpython.so +%endif # 0%{?with_modpython} + %changelog +* Sun Aug 03 2014 Björn Esser - 1.4-5 +- skip the python-subpkg on EPEL <= 7 +- replaced %%define with %%global +- removed %%defattr, since it is not needed for recent releases +- conditionalized stuff for el <= 5 +- small cleanups +- purged unused patches + * Sat Jun 07 2014 Fedora Release Engineering - 1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From da030cfe6cde5b79431400a8ed0d1e850f18d629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 3 Aug 2014 21:13:01 +0200 Subject: [PATCH 190/344] add missing backslashes --- znc.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index 35a852a..05cefd7 100644 --- a/znc.spec +++ b/znc.spec @@ -135,9 +135,9 @@ chmod -x modules/q.cpp %configure \ --with-module-prefix=%{_libdir}/znc \ %if 0%{?with_modperl} - --enable-perl + --enable-perl \ %else - --disable-perl + --disable-perl \ %endif # 0%{?with_modperl} %if 0%{?with_modpython} --enable-python \ @@ -232,7 +232,6 @@ fi %{_libdir}/znc/controlpanel.so %{_libdir}/znc/crypt.so %{_libdir}/znc/ctcpflood.so -#%{_libdir}/znc/cyrusauth.so %{_libdir}/znc/dcc.so %{_libdir}/znc/disconkick.so %{_libdir}/znc/fail2ban.so @@ -273,7 +272,6 @@ fi %files devel %{_bindir}/znc-buildmod -#%{_bindir}/znc-config %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/znc/ From 2e8bfbdf2e19c0cf79bd2a67e723da2f631c4bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 3 Aug 2014 21:35:54 +0200 Subject: [PATCH 191/344] re-add needed %%global for Python3 --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index 05cefd7..ed2dc2e 100644 --- a/znc.spec +++ b/znc.spec @@ -11,6 +11,7 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 6 %if 0%{?fedora} >= 13 || 0%{?rhel} >= 8 +%global __python %{__python3} %global with_modpython 1 %endif # 0%{?fedora} >= 13 || 0%{?rhel} >= 8 From 79f80df01ef930983643500dff26caa185978c40 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:46:49 +0000 Subject: [PATCH 192/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index ed2dc2e..b903320 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -294,6 +294,9 @@ fi %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Aug 03 2014 Björn Esser - 1.4-5 - skip the python-subpkg on EPEL <= 7 - replaced %%define with %%global From 0637e1a0ddb927378303f2f3131d391ac9353995 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Aug 2014 12:53:35 +0200 Subject: [PATCH 193/344] Perl 5.20 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index b903320..865f627 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -294,6 +294,9 @@ fi %changelog +* Wed Aug 27 2014 Jitka Plesnikova - 1.4-7 +- Perl 5.20 rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 78cb5b137161acd5ae2c31ca6e02d60adb968a2c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Feb 2015 19:46:04 -0600 Subject: [PATCH 194/344] Update to 1.6.0 --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 96a6b25..06c1db4 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /znc-1.2-rc2.tar.gz /znc-1.2.tar.gz /znc-1.4.tar.gz +/znc-1.6.0.tar.gz diff --git a/sources b/sources index 35f76e9..69592cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -630cb74db34d2d5451ba30b47869f6bb znc-1.4.tar.gz +674d8c1277752dcc627b96e33a63376e znc-1.6.0.tar.gz diff --git a/znc.spec b/znc.spec index 865f627..c149247 100644 --- a/znc.spec +++ b/znc.spec @@ -16,8 +16,8 @@ %endif # 0%{?fedora} >= 13 || 0%{?rhel} >= 8 Name: znc -Version: 1.4 -Release: 7%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -213,6 +213,7 @@ fi %{_bindir}/znc %{_mandir}/man1/* %{_libdir}/znc/adminlog.so +%{_libdir}/znc/alias.so %{_libdir}/znc/autoattach.so %{_libdir}/znc/autocycle.so %{_libdir}/znc/autoop.so @@ -227,7 +228,6 @@ fi %{_libdir}/znc/cert.so %{_libdir}/znc/certauth.so %{_libdir}/znc/chansaver.so -%{_libdir}/znc/charset.so %{_libdir}/znc/clearbufferonmsg.so %{_libdir}/znc/clientnotify.so %{_libdir}/znc/controlpanel.so @@ -294,6 +294,9 @@ fi %changelog +* Mon Feb 23 2015 Nick Bebout - 1.6.0-1 +- Update to 1.6.0 + * Wed Aug 27 2014 Jitka Plesnikova - 1.4-7 - Perl 5.20 rebuild From 17a668c257475cefa9b3ce7637dd276945f1686c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:55:20 +0200 Subject: [PATCH 195/344] Rebuilt for GCC 5 C++11 ABI change --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index c149247..97cf79d 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -294,6 +294,9 @@ fi %changelog +* Sat May 02 2015 Kalev Lember - 1.6.0-2 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Feb 23 2015 Nick Bebout - 1.6.0-1 - Update to 1.6.0 From 3673eff25e823760bd8d140082a9aaa44c698064 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sat, 6 Jun 2015 18:20:53 +0200 Subject: [PATCH 196/344] Perl 5.22 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 97cf79d..f077ebd 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -294,6 +294,9 @@ fi %changelog +* Sat Jun 06 2015 Jitka Plesnikova - 1.6.0-3 +- Perl 5.22 rebuild + * Sat May 02 2015 Kalev Lember - 1.6.0-2 - Rebuilt for GCC 5 C++11 ABI change From 4184aa223b6f8626c738f509ab22b748636b9b2e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 18 Jun 2015 19:41:19 -0500 Subject: [PATCH 197/344] Fix bugs --- znc.service | 2 +- znc.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/znc.service b/znc.service index 55bb678..a210a77 100644 --- a/znc.service +++ b/znc.service @@ -3,7 +3,7 @@ Description=ZNC - an advanced IRC bouncer After=network.target [Service] -ExecStart=/usr/bin/znc +ExecStart=/usr/bin/znc -d /var/lib/znc User=znc Type=forking diff --git a/znc.spec b/znc.spec index f077ebd..2df69b3 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -39,6 +39,7 @@ BuildRequires: automake BuildRequires: c-ares-devel BuildRequires: cyrus-sasl-devel BuildRequires: gettext-devel +BuildRequires: libicu-devel BuildRequires: openssl-devel >= 0.9.8 BuildRequires: perl(ExtUtils::Embed) @@ -145,7 +146,7 @@ chmod -x modules/q.cpp %else # 0%{?with_modpython} --disable-python \ %endif # 0%{?with_modpython} - --enable-ipv6 --enable-sasl --enable-tcl + --enable-ipv6 --enable-cyrus --enable-tcl %__make %{?_smp_mflags} @@ -294,6 +295,11 @@ fi %changelog +* Tue Jun 09 2015 Nick Bebout - 1.6.0-4 +- Add ZNC path to znc.service - bz#1179832 +- Fix command to enable cyrus sasl - bz#1112022 +- Add libicu dep to enable charset module - bz#1202033 + * Sat Jun 06 2015 Jitka Plesnikova - 1.6.0-3 - Perl 5.22 rebuild From 5e91d0ea2ec8de784c93f602523b99baf18b16c7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 18 Jun 2015 19:56:52 -0500 Subject: [PATCH 198/344] Update files in spec --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index 2df69b3..e1c861e 100644 --- a/znc.spec +++ b/znc.spec @@ -234,6 +234,7 @@ fi %{_libdir}/znc/controlpanel.so %{_libdir}/znc/crypt.so %{_libdir}/znc/ctcpflood.so +%{_libdir}/znc/cyrusauth.so %{_libdir}/znc/dcc.so %{_libdir}/znc/disconkick.so %{_libdir}/znc/fail2ban.so From 7cc5f22f1b7913842ae0d00be3710d6ea20fd712 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 19 Jun 2015 16:53:45 -0500 Subject: [PATCH 199/344] Revert my change to the znc path. Any systemd based version will use /var/lib/znc/.znc --- znc.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.service b/znc.service index a210a77..55bb678 100644 --- a/znc.service +++ b/znc.service @@ -3,7 +3,7 @@ Description=ZNC - an advanced IRC bouncer After=network.target [Service] -ExecStart=/usr/bin/znc -d /var/lib/znc +ExecStart=/usr/bin/znc User=znc Type=forking From ef7c08bec634a7ee9c503e4c42169b4f5bd151a5 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 19 Jun 2015 16:54:49 -0500 Subject: [PATCH 200/344] Revert change to znc path --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index e1c861e..a4ae64d 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Fri Jun 19 2015 Nick Bebout - 1.6.0-5 +- Revert change to ZNC path - bz#1179832 and bz#1148639 + * Tue Jun 09 2015 Nick Bebout - 1.6.0-4 - Add ZNC path to znc.service - bz#1179832 - Fix command to enable cyrus sasl - bz#1112022 From 835c5c393e20d4e6cfc9a0229c318be73933878c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 3 Aug 2015 19:37:58 -0500 Subject: [PATCH 201/344] Update to 1.6.1 --- .gitignore | 1 + sources | 2 +- znc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 06c1db4..ff185e8 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /znc-1.2.tar.gz /znc-1.4.tar.gz /znc-1.6.0.tar.gz +/znc-1.6.1.tar.gz diff --git a/sources b/sources index 69592cb..c8b32a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -674d8c1277752dcc627b96e33a63376e znc-1.6.0.tar.gz +8e29289e6229b6d2473de202170745ab znc-1.6.1.tar.gz diff --git a/znc.spec b/znc.spec index a4ae64d..6a317b2 100644 --- a/znc.spec +++ b/znc.spec @@ -16,8 +16,8 @@ %endif # 0%{?fedora} >= 13 || 0%{?rhel} >= 8 Name: znc -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Mon Aug 3 2015 Nick Bebout - 1.6.1-1 +- Update to 1.6.1 + * Fri Jun 19 2015 Nick Bebout - 1.6.0-5 - Revert change to ZNC path - bz#1179832 and bz#1148639 From c47fde8e92f31059e50d05b399c7cba60007074a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 28 Oct 2015 14:09:12 +0100 Subject: [PATCH 202/344] rebuild for ICU 56.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 6a317b2..0c5f827 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Wed Oct 28 2015 David Tardon - 1.6.1-2 +- rebuild for ICU 56.1 + * Mon Aug 3 2015 Nick Bebout - 1.6.1-1 - Update to 1.6.1 From ee1088bf771c66ed38bcae3d83aeb09020e58507 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 Nov 2015 18:17:28 +0000 Subject: [PATCH 203/344] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0c5f827..06b69ce 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Tue Nov 10 2015 Fedora Release Engineering - 1.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Wed Oct 28 2015 David Tardon - 1.6.1-2 - rebuild for ICU 56.1 From a40401f505960587c18275cbe65924efefd17dfb Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 16 Nov 2015 15:02:58 -0600 Subject: [PATCH 204/344] Update to 1.6.2 --- .gitignore | 1 + sources | 2 +- znc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ff185e8..4e79987 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /znc-1.4.tar.gz /znc-1.6.0.tar.gz /znc-1.6.1.tar.gz +/znc-1.6.2.tar.gz diff --git a/sources b/sources index c8b32a0..6cc1d58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e29289e6229b6d2473de202170745ab znc-1.6.1.tar.gz +89f6696ed366661f7432ece343fd19d0 znc-1.6.2.tar.gz diff --git a/znc.spec b/znc.spec index 06b69ce..2788e0d 100644 --- a/znc.spec +++ b/znc.spec @@ -16,8 +16,8 @@ %endif # 0%{?fedora} >= 13 || 0%{?rhel} >= 8 Name: znc -Version: 1.6.1 -Release: 3%{?dist} +Version: 1.6.2 +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Mon Nov 16 2015 Nick Bebout - 1.6.2-1 +- Update to 1.6.2 + * Tue Nov 10 2015 Fedora Release Engineering - 1.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 From 208c4b4f3991d989bd7608aba67bd7c575056955 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:08:20 +0000 Subject: [PATCH 205/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 2788e0d..0ea1300 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Nov 16 2015 Nick Bebout - 1.6.2-1 - Update to 1.6.2 From 42b83a035c50e36ca12eef9fac39997776c9a2fb Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 6 Apr 2016 14:11:01 -0500 Subject: [PATCH 206/344] Update to 1.6.3 --- .gitignore | 1 + sources | 2 +- znc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e79987..2a5270f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /znc-1.6.0.tar.gz /znc-1.6.1.tar.gz /znc-1.6.2.tar.gz +/znc-1.6.3.tar.gz diff --git a/sources b/sources index 6cc1d58..29f0927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89f6696ed366661f7432ece343fd19d0 znc-1.6.2.tar.gz +0dad0307e2faea26b9e304e308f7ec63 znc-1.6.3.tar.gz diff --git a/znc.spec b/znc.spec index 0ea1300..081eb50 100644 --- a/znc.spec +++ b/znc.spec @@ -16,8 +16,8 @@ %endif # 0%{?fedora} >= 13 || 0%{?rhel} >= 8 Name: znc -Version: 1.6.2 -Release: 2%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Wed Apr 06 2016 Nick Bebout - 1.6.3-1 +- Update to 1.6.3 + * Fri Feb 05 2016 Fedora Release Engineering - 1.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3f5062ef28c1a27cd1cdb74e4e52f418740a42d3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 15 Apr 2016 20:17:27 +0200 Subject: [PATCH 207/344] rebuild for ICU 57.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 081eb50..cfc5a35 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Fri Apr 15 2016 David Tardon - 1.6.3-2 +- rebuild for ICU 57.1 + * Wed Apr 06 2016 Nick Bebout - 1.6.3-1 - Update to 1.6.3 From 2ba9f4d6ca573b3d51eeaa042f69e934ef6082c4 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 17 May 2016 03:29:45 +0200 Subject: [PATCH 208/344] Perl 5.24 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index cfc5a35..ebec4f3 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.6.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -296,6 +296,9 @@ fi %changelog +* Tue May 17 2016 Jitka Plesnikova - 1.6.3-3 +- Perl 5.24 rebuild + * Fri Apr 15 2016 David Tardon - 1.6.3-2 - rebuild for ICU 57.1 From 799aee9b7c70f4779016ade14d8fda05763b9700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:21:25 +0200 Subject: [PATCH 209/344] Mandatory Perl build-requires added --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index ebec4f3..2de20e3 100644 --- a/znc.spec +++ b/znc.spec @@ -99,6 +99,7 @@ Summary: perl module for ZNC Group: Development/Libraries BuildRequires: perl-devel +BuildRequires: perl-generators BuildRequires: swig Requires: %{name} = %{version}-%{release} From a53b3b8ab7c26ae533a32caff0103e05e9011435 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 7 Oct 2016 13:17:01 -0500 Subject: [PATCH 210/344] cleanup conditionals, use upstream unit file --- znc.spec | 59 ++++---------------------------------------------------- 1 file changed, 4 insertions(+), 55 deletions(-) diff --git a/znc.spec b/znc.spec index 081eb50..1953e46 100644 --- a/znc.spec +++ b/znc.spec @@ -2,18 +2,14 @@ %global _hardened_build 1 # Define variables to use in conditionals -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 -%global use_systemd 1 -%endif # 0%{?fedora} >= 15 || 0%{?rhel} >= 7 - %if 0%{?fedora} || 0%{?rhel} >= 6 %global with_modperl 1 %endif # 0%{?fedora} || 0%{?rhel} >= 6 -%if 0%{?fedora} >= 13 || 0%{?rhel} >= 8 +%if 0%{?fedora} || 0%{?rhel} >= 8 %global __python %{__python3} %global with_modpython 1 -%endif # 0%{?fedora} >= 13 || 0%{?rhel} >= 8 +%endif # 0%{?fedora} || 0%{?rhel} >= 8 Name: znc Version: 1.6.3 @@ -25,16 +21,6 @@ License: ASL 2.0 URL: http://znc.in Source0: %{url}/releases/%{name}-%{version}.tar.gz -%if 0%{?use_systemd} -Source1: znc.service -%else # 0%{?use_systemd} -Source1: znc.init -%endif # 0%{?use_systemd} - -%if 0%{?rhel} && 0%{?rhel} <= 5 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -%endif # 0%{?rhel} && 0%{?rhel} <= 5 - BuildRequires: automake BuildRequires: c-ares-devel BuildRequires: cyrus-sasl-devel @@ -47,28 +33,18 @@ BuildRequires: perl(ExtUtils::Embed) Obsoletes: znc-extra <= %{version}-%{release} %endif # (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) -%if 0%{?use_systemd} BuildRequires: systemd-units -%endif Requires(pre): shadow-utils -%if 0%{?use_systemd} Requires(post): systemd-units Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units -%else # 0%{?use_systemd} -Requires(post): chkconfig -Requires(preun): chkconfig -# This is for /sbin/service -Requires(preun): initscripts -%endif # 0%{?use_systemd} %description ZNC is an IRC bouncer with many advanced features like detaching, multiple users, per channel playback buffer, SSL, IPv6, transparent DCC bouncing, Perl and C++ module support to name a few. - %package devel Summary: Development files needed to compile ZNC modules Group: Development/Libraries @@ -80,7 +56,6 @@ BuildRequires: pkgconfig All includes and program files you need to compile your own znc modules. - %package modtcl Summary: TCL module for ZNC Group: Development/Libraries @@ -136,6 +111,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ + --with-systemdsystemunitdir=%{_unitdir} \ %if 0%{?with_modperl} --enable-perl \ %else @@ -155,13 +131,8 @@ chmod -x modules/q.cpp %__rm -Rf "%{buildroot}" %endif # 0%{?rhel} && 0%{?rhel} <= 5 %__make install DESTDIR="%{buildroot}" -%if 0%{?use_systemd} mkdir -p %buildroot%{_unitdir} -install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service -%else # 0%{?use_systemd} -mkdir -p %buildroot%{_initrddir} -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/znc -%endif # 0%{?use_systemd} +#install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service %if 0%{?rhel} && 0%{?rhel} <= 5 @@ -180,33 +151,15 @@ chown znc:znc /var/lib/znc %post -%if 0%{?use_systemd} %systemd_post znc.service -%else # 0%{?use_systemd} -# This adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add znc -%endif # 0%{?use_systemd} %postun -%if 0%{?use_systemd} %systemd_postun_with_restart znc.service -%else # 0%{?use_systemd} -if [ "$1" -ge "1" ] ; then - /sbin/service znc condrestart >/dev/null 2>&1 || : -fi -%endif # 0%{?use_systemd} %preun -%if 0%{?use_systemd} %systemd_preun znc.service -%else # 0%{?use_systemd} -if [ $1 -eq 0 ] ; then - /sbin/service znc stop >/dev/null 2>&1 || : - /sbin/chkconfig --del znc || : -fi -%endif # 0%{?use_systemd} %files @@ -267,11 +220,7 @@ fi %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so %{_datadir}/znc/ -%if 0%{?use_systemd} %{_unitdir}/znc.service -%else # 0%{?use_systemd} -%{_initrddir}/znc -%endif # 0%{?use_systemd} %files devel %{_bindir}/znc-buildmod From 7fc881758c026b89844adae4fea932f9ded7177a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 7 Oct 2016 13:18:44 -0500 Subject: [PATCH 211/344] Cleanup conditionals, use upstream systemd unit file --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 1953e46..0640dc3 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -245,6 +245,9 @@ chown znc:znc /var/lib/znc %changelog +* Fri Oct 07 2016 Nick Bebout - 1.6.3-2 +- Clean up conditionals, use upstream systemd unit file + * Wed Apr 06 2016 Nick Bebout - 1.6.3-1 - Update to 1.6.3 From aa5e141f54ad25fbb084ae8b8efc6dc77864fae4 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 7 Oct 2016 16:07:17 -0500 Subject: [PATCH 212/344] Fix bug 1367810 --- znc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index a2a65a4..5431e7a 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -49,7 +49,7 @@ DCC bouncing, Perl and C++ module support to name a few. Summary: Development files needed to compile ZNC modules Group: Development/Libraries Requires: %{name} = %{version}-%{release} pkgconfig -Requires: openssl-devel c-ares-devel glibc-devel +Requires: openssl-devel c-ares-devel glibc-devel libicu-devel%{?_isa} BuildRequires: pkgconfig %description devel @@ -246,6 +246,9 @@ chown znc:znc /var/lib/znc %changelog +* Fri Oct 07 2016 Nick Bebout - 1.6.3-5 +- Fix bug 1367810 + * Fri Oct 07 2016 Nick Bebout - 1.6.3-4 - Clean up conditionals, use upstream systemd unit file From 375994c11b4dcf480e2bcffadb2f455eb798b245 Mon Sep 17 00:00:00 2001 From: Eli Young Date: Fri, 7 Oct 2016 15:04:59 -0700 Subject: [PATCH 213/344] Add support for modpython on EPEL >= 7 --- znc.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/znc.spec b/znc.spec index 5431e7a..5765909 100644 --- a/znc.spec +++ b/znc.spec @@ -6,14 +6,14 @@ %global with_modperl 1 %endif # 0%{?fedora} || 0%{?rhel} >= 6 -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if 0%{?fedora} || 0%{?rhel} >= 7 %global __python %{__python3} %global with_modpython 1 -%endif # 0%{?fedora} || 0%{?rhel} >= 8 +%endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc Version: 1.6.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -92,11 +92,19 @@ perl module for ZNC Summary: python3 module for ZNC Group: Development/Libraries +%if 0%{?rhel} +BuildRequires: python34-devel +%else BuildRequires: python3-devel +%endif # 0%{?rhel} BuildRequires: swig Requires: %{name} = %{version}-%{release} +%if 0%{?rhel} +Requires: python34 +%else Requires: python3 +%endif # 0%{?rhel} %description modpython python3 module for ZNC @@ -246,6 +254,9 @@ chown znc:znc /var/lib/znc %changelog +* Fri Oct 07 2016 Eli Young - 1.6.3-6 +- Add support for modpython on EPEL >= 7 + * Fri Oct 07 2016 Nick Bebout - 1.6.3-5 - Fix bug 1367810 From 37ece4fccd9f90578403a73833091a8688f4570f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Nov 2016 08:20:32 -0600 Subject: [PATCH 214/344] Apply patch from tibbs to own libdir/znc --- znc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 5765909..52e99d8 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -175,6 +175,7 @@ chown znc:znc /var/lib/znc %doc AUTHORS LICENSE README.md %{_bindir}/znc %{_mandir}/man1/* +%dir %{_libdir}/znc %{_libdir}/znc/adminlog.so %{_libdir}/znc/alias.so %{_libdir}/znc/autoattach.so @@ -254,6 +255,10 @@ chown znc:znc /var/lib/znc %changelog +* Wed Nov 02 2016 Jason L Tibbitts III - 1.6.3-7 +- Have the main package own %%_libdir/znc. Previously the directory was + unowned. + * Fri Oct 07 2016 Eli Young - 1.6.3-6 - Add support for modpython on EPEL >= 7 From 234a1d0dcddefdf8a55b3764faeec624630a7306 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 28 Nov 2016 16:36:51 -0600 Subject: [PATCH 215/344] Update to 1.6.4-rc2 --- .gitignore | 1 + sources | 2 +- znc.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2a5270f..3b7753b 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /znc-1.6.1.tar.gz /znc-1.6.2.tar.gz /znc-1.6.3.tar.gz +/znc-1.6.4-rc2.tar.gz diff --git a/sources b/sources index 29f0927..0cc58c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0dad0307e2faea26b9e304e308f7ec63 znc-1.6.3.tar.gz +349f73c4dbe1861852b2e2649a2c50d2 znc-1.6.4-rc2.tar.gz diff --git a/znc.spec b/znc.spec index 52e99d8..a4ac240 100644 --- a/znc.spec +++ b/znc.spec @@ -12,14 +12,15 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.6.3 -Release: 7%{?dist} +Version: 1.6.4 +Release: 0.1-rc2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons License: ASL 2.0 URL: http://znc.in -Source0: %{url}/releases/%{name}-%{version}.tar.gz +#Source0: %{url}/releases/%{name}-%{version}.tar.gz +Source0: http://znc.in/releases/znc-1.6.4-rc2.tar.gz BuildRequires: automake BuildRequires: c-ares-devel @@ -255,6 +256,9 @@ chown znc:znc /var/lib/znc %changelog +* Mon Nov 28 2016 Nick Bebout - 1.6.4-0.1-rc2 +- Update to 1.6.4-rc2 + * Wed Nov 02 2016 Jason L Tibbitts III - 1.6.3-7 - Have the main package own %%_libdir/znc. Previously the directory was unowned. From c4189a85539b14cd31edd5f29de8089944a6dc5d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 28 Nov 2016 16:38:42 -0600 Subject: [PATCH 216/344] Fix N-V-R --- znc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index a4ac240..6d2ee89 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.4 -Release: 0.1-rc2%{?dist} +Release: 0.1.rc2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -256,7 +256,7 @@ chown znc:znc /var/lib/znc %changelog -* Mon Nov 28 2016 Nick Bebout - 1.6.4-0.1-rc2 +* Mon Nov 28 2016 Nick Bebout - 1.6.4-0.1.rc2 - Update to 1.6.4-rc2 * Wed Nov 02 2016 Jason L Tibbitts III - 1.6.3-7 From 81e864b31f6704eee1ca9a48b06b14a80a339fa6 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 28 Nov 2016 16:44:12 -0600 Subject: [PATCH 217/344] Fix %setup --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 6d2ee89..7c21017 100644 --- a/znc.spec +++ b/znc.spec @@ -113,7 +113,7 @@ python3 module for ZNC %prep -%setup -q +%setup -q -n znc-1.6.4-rc2 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From b260c20ce0d0d58cd15cb920c61bd87cf078cc63 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 16 Dec 2016 13:15:10 -0600 Subject: [PATCH 218/344] Update to 1.6.4 --- .gitignore | 1 + sources | 2 +- znc.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3b7753b..4f6801c 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /znc-1.6.2.tar.gz /znc-1.6.3.tar.gz /znc-1.6.4-rc2.tar.gz +/znc-1.6.4.tar.gz diff --git a/sources b/sources index 0cc58c3..c897b9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -349f73c4dbe1861852b2e2649a2c50d2 znc-1.6.4-rc2.tar.gz +SHA512 (znc-1.6.4.tar.gz) = d66069a7db4d85f8f132aed1ee4b0da8a04c61ab0e2df36426eb326e713401e824c9653b7edd0f7b317779b95b56965bc987c7099eb83b4950386462fd96cd8f diff --git a/znc.spec b/znc.spec index 7c21017..80ae444 100644 --- a/znc.spec +++ b/znc.spec @@ -13,14 +13,13 @@ Name: znc Version: 1.6.4 -Release: 0.1.rc2%{?dist} +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons License: ASL 2.0 URL: http://znc.in -#Source0: %{url}/releases/%{name}-%{version}.tar.gz -Source0: http://znc.in/releases/znc-1.6.4-rc2.tar.gz +Source0: %{url}/releases/%{name}-%{version}.tar.gz BuildRequires: automake BuildRequires: c-ares-devel @@ -113,7 +112,7 @@ python3 module for ZNC %prep -%setup -q -n znc-1.6.4-rc2 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -256,6 +255,9 @@ chown znc:znc /var/lib/znc %changelog +* Fri Dec 16 2016 Nick Bebout - 1.6.4-1 +- Update to 1.6.4 + * Mon Nov 28 2016 Nick Bebout - 1.6.4-0.1.rc2 - Update to 1.6.4-rc2 From c5007ded61185396008319ed4beb7394dac6232c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:38 +0100 Subject: [PATCH 219/344] Rebuild for Python 3.6 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 80ae444..245bda5 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -255,6 +255,9 @@ chown znc:znc /var/lib/znc %changelog +* Mon Dec 19 2016 Miro Hrončok - 1.6.4-2 +- Rebuild for Python 3.6 + * Fri Dec 16 2016 Nick Bebout - 1.6.4-1 - Update to 1.6.4 From f25e46c55b991d143f44d37dacffa81a01e4d200 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:26:24 +0000 Subject: [PATCH 220/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 245bda5..a3e3a48 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -255,6 +255,9 @@ chown znc:znc /var/lib/znc %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 19 2016 Miro Hrončok - 1.6.4-2 - Rebuild for Python 3.6 From 0f2ad4414f81e5ec8be34b66b110d816914dff26 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 14 Mar 2017 10:06:47 -0500 Subject: [PATCH 221/344] Update to 1.6.5 --- .gitignore | 1 + sources | 2 +- znc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4f6801c..80bc42f 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /znc-1.6.3.tar.gz /znc-1.6.4-rc2.tar.gz /znc-1.6.4.tar.gz +/znc-1.6.5.tar.gz diff --git a/sources b/sources index c897b9f..a0381c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (znc-1.6.4.tar.gz) = d66069a7db4d85f8f132aed1ee4b0da8a04c61ab0e2df36426eb326e713401e824c9653b7edd0f7b317779b95b56965bc987c7099eb83b4950386462fd96cd8f +SHA512 (znc-1.6.5.tar.gz) = d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 diff --git a/znc.spec b/znc.spec index a3e3a48..1a85bb7 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.6.4 -Release: 3%{?dist} +Version: 1.6.5 +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -255,6 +255,9 @@ chown znc:znc /var/lib/znc %changelog +* Tue Mar 14 2017 Nick Bebout - 1.6.5-1 +- Update to 1.6.5 + * Sat Feb 11 2017 Fedora Release Engineering - 1.6.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f0a00b68e0f83b74a37c1581c7a56890360b8685 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 14 Mar 2017 10:30:42 -0500 Subject: [PATCH 222/344] Apply patch from tibbs to change how /var/lib/znc is created --- znc.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 1a85bb7..9df77be 100644 --- a/znc.spec +++ b/znc.spec @@ -155,8 +155,6 @@ getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \ -c "Account for ZNC to run as" znc -mkdir -p /var/lib/znc -chown znc:znc /var/lib/znc %post @@ -231,6 +229,7 @@ chown znc:znc /var/lib/znc %{_libdir}/znc/webadmin.so %{_datadir}/znc/ %{_unitdir}/znc.service +%attr(-,znc,znc) %{_sharedstatedir}/znc/ %files devel %{_bindir}/znc-buildmod From 07b978f9e6175c72ad0507b4cbe5d0bf6fc7ca4f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 14 Mar 2017 10:33:27 -0500 Subject: [PATCH 223/344] Apply patch from tibbs to change how /var/lib/znc is created --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 9df77be..c7397e8 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -254,6 +254,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Mar 14 2017 Nick Bebout - 1.6.5-2 +- Apply patch from tibbs to change how /var/lib/znc is created + * Tue Mar 14 2017 Nick Bebout - 1.6.5-1 - Update to 1.6.5 From e70bc574ea5a594f086170d40c2fb581a574f69a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 19:51:32 +0000 Subject: [PATCH 224/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index c7397e8..d12276c 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -254,6 +254,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon May 15 2017 Fedora Release Engineering - 1.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Tue Mar 14 2017 Nick Bebout - 1.6.5-2 - Apply patch from tibbs to change how /var/lib/znc is created From 127290d15034a9869a3986545ef801c0d29a8b8b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 4 Jun 2017 09:56:40 +0200 Subject: [PATCH 225/344] Perl 5.26 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d12276c..b881b0c 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -254,6 +254,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sun Jun 04 2017 Jitka Plesnikova - 1.6.5-4 +- Perl 5.26 rebuild + * Mon May 15 2017 Fedora Release Engineering - 1.6.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From 83fe02ad82b919e99ff766711a4b68b590edab0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 12 Jun 2017 17:15:26 +0200 Subject: [PATCH 226/344] Fix creating /var/lib/znc directory --- znc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index b881b0c..c069b5b 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -142,6 +142,7 @@ chmod -x modules/q.cpp %__make install DESTDIR="%{buildroot}" mkdir -p %buildroot%{_unitdir} #install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service +install -d "%{buildroot}%{_sharedstatedir}/znc" %if 0%{?rhel} && 0%{?rhel} <= 5 @@ -254,6 +255,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Jun 12 2017 Petr Pisar - 1.6.5-5 +- Fix creating /var/lib/znc directory (bug #1402472) + * Sun Jun 04 2017 Jitka Plesnikova - 1.6.5-4 - Perl 5.26 rebuild From 752dd46c35da9d47b487423f181d0a85760c31dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 13 Jul 2017 09:59:50 +0200 Subject: [PATCH 227/344] perl dependency renamed to perl-interpreter --- znc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index c069b5b..16d4218 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -78,7 +78,7 @@ BuildRequires: perl-generators BuildRequires: swig Requires: %{name} = %{version}-%{release} -Requires: perl +Requires: perl-interpreter Provides: perl(ZNC::Module) = %{version}-%{release} @@ -255,6 +255,10 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Jul 13 2017 Petr Pisar - 1.6.5-6 +- perl dependency renamed to perl-interpreter + + * Mon Jun 12 2017 Petr Pisar - 1.6.5-5 - Fix creating /var/lib/znc directory (bug #1402472) From 88c004476ea84d73d07554f79d47fae649408846 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:45:18 +0000 Subject: [PATCH 228/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 16d4218..903a886 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -255,6 +255,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jul 13 2017 Petr Pisar - 1.6.5-6 - perl dependency renamed to perl-interpreter From b246f770e8e533775318330282d0bdc52941df3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:13:07 +0000 Subject: [PATCH 229/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 903a886..67bd729 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -255,6 +255,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.6.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9560e1eaf83e7b5fa984bc761a79be6709a42c68 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 30 Nov 2017 20:57:24 +0000 Subject: [PATCH 230/344] Rebuild for ICU 60.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 67bd729..a814083 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -255,6 +255,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Nov 30 2017 Pete Walter - 1.6.5-9 +- Rebuild for ICU 60.1 + * Thu Aug 03 2017 Fedora Release Engineering - 1.6.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 2a7e59df0e710ccc871867af34e44e0de275d32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jan 2018 23:08:48 +0100 Subject: [PATCH 231/344] Rebuilt for switch to libxcrypt --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index a814083..98b2453 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -255,6 +255,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jan 20 2018 Björn Esser - 1.6.5-10 +- Rebuilt for switch to libxcrypt + * Thu Nov 30 2017 Pete Walter - 1.6.5-9 - Rebuild for ICU 60.1 From 091b6c7bb1da9b0646d7f253a22f2e05e265449c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 25 Jan 2018 15:58:56 +0100 Subject: [PATCH 232/344] Fix systemd executions/requirements Signed-off-by: Igor Gnatenko --- znc.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/znc.spec b/znc.spec index 98b2453..aeb3ce6 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -33,12 +33,9 @@ BuildRequires: perl(ExtUtils::Embed) Obsoletes: znc-extra <= %{version}-%{release} %endif # (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) -BuildRequires: systemd-units Requires(pre): shadow-utils -Requires(post): systemd-units -Requires(post): systemd-sysv -Requires(preun): systemd-units -Requires(postun): systemd-units +BuildRequires: systemd +%{?systemd_requires} %description ZNC is an IRC bouncer with many advanced features like detaching, @@ -255,6 +252,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Jan 25 2018 Igor Gnatenko - 1.6.5-11 +- Fix systemd executions/requirements + * Sat Jan 20 2018 Björn Esser - 1.6.5-10 - Rebuilt for switch to libxcrypt From b0b57dcc97a07a2c1466e16b6f484bf57efe16e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:31:03 +0000 Subject: [PATCH 233/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index aeb3ce6..23545a1 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -252,6 +252,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.6.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 25 2018 Igor Gnatenko - 1.6.5-11 - Fix systemd executions/requirements From ac0cebd74725cd1ec15cf7445c743d2beb14bd68 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 5 Mar 2018 08:15:29 -0600 Subject: [PATCH 234/344] Update to 1.6.6 --- .gitignore | 1 + sources | 2 +- znc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 80bc42f..8d89908 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /znc-1.6.4-rc2.tar.gz /znc-1.6.4.tar.gz /znc-1.6.5.tar.gz +/znc-1.6.6.tar.gz diff --git a/sources b/sources index a0381c6..593ede6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (znc-1.6.5.tar.gz) = d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 +SHA512 (znc-1.6.6.tar.gz) = cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7 diff --git a/znc.spec b/znc.spec index 23545a1..10747e8 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.6.5 -Release: 12%{?dist} +Version: 1.6.6 +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -252,6 +252,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Mar 05 2018 Nick Bebout - 1.6.6-1 +- Update to 1.6.6 + * Fri Feb 09 2018 Fedora Release Engineering - 1.6.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9356bcd845f779fb097ead44d31866c6b35c8acc Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 30 Apr 2018 08:32:48 +0100 Subject: [PATCH 235/344] Rebuild for ICU 61.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 10747e8..f2f3787 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.6.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -252,6 +252,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Apr 30 2018 Pete Walter - 1.6.6-2 +- Rebuild for ICU 61.1 + * Mon Mar 05 2018 Nick Bebout - 1.6.6-1 - Update to 1.6.6 From dcd546a2a9a1bd944c5ffcc1a21f8150fb8b2919 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 2 May 2018 14:46:29 -0500 Subject: [PATCH 236/344] Update to 1.7.0 --- .gitignore | 1 + sources | 2 +- znc.spec | 65 ++++++------------------------------------------------ 3 files changed, 9 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index 8d89908..f47d7e6 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /znc-1.6.4.tar.gz /znc-1.6.5.tar.gz /znc-1.6.6.tar.gz +/znc-1.7.0.tar.gz diff --git a/sources b/sources index 593ede6..c1e0886 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (znc-1.6.6.tar.gz) = cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7 +SHA512 (znc-1.7.0.tar.gz) = 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b diff --git a/znc.spec b/znc.spec index f2f3787..ae5617a 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.6.6 -Release: 2%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -138,10 +138,8 @@ chmod -x modules/q.cpp %endif # 0%{?rhel} && 0%{?rhel} <= 5 %__make install DESTDIR="%{buildroot}" mkdir -p %buildroot%{_unitdir} -#install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service install -d "%{buildroot}%{_sharedstatedir}/znc" - %if 0%{?rhel} && 0%{?rhel} <= 5 %clean %__rm -Rf "%{buildroot}" @@ -168,63 +166,11 @@ getent passwd znc >/dev/null || \ %files -%doc AUTHORS LICENSE README.md +%doc LICENSE README.md %{_bindir}/znc %{_mandir}/man1/* %dir %{_libdir}/znc -%{_libdir}/znc/adminlog.so -%{_libdir}/znc/alias.so -%{_libdir}/znc/autoattach.so -%{_libdir}/znc/autocycle.so -%{_libdir}/znc/autoop.so -%{_libdir}/znc/autoreply.so -%{_libdir}/znc/autovoice.so -%{_libdir}/znc/awaynick.so -%{_libdir}/znc/awaystore.so -%{_libdir}/znc/block_motd.so -%{_libdir}/znc/blockuser.so -%{_libdir}/znc/bouncedcc.so -%{_libdir}/znc/buffextras.so -%{_libdir}/znc/cert.so -%{_libdir}/znc/certauth.so -%{_libdir}/znc/chansaver.so -%{_libdir}/znc/clearbufferonmsg.so -%{_libdir}/znc/clientnotify.so -%{_libdir}/znc/controlpanel.so -%{_libdir}/znc/crypt.so -%{_libdir}/znc/ctcpflood.so -%{_libdir}/znc/cyrusauth.so -%{_libdir}/znc/dcc.so -%{_libdir}/znc/disconkick.so -%{_libdir}/znc/fail2ban.so -%{_libdir}/znc/flooddetach.so -%{_libdir}/znc/identfile.so -%{_libdir}/znc/imapauth.so -%{_libdir}/znc/keepnick.so -%{_libdir}/znc/kickrejoin.so -%{_libdir}/znc/lastseen.so -%{_libdir}/znc/listsockets.so -%{_libdir}/znc/log.so -%{_libdir}/znc/missingmotd.so -%{_libdir}/znc/modules_online.so -%{_libdir}/znc/nickserv.so -%{_libdir}/znc/notes.so -%{_libdir}/znc/notify_connect.so -%{_libdir}/znc/partyline.so -%{_libdir}/znc/perform.so -%{_libdir}/znc/q.so -%{_libdir}/znc/raw.so -%{_libdir}/znc/route_replies.so -%{_libdir}/znc/sample.so -%{_libdir}/znc/sasl.so -%{_libdir}/znc/savebuff.so -%{_libdir}/znc/schat.so -%{_libdir}/znc/send_raw.so -%{_libdir}/znc/shell.so -%{_libdir}/znc/simple_away.so -%{_libdir}/znc/stickychan.so -%{_libdir}/znc/watch.so -%{_libdir}/znc/webadmin.so +%{_libdir}/znc/* %{_datadir}/znc/ %{_unitdir}/znc.service %attr(-,znc,znc) %{_sharedstatedir}/znc/ @@ -252,6 +198,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed May 2 2018 Nick Bebout - 1.7.0-1 +- Update to 1.7.0 + * Mon Apr 30 2018 Pete Walter - 1.6.6-2 - Rebuild for ICU 61.1 From 2c25631517c734edbf596c271dcf7c3cfc8d7f7c Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 15 May 2018 14:24:52 +0100 Subject: [PATCH 237/344] Rebuild for ICU 61.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index ae5617a..c5d9986 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -198,6 +198,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue May 15 2018 Pete Walter - 1.7.0-2 +- Rebuild for ICU 61.1 + * Wed May 2 2018 Nick Bebout - 1.7.0-1 - Update to 1.7.0 From ab1e6679f6b120cacfaa99b329f2bfab1f119588 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 18 May 2018 13:35:47 -0500 Subject: [PATCH 238/344] Revert "Update to 1.7.0" This reverts commit dcd546a2a9a1bd944c5ffcc1a21f8150fb8b2919. --- .gitignore | 1 - sources | 2 +- znc.spec | 65 ++++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 59 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index f47d7e6..8d89908 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,3 @@ /znc-1.6.4.tar.gz /znc-1.6.5.tar.gz /znc-1.6.6.tar.gz -/znc-1.7.0.tar.gz diff --git a/sources b/sources index c1e0886..593ede6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (znc-1.7.0.tar.gz) = 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b +SHA512 (znc-1.6.6.tar.gz) = cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7 diff --git a/znc.spec b/znc.spec index ae5617a..f2f3787 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.7.0 -Release: 1%{?dist} +Version: 1.6.6 +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -138,8 +138,10 @@ chmod -x modules/q.cpp %endif # 0%{?rhel} && 0%{?rhel} <= 5 %__make install DESTDIR="%{buildroot}" mkdir -p %buildroot%{_unitdir} +#install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service install -d "%{buildroot}%{_sharedstatedir}/znc" + %if 0%{?rhel} && 0%{?rhel} <= 5 %clean %__rm -Rf "%{buildroot}" @@ -166,11 +168,63 @@ getent passwd znc >/dev/null || \ %files -%doc LICENSE README.md +%doc AUTHORS LICENSE README.md %{_bindir}/znc %{_mandir}/man1/* %dir %{_libdir}/znc -%{_libdir}/znc/* +%{_libdir}/znc/adminlog.so +%{_libdir}/znc/alias.so +%{_libdir}/znc/autoattach.so +%{_libdir}/znc/autocycle.so +%{_libdir}/znc/autoop.so +%{_libdir}/znc/autoreply.so +%{_libdir}/znc/autovoice.so +%{_libdir}/znc/awaynick.so +%{_libdir}/znc/awaystore.so +%{_libdir}/znc/block_motd.so +%{_libdir}/znc/blockuser.so +%{_libdir}/znc/bouncedcc.so +%{_libdir}/znc/buffextras.so +%{_libdir}/znc/cert.so +%{_libdir}/znc/certauth.so +%{_libdir}/znc/chansaver.so +%{_libdir}/znc/clearbufferonmsg.so +%{_libdir}/znc/clientnotify.so +%{_libdir}/znc/controlpanel.so +%{_libdir}/znc/crypt.so +%{_libdir}/znc/ctcpflood.so +%{_libdir}/znc/cyrusauth.so +%{_libdir}/znc/dcc.so +%{_libdir}/znc/disconkick.so +%{_libdir}/znc/fail2ban.so +%{_libdir}/znc/flooddetach.so +%{_libdir}/znc/identfile.so +%{_libdir}/znc/imapauth.so +%{_libdir}/znc/keepnick.so +%{_libdir}/znc/kickrejoin.so +%{_libdir}/znc/lastseen.so +%{_libdir}/znc/listsockets.so +%{_libdir}/znc/log.so +%{_libdir}/znc/missingmotd.so +%{_libdir}/znc/modules_online.so +%{_libdir}/znc/nickserv.so +%{_libdir}/znc/notes.so +%{_libdir}/znc/notify_connect.so +%{_libdir}/znc/partyline.so +%{_libdir}/znc/perform.so +%{_libdir}/znc/q.so +%{_libdir}/znc/raw.so +%{_libdir}/znc/route_replies.so +%{_libdir}/znc/sample.so +%{_libdir}/znc/sasl.so +%{_libdir}/znc/savebuff.so +%{_libdir}/znc/schat.so +%{_libdir}/znc/send_raw.so +%{_libdir}/znc/shell.so +%{_libdir}/znc/simple_away.so +%{_libdir}/znc/stickychan.so +%{_libdir}/znc/watch.so +%{_libdir}/znc/webadmin.so %{_datadir}/znc/ %{_unitdir}/znc.service %attr(-,znc,znc) %{_sharedstatedir}/znc/ @@ -198,9 +252,6 @@ getent passwd znc >/dev/null || \ %changelog -* Wed May 2 2018 Nick Bebout - 1.7.0-1 -- Update to 1.7.0 - * Mon Apr 30 2018 Pete Walter - 1.6.6-2 - Rebuild for ICU 61.1 From c4ebcd526b31a150eb92c5ecf9bffe7ea4c0cdff Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 18 May 2018 14:35:05 -0500 Subject: [PATCH 239/344] Fix %files to not use wildcard --- .gitignore | 1 + sources | 2 +- znc.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8d89908..f47d7e6 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /znc-1.6.4.tar.gz /znc-1.6.5.tar.gz /znc-1.6.6.tar.gz +/znc-1.7.0.tar.gz diff --git a/sources b/sources index 593ede6..c1e0886 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (znc-1.6.6.tar.gz) = cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7 +SHA512 (znc-1.7.0.tar.gz) = 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b diff --git a/znc.spec b/znc.spec index f2f3787..445167f 100644 --- a/znc.spec +++ b/znc.spec @@ -12,7 +12,7 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.6.6 +Version: 1.7.0 Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -168,7 +168,7 @@ getent passwd znc >/dev/null || \ %files -%doc AUTHORS LICENSE README.md +%doc LICENSE README.md %{_bindir}/znc %{_mandir}/man1/* %dir %{_libdir}/znc @@ -216,6 +216,7 @@ getent passwd znc >/dev/null || \ %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so +%{_libdir}/znc/samplewebapi.so %{_libdir}/znc/sasl.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so @@ -223,6 +224,7 @@ getent passwd znc >/dev/null || \ %{_libdir}/znc/shell.so %{_libdir}/znc/simple_away.so %{_libdir}/znc/stickychan.so +%{_libdir}/znc/stripcontrols.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so %{_datadir}/znc/ @@ -248,10 +250,15 @@ getent passwd znc >/dev/null || \ %files modpython %{_libdir}/znc/modpython/ %{_libdir}/znc/modpython.so +%{_libdir}/znc/pyeval.py +%{_libdir}/znc/__pycache__/ %endif # 0%{?with_modpython} %changelog +* Fri May 18 2018 Nick Bebout - 1.7.0-1 +- Update to 1.7.0 + * Mon Apr 30 2018 Pete Walter - 1.6.6-2 - Rebuild for ICU 61.1 From 853357be180429011ed801b9b13186914d6c543c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:31:02 +0200 Subject: [PATCH 240/344] Rebuilt for Python 3.7 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index fb54f4a..fb9ab42 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -256,6 +256,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jun 19 2018 Miro Hrončok - 1.7.0-4 +- Rebuilt for Python 3.7 + * Fri May 18 2018 Nick Bebout - 1.7.0-3 - Fix %%files to not use wildcard From 35493f64d05aa9beaa5379ce726feebcea173b50 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 28 Jun 2018 03:33:43 +0200 Subject: [PATCH 241/344] Perl 5.28 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index fb9ab42..b99209d 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -256,6 +256,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Jun 28 2018 Jitka Plesnikova - 1.7.0-5 +- Perl 5.28 rebuild + * Tue Jun 19 2018 Miro Hrončok - 1.7.0-4 - Rebuilt for Python 3.7 From 5ac3db7ead2c9bed2a532ed3608a760e008b1f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 3 Jul 2018 12:35:56 +0200 Subject: [PATCH 242/344] Perl 5.28 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index b99209d..3104dc7 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -256,6 +256,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jul 03 2018 Petr Pisar - 1.7.0-6 +- Perl 5.28 rebuild + * Thu Jun 28 2018 Jitka Plesnikova - 1.7.0-5 - Perl 5.28 rebuild From 04dd6d84b9c5152cc5bcddb6f1de6685482822ef Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 10 Jul 2018 22:06:13 +0100 Subject: [PATCH 243/344] Rebuild for ICU 62 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 3104dc7..f4e6560 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -256,6 +256,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jul 10 2018 Pete Walter - 1.7.0-7 +- Rebuild for ICU 62 + * Tue Jul 03 2018 Petr Pisar - 1.7.0-6 - Perl 5.28 rebuild From 6ce4d60bbb2cb98b65ef63ca7171b246cfc44ca5 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 10 Jul 2018 23:46:45 +0100 Subject: [PATCH 244/344] Add missing BuildRequires: gcc-c++ --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index f4e6560..b6924f0 100644 --- a/znc.spec +++ b/znc.spec @@ -24,6 +24,7 @@ Source0: %{url}/releases/%{name}-%{version}.tar.gz BuildRequires: automake BuildRequires: c-ares-devel BuildRequires: cyrus-sasl-devel +BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: libicu-devel BuildRequires: openssl-devel >= 0.9.8 From ec1af11616e7c1e92c16fea72f13540a73adad4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:52:27 +0000 Subject: [PATCH 245/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index b6924f0..fa41564 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -257,6 +257,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.7.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 10 2018 Pete Walter - 1.7.0-7 - Rebuild for ICU 62 From 2b698f2c1f673c68ee8fc382b84b648def2cf987 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 17 Jul 2018 18:51:09 -0500 Subject: [PATCH 246/344] Update to 1.7.1 --- .gitignore | 1 + sources | 2 +- znc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f47d7e6..28c361d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /znc-1.6.5.tar.gz /znc-1.6.6.tar.gz /znc-1.7.0.tar.gz +/znc-1.7.1.tar.gz diff --git a/sources b/sources index c1e0886..16e73b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (znc-1.7.0.tar.gz) = 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b +SHA512 (znc-1.7.1.tar.gz) = 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902 diff --git a/znc.spec b/znc.spec index fa41564..cea400e 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.7.0 -Release: 8%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -257,6 +257,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jul 17 2018 Nick Bebout - 1.7.1-1 +- Update to 1.7.1 + * Sat Jul 14 2018 Fedora Release Engineering - 1.7.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 18f3e665cdec1738bcebf0d4baa834634d572aff Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 17 Jul 2018 19:05:14 -0500 Subject: [PATCH 247/344] Add admindebug.so to files --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index cea400e..c2051d7 100644 --- a/znc.spec +++ b/znc.spec @@ -173,6 +173,7 @@ getent passwd znc >/dev/null || \ %{_bindir}/znc %{_mandir}/man1/* %dir %{_libdir}/znc +%{_libdir}/znc/admindebug.so %{_libdir}/znc/adminlog.so %{_libdir}/znc/alias.so %{_libdir}/znc/autoattach.so From 16c5bdf70bcd4598d64211e1ef64e64b4c717d29 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jul 2018 11:05:26 -0500 Subject: [PATCH 248/344] Add gcc-c++ and redhat-rpm-config to dependencies --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index fb54f4a..df7d0b2 100644 --- a/znc.spec +++ b/znc.spec @@ -48,6 +48,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} pkgconfig Requires: openssl-devel c-ares-devel glibc-devel libicu-devel%{?_isa} BuildRequires: pkgconfig +Requires: gcc-c++ redhat-rpm-config %description devel All includes and program files you need to compile your own znc From 5e81aa65ec21e2c15ab0df67902d17e7e269a8b0 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Jul 2018 11:06:25 -0500 Subject: [PATCH 249/344] Add gcc-c++ and redhat-rpm-config to dependencies of znc-devel --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 397c685..bc68124 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer Group: System Environment/Daemons @@ -259,6 +259,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Jul 23 2018 Nick Bebout - 1.7.1-2 +- Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies + * Tue Jul 17 2018 Nick Bebout - 1.7.1-1 - Update to 1.7.1 From 434c418ed584ddfaa7f7b469c835048fa54bd823 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 24 Aug 2018 13:56:33 -0400 Subject: [PATCH 250/344] Simplify and improve git ignore rules Using a pattern to match the source tar.gz files prevents fedpkg upload from needlessly appending each new source file to .gitignore. Also ignore *.rpm, the results dir from mockbuild, and expanded source directories. --- .gitignore | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 28c361d..3ca534e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1,6 @@ -/znc-0.096.tar.gz -/znc-0.097.svn2196.tar.bz2 -/znc-0.097.svn2197.tar.bz2 -/znc-0.097.svn2202.tar.bz2 -/znc-0.097.svn2213.tar.bz2 -/znc-0.097.svn2214.tar.bz2 -/znc-0.097.svn2255.tar.bz2 -/znc-0.097.svn2269.tar.bz2 -/znc-0.097.svn2272.tar.xz -/znc-0.097.svn2277.tar.xz -/znc-0.097.tar.xz -/znc-0.098-alpha1.tar.gz -/znc-0.098-beta.tar.gz -/znc-0.098-rc1.tar.gz -/znc-0.098.tar.gz -/znc-0.099.tar.xz -/znc-0.2-alpha1.tar.gz -/znc-0.2-beta1.tar.gz -/znc-0.200-rc1.tar.gz -/znc-0.200.tar.gz -/znc-0.202.tar.gz -/znc-0.204.tar.gz -/znc-0.206.tar.gz -/znc-1.0-alpha1.tar.gz -/znc-1.0-beta1.tar.gz -/znc-1.0.tar.gz -/znc-1.2-alpha1.tar.gz -/znc-1.2-beta1.tar.gz -/znc-1.2-rc2.tar.gz -/znc-1.2.tar.gz -/znc-1.4.tar.gz -/znc-1.6.0.tar.gz -/znc-1.6.1.tar.gz -/znc-1.6.2.tar.gz -/znc-1.6.3.tar.gz -/znc-1.6.4-rc2.tar.gz -/znc-1.6.4.tar.gz -/znc-1.6.5.tar.gz -/znc-1.6.6.tar.gz -/znc-1.7.0.tar.gz -/znc-1.7.1.tar.gz +/*.rpm +/gpgkey-*.gpg +/results_*/ +/znc-*/ +/znc-*.tar.gz +/znc-*.tar.gz.sig From a61baffdc8f16046d65ec9e2f2774c3904d51016 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 24 Aug 2018 13:12:21 -0400 Subject: [PATCH 251/344] Clean up ancient Fedora and RHEL conditionals RHEL-5 reached EOL in March of 2017. Fedora-24 is similarly EOL. --- znc.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/znc.spec b/znc.spec index bc68124..3cf6dd3 100644 --- a/znc.spec +++ b/znc.spec @@ -30,9 +30,9 @@ BuildRequires: libicu-devel BuildRequires: openssl-devel >= 0.9.8 BuildRequires: perl(ExtUtils::Embed) -%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) +%if 0%{?rhel} && 0%{?rhel} <= 9 Obsoletes: znc-extra <= %{version}-%{release} -%endif # (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) +%endif # 0%{?rhel} && 0%{?rhel} <= 9 Requires(pre): shadow-utils BuildRequires: systemd @@ -135,21 +135,12 @@ chmod -x modules/q.cpp %install -%if 0%{?rhel} && 0%{?rhel} <= 5 -%__rm -Rf "%{buildroot}" -%endif # 0%{?rhel} && 0%{?rhel} <= 5 %__make install DESTDIR="%{buildroot}" mkdir -p %buildroot%{_unitdir} #install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service install -d "%{buildroot}%{_sharedstatedir}/znc" -%if 0%{?rhel} && 0%{?rhel} <= 5 -%clean -%__rm -Rf "%{buildroot}" -%endif # 0%{?rhel} && 0%{?rhel} <= 5 - - %pre getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ @@ -259,6 +250,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Aug 24 2018 Todd Zullinger +- Clean up ancient Fedora and RHEL conditionals + * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From 21befc622d2616ef621b3fa4b807370ba89e3701 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 17 Jan 2017 01:57:21 -0500 Subject: [PATCH 252/344] Remove cruft from %prep The znc.cpp file was moved in znc-1.0 and the pattern used in the perl replacement changed. No one seems to have missed the addition of the %%{release} macro which was intended. Drop the command and avoid an rpm build warning. Similarly, the q.cpp file mode no longer needs to be fixed. --- znc.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 3cf6dd3..55426c0 100644 --- a/znc.spec +++ b/znc.spec @@ -112,8 +112,6 @@ python3 module for ZNC %prep %setup -q -%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -chmod -x modules/q.cpp %build @@ -252,6 +250,7 @@ getent passwd znc >/dev/null || \ %changelog * Fri Aug 24 2018 Todd Zullinger - Clean up ancient Fedora and RHEL conditionals +- Remove cruft from %%prep * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From 2e6612f513c9c58ad8b551b8426aef1a37de40ca Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 25 Aug 2018 23:52:33 -0400 Subject: [PATCH 253/344] Use %autosetup, %make_build, and %make_install macros Using %autosetup removes the need to manually define %patchN macros. Using %make_build and %make_install handles %{?_smp_mflags} and DESTDIR. Also remove cruft related to the znc systemd service file install, left after a53b3b8 ("cleanup conditionals, use upstream unit file", 2016-10-07). --- znc.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/znc.spec b/znc.spec index 55426c0..bd9f22c 100644 --- a/znc.spec +++ b/znc.spec @@ -111,7 +111,7 @@ python3 module for ZNC %prep -%setup -q +%autosetup -p1 %build @@ -129,13 +129,11 @@ python3 module for ZNC --disable-python \ %endif # 0%{?with_modpython} --enable-ipv6 --enable-cyrus --enable-tcl -%__make %{?_smp_mflags} +%make_build %install -%__make install DESTDIR="%{buildroot}" -mkdir -p %buildroot%{_unitdir} -#install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service +%make_install install -d "%{buildroot}%{_sharedstatedir}/znc" @@ -251,6 +249,7 @@ getent passwd znc >/dev/null || \ * Fri Aug 24 2018 Todd Zullinger - Clean up ancient Fedora and RHEL conditionals - Remove cruft from %%prep +- Use %%autosetup, %%make_build, and %%make_install macros * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From b4e64ed274cb21eb7cc5cd372b0d3f8004a3a986 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 01:46:30 -0400 Subject: [PATCH 254/344] Use https for URL and SOURCE tags While upstream redirects to https these days, avoid sending users to the non-secure site. As %url is used for Source0 it's preferable to download source tarballs via a secure channel. --- znc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index bd9f22c..815df07 100644 --- a/znc.spec +++ b/znc.spec @@ -18,7 +18,7 @@ Summary: An advanced IRC bouncer Group: System Environment/Daemons License: ASL 2.0 -URL: http://znc.in +URL: https://znc.in Source0: %{url}/releases/%{name}-%{version}.tar.gz BuildRequires: automake @@ -250,6 +250,7 @@ getent passwd znc >/dev/null || \ - Clean up ancient Fedora and RHEL conditionals - Remove cruft from %%prep - Use %%autosetup, %%make_build, and %%make_install macros +- Use https for URL and SOURCE tags * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From 7e502cc8e69ee859ddf097d7a493349bbf73bf12 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 00:32:30 -0400 Subject: [PATCH 255/344] Check upstream GPG signature in %prep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream provides signatures for the source tarballs. Automatically verify them in %prep. This is one less manual step for maintainers. The upstream tarballs are signed by Alexey Sokolov, AKA DarthGandalf. The key was initially taken from Alexey's profile page at savannah.gnu.org¹. The key was then refreshed from the public keyservers to pick up changes to the expiration date. Lastly, it was exported via the following command: gpg2 --armor --export-options export-minimal --export \ D5823CACB477191CAC0075555AE420CC0209989E > gpgkey-5AE420CC0209989E.asc ¹ https://savannah.gnu.org/users/darthgandalf --- gpgkey-5AE420CC0209989E.asc | 89 +++++++++++++++++++++++++++++++++++++ znc.spec | 11 +++++ 2 files changed, 100 insertions(+) create mode 100644 gpgkey-5AE420CC0209989E.asc diff --git a/gpgkey-5AE420CC0209989E.asc b/gpgkey-5AE420CC0209989E.asc new file mode 100644 index 0000000..bc8a0f5 --- /dev/null +++ b/gpgkey-5AE420CC0209989E.asc @@ -0,0 +1,89 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBE66oWABEADT/ix/xviuWpwAeySocHnYozbjO4L1lKzaj4OMfAZfP+KvwX8H +jy0Ymf4KwxVkub0R2znLlmYiSjHaelMNwK9EDaY48uodV7EMHBostP6u+tjUJQsZ +tQI3ErUYOv0Qlx3xfZ8UvlCT6AWdvlZQha8oAs3EzaUPrBD5dsnUFE6wq0UsBBoA +5xCh/2eGEqKjtSNTf1ZtSCF1StfRPPX8bqkEMpBsTTak3G6+3yt9GYRAqDwSTkB2 +usMroWrDAIG2+mLKqpHtRKz3T/VP4sL7v03w+DDPyQXMajHepAdAwkMweRWQgZBi +n3Qb5tOHPQTzR/3zz80XidyxjwL9hNdrRA5tHoH3uoNCZ1XNZrsK8XnCBDHQJdVK +jD2TOceTH/khobjm+187PcmCunkHuiFH0qY1rX7vsv9F4Zy78ZV4UD76Lky5UE7Y +nns4oyQqfjRGyCC9kw7hmUDQ0LBMPaoxAf5IOuXQlLc7RHmdcwvML6nBzIV2ueJG +AMWnNh4G8Ms4N6buZHHAipZ8EzL9itbNVjvKdh2K02wq6M8/QvRKlp1kcmpJsDAC +501tUXMyPA1K9FppWRrXjmAzYvSSXXRcXT8U6RXxVA48JI6UaO4AL2iV1MjmsXo6 +SdaPCFg4oiziTGgCdNcdKqSJU7N8oYDwHRZ7wSOeVI1b7ZB6cXbrQAHBUQARAQAB +tCNBbGV4ZXkgU29rb2xvdiA8a3RvbmlidWRAZ21haWwuY29tPokCPgQTAQIAKAIb +AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlhytLQFCQ9brdAACgkQWuQgzAIJ +mJ4kYA/7Bmak/BOdHNoSQCGzAj+rTiWNuTVmaMPU9cIrDvh2VvpLMHZfVktQ7pEv +lKZh4/93SXKY9MrFg2U5ThFO+O5wd62S0dTmUZuzh54qvxTQgCA1ShgCvDj+6YGn +IyrbtkLOCEiFT1+GR2pBdaZfsiO1uGZ177KOR7TSoh95ZA7/euU0nWX+75DTtaLK +vbwG0/H9vF1/ANAVsGMQEw2a/L5JDc0UxUYDwydkLoow+JVzSwYmhS5uLr5+bSv8 +i2uvcFOiLktBosu/Mrt4vOvzMdUlA1Tto8E945CZdRFahU7LHHnMRZseqy/928S8 +L7MLuCnyCIF1B6tJecoXgjaAtyRFfwhnpZbx5r9ebsT6nHLXSWmGoQCT8AbaP+pu +tQTeT0exzf0JY5kLosKT0XdklGHyuOpOlid+kyEJXTgLZBkpBW9Ee4Qu9NzTvaBM +Et8bM7d9pj56e6i+ybMYAOm9eM8wP6aUGrSmMlm1d1k2X4PiwyrLui7pJ/2oRgqX +DGwGXEi4dEjyrXMPAjqFTKJUzYG5+DkmUohD4WBD+SYyZnxeLhu5AJDsQlBA+cRn +yluy6ohCr2Pp+32bIVzYZzl6uTT+WcIuY7d8eF8c/9lvG63rCHn10xOC5/En+CCX +bjCP2l0XBMaoC1EXeakoeoIsp0uyOzKVz2eciL+wVSZ2+Iq3US20JEFsZXhleSBT +b2tvbG92IDxhbGV4ZXlAYXNva29sb3Yub3JnPokCQQQTAQIAKwIbAwYLCQgHAwIG +FQgCCQoLBBYCAwECHgECF4ACGQEFAlhytLAFCQ9brdAACgkQWuQgzAIJmJ7Xmg/9 +EZexxioWUbpNMBUbXMLjPWQXxyV+/53nDGnl8WJWvPStIbubulratXRJtL8J8C1t +uTMgSP85bRsnUxv1ETOwg7esET13LR3sqDDWIzvqFiiupNBh3CI54Ub761JsZBCk +rtiKjg6EDwOK3hCCaQt3RdATeLAF/Qxok8WAHEgWhCd0sjSlhMyqTiMvFpod678A +WYoOjPbb3Vc+pdl7qC0hBaIwKgjnW3eowjoSWDg8VyUSb1vtwXyknKHZ1ZmzOjjx +TRE1Rw69NQMzJCEMZaF1L5JdolQbS4dm27NRN1Fd5hgXhfe7doq/FLd/f8sgNvIL +UctdzpI3HNmN5QXH2xaDkY3fFc2e+8qHK6wPOX2IKMBTBXwnXFxJIQcDXEImVo8U +1sZtiABan2Yfec0mnVO/ofiYrR7z5hrFnUfuTUs3XUWUmJSqzPmf43zbRbTndhlL +nLdHiRz35+cFhleh1mDgFbFRQCtA7a7NF0CIcAWZxFe6WtcTb83J4Dq+6tsO01hS +9b3npYAjV6pB2nQJAlDH4a9YOZB/fY//Lc00kt8UnTV1NFw3usUBaSq5wIgB3IvS +RA38FHd+yH05R79nvZUkjtyHiE9znUbehBIJjtB//A3e6Bga9i91ebQBaN/MLa8c +zbOjP641cLe41/WEDsHe+qP4oNunjJ3bHBvw5F+0RYW0K0FsZXhleSBTb2tvbG92 +IDxhbGV4ZXlAYWxleGV5c29rb2xvdi5jby5jYz6JAh8EMAEIAAkFAlZoQfoCHSAA +CgkQWuQgzAIJmJ5F0A//VLE/Eg2RzIA1u6bj2F/+q3vVxZGh27druc70/lyERHvF +zuEpwedWJY9hn8QW8hfoSEf+KF5FR7DQ31l5072en6G4k8uNrVhwWXdraNMV+FoF +jiFbUPhWu09tHiyqtuPrxVnibPXWqZ66/gta1gbc+5jxm0MA+13czka3DOm26/Vg +2IIt6GCGM4nUaBSC2iifbVH/FbxHc7KlzK+itdqigp5Ij2qg1tRY/W6t5zFuiiax +YE6ni9sUljRz/nO+rk5I/ZcTy69rtVmy0z3we58jsxkzDs1SSJ6Qw3gjcMdsmllu +FFGMm3X6P1X23pjJ7aPzVMkmD5BQEKKGm/Od184i/VGm6a2tai4eHvIn8/VBSNu2 +PqNpCXmL0GnO2d869hXqtVd5EqegaHVEaSLnyqKnxU6Fgnf33epvhkfJ6mdFmnHF +7RFr/VuGnWRHnkT9ZtGUazBAywv041tIqUMcw22ER2exRei5n/cS9FOfqM7EqfO4 +BKm8RAjtJUzHB7ha/MRj6hQLsBf8mpNZJWKLhOzuvqveTljuGaD6xfTvxZ8zxCRO +dZrer5VvQkkV35V+e4nJGRAy4Mn0g38C8VF+BbvzIa0Noes3ZJ36Nt/Xuvy+wL4E +fmBvxLtEs/DFAiTCwX9NAujjDVXlTA81A/Ig7/vpD+g+F2EN9MjtUBTdPod6Gyq0 +LkFsZXhleSBTb2tvbG92IChaTkMpIDxhbGV4ZXkrem5jQGFzb2tvbG92Lm9yZz6J +Aj8EEwECACkCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAUCWHK0tAUJD1ut +0AAKCRBa5CDMAgmYniG7D/9C3eM//ZX7O4e4tPdgFQqA8CX286dISnN74Lq0451P +xw5MpbJvC8sEDcBg3EdGngRF6W8GRQnMHZKhqrVZn/LbzcE1b+CxyjmCT4xXWOJ1 +0vUgaJkJNQGg3VLl4ImhWgRX16jX+poKa85NsbVWm0zl2U9ZxOfQIh+TCQizju7L +6fK6knYG3rw51YWLWJ268KgxsGgovMVF4e/g6vaFVwZCmhREL9nq8/tDcMJnnwtt +sAdWHT5axRJOHru3oroatyjnQygsoboMe9ScKC+VZSt27l6fsF6bfct6sqIahW1U +hV/MajWF/PjdcQBg+BUE/jMzmiB2modl1savr0/O4wjvnRHQjmh5U2VVwJ4YMGVo +y6TTurEL0POialzIMqLhrGtqv1bIefk7d4FAqGg97gX1HsBOKKWhmXzdBMgR0ueK +lwjlbYEETya9XvQ2gDQS8Fa0G+RbbXesJLChl07O32ujfzkUlzJnaGSS8l3gV328 +g7+PT5iu9ZBQlLl+X+EGhDhhb/qRKBf0eUHIFmDvVBQ/FTW3SkeKuR4wgQ6z8Sfr +dyS/Dc9yQKNz7wXsUEzYhLV5eNdBrbFcUOHqXfc/LYzMXGKL78fNUFuZLxs7lw8p +fb6dNBZ8DqsgbMmCXiboNI+J1IUSLhaXYMlW7mLpq17+U8BpfY/QUVzNgN3lrnJH +yLkCDQROuqFgARAAprAiO4ddX7PCYekdLhCmpTl6FQRsM9pfObBOjeenMeZ9R0jA +IiaaoNkAIHQjZFlcUDezzjzoegGqhy/Hf8Zk4rwJ9ypfg4tjKdWtnWPG4NjXMjXV +vyiaGFl9JwOLV3tXhcLRHRkl8RKE1Sl5ez3SJ7cw3NbEgeJ2esRHjcFULQbQpg4I +ND6ati/vUOKmP9v/ocpwuUL/2yBZzwPETc6/jeK5MZPtxWBD6zoyoCFmo/0SEORF +IyUoNQsev5+AtNowQ4ERXhYPBbJkkbrk2usQZDlSaqAcDg3xu4Ln5ft26CT8BJhr +R6l4WiqPrR9Q92e+Mo/mC+UKL4cmUZeOGX1f9z1niNNjKAhwgjPFAwiahLf5WVmR +V0mbTeD2mdnJXBam9UYo8WaagmJZYQ4Gk+Vk8akWnO2EUP3baUFsN80wAUlsKIWX +A7By19A80CiSMrhCkIlgCJY1U9+WWJShGybKv4YuYuizNi8zHOiWIKzulXRtkpHl +XcKaoYdQz3hv5iPOr+SNSDo3IKLuuNhEAtOreTkuvjASz3X0etGjAqbv8jOCBSH3 +PlNB4BEwdGY5KAEZdARXPm2cv50PW1oamO7B1+ZXaPGM6iH7bZqFaGyBIrBSetnz +QyaEuTx4ES858atajsEe+74h1Mkhy3zjqdDFkznKNmiMtK3ea2sZCcnqM6EAEQEA +AYkCJQQYAQIADwIbDAUCWHK01wUJD1ut9wAKCRBa5CDMAgmYnsJaD/0dOb3gYBHX +P+Sdh/QeH3UhaIQgKvBqFkQs5xXV11aQ3GYlqe2FSMXfqSYx2LLUmonxsLSw8bQb +HbaQgs2/innLpghTea9Pu1aJYmDa85RFi4vruhht8k7k9fdJLY+L3r6+uL0o463I +MZZhBFitBpvCabJUw0DUv0ZUp6FfuRA99VwYXy+MbtY6+EqdcF3t/pmiYOcXWPEt +hJAeJ2zwxF+8dA/uvXjfVyb6NAbMuYyHYzaZmCYW+Bz3+LS8ct3QDOqi2L0cj3vb +pLcOQD2WzS1tMqx4o8GzVCn0W0246y3rMURYBrd/4wGpSLogbyPk/HbUH+UqVmrO +HeVXUp88oP91o/nU+8zP5y02Yc3JqllqT8275m1w3NuSwaTa6PiHCmT542OfpBNp +PuhQ7IPPmwK5unOgFtQH8EydnMopuQjQeNHgrFKmfifn2++aTYnUdOV16qVy4oEv +aBjF+RqFDkTtSbB4ji72JCpEAtiXStouSWU9K8eIi+Su5J31/jBJV8xyf+MZ3aAE +By3K3LSty7l4Ie7XqsMD8HMxXUQUj7rUEoysw1YZALeEIR7mzEW5+go+Lq/F71RP +GcrDrdtKA5xNJZpoOB2IgS2ZBTlrjOdu9QGX8sZdr9I5SNsATtmOvlYHCsKiasQj +yyIpbKrNT4ugmrTrkOXU85APrub821Rp+g== +=HB3n +-----END PGP PUBLIC KEY BLOCK----- diff --git a/znc.spec b/znc.spec index 815df07..185b2a2 100644 --- a/znc.spec +++ b/znc.spec @@ -20,12 +20,15 @@ Group: System Environment/Daemons License: ASL 2.0 URL: https://znc.in Source0: %{url}/releases/%{name}-%{version}.tar.gz +Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig +Source2: gpgkey-5AE420CC0209989E.asc BuildRequires: automake BuildRequires: c-ares-devel BuildRequires: cyrus-sasl-devel BuildRequires: gcc-c++ BuildRequires: gettext-devel +BuildRequires: gnupg2 BuildRequires: libicu-devel BuildRequires: openssl-devel >= 0.9.8 BuildRequires: perl(ExtUtils::Embed) @@ -111,6 +114,13 @@ python3 module for ZNC %prep +# Verify GPG signature +gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings +key="%{SOURCE2}" +gpg2 --dearmor --quiet --batch --yes $key >/dev/null +gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} +rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key + %autosetup -p1 @@ -251,6 +261,7 @@ getent passwd znc >/dev/null || \ - Remove cruft from %%prep - Use %%autosetup, %%make_build, and %%make_install macros - Use https for URL and SOURCE tags +- Check upstream GPG signature in %%prep * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From d9397228013fc8ea545e4351414bec0ca442fda0 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 00:44:38 -0400 Subject: [PATCH 256/344] Simplify %{_libdir}/znc/ file list Manually maintaining the module list is tedious and error-prone. Include all files under %{_libdir}/znc by default. Use %exclude to filter out the modperl, modpython, and modtcl files. --- znc.spec | 73 +++++++++++++------------------------------------------- 1 file changed, 16 insertions(+), 57 deletions(-) diff --git a/znc.spec b/znc.spec index 185b2a2..136bf60 100644 --- a/znc.spec +++ b/znc.spec @@ -170,64 +170,21 @@ getent passwd znc >/dev/null || \ %doc LICENSE README.md %{_bindir}/znc %{_mandir}/man1/* -%dir %{_libdir}/znc -%{_libdir}/znc/admindebug.so -%{_libdir}/znc/adminlog.so -%{_libdir}/znc/alias.so -%{_libdir}/znc/autoattach.so -%{_libdir}/znc/autocycle.so -%{_libdir}/znc/autoop.so -%{_libdir}/znc/autoreply.so -%{_libdir}/znc/autovoice.so -%{_libdir}/znc/awaynick.so -%{_libdir}/znc/awaystore.so -%{_libdir}/znc/block_motd.so -%{_libdir}/znc/blockuser.so -%{_libdir}/znc/bouncedcc.so -%{_libdir}/znc/buffextras.so -%{_libdir}/znc/cert.so -%{_libdir}/znc/certauth.so -%{_libdir}/znc/chansaver.so -%{_libdir}/znc/clearbufferonmsg.so -%{_libdir}/znc/clientnotify.so -%{_libdir}/znc/controlpanel.so -%{_libdir}/znc/crypt.so -%{_libdir}/znc/ctcpflood.so -%{_libdir}/znc/cyrusauth.so -%{_libdir}/znc/dcc.so -%{_libdir}/znc/disconkick.so -%{_libdir}/znc/fail2ban.so -%{_libdir}/znc/flooddetach.so -%{_libdir}/znc/identfile.so -%{_libdir}/znc/imapauth.so -%{_libdir}/znc/keepnick.so -%{_libdir}/znc/kickrejoin.so -%{_libdir}/znc/lastseen.so -%{_libdir}/znc/listsockets.so -%{_libdir}/znc/log.so -%{_libdir}/znc/missingmotd.so -%{_libdir}/znc/modules_online.so -%{_libdir}/znc/nickserv.so -%{_libdir}/znc/notes.so -%{_libdir}/znc/notify_connect.so -%{_libdir}/znc/partyline.so -%{_libdir}/znc/perform.so -%{_libdir}/znc/q.so -%{_libdir}/znc/raw.so -%{_libdir}/znc/route_replies.so -%{_libdir}/znc/sample.so -%{_libdir}/znc/samplewebapi.so -%{_libdir}/znc/sasl.so -%{_libdir}/znc/savebuff.so -%{_libdir}/znc/schat.so -%{_libdir}/znc/send_raw.so -%{_libdir}/znc/shell.so -%{_libdir}/znc/simple_away.so -%{_libdir}/znc/stickychan.so -%{_libdir}/znc/stripcontrols.so -%{_libdir}/znc/watch.so -%{_libdir}/znc/webadmin.so +%{_libdir}/znc +# exclude modperl, modpython, and modtcl files +%exclude %{_libdir}/znc/modperl/ +%exclude %{_libdir}/znc/modperl.so +%exclude %{_libdir}/znc/perleval.pm +%if 0%{?with_modpython} +%exclude %{_libdir}/znc/__pycache__/ +%exclude %{_libdir}/znc/modpython/ +%exclude %{_libdir}/znc/modpython.so +%exclude %{_libdir}/znc/pyeval.py +%endif # 0%{?with_modpython} +%exclude %{_libdir}/znc/modtcl.so %{_datadir}/znc/ +# exclude modtcl files +%exclude %{_datadir}/znc/modtcl/ %{_unitdir}/znc.service %attr(-,znc,znc) %{_sharedstatedir}/znc/ @@ -238,6 +195,7 @@ getent passwd znc >/dev/null || \ %files modtcl %{_libdir}/znc/modtcl.so +%{_datadir}/znc/modtcl/ %if 0%{?with_modperl} %files modperl @@ -262,6 +220,7 @@ getent passwd znc >/dev/null || \ - Use %%autosetup, %%make_build, and %%make_install macros - Use https for URL and SOURCE tags - Check upstream GPG signature in %%prep +- Simplify %%{_libdir}/znc/ file list * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From 48fada5db5722aeb1b6dd7687fc7ddf21c101388 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 00:51:20 -0400 Subject: [PATCH 257/344] Enable verbose make A quiet make might be easier to read but it's useless for debugging build issues and verifying that the proper compilation options are used. --- znc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 136bf60..14074d9 100644 --- a/znc.spec +++ b/znc.spec @@ -139,7 +139,7 @@ rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key --disable-python \ %endif # 0%{?with_modpython} --enable-ipv6 --enable-cyrus --enable-tcl -%make_build +%make_build V=1 %install @@ -221,6 +221,7 @@ getent passwd znc >/dev/null || \ - Use https for URL and SOURCE tags - Check upstream GPG signature in %%prep - Simplify %%{_libdir}/znc/ file list +- Enable verbose make * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From ef6ca5620925c9c7f6cca8ba066cccb8843d7faa Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 01:07:24 -0400 Subject: [PATCH 258/344] Pass --with-tcl to ensure tclConfig.sh is found On x86_64 the default search path configure uses for tclConfig.sh does not include /usr/lib64. The tcl module builds with default settings, but we can do better by explicitly setting --with-tcl. This ensures that TCL_FLAGS is set by tclConfig.sh rather than guessed. --- znc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 14074d9..c8e331a 100644 --- a/znc.spec +++ b/znc.spec @@ -138,7 +138,7 @@ rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key %else # 0%{?with_modpython} --disable-python \ %endif # 0%{?with_modpython} - --enable-ipv6 --enable-cyrus --enable-tcl + --enable-ipv6 --enable-cyrus --enable-tcl --with-tcl=%{_libdir} %make_build V=1 @@ -222,6 +222,7 @@ getent passwd znc >/dev/null || \ - Check upstream GPG signature in %%prep - Simplify %%{_libdir}/znc/ file list - Enable verbose make +- Pass --with-tcl to ensure tclConfig.sh is found * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From d97d3c4cd41b1359029207fd1f05aa88e6200833 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 01:34:27 -0400 Subject: [PATCH 259/344] Capitalize 'Perl' and 'Python' in Summary This is minor, but rpmlint complains about the summaries for the perl and python modules otherwise. Use "%{summary}." for the %description of the mod(perl|python|tcl) packages. --- znc.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/znc.spec b/znc.spec index c8e331a..43fac82 100644 --- a/znc.spec +++ b/znc.spec @@ -68,11 +68,11 @@ Requires: %{name} = %{version}-%{release} Requires: tcl %description modtcl -TCL module for ZNC +%{summary}. %if 0%{?with_modperl} %package modperl -Summary: perl module for ZNC +Summary: Perl module for ZNC Group: Development/Libraries BuildRequires: perl-devel @@ -85,13 +85,13 @@ Requires: perl-interpreter Provides: perl(ZNC::Module) = %{version}-%{release} %description modperl -perl module for ZNC +%{summary}. %endif # 0%{?with_modperl} %if 0%{?with_modpython} %package modpython -Summary: python3 module for ZNC +Summary: Python3 module for ZNC Group: Development/Libraries %if 0%{?rhel} @@ -109,7 +109,7 @@ Requires: python3 %endif # 0%{?rhel} %description modpython -python3 module for ZNC +%{summary}. %endif # 0%{?with_modpython} From 878da480e861ca7246b39059b6394358ec0a9b4a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 01:37:18 -0400 Subject: [PATCH 260/344] Drop obsolete Group tag The packaging guidelines specify that this tag should not be used. --- znc.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/znc.spec b/znc.spec index 43fac82..8c39890 100644 --- a/znc.spec +++ b/znc.spec @@ -15,7 +15,6 @@ Name: znc Version: 1.7.1 Release: 2%{?dist} Summary: An advanced IRC bouncer -Group: System Environment/Daemons License: ASL 2.0 URL: https://znc.in @@ -48,7 +47,6 @@ DCC bouncing, Perl and C++ module support to name a few. %package devel Summary: Development files needed to compile ZNC modules -Group: Development/Libraries Requires: %{name} = %{version}-%{release} pkgconfig Requires: openssl-devel c-ares-devel glibc-devel libicu-devel%{?_isa} BuildRequires: pkgconfig @@ -60,7 +58,6 @@ modules. %package modtcl Summary: TCL module for ZNC -Group: Development/Libraries BuildRequires: tcl-devel @@ -73,7 +70,6 @@ Requires: tcl %if 0%{?with_modperl} %package modperl Summary: Perl module for ZNC -Group: Development/Libraries BuildRequires: perl-devel BuildRequires: perl-generators @@ -92,7 +88,6 @@ Provides: perl(ZNC::Module) = %{version}-%{release} %if 0%{?with_modpython} %package modpython Summary: Python3 module for ZNC -Group: Development/Libraries %if 0%{?rhel} BuildRequires: python34-devel @@ -223,6 +218,7 @@ getent passwd znc >/dev/null || \ - Simplify %%{_libdir}/znc/ file list - Enable verbose make - Pass --with-tcl to ensure tclConfig.sh is found +- Remove Group tag * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From 9048b9f36a53159864aae8471906597a4d1d37b7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 02:03:46 -0400 Subject: [PATCH 261/344] Use system-wide crypto policy Upstream uses reasonable defaults and keeps them updated. However, Fedora packages should use the system-wide crypto policy. Reference: https://fedoraproject.org/wiki/Packaging:CryptoPolicies --- 0001-Use-system-wide-crypto-policy.patch | 42 ++++++++++++++++++++++++ znc.spec | 4 +++ 2 files changed, 46 insertions(+) create mode 100644 0001-Use-system-wide-crypto-policy.patch diff --git a/0001-Use-system-wide-crypto-policy.patch b/0001-Use-system-wide-crypto-policy.patch new file mode 100644 index 0000000..04b4cfa --- /dev/null +++ b/0001-Use-system-wide-crypto-policy.patch @@ -0,0 +1,42 @@ +From f0f51d75c160baeb212090940ec1dc35af9bd565 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Sun, 26 Aug 2018 01:31:13 -0400 +Subject: [PATCH] Use system-wide crypto policy + +Reference: https://fedoraproject.org/wiki/Packaging:CryptoPolicies +--- + src/Socket.cpp | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +diff --git a/src/Socket.cpp b/src/Socket.cpp +index fa510462..e40c76ea 100644 +--- a/src/Socket.cpp ++++ b/src/Socket.cpp +@@ -28,21 +28,10 @@ + #endif + + #ifdef HAVE_LIBSSL +-// Copypasted from +-// https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29 +-// at 2018-04-01 ++// Use system-wide crypto policy ++// https://fedoraproject.org/wiki/Packaging:CryptoPolicies + static CString ZNC_DefaultCipher() { +- return "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-" +- "ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-" +- "AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-" +- "SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-" +- "RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:" +- "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-" +- "SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:" +- "DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:" +- "ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:" +- "AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-" +- "SHA:DES-CBC3-SHA:!DSS"; ++ return "PROFILE=SYSTEM"; + } + #endif + +-- +2.19.0.rc0 + diff --git a/znc.spec b/znc.spec index 8c39890..1b0143b 100644 --- a/znc.spec +++ b/znc.spec @@ -21,6 +21,9 @@ URL: https://znc.in Source0: %{url}/releases/%{name}-%{version}.tar.gz Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig Source2: gpgkey-5AE420CC0209989E.asc +# Use system-wide crypto policy +# https://fedoraproject.org/wiki/Packaging:CryptoPolicies +Patch0: 0001-Use-system-wide-crypto-policy.patch BuildRequires: automake BuildRequires: c-ares-devel @@ -219,6 +222,7 @@ getent passwd znc >/dev/null || \ - Enable verbose make - Pass --with-tcl to ensure tclConfig.sh is found - Remove Group tag +- Use system-wide crypto policy * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From f0d7b66afa130f9b2cabe36adb991f048a9c6ce7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 04:03:46 -0400 Subject: [PATCH 262/344] Use %license tag for LICENSE file --- znc.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 1b0143b..1552611 100644 --- a/znc.spec +++ b/znc.spec @@ -165,7 +165,8 @@ getent passwd znc >/dev/null || \ %files -%doc LICENSE README.md +%doc README.md +%license LICENSE %{_bindir}/znc %{_mandir}/man1/* %{_libdir}/znc @@ -223,6 +224,7 @@ getent passwd znc >/dev/null || \ - Pass --with-tcl to ensure tclConfig.sh is found - Remove Group tag - Use system-wide crypto policy +- Use %%license tag for LICENSE file * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From c3743a066ea218fc24e7f3f733a2dfe357caa611 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 02:28:16 -0400 Subject: [PATCH 263/344] Add ChangeLog.md and NOTICE files to %doc The ChangeLog file was added in 1.6.0 and contains useful information for users. The AUTHORS file was removed from %doc in znc-1.7.0-1, because the file was no longer present in the upstream tarball. Prior to that, the AUTHORS file was a symlink to the (unpackaged) NOTICES file from znc-1.2-0.1.alpha1 through znc-1.6.6. --- znc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 1552611..c54f72f 100644 --- a/znc.spec +++ b/znc.spec @@ -165,7 +165,7 @@ getent passwd znc >/dev/null || \ %files -%doc README.md +%doc ChangeLog.md NOTICE README.md %license LICENSE %{_bindir}/znc %{_mandir}/man1/* @@ -225,6 +225,7 @@ getent passwd znc >/dev/null || \ - Remove Group tag - Use system-wide crypto policy - Use %%license tag for LICENSE file +- Add ChangeLog.md and NOTICE files to %%doc * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From cfed6841db12855b86cba2523d36733f724b0e25 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 03:14:24 -0400 Subject: [PATCH 264/344] Move znc-buildmod.1 to znc-devel The znc-buildmod command is in znc-devel. The man-page belongs there as well. --- znc.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index c54f72f..331e82c 100644 --- a/znc.spec +++ b/znc.spec @@ -168,7 +168,7 @@ getent passwd znc >/dev/null || \ %doc ChangeLog.md NOTICE README.md %license LICENSE %{_bindir}/znc -%{_mandir}/man1/* +%{_mandir}/man1/znc.1* %{_libdir}/znc # exclude modperl, modpython, and modtcl files %exclude %{_libdir}/znc/modperl/ @@ -191,6 +191,7 @@ getent passwd znc >/dev/null || \ %{_bindir}/znc-buildmod %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/znc/ +%{_mandir}/man1/znc-buildmod.1* %files modtcl %{_libdir}/znc/modtcl.so @@ -226,6 +227,7 @@ getent passwd znc >/dev/null || \ - Use system-wide crypto policy - Use %%license tag for LICENSE file - Add ChangeLog.md and NOTICE files to %%doc +- Move znc-buildmod.1 to znc-devel * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies From dcd0ebc78e1df0e182fe300b6d130cf06bbaf7da Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 03:29:24 -0400 Subject: [PATCH 265/344] Add rpmlint config file Filter several expected warnings and error messages from rpmlint. --- znc.rpmlintrc | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 znc.rpmlintrc diff --git a/znc.rpmlintrc b/znc.rpmlintrc new file mode 100644 index 0000000..8f14c39 --- /dev/null +++ b/znc.rpmlintrc @@ -0,0 +1,13 @@ +from Config import * + +# Ignore dangling symlinks in .build-id dirs +addFilter("znc\..*: W: dangling-relative-symlink /usr/lib/.build-id/.*") + +# No documentation is expected in these packages +addFilter("znc-(devel|modperl|modpython|modtcl)\..*: W: no-documentation") + +# /var/lib/znc is expected to be owned by the znc user/group +addFilter("znc\..*: W: non-standard-[gu]id /var/lib/znc znc") + +# Some template files are expected to be empty +addFilter("znc\..*: E: zero-length /usr/share/znc/webskins/.*/tmpl/.*\.tmpl") From 7eb901b93c8606c125b190d3f98ea1823d276223 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 26 Aug 2018 21:11:12 -0400 Subject: [PATCH 266/344] Bump release --- znc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 331e82c..9e5bccc 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -214,7 +214,7 @@ getent passwd znc >/dev/null || \ %changelog -* Fri Aug 24 2018 Todd Zullinger +* Fri Aug 24 2018 Todd Zullinger - 1.7.1-3 - Clean up ancient Fedora and RHEL conditionals - Remove cruft from %%prep - Use %%autosetup, %%make_build, and %%make_install macros From 4b3ade3e9a810461ca2ebd200e9dc7ed72771f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Nov 2018 12:53:57 +0100 Subject: [PATCH 267/344] https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 --- znc.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/znc.spec b/znc.spec index bc68124..2192917 100644 --- a/znc.spec +++ b/znc.spec @@ -1,3 +1,7 @@ +# This package depends on automagic byte compilation +# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 +%global _python_bytecompile_extra 1 + # ZNC is a daemon application and that's why needs hardening %global _hardened_build 1 From 46164dba2dd009bc9dcf69222e0d7358861fe9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 4 Jan 2019 00:16:26 +0100 Subject: [PATCH 268/344] Add missing source file (GPG signature) --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 16e73b2..1ea7ba6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (znc-1.7.1.tar.gz) = 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902 +SHA512 (znc-1.7.1.tar.gz.sig) = d2ee08b0cf421a48f4127f3509e4d6b79a6ce3cdc6184e7aca98e8cbffd3f6e7b5618be1af4e6fd2df51d50384cac5858d8ec6b1db6ceacb7924fdb1359199d0 From 8d389a3cca36282f79cf43ded7576140f215f3da Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 23 Jan 2019 21:49:03 +0000 Subject: [PATCH 269/344] Rebuild for ICU 63 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 3bbd41c..87976e4 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -218,6 +218,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed Jan 23 2019 Pete Walter - 1.7.1-4 +- Rebuild for ICU 63 + * Fri Aug 24 2018 Todd Zullinger - 1.7.1-3 - Clean up ancient Fedora and RHEL conditionals - Remove cruft from %%prep From 0b633c2df23824387472ae352758694227de948e Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 29 Jan 2019 15:32:05 -0600 Subject: [PATCH 270/344] Update to 1.7.2. Also add a quick sed call to fix three references to /usr/local/ in the manpage. --- sources | 4 ++-- znc.spec | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 1ea7ba6..fe919bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (znc-1.7.1.tar.gz) = 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902 -SHA512 (znc-1.7.1.tar.gz.sig) = d2ee08b0cf421a48f4127f3509e4d6b79a6ce3cdc6184e7aca98e8cbffd3f6e7b5618be1af4e6fd2df51d50384cac5858d8ec6b1db6ceacb7924fdb1359199d0 +SHA512 (znc-1.7.2.tar.gz) = fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577 +SHA512 (znc-1.7.2.tar.gz.sig) = c853317d7737a3779b24364d347a1a0484842d1876ca1a5b82909a99bd405cdf152058688e44a2df1c12aa1c2b5d5c6b7c7012543d99976ed7d9cab8557bf4b9 diff --git a/znc.spec b/znc.spec index 87976e4..fe52ee7 100644 --- a/znc.spec +++ b/znc.spec @@ -16,8 +16,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.7.1 -Release: 4%{?dist} +Version: 1.7.2 +Release: 1%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -125,6 +125,8 @@ rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key %autosetup -p1 +# The manual page references /usr/local/; fix that +sed -ie 's!/usr/local/!/usr/!' man/znc.1 %build %configure \ @@ -218,6 +220,10 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jan 29 2019 Jason L Tibbitts III - 1.7.2-1 +- Update to 1.7.2. +- Fix three paths in the manpage (#1624519). + * Wed Jan 23 2019 Pete Walter - 1.7.1-4 - Rebuild for ICU 63 From 7c6b28aaa94075a66ba59247b994969895a7e5a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:14:01 +0000 Subject: [PATCH 271/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index fe52ee7..a7b9142 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -220,6 +220,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 29 2019 Jason L Tibbitts III - 1.7.2-1 - Update to 1.7.2. - Fix three paths in the manpage (#1624519). From 74fc3f07da4a720f74a506c93ee32c18a3170c38 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 27 Mar 2019 08:37:04 -0500 Subject: [PATCH 272/344] Update to 1.7.3-rc1 to fix CVE-2019-9917 --- .gitignore | 1 + sources | 5 +++-- znc.spec | 14 ++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3ca534e..c0b1006 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /znc-*/ /znc-*.tar.gz /znc-*.tar.gz.sig +/gpgkey-5AE420CC0209989E.asc diff --git a/sources b/sources index fe919bf..2e806fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (znc-1.7.2.tar.gz) = fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577 -SHA512 (znc-1.7.2.tar.gz.sig) = c853317d7737a3779b24364d347a1a0484842d1876ca1a5b82909a99bd405cdf152058688e44a2df1c12aa1c2b5d5c6b7c7012543d99976ed7d9cab8557bf4b9 +SHA512 (znc-1.7.3-rc1.tar.gz) = 24804cd135fb121b23157634c429db4675aebbf18248382b4d616c8f63b8d12d35e5cf9aaee2dabde1a85ceabb24a7f27f595fe2710cdcfc7aa27d895281ffed +SHA512 (znc-1.7.3-rc1.tar.gz.sig) = 29ef6ffc80a3c5bd4c6d79648fc1a2826501e2e8604423baaf4d66aa69e8e428a44f4edc89402dbefa4915aeea03dd9690f3403f67c44e0a91e5a3b9e0411a16 +SHA512 (gpgkey-5AE420CC0209989E.asc) = fe1abc5c67b831fcb9af64234a0462ce84f2b6bd18179510fbbc756bd6be428ce097eab3d3715cbc5dc24c6017ac96077066ed0328b5df6305f5afe55ae39610 diff --git a/znc.spec b/znc.spec index a7b9142..8075b63 100644 --- a/znc.spec +++ b/znc.spec @@ -16,14 +16,17 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.7.2 -Release: 2%{?dist} +Version: 1.7.3 +Release: 0.1%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 URL: https://znc.in -Source0: %{url}/releases/%{name}-%{version}.tar.gz -Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig +#Source0: %{url}/releases/%{name}-%{version}.tar.gz +#Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig +Source0: %{url}/releases/%{name}-1.7.3-rc1.tar.gz +Source1: %{url}/releases/%{name}-1.7.3-rc1.tar.gz.sig + Source2: gpgkey-5AE420CC0209989E.asc # Use system-wide crypto policy # https://fedoraproject.org/wiki/Packaging:CryptoPolicies @@ -220,6 +223,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed Mar 27 2019 Nick Bebout - 1.7.3-0.1 +- Update to 1.7.3-rc1 to fix CVE-2019-9917 + * Sun Feb 03 2019 Fedora Release Engineering - 1.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 75ee78d08d5ced3a80647f98f844accd32253c4e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 27 Mar 2019 08:47:23 -0500 Subject: [PATCH 273/344] Update to 1.7.3 --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 8075b63..dd5d0e4 100644 --- a/znc.spec +++ b/znc.spec @@ -126,7 +126,7 @@ gpg2 --dearmor --quiet --batch --yes $key >/dev/null gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key -%autosetup -p1 +%autosetup -p1 -n znc-1.7.3-rc1 # The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 From 95f8a308e7e7712e4e7cf062962186ff678f5c8c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 9 Apr 2019 08:25:30 -0500 Subject: [PATCH 274/344] Update to 1.7.3 --- sources | 4 ++-- znc.spec | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 2e806fa..bc29f8a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (znc-1.7.3-rc1.tar.gz) = 24804cd135fb121b23157634c429db4675aebbf18248382b4d616c8f63b8d12d35e5cf9aaee2dabde1a85ceabb24a7f27f595fe2710cdcfc7aa27d895281ffed -SHA512 (znc-1.7.3-rc1.tar.gz.sig) = 29ef6ffc80a3c5bd4c6d79648fc1a2826501e2e8604423baaf4d66aa69e8e428a44f4edc89402dbefa4915aeea03dd9690f3403f67c44e0a91e5a3b9e0411a16 +SHA512 (znc-1.7.3.tar.gz) = 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8 +SHA512 (znc-1.7.3.tar.gz.sig) = 51bc9f389968f1c625140140724e833ae44a0bacb5b57f7ac02824a4dd81de7f4108a7497424bd7a845ecbf769477cb5912481f628902633d6c7b7886b16cd9d SHA512 (gpgkey-5AE420CC0209989E.asc) = fe1abc5c67b831fcb9af64234a0462ce84f2b6bd18179510fbbc756bd6be428ce097eab3d3715cbc5dc24c6017ac96077066ed0328b5df6305f5afe55ae39610 diff --git a/znc.spec b/znc.spec index dd5d0e4..a71af43 100644 --- a/znc.spec +++ b/znc.spec @@ -17,15 +17,13 @@ Name: znc Version: 1.7.3 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 URL: https://znc.in -#Source0: %{url}/releases/%{name}-%{version}.tar.gz -#Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig -Source0: %{url}/releases/%{name}-1.7.3-rc1.tar.gz -Source1: %{url}/releases/%{name}-1.7.3-rc1.tar.gz.sig +Source0: %{url}/releases/%{name}-%{version}.tar.gz +Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig Source2: gpgkey-5AE420CC0209989E.asc # Use system-wide crypto policy @@ -223,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Apr 9 2019 Nick Bebout - 1.7.3-1 +- Update to 1.7.3 + * Wed Mar 27 2019 Nick Bebout - 1.7.3-0.1 - Update to 1.7.3-rc1 to fix CVE-2019-9917 From 8a55901c025f35e3a143dc252e74e69f5d7ccf56 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 9 Apr 2019 08:31:28 -0500 Subject: [PATCH 275/344] Fix build --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index a71af43..5456e3e 100644 --- a/znc.spec +++ b/znc.spec @@ -124,7 +124,7 @@ gpg2 --dearmor --quiet --batch --yes $key >/dev/null gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key -%autosetup -p1 -n znc-1.7.3-rc1 +%autosetup -p1 # The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 From c5aa0f5e280d73ada5aba379882878e2fc1b4a67 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 30 May 2019 13:34:27 +0200 Subject: [PATCH 276/344] Perl 5.30 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 5456e3e..8c2ea3d 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu May 30 2019 Jitka Plesnikova - 1.7.3-2 +- Perl 5.30 rebuild + * Tue Apr 9 2019 Nick Bebout - 1.7.3-1 - Update to 1.7.3 From 623fd0a1ade6639c30e491e7ebc3870224f4d0b5 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 5 Jul 2019 16:26:03 -0500 Subject: [PATCH 277/344] Update to 1.7.4 to fix CVE-2019-12816 --- sources | 4 +--- znc.spec | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sources b/sources index bc29f8a..216da4f 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (znc-1.7.3.tar.gz) = 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8 -SHA512 (znc-1.7.3.tar.gz.sig) = 51bc9f389968f1c625140140724e833ae44a0bacb5b57f7ac02824a4dd81de7f4108a7497424bd7a845ecbf769477cb5912481f628902633d6c7b7886b16cd9d -SHA512 (gpgkey-5AE420CC0209989E.asc) = fe1abc5c67b831fcb9af64234a0462ce84f2b6bd18179510fbbc756bd6be428ce097eab3d3715cbc5dc24c6017ac96077066ed0328b5df6305f5afe55ae39610 +SHA512 (znc-1.7.4.tar.gz) = ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae diff --git a/znc.spec b/znc.spec index 5456e3e..1786e0c 100644 --- a/znc.spec +++ b/znc.spec @@ -16,7 +16,7 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.7.3 +Version: 1.7.4 Release: 1%{?dist} Summary: An advanced IRC bouncer @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Jul 5 2019 Nick Bebout - 1.7.4-1 +- Update to 1.7.4 to fix CVE-2019-12816 + * Tue Apr 9 2019 Nick Bebout - 1.7.3-1 - Update to 1.7.3 From 19e5b49261667d446f8f86c4fe75cc32019d8a47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:03:54 +0000 Subject: [PATCH 278/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 41bc6b6..354aac2 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jul 5 2019 Nick Bebout - 1.7.4-1 - Update to 1.7.4 to fix CVE-2019-12816 From 100b9ab420808a999a8628035e3b10c7e4abde6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:10:08 +0200 Subject: [PATCH 279/344] Rebuilt for Python 3.8 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 354aac2..c67f997 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Aug 19 2019 Miro Hrončok - 1.7.4-3 +- Rebuilt for Python 3.8 + * Sat Jul 27 2019 Fedora Release Engineering - 1.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2cadb6b157d6cd310641d650c1acb1efb989ff4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 19:11:34 +0200 Subject: [PATCH 280/344] Rebuilt for Python 3.8 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index c67f997..29da468 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Aug 19 2019 Miro Hrončok - 1.7.4-4 +- Rebuilt for Python 3.8 + * Mon Aug 19 2019 Miro Hrončok - 1.7.4-3 - Rebuilt for Python 3.8 From 785926e9a286b441654f4bf4a3dc19f23f11b285 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Sep 2019 07:58:38 -0500 Subject: [PATCH 281/344] Commit signature --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 216da4f..78631c6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (znc-1.7.4.tar.gz) = ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae +SHA512 (znc-1.7.4.tar.gz.sig) = b3ae90292929be6fee8e3b25b11e3f958f5d918b250bd08f89ec301acd3c0f26a73b890e07570652a4afb5498fe2ed6a3f2adeaefd7945f573b694a971466930 From baf7009f9baca036015768df8fc1bc2461cd3ef8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Sep 2019 08:32:21 -0500 Subject: [PATCH 282/344] Update to 1.7.5-rc1 (AKA 1.7.5-0.1) --- sources | 4 ++-- znc.spec | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 78631c6..7f894c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (znc-1.7.4.tar.gz) = ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae -SHA512 (znc-1.7.4.tar.gz.sig) = b3ae90292929be6fee8e3b25b11e3f958f5d918b250bd08f89ec301acd3c0f26a73b890e07570652a4afb5498fe2ed6a3f2adeaefd7945f573b694a971466930 +SHA512 (znc-1.7.5-rc1.tar.gz) = e7363dc35fa9ce803d5c7b8f04c3415984c07417ba9c0ba4660b4facabfade9e5c8dc8b33539ea8ba1bff77ea04239b9bab497f850d0e6818f3ea496a07630c7 +SHA512 (znc-1.7.5-rc1.tar.gz.sig) = 2c96f3b4ad5bc51c26a1cdd9257a3e56a30509630e5dfe8615618838146bfc4b21d86b848e710b4c95828ca43b81e6744a7c58ee6dac09201dee9cf7a197cb98 diff --git a/znc.spec b/znc.spec index 29da468..8644a49 100644 --- a/znc.spec +++ b/znc.spec @@ -16,14 +16,14 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.7.4 -Release: 4%{?dist} +Version: 1.7.5 +Release: 0.1%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 URL: https://znc.in -Source0: %{url}/releases/%{name}-%{version}.tar.gz -Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig +Source0: %{url}/releases/%{name}-%{version}-rc1.tar.gz +Source1: %{url}/releases/%{name}-%{version}-rc1.tar.gz.sig Source2: gpgkey-5AE420CC0209989E.asc # Use system-wide crypto policy @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Sep 23 2019 Nick Bebout - 1.7.5-0.1 +- Update to 1.7.5-rc1 + * Mon Aug 19 2019 Miro Hrončok - 1.7.4-4 - Rebuilt for Python 3.8 From e76c1e4c18b6aa8361f0606f623a51687248dcd3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 23 Sep 2019 08:37:33 -0500 Subject: [PATCH 283/344] Use %setup and %patch instead of %autosetup in rawhide --- znc.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 8644a49..d01d5e8 100644 --- a/znc.spec +++ b/znc.spec @@ -124,7 +124,9 @@ gpg2 --dearmor --quiet --batch --yes $key >/dev/null gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key -%autosetup -p1 +# autosetup -p1 +%setup -n znc-1.7.5-rc1 +%patch0 -p1 # The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 From 65a08f1ff2a9b6454986c13a703db2b4ee28882b Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 27 Sep 2019 16:37:55 -0500 Subject: [PATCH 284/344] Update to 1.7.5 --- sources | 4 ++-- znc.spec | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 7f894c7..f69fbfe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (znc-1.7.5-rc1.tar.gz) = e7363dc35fa9ce803d5c7b8f04c3415984c07417ba9c0ba4660b4facabfade9e5c8dc8b33539ea8ba1bff77ea04239b9bab497f850d0e6818f3ea496a07630c7 -SHA512 (znc-1.7.5-rc1.tar.gz.sig) = 2c96f3b4ad5bc51c26a1cdd9257a3e56a30509630e5dfe8615618838146bfc4b21d86b848e710b4c95828ca43b81e6744a7c58ee6dac09201dee9cf7a197cb98 +SHA512 (znc-1.7.5.tar.gz) = f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825 +SHA512 (znc-1.7.5.tar.gz.sig) = 479f00ae38405d6d5cc40b563f433cd82d25341040fc6ef977eae7e30e51b4801e01cf124aa91e6a72a60afd4a463b0141e65787447f706df0f279ebc1d5e8b1 diff --git a/znc.spec b/znc.spec index d01d5e8..d518034 100644 --- a/znc.spec +++ b/znc.spec @@ -17,13 +17,13 @@ Name: znc Version: 1.7.5 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 URL: https://znc.in -Source0: %{url}/releases/%{name}-%{version}-rc1.tar.gz -Source1: %{url}/releases/%{name}-%{version}-rc1.tar.gz.sig +Source0: %{url}/releases/%{name}-%{version}.tar.gz +Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig Source2: gpgkey-5AE420CC0209989E.asc # Use system-wide crypto policy @@ -124,9 +124,9 @@ gpg2 --dearmor --quiet --batch --yes $key >/dev/null gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key -# autosetup -p1 -%setup -n znc-1.7.5-rc1 -%patch0 -p1 +%autosetup -p1 +#%setup -n znc-1.7.5-rc1 +#%patch0 -p1 # The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 @@ -223,6 +223,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Sep 27 2019 Nick Bebout - 1.7.5-1 +- Update to 1.7.5 + * Mon Sep 23 2019 Nick Bebout - 1.7.5-0.1 - Update to 1.7.5-rc1 From c335efb39733ae2d7d7799df46206c3e736716b7 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 1 Nov 2019 15:49:39 +0000 Subject: [PATCH 285/344] Rebuild for ICU 65 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d518034..1280a5e 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -223,6 +223,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Nov 01 2019 Pete Walter - 1.7.5-2 +- Rebuild for ICU 65 + * Fri Sep 27 2019 Nick Bebout - 1.7.5-1 - Update to 1.7.5 From 2198f30d06cdca4ae77bf9c51d60399780e32e70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:22:43 +0000 Subject: [PATCH 286/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 1280a5e..8f14796 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -223,6 +223,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.7.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 01 2019 Pete Walter - 1.7.5-2 - Rebuild for ICU 65 From 669cee7b3ecafa21ac66e5f0805960481afc5df8 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 20 Apr 2020 03:20:30 +0200 Subject: [PATCH 287/344] Modernize spec file slightly for building on RHEL/CentOS 7 and 8 --- znc.spec | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/znc.spec b/znc.spec index 8f14796..7ced33e 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,3 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - # ZNC is a daemon application and that's why needs hardening %global _hardened_build 1 @@ -17,7 +13,7 @@ Name: znc Version: 1.7.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -97,19 +93,11 @@ Provides: perl(ZNC::Module) = %{version}-%{release} %package modpython Summary: Python3 module for ZNC -%if 0%{?rhel} -BuildRequires: python34-devel -%else -BuildRequires: python3-devel -%endif # 0%{?rhel} +BuildRequires: python%{python3_pkgversion}-devel BuildRequires: swig Requires: %{name} = %{version}-%{release} -%if 0%{?rhel} -Requires: python34 -%else -Requires: python3 -%endif # 0%{?rhel} +Requires: python%{python3_pkgversion} %description modpython %{summary}. @@ -152,6 +140,7 @@ sed -ie 's!/usr/local/!/usr/!' man/znc.1 %install %make_install install -d "%{buildroot}%{_sharedstatedir}/znc" +%py_byte_compile %{__python3} %{buildroot}%{_libdir}/znc/ %pre @@ -223,6 +212,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Apr 20 2020 Robert Scheck - 1.7.5-4 +- Modernize spec file slightly for building on RHEL/CentOS 7 and 8 + * Fri Jan 31 2020 Fedora Release Engineering - 1.7.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From cf062223965cf5000e575becfe211490f96faed1 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 15 May 2020 14:20:40 +0100 Subject: [PATCH 288/344] Rebuild for ICU 67 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 7ced33e..0a7c810 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.7.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -212,6 +212,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri May 15 2020 Pete Walter - 1.7.5-5 +- Rebuild for ICU 67 + * Mon Apr 20 2020 Robert Scheck - 1.7.5-4 - Modernize spec file slightly for building on RHEL/CentOS 7 and 8 From 9ebddfed03eded860edc24f4aca5994a26146d65 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 20 May 2020 13:17:12 -0500 Subject: [PATCH 289/344] ZNC should start after network-online.target instead of network.target --- znc.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.service b/znc.service index 55bb678..9031e27 100644 --- a/znc.service +++ b/znc.service @@ -1,6 +1,6 @@ [Unit] Description=ZNC - an advanced IRC bouncer -After=network.target +After=network-online.target [Service] ExecStart=/usr/bin/znc From 8f6c7942f1faf88f0b7dbde795252c32497c5343 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 20 May 2020 13:21:07 -0500 Subject: [PATCH 290/344] Update to 1.8.0 --- znc.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index 0a7c810..dc5d1f8 100644 --- a/znc.spec +++ b/znc.spec @@ -12,14 +12,14 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.7.5 -Release: 5%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 URL: https://znc.in -Source0: %{url}/releases/%{name}-%{version}.tar.gz -Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig +Source0: %{url}/releases/archive/%{name}-%{version}.tar.gz +Source1: %{url}/releases/archive/%{name}-%{version}.tar.gz.sig Source2: gpgkey-5AE420CC0209989E.asc # Use system-wide crypto policy @@ -212,6 +212,10 @@ getent passwd znc >/dev/null || \ %changelog +* Wed May 20 2020 Nick Bebout - 1.8.0-1 +- Update to 1.8.0 +- Fix systemd unit file to require network-online.target + * Fri May 15 2020 Pete Walter - 1.7.5-5 - Rebuild for ICU 67 From db60e8386d090dcb11c205c8fcad0cb64723efeb Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 20 May 2020 13:22:27 -0500 Subject: [PATCH 291/344] Update sources file --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f69fbfe..c2d3bfd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (znc-1.7.5.tar.gz) = f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825 -SHA512 (znc-1.7.5.tar.gz.sig) = 479f00ae38405d6d5cc40b563f433cd82d25341040fc6ef977eae7e30e51b4801e01cf124aa91e6a72a60afd4a463b0141e65787447f706df0f279ebc1d5e8b1 +SHA512 (znc-1.8.0.tar.gz) = f0b9e0e8d7229d79c3fa00826067624d4e3a1ac1062419d5d5564404817f2a9c9047d52c3dccf01ac02333361798fbd8893bd9d55195f7e118416ef2374707dc +SHA512 (znc-1.8.0.tar.gz.sig) = 4d293a94f878ebb8dd96345b049cd0f2a634cc5a845cbf1a21eb1c6be67832a1eeb1c1917294cb02de751ba5fd320c676eadfa175b563fa3064e5193b7385c7c From e8767eccdf6b20121bfbc1120b759c4c47e1be5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:55:51 +0200 Subject: [PATCH 292/344] Rebuilt for Python 3.9 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index dc5d1f8..8e364f1 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -212,6 +212,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue May 26 2020 Miro Hrončok - 1.8.0-2 +- Rebuilt for Python 3.9 + * Wed May 20 2020 Nick Bebout - 1.8.0-1 - Update to 1.8.0 - Fix systemd unit file to require network-online.target From 0c3b29c5d84dd6602d0cc21c649f2c0c3ef6a43a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 19 Jun 2020 21:40:51 -0500 Subject: [PATCH 293/344] Update to 1.8.1 to fix CVE-2020-13775 --- sources | 4 ++-- znc.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c2d3bfd..5c16f3d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (znc-1.8.0.tar.gz) = f0b9e0e8d7229d79c3fa00826067624d4e3a1ac1062419d5d5564404817f2a9c9047d52c3dccf01ac02333361798fbd8893bd9d55195f7e118416ef2374707dc -SHA512 (znc-1.8.0.tar.gz.sig) = 4d293a94f878ebb8dd96345b049cd0f2a634cc5a845cbf1a21eb1c6be67832a1eeb1c1917294cb02de751ba5fd320c676eadfa175b563fa3064e5193b7385c7c +SHA512 (znc-1.8.1.tar.gz) = 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16 +SHA512 (znc-1.8.1.tar.gz.sig) = 95ea0cb8e5de0a09fdabfd8ed825216c8908434808898bfcff24b8faad657506f6b434179fa90ce7b40088e9e54433d99f1a9e254a02fcf37e5c8f28ab5a4156 diff --git a/znc.spec b/znc.spec index 8e364f1..ca4fa49 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.8.0 -Release: 2%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -212,6 +212,10 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Jun 19 2020 Nick Bebout - 1.8.1-1 +- Update to 1.8.1 +- Fix CVE-2020-13775 possible crash/NULL pointer dereference + * Tue May 26 2020 Miro Hrončok - 1.8.0-2 - Rebuilt for Python 3.9 From bd69d824d757dddc33a093dd8ce5e9e8913e006f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 19:11:15 +0200 Subject: [PATCH 294/344] Perl 5.32 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index ca4fa49..705a19f 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -212,6 +212,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 1.8.1-2 +- Perl 5.32 rebuild + * Fri Jun 19 2020 Nick Bebout - 1.8.1-1 - Update to 1.8.1 - Fix CVE-2020-13775 possible crash/NULL pointer dereference From d37032374d4a0a0bfe51d0322d8be4330856241c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:26:24 +0000 Subject: [PATCH 295/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 705a19f..1de9cee 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -212,6 +212,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 22 2020 Jitka Plesnikova - 1.8.1-2 - Perl 5.32 rebuild From f68b63b83b2d656f00617bf0b47c39576e93e7ce Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 1 Oct 2020 15:19:19 -0500 Subject: [PATCH 296/344] Update to 1.8.2 --- sources | 4 ++-- znc.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5c16f3d..29a7d20 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (znc-1.8.1.tar.gz) = 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16 -SHA512 (znc-1.8.1.tar.gz.sig) = 95ea0cb8e5de0a09fdabfd8ed825216c8908434808898bfcff24b8faad657506f6b434179fa90ce7b40088e9e54433d99f1a9e254a02fcf37e5c8f28ab5a4156 +SHA512 (znc-1.8.2.tar.gz) = e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9 +SHA512 (znc-1.8.2.tar.gz.sig) = c4fb2817a54155cef19702e3f48ba845350209019445d7b056d303c708ddf8931eea308a0ec84d58f02be0cb932b663c3d2a732c48112205dbe953f8b08423cb diff --git a/znc.spec b/znc.spec index ca4fa49..e8688ff 100644 --- a/znc.spec +++ b/znc.spec @@ -12,7 +12,7 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} Summary: An advanced IRC bouncer @@ -212,6 +212,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Oct 01 2020 Nick Bebout - 1.8.2-1 +- Update to 1.8.2 + * Fri Jun 19 2020 Nick Bebout - 1.8.1-1 - Update to 1.8.1 - Fix CVE-2020-13775 possible crash/NULL pointer dereference From 87f9d1ca4d26ce28ac5b28fa43e4628d3fa67dd9 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 31 Oct 2020 01:07:42 +0100 Subject: [PATCH 297/344] Build against OpenSSL 1.1 on RHEL/CentOS 7 (for TLSv1.3 support) --- znc.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 32b8395..7dc1d1c 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -33,7 +33,11 @@ BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: gnupg2 BuildRequires: libicu-devel +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: openssl-devel >= 0.9.8 +%else +BuildRequires: openssl11-devel +%endif BuildRequires: perl(ExtUtils::Embed) %if 0%{?rhel} && 0%{?rhel} <= 9 @@ -120,6 +124,10 @@ rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key sed -ie 's!/usr/local/!/usr/!' man/znc.1 %build +%if 0%{?rhel} == 7 +sed -e 's/"openssl"/"openssl11"/g' -i configure +%endif + %configure \ --with-module-prefix=%{_libdir}/znc \ --with-systemdsystemunitdir=%{_unitdir} \ @@ -212,6 +220,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Oct 31 2020 Robert Scheck - 1.8.2-2 +- Build against OpenSSL 1.1 on RHEL/CentOS 7 (for TLSv1.3 support) + * Thu Oct 01 2020 Nick Bebout - 1.8.2-1 - Update to 1.8.2 From 43001c12eddd1ef6b657ebb1a6d47d9167db5eb2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:55:50 +0000 Subject: [PATCH 298/344] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- znc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/znc.spec b/znc.spec index 7dc1d1c..91c4db4 100644 --- a/znc.spec +++ b/znc.spec @@ -26,6 +26,7 @@ Source2: gpgkey-5AE420CC0209989E.asc # https://fedoraproject.org/wiki/Packaging:CryptoPolicies Patch0: 0001-Use-system-wide-crypto-policy.patch +BuildRequires: make BuildRequires: automake BuildRequires: c-ares-devel BuildRequires: cyrus-sasl-devel From deef89c2c836e4394701a187fc9fc20c8aab6261 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:45:01 +0000 Subject: [PATCH 299/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 91c4db4..1e48147 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Oct 31 2020 Robert Scheck - 1.8.2-2 - Build against OpenSSL 1.1 on RHEL/CentOS 7 (for TLSv1.3 support) From b7720181f311130abe573fb52adfd09c7d1cfc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:11:59 +0100 Subject: [PATCH 300/344] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- znc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 1e48147..35e1c00 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,10 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.8.2-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Thu Jan 28 2021 Fedora Release Engineering - 1.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a2d4422e26059a0973297d371dc5dfad0557a32e Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 19 May 2021 16:58:25 +0100 Subject: [PATCH 301/344] Rebuild for ICU 69 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 35e1c00..3510b99 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed May 19 2021 Pete Walter - 1.8.2-5 +- Rebuild for ICU 69 + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.8.2-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 0d52871822ae2afa543b8dfe28d128d924ef5e4e Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 20 May 2021 01:25:36 +0100 Subject: [PATCH 302/344] Rebuild for ICU 69 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 3510b99..df76af1 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu May 20 2021 Pete Walter - 1.8.2-6 +- Rebuild for ICU 69 + * Wed May 19 2021 Pete Walter - 1.8.2-5 - Rebuild for ICU 69 From 6ad346496a1278cf4a0f53e345da75713801250f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:47:58 +0200 Subject: [PATCH 303/344] Perl 5.34 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index df76af1..03224ef 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri May 21 2021 Jitka Plesnikova - 1.8.2-7 +- Perl 5.34 rebuild + * Thu May 20 2021 Pete Walter - 1.8.2-6 - Rebuild for ICU 69 From 336d040433fe6e55daef9079f1552d535b1dc7be Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:20:54 +0200 Subject: [PATCH 304/344] Rebuilt for Python 3.10 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 03224ef..5186307 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Jun 04 2021 Python Maint - 1.8.2-8 +- Rebuilt for Python 3.10 + * Fri May 21 2021 Jitka Plesnikova - 1.8.2-7 - Perl 5.34 rebuild From 7e49c3b16f525c9de1573d1e36e89f85ba622f15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:21:27 +0000 Subject: [PATCH 305/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 5186307..13161ed 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.8.2-8 - Rebuilt for Python 3.10 From c83d39753aef5e3e07d739629e2100b30e5c6b6b Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:18:43 +0200 Subject: [PATCH 306/344] Rebuilt with OpenSSL 3.0.0 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 13161ed..b7b99e3 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Sep 14 2021 Sahana Prasad - 1.8.2-10 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.8.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d506157cb1df638a86a0ff30674d0a29709cf06b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:55:05 +0000 Subject: [PATCH 307/344] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index b7b99e3..5df9ef4 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.8.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 1.8.2-10 - Rebuilt with OpenSSL 3.0.0 From 308e9c63d33b27e031736d61c26e41b1e2d1f5b7 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 18:18:35 -0800 Subject: [PATCH 308/344] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 93a31d5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: znc -# $Id$ -NAME := znc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 1147d20ef456e9a9f984163dcb39420d39e2aba1 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 19:56:29 +0200 Subject: [PATCH 309/344] Perl 5.36 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 5df9ef4..401205b 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon May 30 2022 Jitka Plesnikova - 1.8.2-12 +- Perl 5.36 rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.8.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 84d6887875ff140c9656d8c0b6075e12fb71df65 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:44:17 +0200 Subject: [PATCH 310/344] Rebuilt for Python 3.11 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 401205b..fdca868 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Jun 13 2022 Python Maint - 1.8.2-13 +- Rebuilt for Python 3.11 + * Mon May 30 2022 Jitka Plesnikova - 1.8.2-12 - Perl 5.36 rebuild From 9fd58dec00ee21f3e51bc7ff236930840b7eab3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:59:01 +0000 Subject: [PATCH 311/344] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index fdca868..5b12364 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1.8.2-13 - Rebuilt for Python 3.11 From 390687ee6028d0ff0ad6ea7ef6af3d7418d5f195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 1 Aug 2022 15:13:41 +0200 Subject: [PATCH 312/344] Rebuilt for ICU 71.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 5b12364..6c07b28 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Mon Aug 01 2022 Frantisek Zatloukal - 1.8.2-15 +- Rebuilt for ICU 71.1 + * Sat Jul 23 2022 Fedora Release Engineering - 1.8.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 21168675e017cba2923b7852e7f05fce87a4b473 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 31 Dec 2022 03:54:34 +0000 Subject: [PATCH 313/344] Rebuild for ICU 72 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 6c07b28..d15c62f 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Dec 31 2022 Pete Walter - 1.8.2-16 +- Rebuild for ICU 72 + * Mon Aug 01 2022 Frantisek Zatloukal - 1.8.2-15 - Rebuilt for ICU 71.1 From 6b26da3de32933c383bc2f95f73b8b399fe52727 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:19:40 +0000 Subject: [PATCH 314/344] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d15c62f..5d734e9 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.8.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 31 2022 Pete Walter - 1.8.2-16 - Rebuild for ICU 72 From 25dbe3fc154cf13d54ad6e745536bd220cda1b9a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 21:00:41 +0200 Subject: [PATCH 315/344] Rebuilt for Python 3.12 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 5d734e9..751ee79 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jun 13 2023 Python Maint - 1.8.2-18 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 1.8.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6bb219d334bec1e2abe8767580e6224549ae5c24 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 16:27:01 +0200 Subject: [PATCH 316/344] Perl 5.38 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 751ee79..2858eaa 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 1.8.2-19 +- Perl 5.38 rebuild + * Tue Jun 13 2023 Python Maint - 1.8.2-18 - Rebuilt for Python 3.12 From 50312b99d50b1ef14101160ec76fa2bcdfff8639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 22:23:49 +0200 Subject: [PATCH 317/344] Rebuilt for ICU 73.2 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 2858eaa..544a338 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jul 11 2023 František Zatloukal - 1.8.2-20 +- Rebuilt for ICU 73.2 + * Tue Jul 11 2023 Jitka Plesnikova - 1.8.2-19 - Perl 5.38 rebuild From ffc0f99a3d0d0674f1153f49cc6efc51766677b4 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 13 Jul 2023 10:15:32 +0200 Subject: [PATCH 318/344] Perl 5.38 re-rebuild updated packages --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 544a338..5afe536 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Jul 13 2023 Jitka Plesnikova - 1.8.2-21 +- Perl 5.38 re-rebuild updated packages + * Tue Jul 11 2023 František Zatloukal - 1.8.2-20 - Rebuilt for ICU 73.2 From f8a13d03d7ad60ea974a950b385285dd7cf65fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Thu, 13 Jul 2023 18:36:48 +0200 Subject: [PATCH 319/344] Rebuilt for ICU 73.2 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 5afe536..0d8f529 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Jul 13 2023 František Zatloukal - 1.8.2-22 +- Rebuilt for ICU 73.2 + * Thu Jul 13 2023 Jitka Plesnikova - 1.8.2-21 - Perl 5.38 re-rebuild updated packages From de6ca93075376a0fcb0eb4ead57edcc6f44f8b2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:45:46 +0000 Subject: [PATCH 320/344] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0d8f529..158d700 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.8.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 13 2023 František Zatloukal - 1.8.2-22 - Rebuilt for ICU 73.2 From 9722e6194849ba21b56fe412d7d7f6bcbffc7902 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:14:38 +0000 Subject: [PATCH 321/344] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 158d700..a991d95 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.8.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.8.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0414e519c612c80e5ed1f60b05de35098c0f4469 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 31 Jan 2024 20:28:58 +0000 Subject: [PATCH 322/344] Rebuild for ICU 74 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index a991d95..0b6ee16 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed Jan 31 2024 Pete Walter - 1.8.2-25 +- Rebuild for ICU 74 + * Sat Jan 27 2024 Fedora Release Engineering - 1.8.2-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0c6101912165e86baa6f9175eb0c5c5b61c2486e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:12:54 +0200 Subject: [PATCH 323/344] Rebuilt for Python 3.13 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0b6ee16..97fff9a 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Jun 07 2024 Python Maint - 1.8.2-26 +- Rebuilt for Python 3.13 + * Wed Jan 31 2024 Pete Walter - 1.8.2-25 - Rebuild for ICU 74 From 26dfea74b0bfb0e8ce04f8be106f92174562a7a2 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 12 Jun 2024 12:53:36 +0200 Subject: [PATCH 324/344] Perl 5.40 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 97fff9a..e420266 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed Jun 12 2024 Jitka Plesnikova - 1.8.2-27 +- Perl 5.40 rebuild + * Fri Jun 07 2024 Python Maint - 1.8.2-26 - Rebuilt for Python 3.13 From 6527f23bb74ce6bcec10e06ed2f46638a8c3c28b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 18 Jun 2024 09:39:37 +0200 Subject: [PATCH 325/344] Rebuilt for Python 3.13 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index e420266..88616b6 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.8.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Jun 18 2024 Python Maint - 1.8.2-28 +- Rebuilt for Python 3.13 + * Wed Jun 12 2024 Jitka Plesnikova - 1.8.2-27 - Perl 5.40 rebuild From dd25b4741db914aa1243c300e900da6987a3edde Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Fri, 31 May 2024 09:56:35 +0200 Subject: [PATCH 326/344] Fix improperly commented out macros in %prep Since RPM 4.20, %prep is no longer implemented as a special "hack" [1] but is now a regular build scriptlet, meaning that %setup or %patch are now treated as regular macros and thus will be expanded even in comments (as documented in [2]). Our spec has these so fix them up to unbreak the build on F41. [1] https://github.com/rpm-software-management/rpm/issues/2205 [2] https://rpm-software-management.github.io/rpm/manual/spec.html --- znc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 88616b6..5cfaa0e 100644 --- a/znc.spec +++ b/znc.spec @@ -118,8 +118,8 @@ gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key %autosetup -p1 -#%setup -n znc-1.7.5-rc1 -#%patch0 -p1 +%dnl %setup -n znc-1.7.5-rc1 +%dnl %patch0 -p1 # The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 From dda90e644127c5389a68f9908194e160e5f8504e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 17 Jul 2024 13:49:20 -0500 Subject: [PATCH 327/344] Update to 1.9.1 --- sources | 3 +-- znc.spec | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 29a7d20..d1bb994 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (znc-1.8.2.tar.gz) = e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9 -SHA512 (znc-1.8.2.tar.gz.sig) = c4fb2817a54155cef19702e3f48ba845350209019445d7b056d303c708ddf8931eea308a0ec84d58f02be0cb932b663c3d2a732c48112205dbe953f8b08423cb +SHA512 (znc-1.9.1.tar.gz) = 939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6 diff --git a/znc.spec b/znc.spec index 88616b6..77fac1e 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.8.2 -Release: 28%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed Jul 17 2024 Nick Bebout - 1.9.1-1 +- Update to 1.9.1 + * Tue Jun 18 2024 Python Maint - 1.8.2-28 - Rebuilt for Python 3.13 From ecf25c9c57596709e11e6bd89d31596936ec463e Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 17 Jul 2024 13:55:01 -0500 Subject: [PATCH 328/344] Add signature --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index d1bb994..03f8b97 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (znc-1.9.1.tar.gz) = 939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6 +SHA512 (znc-1.9.1.tar.gz.sig) = f9c0134ed8248828871d5ff8d0fc72a7b94426871ad75957aa675274a9da1a8957fae09603cee03729b33d42e14fcbf5f1952867fa38fef4e2860d62944af488 From 5c51e0f7fa994c5128363b4c495ea6087951a6e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:55:45 +0000 Subject: [PATCH 329/344] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 77fac1e..31548fe 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jul 17 2024 Nick Bebout - 1.9.1-1 - Update to 1.9.1 From c87eddaf82d4a174a08562832b58decdc072d06b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 18:12:30 +0200 Subject: [PATCH 330/344] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- znc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 31548fe..cbfe82f 100644 --- a/znc.spec +++ b/znc.spec @@ -13,10 +13,11 @@ Name: znc Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: https://znc.in Source0: %{url}/releases/archive/%{name}-%{version}.tar.gz Source1: %{url}/releases/archive/%{name}-%{version}.tar.gz.sig @@ -221,6 +222,9 @@ getent passwd znc >/dev/null || \ %changelog +* Wed Jul 24 2024 Miroslav Suchý - 1.9.1-3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 377a89607ddad7f441e1eed19439546e8f5c7ae4 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sun, 25 Aug 2024 17:33:41 -0400 Subject: [PATCH 331/344] rebase system crypto policy patch --- 0001-Use-system-wide-crypto-policy.patch | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/0001-Use-system-wide-crypto-policy.patch b/0001-Use-system-wide-crypto-policy.patch index 04b4cfa..ca64213 100644 --- a/0001-Use-system-wide-crypto-policy.patch +++ b/0001-Use-system-wide-crypto-policy.patch @@ -9,34 +9,26 @@ Reference: https://fedoraproject.org/wiki/Packaging:CryptoPolicies 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/Socket.cpp b/src/Socket.cpp -index fa510462..e40c76ea 100644 +index 577f69c..f413f96 100644 --- a/src/Socket.cpp +++ b/src/Socket.cpp -@@ -28,21 +28,10 @@ +@@ -28,15 +28,11 @@ #endif #ifdef HAVE_LIBSSL -// Copypasted from -// https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29 --// at 2018-04-01 +-// at 2024-02-08 (version 5.7) +// Use system-wide crypto policy +// https://fedoraproject.org/wiki/Packaging:CryptoPolicies static CString ZNC_DefaultCipher() { -- return "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-" -- "ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-" -- "AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-" -- "SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-" -- "RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:" -- "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-" -- "SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:" -- "DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:" -- "ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:" -- "AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-" -- "SHA:DES-CBC3-SHA:!DSS"; + // This is TLS1.2 only, because TLS1.3 ciphers are probably not configurable here yet +- return "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:" +- "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:" +- "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:" +- "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305"; + return "PROFILE=SYSTEM"; } #endif - -- -2.19.0.rc0 From ef1895867bc284e4d76d141cfb6a9c32eb53e34b Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Sun, 25 Aug 2024 18:15:41 -0400 Subject: [PATCH 332/344] fix ftbfs, fti, CVE-2024-39844, switch to cmake - switch to pure cmake (1.9.0 turned configure into a wrapper which dropped options) - resolve ftbfs, fti, new version (#226393 #2301380 #2292226) - resolve CVE-2024-39844 (#2295622) --- 0001-Use-system-wide-crypto-policy.patch | 2 -- znc.spec | 45 ++++++++++++++---------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/0001-Use-system-wide-crypto-policy.patch b/0001-Use-system-wide-crypto-policy.patch index ca64213..6688c49 100644 --- a/0001-Use-system-wide-crypto-policy.patch +++ b/0001-Use-system-wide-crypto-policy.patch @@ -30,5 +30,3 @@ index 577f69c..f413f96 100644 + return "PROFILE=SYSTEM"; } #endif --- - diff --git a/znc.spec b/znc.spec index 71da541..1eb5457 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -27,19 +27,25 @@ Source2: gpgkey-5AE420CC0209989E.asc # https://fedoraproject.org/wiki/Packaging:CryptoPolicies Patch0: 0001-Use-system-wide-crypto-policy.patch -BuildRequires: make -BuildRequires: automake BuildRequires: c-ares-devel +BuildRequires: cmake BuildRequires: cyrus-sasl-devel BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: gnupg2 BuildRequires: libicu-devel +BuildRequires: make + %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: openssl-devel >= 0.9.8 %else BuildRequires: openssl11-devel %endif + +%if 0%{?fedora} >= 41 +BuildRequires: openssl-devel-engine +%endif + BuildRequires: perl(ExtUtils::Embed) %if 0%{?rhel} && 0%{?rhel} <= 9 @@ -119,8 +125,6 @@ gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key %autosetup -p1 -%dnl %setup -n znc-1.7.5-rc1 -%dnl %patch0 -p1 # The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 @@ -130,25 +134,23 @@ sed -ie 's!/usr/local/!/usr/!' man/znc.1 sed -e 's/"openssl"/"openssl11"/g' -i configure %endif -%configure \ - --with-module-prefix=%{_libdir}/znc \ - --with-systemdsystemunitdir=%{_unitdir} \ +%cmake \ %if 0%{?with_modperl} - --enable-perl \ -%else - --disable-perl \ -%endif # 0%{?with_modperl} + -DWANT_PERL=1 \ +%endif %if 0%{?with_modpython} - --enable-python \ -%else # 0%{?with_modpython} - --disable-python \ -%endif # 0%{?with_modpython} - --enable-ipv6 --enable-cyrus --enable-tcl --with-tcl=%{_libdir} -%make_build V=1 + -DWANT_PYTHON=1 \ +%endif + -DWANT_SYSTEMD=1 \ + -DSYSTEMD_DIR=%{_unitdir} \ + -DWANT_IPV6=1 \ + -DWANT_CYRUS=1 \ + -DWANT_TCL=1 +%cmake_build %install -%make_install +%cmake_install install -d "%{buildroot}%{_sharedstatedir}/znc" %py_byte_compile %{__python3} %{buildroot}%{_libdir}/znc/ @@ -222,6 +224,11 @@ getent passwd znc >/dev/null || \ %changelog +* Sun Aug 25 2024 Neil Hanlon - 1.9.1-4 +- switch to pure cmake (1.9.0 turned configure into a wrapper which dropped options) +- resolve ftbfs, fti, new version (#226393 #2301380 #2292226) +- resolve CVE-2024-39844 (#2295622) + * Wed Jul 24 2024 Miroslav Suchý - 1.9.1-3 - convert license to SPDX From dc252de4f0262cab21ca9845209d4a99a939e186 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Mon, 2 Sep 2024 19:26:00 -0400 Subject: [PATCH 333/344] fix: aarch64 build fails due to parallelism --- znc.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/znc.spec b/znc.spec index 1eb5457..493ab27 100644 --- a/znc.spec +++ b/znc.spec @@ -134,6 +134,11 @@ sed -ie 's!/usr/local/!/usr/!' man/znc.1 sed -e 's/"openssl"/"openssl11"/g' -i configure %endif +# NOTE(neil): 2024-09-02 aarch64 responds badly to building on large machines +%ifarch aarch64 +%global _smp_build_ncpus 1 +%endif + %cmake \ %if 0%{?with_modperl} -DWANT_PERL=1 \ From 95993e313fd83ac507bd4c0daf7e6a6da6e81031 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 8 Dec 2024 23:04:59 +0000 Subject: [PATCH 334/344] Rebuild for ICU 76 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 493ab27..556b1f6 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -229,6 +229,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sun Dec 08 2024 Pete Walter - 1.9.1-5 +- Rebuild for ICU 76 + * Sun Aug 25 2024 Neil Hanlon - 1.9.1-4 - switch to pure cmake (1.9.0 turned configure into a wrapper which dropped options) - resolve ftbfs, fti, new version (#226393 #2301380 #2292226) From eb1f6fc672b7e90341ad3574376bc7a14375a596 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:50:35 +0000 Subject: [PATCH 335/344] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 556b1f6..f27442d 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -229,6 +229,9 @@ getent passwd znc >/dev/null || \ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.9.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Dec 08 2024 Pete Walter - 1.9.1-5 - Rebuild for ICU 76 From 9c3026d04d500b75262f631f3e8e47e596388e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:14 +0100 Subject: [PATCH 336/344] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- znc.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/znc.spec b/znc.spec index f27442d..7ac3458 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -52,7 +52,6 @@ BuildRequires: perl(ExtUtils::Embed) Obsoletes: znc-extra <= %{version}-%{release} %endif # 0%{?rhel} && 0%{?rhel} <= 9 -Requires(pre): shadow-utils BuildRequires: systemd %{?systemd_requires} @@ -129,6 +128,11 @@ rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key # The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 +# Create a sysusers.d config file +cat >znc.sysusers.conf </dev/null || groupadd -r znc -getent passwd znc >/dev/null || \ - useradd -r -g znc -d /var/lib/znc -s /sbin/nologin \ - -c "Account for ZNC to run as" znc %post @@ -201,6 +202,7 @@ getent passwd znc >/dev/null || \ %exclude %{_datadir}/znc/modtcl/ %{_unitdir}/znc.service %attr(-,znc,znc) %{_sharedstatedir}/znc/ +%{_sysusersdir}/znc.conf %files devel %{_bindir}/znc-buildmod @@ -229,6 +231,9 @@ getent passwd znc >/dev/null || \ %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.9.1-7 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 1.9.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b6fef453ade67e2ebcdc65b250e1987aab1e9564 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:54:40 +0200 Subject: [PATCH 337/344] Rebuilt for Python 3.14 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 7ac3458..77f6b41 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -231,6 +231,9 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf %changelog +* Mon Jun 02 2025 Python Maint - 1.9.1-8 +- Rebuilt for Python 3.14 + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.9.1-7 - Add sysusers.d config file to allow rpm to create users/groups automatically From 967dc69a063f2608b226afb64fa8f85081e6e046 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:38:08 +0200 Subject: [PATCH 338/344] Perl 5.42 rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 77f6b41..7e99180 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -231,6 +231,9 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 1.9.1-9 +- Perl 5.42 rebuild + * Mon Jun 02 2025 Python Maint - 1.9.1-8 - Rebuilt for Python 3.14 From 37643858300435a4cf0ada3cefde9f80aa9accda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:20:05 +0000 Subject: [PATCH 339/344] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 7e99180..0fd2693 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -231,6 +231,9 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.9.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 1.9.1-9 - Perl 5.42 rebuild From da4da1f9137ba940ece2f3390bc12bdfc0c05509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:58:56 +0200 Subject: [PATCH 340/344] Rebuilt for icu 77.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0fd2693..d0ba349 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -231,6 +231,9 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf %changelog +* Wed Aug 06 2025 František Zatloukal - 1.9.1-11 +- Rebuilt for icu 77.1 + * Fri Jul 25 2025 Fedora Release Engineering - 1.9.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c662e6cce00e40172a68f7c8c84a147945f05e23 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:23:55 +0200 Subject: [PATCH 341/344] Rebuilt for Python 3.14.0rc2 bytecode --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d0ba349..0c422a7 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -231,6 +231,9 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf %changelog +* Fri Aug 15 2025 Python Maint - 1.9.1-12 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Aug 06 2025 František Zatloukal - 1.9.1-11 - Rebuilt for icu 77.1 From 6523153084ce24fbe2ecf2837ecfab0e74f79fa8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:04:39 +0200 Subject: [PATCH 342/344] Rebuilt for Python 3.14.0rc3 bytecode --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 0c422a7..3a37cc3 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@ Name: znc Version: 1.9.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -231,6 +231,9 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf %changelog +* Fri Sep 19 2025 Python Maint - 1.9.1-13 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.9.1-12 - Rebuilt for Python 3.14.0rc2 bytecode From b0243b3ddfc1fa8940c564bb9127f544a3429634 Mon Sep 17 00:00:00 2001 From: Ben Maconi Date: Mon, 13 Oct 2025 18:37:46 -0500 Subject: [PATCH 343/344] Updated to version 1.10.1 --- sources | 4 ++-- znc.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 03f8b97..473bf75 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (znc-1.9.1.tar.gz) = 939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6 -SHA512 (znc-1.9.1.tar.gz.sig) = f9c0134ed8248828871d5ff8d0fc72a7b94426871ad75957aa675274a9da1a8957fae09603cee03729b33d42e14fcbf5f1952867fa38fef4e2860d62944af488 +SHA512 (znc-1.10.1.tar.gz) = f125eef5a9f8bfcd278951971638fe8a937261001bfd8f6438fc51fda666b97c00780c5c6f1a921b3db79cb7656bc9675eb3881b18b22b7738e0976ebcca7cb3 +SHA512 (znc-1.10.1.tar.gz.sig) = a85b65dacce72d51cda4260ff881496c82b77dabf273fda1c3f536360950755700b352a6d22bac01c808abae13c4b686a2e5f36b0351e0b77ec032057caee311 diff --git a/znc.spec b/znc.spec index 3a37cc3..8b6fe43 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.9.1 -Release: 13%{?dist} +Version: 1.10.1 +Release: 1%{?dist} Summary: An advanced IRC bouncer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -231,6 +231,9 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf %changelog +* Mon Oct 13 2025 Ben Maconi - 1.10.1-1 +- Updated to 1.10.1 + * Fri Sep 19 2025 Python Maint - 1.9.1-13 - Rebuilt for Python 3.14.0rc3 bytecode From 930afb93a7f930319e7d15bb09b80594eed2d7ca Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 13 Oct 2025 19:10:09 -0500 Subject: [PATCH 344/344] Use 1 CPU for x86_64 --- znc.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/znc.spec b/znc.spec index 8b6fe43..ee6592c 100644 --- a/znc.spec +++ b/znc.spec @@ -143,6 +143,10 @@ sed -e 's/"openssl"/"openssl11"/g' -i configure %global _smp_build_ncpus 1 %endif +%ifarch x86_64 +%global _smp_build_ncpus 1 +%endif + %cmake \ %if 0%{?with_modperl} -DWANT_PERL=1 \