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