rpms/znc/EL-5 znc-0.072-webadmin.diff,NONE,1.1 znc.spec,1.2,1.3

[Nick Bebout]

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17027

Modified Files:
	znc.spec 
Added Files:
	znc-0.072-webadmin.diff 
Log Message:
Updating to 0.072-2


znc-0.072-webadmin.diff:
 webadmin.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE znc-0.072-webadmin.diff ---
--- 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/";


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/znc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- znc.spec	23 Jul 2009 01:22:42 -0000	1.2
+++ znc.spec	23 Jul 2009 02:00:10 -0000	1.3
@@ -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 <nb at fedoraproject.org> - 0.072-2
+- Backport patch to fix webadmin skins issue introduced in 0.072
 * Wed Jul 22 2009 Nick Bebout <nb at 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 at fedoraproject.org> - 0.070-7
 - Fix License: to be GPLv2 with exceptions
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-6