From f003646cd4df9254a19909c3327b5883898a386f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 20 Mar 2009 02:52:42 +0000 Subject: [PATCH 1/9] Initialize branch EL-5 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..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 74d93f308d99f127b2d64ed0298285fe16d51047 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Fri, 20 Mar 2009 16:11:30 +0000 Subject: [PATCH 2/9] - Initial commit --- .cvsignore | 1 + import.log | 1 + sources | 1 + zikula-1.1.1-config.patch | 11 +++ zikula.conf | 102 +++++++++++++++++++++++++++ zikula.spec | 142 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 258 insertions(+) create mode 100644 import.log create mode 100644 zikula-1.1.1-config.patch create mode 100644 zikula.conf create mode 100644 zikula.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3196e30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Zikula-1.1.1-CORE.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..6dd6e0e --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397 diff --git a/sources b/sources index e69de29..b21310c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d09fee4fc1f4756bff11f61c6d3797a1 Zikula-1.1.1-CORE.tar.gz diff --git a/zikula-1.1.1-config.patch b/zikula-1.1.1-config.patch new file mode 100644 index 0000000..57127fb --- /dev/null +++ b/zikula-1.1.1-config.patch @@ -0,0 +1,11 @@ +--- 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 @@ + 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']['development'] = 0; // should be set to 0/false when cutting a release for production use + diff --git a/zikula.conf b/zikula.conf new file mode 100644 index 0000000..1a84986 --- /dev/null +++ b/zikula.conf @@ -0,0 +1,102 @@ +#conf file for dedicated server installs of Zikula. +# v0.1 David Nalley - Initial consolidation of .htaccess files from Zikulasource +# +Alias /zikula /usr/share/zikula + + order deny,allow + allow from all + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + SetEnvIf Request_URI "\.jpg$" object_is_jpg=jpg + SetEnvIf Request_URI "\.gif$" object_is_gif=gif + SetEnvIf Request_URI "\.png$" object_is_png=png + SetEnvIf Request_URI "\.tif$" object_is_tif=tif + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + Allow from env=object_is_jpg + Allow from env=object_is_gif + Allow from env=object_is_png + Allow from env=object_is_tif + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + SetEnvIf Request_URI "\.jpg$" object_is_jpg=jpg + SetEnvIf Request_URI "\.gif$" object_is_gif=gif + SetEnvIf Request_URI "\.png$" object_is_png=png + SetEnvIf Request_URI "\.tif$" object_is_tif=tif + SetEnvIf Request_URI "\.swf$" object_is_swf=swf + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + Allow from env=object_is_jpg + Allow from env=object_is_gif + Allow from env=object_is_png + Allow from env=object_is_tif + Allow from env=object_is_swf + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + SetEnvIf Request_URI "\.jpg$" object_is_jpg=jpg + SetEnvIf Request_URI "\.gif$" object_is_gif=gif + SetEnvIf Request_URI "\.png$" object_is_png=png + SetEnvIf Request_URI "\.tif$" object_is_tif=tif + SetEnvIf Request_URI "\.swf$" object_is_swf=swf + SetEnvIf Request_URI "\.flv$" object_is_flv=flv + SetEnvIf Request_URI "\.ico$" object_is_ico=ico + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + Allow from env=object_is_jpg + Allow from env=object_is_gif + Allow from env=object_is_png + Allow from env=object_is_tif + Allow from env=object_is_swf + Allow from env=object_is_flv + Allow from env=object_is_ico + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + + + + Options -Indexes + Order deny,allow + Deny from all + + + + Options -Indexes + SetEnvIf Request_URI "\.html$" object_is_html=html + Allow from env=object_is_html + + + + Options -Indexes + SetEnvIf Request_URI "\.css$" object_is_css=css + SetEnvIf Request_URI "\.js$" object_is_js=js + Order deny,allow + Deny from all + Allow from env=object_is_css + Allow from env=object_is_js + diff --git a/zikula.spec b/zikula.spec new file mode 100644 index 0000000..4aba1c8 --- /dev/null +++ b/zikula.spec @@ -0,0 +1,142 @@ +Name: zikula +Version: 1.1.1 +Release: 12%{?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.tar.gz +#URL for source is http://code.zikula.org/core/downloads/99 +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/ +Patch: %{name}-%{version}-config.patch +#Patch is recorded in ticket 901 on the zikula trac instance +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: httpd +Requires: php >= 5.2.0 +Requires: php-mysql >= 5.2.0 +Requires: php-pgsql >= 5.2.0 +Requires(pre): policycoreutils + +%description +Zikula is a free open source Web Application Framework. \ +It can be used to develop robust, secure, interactive and \ +editable websites and web based applications. Zikula is written \ +in PHP object oriented and fully modular. It requires a database \ + and may use all leading database platforms like MySQL, \ +PostgreSQL and Microsoft SQL Server. \ +Zikula is the successor to the PostNuke project. + +%pre +semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || : + +%prep +%setup -c -qn %{name}-%{version} +%patch -p0 + +%build +#nothing really for this section but rpmbuild complains if build is empty + +%install +rm -rf %{buildroot} +%{__mkdir} -p %{buildroot}/%{_datadir}/%{name} +%{__mkdir} -p %{buildroot}/%{_localstatedir}/lib/%{name} +%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name} +%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ + +cp -pr config images includes install javascript language modules system themes -t %{buildroot}/%{_datadir}/%{name} +install -m 0644 *php robots.txt %{buildroot}/%{_datadir}/%{name} + + +cp -pr pnTemp -t %{buildroot}/%{_localstatedir}/lib/%{name} +install -m 0664 ./config/config.php %{buildroot}/%{_sysconfdir}/%{name}/config.php +ln -sf %{_sysconfdir}/%{name}/config.php %{buildroot}/%{_datadir}/%{name}/config/config.php +install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zikula.conf + + +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 + +cd %{buildroot} +cd - +#Making script executable to stop rpmlint from complaining +chmod 0755 %{buildroot}/%{_datadir}/%{name}/javascript/phplayersmenu/CHANGE_TEMPLATE_CLASS_NAME.sh +#Getting rid of zerolength files +find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \; + +#Purging .htaccess files +find ${RPM_BUILD_ROOT} -name .htaccess -exec rm -f {} \; +%clean +rm -rf %{buildroot} + +%files + +%defattr(-,root,root,-) +%doc docs/* +%{_datadir}/%{name} +%attr(-,apache,apache) %{_localstatedir}/lib/%{name} +%config(noreplace) %{_sysconfdir}/httpd/conf.d/zikula.conf +%attr(664,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/config.php + + +%post +ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || : +symlinks -crs /usr/share/zikula || : + +%changelog +* Sat Mar 14 2009 David Nalley 1.1.1-12 +- appended zero exit snippet to all pre and post lines + +* Fri Mar 13 2009 Clint Savage 1.1.1-11 +- added an additional selinux call to modify the context when the +- selinux context already exists + +* Sun Mar 8 2009 David Nalley 1.1.1-10 +- moved selinux stuff to pre rather than post + +* Sun Mar 1 2009 David Nalley 1.1.1-9 +- reverted earlier SElinux issues and used semanage to make it persistent +- added symlink to /usr/share/docs for license and contributors to show up +- changed symlinks command to recurse over enter _datadir + +* Sun Mar 1 2009 David Nalley 1.1.1-8 +- fixed another SELinux issues pointed out by herlo + +* Sun Mar 1 2009 David Nalley 1.1.1-7 +- fixed SElinux context problem pointed out by herlo + +* Sat Feb 28 2009 David Nalley 1.1.1-6 +- removed most install lines, replaced with cp -r +- fixed permissions on config file +- fixed permissions on pntemp dir + +* Sat Feb 21 2009 David Nalley 1.1.1-5 +- fixed install issues. + +* Sat Feb 21 2009 David Nalley 1.1.1-4 +- changed perms + +* Sat Feb 21 2009 David Nalley 1.1.1-3 +- Fixing dangling symlink + +* Tue Feb 17 2009 David Nalley 1.1.1-2 +- Fixed iconv issues and symlinks + +* Sun Feb 09 2009 Clint Savage 1.1.1-1 +- Fixed some minor packaging issues. + +* Wed Jan 28 2009 David Nalley 1.1.0-4 +- Changed license to GPLv2+ + +* Mon Jan 26 2009 Lukas Hetzenecker 1.1.0-3 +- Move the pnTemp directory to /var/lib/zikula/pnTemp + +* Mon Jan 26 2009 Lukas Hetzenecker 1.1.0-1 +- Initial Spec file creation for Fedora From c7ee392a19fa4214d7fe6003f8178e750d2cebff Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Thu, 20 Aug 2009 19:23:42 +0000 Subject: [PATCH 3/9] Fix deps for PHP >= 4.3 as upstream docs say --- zikula.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zikula.spec b/zikula.spec index 4aba1c8..c902e3b 100644 --- a/zikula.spec +++ b/zikula.spec @@ -1,6 +1,6 @@ Name: zikula Version: 1.1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Zikula is a free open source Web Application Framework Group: Applications/Publishing License: GPLv2+ @@ -17,9 +17,9 @@ Patch: %{name}-%{version}-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: httpd -Requires: php >= 5.2.0 -Requires: php-mysql >= 5.2.0 -Requires: php-pgsql >= 5.2.0 +Requires: php >= 4.3 +Requires: php-mysql >= 4.3 +Requires: php-pgsql >= 4.3 Requires(pre): policycoreutils %description @@ -91,6 +91,9 @@ ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || : symlinks -crs /usr/share/zikula || : %changelog +* Wed Aug 12 2009 Paul W. Frields - 1.1.1-13 +- Upstream docs advise that PHP >= 4.3 is correct requirement + * Sat Mar 14 2009 David Nalley 1.1.1-12 - appended zero exit snippet to all pre and post lines From 1562e3a9ec757709210bae87a3bcc3c92b8f02d4 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Mon, 24 Aug 2009 00:26:24 +0000 Subject: [PATCH 4/9] - upgraded to 1.1.2 to match upstream bug 514301 - changed php version requirements to 5.1.2 to remove bundling of sha256 library - added symlinks silencing per ian wellers bug 511137 - silenced selinux problems - Added requires for php-Smarty, php-adodb, php-mcrypt - Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237 --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- ...-config.patch => zikula-1.1.2-config.patch | 0 zikula.spec | 84 ++++++++++++++----- zikulahash.patch | 15 ++++ 6 files changed, 81 insertions(+), 23 deletions(-) rename zikula-1.1.1-config.patch => zikula-1.1.2-config.patch (100%) create mode 100644 zikulahash.patch diff --git a/.cvsignore b/.cvsignore index 3196e30..48d4697 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zikula-1.1.1-CORE.tar.gz +Zikula-1.1.2-CORE.zip diff --git a/import.log b/import.log index 6dd6e0e..ad96dee 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397 +zikula-1_1_2-1_fc11:EL-5:zikula-1.1.2-1.fc11.src.rpm:1251073550 diff --git a/sources b/sources index b21310c..5b7f4e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d09fee4fc1f4756bff11f61c6d3797a1 Zikula-1.1.1-CORE.tar.gz +585a1f8cec31fd33f64aa3968590a93d Zikula-1.1.2-CORE.zip diff --git a/zikula-1.1.1-config.patch b/zikula-1.1.2-config.patch similarity index 100% rename from zikula-1.1.1-config.patch rename to zikula-1.1.2-config.patch diff --git a/zikula.spec b/zikula.spec index c902e3b..d21bcfd 100644 --- a/zikula.spec +++ b/zikula.spec @@ -1,42 +1,55 @@ Name: zikula -Version: 1.1.1 -Release: 13%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Zikula is a free open source Web Application Framework -Group: Applications/Publishing +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.tar.gz +Source0: Zikula-%{version}-CORE.zip #URL for source is http://code.zikula.org/core/downloads/99 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/ -Patch: %{name}-%{version}-config.patch +Patch0: %{name}-%{version}-config.patch #Patch is recorded in ticket 901 on the zikula trac instance +Patch1: %{name}hash.patch +#Patch changes the sha256 hash function that's called to use php5's implementation. BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: httpd -Requires: php >= 4.3 -Requires: php-mysql >= 4.3 -Requires: php-pgsql >= 4.3 +Requires: php >= 5.1.2 +Requires: php-mysql >= 5.1.2 +Requires: php-pgsql >= 5.1.2 +Requires: php-Smarty +Requires: php-mcrypt +Requires: php-adodb +Requires: php-simplepie +Requires: php-IDNA_Convert +Requires: php-mbstring +Requires: symlinks +Requires(post): symlinks Requires(pre): policycoreutils %description -Zikula is a free open source Web Application Framework. \ -It can be used to develop robust, secure, interactive and \ -editable websites and web based applications. Zikula is written \ -in PHP object oriented and fully modular. It requires a database \ - and may use all leading database platforms like MySQL, \ -PostgreSQL and Microsoft SQL Server. \ +A free open source Web Application Framework. +It can be used to develop robust, secure, interactive and +editable websites and web based applications. Zikula is written +in PHP, object oriented, and fully modular. It requires a database + and may use all leading database platforms like MySQL, +PostgreSQL and Microsoft SQL Server. Zikula is the successor to the PostNuke project. %pre -semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || : +semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || : +semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || : %prep %setup -c -qn %{name}-%{version} -%patch -p0 +%patch0 -p0 +%patch1 -p0 +dos2unix docs/Zikula_1_1_2-MYSQL.sql %build #nothing really for this section but rpmbuild complains if build is empty @@ -48,6 +61,19 @@ rm -rf %{buildroot} %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name} %{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ +# Following are deleted as Zikula checks the internal system looking for these libs +# before using the 'bundled' versions. +rm -rf includes/classes/encryption +rm -rf includes/classes/hashes +rm -rf includes/classes/JSON + +# Following are deleted and symlinks will be created below to link to the +# appropriate site packages. +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} install -m 0644 *php robots.txt %{buildroot}/%{_datadir}/%{name} @@ -56,8 +82,11 @@ cp -pr pnTemp -t %{buildroot}/%{_localstatedir}/lib/%{name} install -m 0664 ./config/config.php %{buildroot}/%{_sysconfdir}/%{name}/config.php ln -sf %{_sysconfdir}/%{name}/config.php %{buildroot}/%{_datadir}/%{name}/config/config.php install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zikula.conf - - +#ln -sf %{_datadir}/php/adodb/ %{buildroot}/%{_datadir}/%{name}/includes/classes/adodb || : +#ln -sf %{_datadir}/php/Smarty/ %{buildroot}/%{_datadir}/%{name}/includes/classes/Smarty || : +#ln -sf %{_datadir}/php/php-simplepie/ %{buildroot}/%{_datadir}/%{name}/includes/classes/SimplePie || : +#ln -sf %{_datadir}/php/IDNA_Convert/ %{buildroot}/%{_datadir}/%{name}/includes/classes/idna || : +#symlinks -crs %{buildroot}/%{_datadir}/%{name}/includes/ rm -f %{buildroot}/%{datadir}/%{name}/includes/.htaccess #changinng encoding @@ -87,13 +116,26 @@ rm -rf %{buildroot} %post -ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || : -symlinks -crs /usr/share/zikula || : +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 +* Sat Aug 23 2009 David Nalley 1.1.2-1 +- upgraded to 1.1.2 to match upstream bug 514301 +- changed php version requirements to 5.1.2 to remove bundling of sha256 library +- added symlinks silencing per ian wellers bug 511137 +- silenced selinux problems +- Added requires for php-Smarty, php-adodb, php-mcrypt +- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237 + * Wed Aug 12 2009 Paul W. Frields - 1.1.1-13 - Upstream docs advise that PHP >= 4.3 is correct requirement - + * Sat Mar 14 2009 David Nalley 1.1.1-12 - appended zero exit snippet to all pre and post lines diff --git a/zikulahash.patch b/zikulahash.patch new file mode 100644 index 0000000..84af042 --- /dev/null +++ b/zikulahash.patch @@ -0,0 +1,15 @@ +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 + 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'); + } +- return SHA256::hash($string); ++ return hash('sha256', $string); + } + } + else if ($type == 'md5') { From 90b253750cb1e6c36599fa3f3f634e94e1401330 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Mon, 24 Aug 2009 00:45:12 +0000 Subject: [PATCH 5/9] - added requirement for dos2unix --- import.log | 1 + zikula.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/import.log b/import.log index ad96dee..7bbeacb 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397 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 diff --git a/zikula.spec b/zikula.spec index d21bcfd..3bd64cc 100644 --- a/zikula.spec +++ b/zikula.spec @@ -1,6 +1,6 @@ Name: zikula Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zikula is a free open source Web Application Framework Group: Applications/Publishing License: GPLv2+ @@ -29,6 +29,7 @@ Requires: php-simplepie Requires: php-IDNA_Convert Requires: php-mbstring Requires: symlinks +Requires: dos2unix Requires(post): symlinks Requires(pre): policycoreutils @@ -125,7 +126,10 @@ symlinks -crs /usr/share/zikula/includes/ > /dev/null 2>&1 || : symlinks -crs /usr/share/zikula > /dev/null 2>&1 || : %changelog -* Sat Aug 23 2009 David Nalley 1.1.2-1 +* Sun Aug 23 2009 David Nalley 1.1.2-2 +- added requirement for dos2unix + +* Sun Aug 23 2009 David Nalley 1.1.2-1 - upgraded to 1.1.2 to match upstream bug 514301 - changed php version requirements to 5.1.2 to remove bundling of sha256 library - added symlinks silencing per ian wellers bug 511137 From df537690c1ce0785db183de0df1253b6941d336f Mon Sep 17 00:00:00 2001 From: David Nalley Date: Mon, 24 Aug 2009 01:17:46 +0000 Subject: [PATCH 6/9] - changed requirement for dos2unix to build requirement --- import.log | 1 + zikula.spec | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/import.log b/import.log index 7bbeacb..91a93ae 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397 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 diff --git a/zikula.spec b/zikula.spec index 3bd64cc..6752456 100644 --- a/zikula.spec +++ b/zikula.spec @@ -1,6 +1,6 @@ Name: zikula Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zikula is a free open source Web Application Framework Group: Applications/Publishing License: GPLv2+ @@ -29,7 +29,7 @@ Requires: php-simplepie Requires: php-IDNA_Convert Requires: php-mbstring Requires: symlinks -Requires: dos2unix +BuildRequires: dos2unix Requires(post): symlinks Requires(pre): policycoreutils @@ -126,6 +126,9 @@ symlinks -crs /usr/share/zikula/includes/ > /dev/null 2>&1 || : symlinks -crs /usr/share/zikula > /dev/null 2>&1 || : %changelog +* Sun Aug 24 2009 David Nalley 1.1.2-3 +- changed requirement for dos2unix to build requirement + * Sun Aug 23 2009 David Nalley 1.1.2-2 - added requirement for dos2unix From 07e75c7bfb446a81d57f2db4c5b9023b8abfc69e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:52 +0000 Subject: [PATCH 7/9] 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 5ee9a40af3d393449e72aa7e62195a38cedbf53a Mon Sep 17 00:00:00 2001 From: David Nalley Date: Sun, 6 Jun 2010 19:55:50 +0000 Subject: [PATCH 8/9] - upgrading to 1.2.3 - removed jsminify patch, and thus requirement for custom tarball - fixes XSS and CSRF security problems. --- .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 91a93ae..703f0a5 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397 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 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 576257a14631b8b5bd2e337ed454eb78dbb0a30a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:29:52 +0000 Subject: [PATCH 9/9] 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 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 diff --git a/import.log b/import.log deleted file mode 100644 index 703f0a5..0000000 --- a/import.log +++ /dev/null @@ -1,5 +0,0 @@ -zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397 -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