rpms/zikula/EL-5 zikula-1.2.3-config.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.4, 1.5 sources, 1.3, 1.4 zikula.spec, 1.5, 1.6 zikulahash.patch, 1.1, 1.2 zikula-1.1.2-config.patch, 1.1, NONE
David Nalley
ke4qqq at fedoraproject.org
Sun Jun 6 19:55:51 UTC 2010
Author: ke4qqq
Update of /cvs/pkgs/rpms/zikula/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7206/EL-5
Modified Files:
.cvsignore import.log sources zikula.spec zikulahash.patch
Added Files:
zikula-1.2.3-config.patch
Removed Files:
zikula-1.1.2-config.patch
Log Message:
* Sun June 06 2010 David Nalley <david at gnsa.us> 1.2.3-1
- upgrading to 1.2.3
- removed jsminify patch, and thus requirement for custom tarball
- fixes XSS and CSRF security problems.
zikula-1.2.3-config.patch:
config.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE zikula-1.2.3-config.patch ---
--- config/config.php.diff 2009-10-12 09:14:24.000000000 -0400
+++ config/config.php 2009-12-06 00:33:45.060521101 -0500
@@ -37,7 +37,7 @@
global $PNConfig;
$PNConfig['System']['installed'] = 0; // installer will change this during installation
$PNConfig['System']['tabletype'] = 'myisam'; // installer will change this during installation
-$PNConfig['System']['temp'] = 'pnTemp'; // installer will change this during installation
+$PNConfig['System']['temp'] = '/var/lib/zikula/pnTemp'; // installer will change this during installation
$PNConfig['System']['prefix'] = 'z'; // installer will change this during installation
$PNConfig['System']['development'] = 0; // should be set to 0/false when cutting a release for production use
$PNConfig['System']['default_timezone'] = 'GMT'; // TZ timezone
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 24 Aug 2009 00:26:24 -0000 1.3
+++ .cvsignore 6 Jun 2010 19:55:50 -0000 1.4
@@ -1 +1 @@
-Zikula-1.1.2-CORE.zip
+Zikula-1.2.3.zip
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 24 Aug 2009 01:17:46 -0000 1.4
+++ import.log 6 Jun 2010 19:55:50 -0000 1.5
@@ -2,3 +2,4 @@ zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-1
zikula-1_1_2-1_fc11:EL-5:zikula-1.1.2-1.fc11.src.rpm:1251073550
zikula-1_1_2-2_fc11:EL-5:zikula-1.1.2-2.fc11.src.rpm:1251074682
zikula-1_1_2-3_fc11:EL-5:zikula-1.1.2-3.fc11.src.rpm:1251076644
+zikula-1_2_3-1_fc13:EL-5:zikula-1.2.3-1.fc13.src.rpm:1275853936
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 24 Aug 2009 00:26:24 -0000 1.3
+++ sources 6 Jun 2010 19:55:50 -0000 1.4
@@ -1 +1 @@
-585a1f8cec31fd33f64aa3968590a93d Zikula-1.1.2-CORE.zip
+7641cfd362c8cf9e1ca5f4ecdd9ce44c Zikula-1.2.3.zip
Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/zikula.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- zikula.spec 24 Aug 2009 01:17:46 -0000 1.5
+++ zikula.spec 6 Jun 2010 19:55:50 -0000 1.6
@@ -1,14 +1,14 @@
Name: zikula
-Version: 1.1.2
-Release: 3%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
Summary: Zikula is a free open source Web Application Framework
Group: Applications/Publishing
License: GPLv2+
# There is some content in this package that is LGPL with the bulk
# GPLv2+ thus overall package should be GPLv2+
URL: http://www.zikula.org/
-Source0: Zikula-%{version}-CORE.zip
-#URL for source is http://code.zikula.org/core/downloads/99
+Source0: Zikula-%{version}.zip
+#URL for source is http://zikula.org/CMS/Download/
Source1: zikula.conf
#this is being discussed upstream - for the moment it is a fedora only file
#see http://groups.google.com/group/zikula-discussions/browse_thread/thread/2f44d45a975d1515/
@@ -47,11 +47,12 @@ semanage fcontext -a -t httpd_var_run_t
semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
%prep
-%setup -c -qn %{name}-%{version}
+%setup -qn Zikula-%{version}
%patch0 -p0
%patch1 -p0
-dos2unix docs/Zikula_1_1_2-MYSQL.sql
-
+find . -type f -perm 755 -exec chmod 0644 '{}' \;
+#find . \( -name "*.php" -o -name "*.txt" -o -name "*htm*" -o -name "*.css" -o -name "*.js" -o -name "*.ini" \) -exec chmod 0644 '{}' \;
+chmod -x docs/COPYING
%build
#nothing really for this section but rpmbuild complains if build is empty
@@ -73,9 +74,7 @@ rm -rf includes/classes/JSON
rm -rf includes/classes/Smarty
rm -rf includes/classes/adodb
rm -rf includes/classes/SimplePie
-rm -rf includes/classes/idna
-
-cp -pr config images includes install javascript language modules system themes -t %{buildroot}/%{_datadir}/%{name}
+cp -pr config images includes install javascript locale language modules system themes -t %{buildroot}/%{_datadir}/%{name}
install -m 0644 *php robots.txt %{buildroot}/%{_datadir}/%{name}
@@ -91,8 +90,7 @@ install -m 0644 -D -p %{SOURCE1} %{build
rm -f %{buildroot}/%{datadir}/%{name}/includes/.htaccess
#changinng encoding
-iconv -f ISO-8859-1 -t UTF-8 --output %{_builddir}/%{name}-%{version}/docs/previouscredits.txt %{_builddir}/%{name}-%{version}/docs/previouscredits.txt
-iconv -f ISO-8859-1 -t UTF-8 --output %{_builddir}/%{name}-%{version}/docs/CREDITS.txt %{_builddir}/%{name}-%{version}/docs/CREDITS.txt
+iconv -f ISO-8859-1 -t UTF-8 --output %{_builddir}/Zikula-%{version}/docs/previouscredits.txt %{_builddir}/Zikula-%{version}/docs/previouscredits.txt
cd %{buildroot}
cd -
@@ -117,15 +115,24 @@ rm -rf %{buildroot}
%post
+ln -sf /usr/share/php/php-gettext /usr/share/zikula/includes/classes/php-gettext 2>&1 || :
ln -sf /usr/share/doc/zikula-1.1.2 /usr/share/zikula/docs > /dev/null 2>&1 || :
ln -sf /usr/share/php/adodb /usr/share/zikula/includes/classes/adodb > /dev/null 2>&1 || :
ln -sf /usr/share/php/Smarty /usr/share/zikula/includes/classes/Smarty > /dev/null 2>&1 || :
ln -sf /usr/share/php/php-simplepie /usr/share/zikula/includes/classes/SimplePie > /dev/null 2>&1 || :
-ln -sf /usr/share/php/IDNA_Convert /usr/share/zikula/includes/classes/idna > /dev/null 2>&1 || :
symlinks -crs /usr/share/zikula/includes/ > /dev/null 2>&1 || :
symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
%changelog
+* Wed May 12 2010 David Nalley <david at gnsa.us> 1.2.3-1
+- upgrading to 1.2.3
+- removed jsminify patch, and thus requirement for custom tarball
+- fixes XSS and CSRF security problems.
+* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.2.0-1
+- upgrading to 1.2.0
+- added require for php-gettext and symlinked it to includes/classes
+- added patch to strip jsminify support
+- build custom tarball because upstream ships non-free libs
* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
- changed requirement for dos2unix to build requirement
zikulahash.patch:
DataUtil.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: zikulahash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/zikulahash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zikulahash.patch 24 Aug 2009 00:26:24 -0000 1.1
+++ zikulahash.patch 6 Jun 2010 19:55:50 -0000 1.2
@@ -1,15 +1,14 @@
-diff -rupN old/includes/DataUtil.class.php new/includes/DataUtil.class.php
---- includes/DataUtil.class.php 2008-12-08 13:31:42.000000000 -0500
-+++ includes/DataUtil.class.php 2009-08-23 19:48:25.169290742 -0400
-@@ -448,9 +448,9 @@ class DataUtil
+--- includes/DataUtil.class.php.orig 2009-12-06 00:50:32.903788349 -0500
++++ includes/DataUtil.class.php 2009-12-06 00:51:11.467520804 -0500
+@@ -441,9 +441,9 @@
return bin2hex(mhash(MHASH_SHA256, $string));
} else {
if (!class_exists('SHA256')) {
- Loader::requireOnce('includes/classes/hashes/sha256.class.php');
-+ # Loader::requireOnce('includes/classes/hashes/sha256.class.php');
++# Loader::requireOnce('includes/classes/hashes/sha256.class.php');
}
- return SHA256::hash($string);
-+ return hash('sha256', $string);
++ return hash('sha256', $string);
}
- }
- else if ($type == 'md5') {
+ } else if ($type == 'md5') {
+ return md5($string);
--- zikula-1.1.2-config.patch DELETED ---
More information about the scm-commits
mailing list