rpms
/
znc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 0.074-1

This commit is contained in:
Nick Bebout 2009-07-23 18:12:47 +00:00
parent d45d947f39
commit 391760d7a0
4 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
znc-0.072.tar.gz
znc-0.074.tar.gz

2
sources
View File

@ -1 +1 @@
28791eb14f5a3129602dbab0ef6abbc6 znc-0.072.tar.gz
378187acd114769f8f97ef2d4b19da25 znc-0.074.tar.gz

20
znc-0.072-webadmin.diff
View File

@ -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/";

13
znc.spec
View File

@ -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 <nb@fedoraproject.org> - 0.074-1
- Update to 0.074
* Wed Jul 22 2009 Nick Bebout <nb@fedoraproject.org> - 0.072-3
- Fix date in changelog, disable c-ares
* Wed Jul 22 2009 Nick Bebout <nb@fedoraproject.org> - 0.072-2