Updating to 0.072-2
This commit is contained in:
parent
fb563bbe25
commit
c652e56d16
|
@ -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/";
|
10
znc.spec
10
znc.spec
|
@ -1,11 +1,12 @@
|
||||||
Summary: An advanced IRC bouncer
|
Summary: An advanced IRC bouncer
|
||||||
Name: znc
|
Name: znc
|
||||||
Version: 0.072
|
Version: 0.072
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2 with exceptions
|
License: GPLv2 with exceptions
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
URL: http://znc.sf.net/
|
URL: http://znc.sf.net/
|
||||||
Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz
|
Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz
|
||||||
|
Patch0: %{name}-%{version}-webadmin.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
BuildRequires: perl
|
BuildRequires: perl
|
||||||
BuildRequires: openssl-devel >= 0.9.8
|
BuildRequires: openssl-devel >= 0.9.8
|
||||||
|
@ -37,8 +38,9 @@ modules.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
||||||
#chmod -x modules/q.cpp
|
chmod -x modules/q.cpp
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
|
@ -70,8 +72,10 @@ modules.
|
||||||
%{_includedir}/znc/
|
%{_includedir}/znc/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Web Jul 22 2009 Nick Bebout <nb@fedoraproject.org> - 0.072-2
|
||||||
|
- Backport patch to fix webadmin skins issue introduced in 0.072
|
||||||
* Wed Jul 22 2009 Nick Bebout <nb@fedoraproject.org> - 0.072-1
|
* Wed Jul 22 2009 Nick Bebout <nb@fedoraproject.org> - 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 <nb@fedoraproject.org> - 0.070-7
|
* Sun Jul 12 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-7
|
||||||
- Fix License: to be GPLv2 with exceptions
|
- Fix License: to be GPLv2 with exceptions
|
||||||
* Sat Jul 11 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-6
|
* Sat Jul 11 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-6
|
||||||
|
|
Loading…
Reference in New Issue