From 99aca74fba62086a6050dbedd87c1c5cbeb1ec36 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:28:27 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for zikula --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From a031ed536fe5f1cd706d59c4f12ce87b0d7fd081 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:52 +0000 Subject: [PATCH 2/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6ca8b0f..fbf6e2a 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zikula -# $Id$ +# $Id: Makefile,v 1.1 2009/03/20 02:52:38 kevin Exp $ NAME := zikula SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c13e6e2b5735532ef91089745eb1cf435c5b90c5 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Thu, 13 May 2010 00:38:56 +0000 Subject: [PATCH 3/4] - upgrading to 1.2.3 bz 589727 521193 - removed jsminify patch, and thus requirement for custom tarball - fixes XSS and CSRF security problems. bz 589290 589292 --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- ...-config.patch => zikula-1.2.3-config.patch | 11 ++++--- zikula.spec | 33 +++++++++++-------- zikulahash.patch | 15 ++++----- 6 files changed, 36 insertions(+), 28 deletions(-) rename zikula-1.1.2-config.patch => zikula-1.2.3-config.patch (64%) diff --git a/.cvsignore b/.cvsignore index 48d4697..4407796 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zikula-1.1.2-CORE.zip +Zikula-1.2.3.zip diff --git a/import.log b/import.log index f03627b..42fcea3 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874 zikula-1_1_2-1_fc11:HEAD:zikula-1.1.2-1.fc11.src.rpm:1251073198 zikula-1_1_2-2_fc11:HEAD:zikula-1.1.2-2.fc11.src.rpm:1251074540 zikula-1_1_2-3_fc11:HEAD:zikula-1.1.2-3.fc11.src.rpm:1251075657 +zikula-1_2_3-1_fc13:F-12:zikula-1.2.3-1.fc13.src.rpm:1273711112 diff --git a/sources b/sources index 5b7f4e3..2499d06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -585a1f8cec31fd33f64aa3968590a93d Zikula-1.1.2-CORE.zip +7641cfd362c8cf9e1ca5f4ecdd9ce44c Zikula-1.2.3.zip diff --git a/zikula-1.1.2-config.patch b/zikula-1.2.3-config.patch similarity index 64% rename from zikula-1.1.2-config.patch rename to zikula-1.2.3-config.patch index 57127fb..c320a35 100644 --- a/zikula-1.1.2-config.patch +++ b/zikula-1.2.3-config.patch @@ -1,11 +1,12 @@ ---- config/config.php 2008-06-06 14:03:14.000000000 +0200 -+++ config/config.php.diff 2009-01-26 10:16:12.000000000 +0100 -@@ -36,7 +36,7 @@ +--- 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'] = 'zk'; // 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 + diff --git a/zikula.spec b/zikula.spec index 6752456..c5d21e4 100644 --- a/zikula.spec +++ b/zikula.spec @@ -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 %{_sysconfdir}/%{name}/config.php > /dev 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} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zikula 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 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 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 1.1.2-3 - changed requirement for dos2unix to build requirement diff --git a/zikulahash.patch b/zikulahash.patch index 84af042..fb9bc0b 100644 --- a/zikulahash.patch +++ b/zikulahash.patch @@ -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); From 2c7944b81c0fbb22c3a212e61f604e70fe3f9c8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:29:51 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 5 ----- 4 files changed, 27 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fbf6e2a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula -# $Id: Makefile,v 1.1 2009/03/20 02:52:38 kevin Exp $ -NAME := zikula -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 42fcea3..0000000 --- a/import.log +++ /dev/null @@ -1,5 +0,0 @@ -zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874 -zikula-1_1_2-1_fc11:HEAD:zikula-1.1.2-1.fc11.src.rpm:1251073198 -zikula-1_1_2-2_fc11:HEAD:zikula-1.1.2-2.fc11.src.rpm:1251074540 -zikula-1_1_2-3_fc11:HEAD:zikula-1.1.2-3.fc11.src.rpm:1251075657 -zikula-1_2_3-1_fc13:F-12:zikula-1.2.3-1.fc13.src.rpm:1273711112