Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
ca9c02241f | ||
|
632f18ee92 | ||
|
1cd248744a | ||
|
|
36733a0bd0 | ||
|
|
5650aaab57 | ||
|
d7cc3180a8 | ||
|
|
179033ae13 | ||
| e0b256b48c |
8 changed files with 324 additions and 21 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
Zikula-1.1.2-CORE.zip
|
||||
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: zikula
|
||||
# $Id$
|
||||
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
|
||||
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)
|
||||
1
sources
1
sources
|
|
@ -0,0 +1 @@
|
|||
585a1f8cec31fd33f64aa3968590a93d Zikula-1.1.2-CORE.zip
|
||||
11
zikula-1.1.2-config.patch
Normal file
11
zikula-1.1.2-config.patch
Normal file
|
|
@ -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
|
||||
|
||||
102
zikula.conf
Normal file
102
zikula.conf
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
#conf file for dedicated server installs of Zikula.
|
||||
# v0.1 David Nalley <david@gnsa.us> - Initial consolidation of .htaccess files from Zikulasource
|
||||
#
|
||||
Alias /zikula /usr/share/zikula
|
||||
<Directory /usr/share/zikula/>
|
||||
order deny,allow
|
||||
allow from all
|
||||
</Directory>
|
||||
|
||||
<Directory /usr/share/zikula/install/>
|
||||
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
|
||||
</Directory>
|
||||
|
||||
<Directory /usr/share/zikula/system/>
|
||||
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
|
||||
</Directory>
|
||||
|
||||
<Directory /usr/share/zikula/modules/>
|
||||
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
|
||||
</Directory>
|
||||
|
||||
<Directory /usr/share/zikula/config/>
|
||||
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
|
||||
</Directory>
|
||||
|
||||
<Directory /usr/share/zikula/includes/>
|
||||
Options -Indexes
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
</Directory>
|
||||
|
||||
<Directory /usr/share/zikula/system/Theme/pnincludes/>
|
||||
Options -Indexes
|
||||
SetEnvIf Request_URI "\.html$" object_is_html=html
|
||||
Allow from env=object_is_html
|
||||
</Directory>
|
||||
|
||||
<Directory /var/lib/zikula/pnTemp/>
|
||||
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
|
||||
</Directory>
|
||||
194
zikula.spec
Normal file
194
zikula.spec
Normal file
|
|
@ -0,0 +1,194 @@
|
|||
Name: zikula
|
||||
Version: 1.1.2
|
||||
Release: 3%{?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
|
||||
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/
|
||||
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 >= 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
|
||||
BuildRequires: dos2unix
|
||||
Requires(post): symlinks
|
||||
Requires(pre): policycoreutils
|
||||
|
||||
%description
|
||||
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 > /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}
|
||||
%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
|
||||
|
||||
%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/
|
||||
|
||||
# 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}
|
||||
|
||||
|
||||
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
|
||||
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.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
|
||||
* Sun Aug 24 2009 David Nalley <david@gnsa.us> 1.1.2-3
|
||||
- changed requirement for dos2unix to build requirement
|
||||
|
||||
* Sun Aug 23 2009 David Nalley <david@gnsa.us> 1.1.2-2
|
||||
- added requirement for dos2unix
|
||||
|
||||
* Sun Aug 23 2009 David Nalley <david@gnsa.us> 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 <stickster@gmail.com> - 1.1.1-13
|
||||
- Upstream docs advise that PHP >= 4.3 is correct requirement
|
||||
|
||||
* Sat Mar 14 2009 David Nalley <david@gnsa.us> 1.1.1-12
|
||||
- appended zero exit snippet to all pre and post lines
|
||||
|
||||
* Fri Mar 13 2009 Clint Savage <herlo@fedoraproject.org> 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 <david@gnsa.us> 1.1.1-10
|
||||
- moved selinux stuff to pre rather than post
|
||||
|
||||
* Sun Mar 1 2009 David Nalley <david@gnsa.us> 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 <david@gnsa.us> 1.1.1-8
|
||||
- fixed another SELinux issues pointed out by herlo
|
||||
|
||||
* Sun Mar 1 2009 David Nalley <david@gnsa.us> 1.1.1-7
|
||||
- fixed SElinux context problem pointed out by herlo
|
||||
|
||||
* Sat Feb 28 2009 David Nalley <david@gnsa.us> 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 <david@gnsa.us> 1.1.1-5
|
||||
- fixed install issues.
|
||||
|
||||
* Sat Feb 21 2009 David Nalley <david@gnsa.us> 1.1.1-4
|
||||
- changed perms
|
||||
|
||||
* Sat Feb 21 2009 David Nalley <david@gnsa.us> 1.1.1-3
|
||||
- Fixing dangling symlink
|
||||
|
||||
* Tue Feb 17 2009 David Nalley <david@gnsa.us> 1.1.1-2
|
||||
- Fixed iconv issues and symlinks
|
||||
|
||||
* Sun Feb 09 2009 Clint Savage <herlo@fedoraproject.org> 1.1.1-1
|
||||
- Fixed some minor packaging issues.
|
||||
|
||||
* Wed Jan 28 2009 David Nalley <david@gnsa.us> 1.1.0-4
|
||||
- Changed license to GPLv2+
|
||||
|
||||
* Mon Jan 26 2009 Lukas Hetzenecker <LuHe@gmx.at> 1.1.0-3
|
||||
- Move the pnTemp directory to /var/lib/zikula/pnTemp
|
||||
|
||||
* Mon Jan 26 2009 Lukas Hetzenecker <LuHe@gmx.at> 1.1.0-1
|
||||
- Initial Spec file creation for Fedora
|
||||
15
zikulahash.patch
Normal file
15
zikulahash.patch
Normal file
|
|
@ -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') {
|
||||
Loading…
Add table
Add a link
Reference in a new issue