holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preparing for a first 16.1 beta test-build

Browse Source
This commit is contained in:
Ralf Becker 2015-11-09 10:44:55 +00:00
parent cb2aa3399f
commit e194b0b635
9 changed files with 68 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/rpm-build/apache.conf
View File

@ -16,8 +16,11 @@ RedirectMatch ^(/principals/users/.*)$ /egroupware/groupdav.php$1
<Directory /usr/share/egroupware/>
Options FollowSymLinks ExecCGI
AllowOverride None
Order allow,deny
Allow from all
<IfModule !mod_authz_core.c>
# Apache 2.4
Order allow,deny
Allow from all
</IfModule>
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
@ -45,8 +48,11 @@ RedirectMatch ^(/principals/users/.*)$ /egroupware/groupdav.php$1
php_value post_max_size 65M
php_value max_input_vars 3000
<Files ~ "\.inc\.php$">
Order allow,deny
Deny from all
<IfModule !mod_authz_core.c>
# Apache 2.4
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
# Apache 2.4
Require all denied

6
doc/rpm-build/class.uiasyncservice.inc.php.patch
View File

@ -1,6 +1,6 @@
Index: egroupware/admin/inc/class.uiasyncservice.inc.php
===================================================================
--- egroupware/admin/inc/class.uiasyncservice.inc.php (Revision 51102)
--- egroupware/admin/inc/class.uiasyncservice.inc.php (Revision 54198)
+++ egroupware/admin/inc/class.uiasyncservice.inc.php (Arbeitskopie)
@@ -95,16 +95,20 @@
{
@ -44,9 +44,9 @@ Index: egroupware/admin/inc/class.uiasyncservice.inc.php
echo "<hr><table border=0><tr>\n";
Index: egroupware/phpgwapi/inc/class.egw.inc.php
===================================================================
--- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 51102)
--- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 54198)
+++ egroupware/phpgwapi/inc/class.egw.inc.php (Arbeitskopie)
@@ -605,11 +605,13 @@
@@ -618,11 +618,13 @@
_egw_log_exception($ex);
}
}

2
doc/rpm-build/debian.config
View File

@ -5,7 +5,7 @@ set -e
. /usr/share/debconf/confmodule
db_version 2.0
if grep -q '^DISTRIB_ID="Univention"$' /etc/lsb-release
if grep -q '^DISTRIB_ID="*Univention"*$' /etc/lsb-release
then
# Univention requires non-interactive install:
# mysql credentials are read from their config

20
doc/rpm-build/debian.control
View File

@ -23,7 +23,6 @@ Depends:
egroupware-epl-filemanager (= ${binary:Version}),
egroupware-epl-infolog (= ${binary:Version}),
egroupware-epl-importexport (= ${binary:Version}),
egroupware-epl-manual (= ${binary:Version}),
egroupware-epl-news-admin (= ${binary:Version}),
egroupware-epl-notifications (= ${binary:Version}),
egroupware-epl-phpbrain (= ${binary:Version}),
@ -37,6 +36,7 @@ Depends:
egroupware-epl-tracker (= ${binary:Version}),
egroupware-epl-wiki (= ${binary:Version}),
${misc:Depends}
Recommends: egroupware-epl-archive (= ${binary:Version})
Replaces: egroupware
Conflicts: egroupware
Description: web-based groupware suite - metapackage
@ -58,7 +58,7 @@ Depends: apache2,
php5-mcrypt,
php5-xsl,
${misc:Depends}
Recommends: mysql-server, php-apc, php5-pecl-smb, php5-tidy, mysql-client | postgresql-client
Recommends: mariadb-server | mysql-server, php-apc, php5-pecl-smb, php5-tidy, mariadb-client | mysql-client | postgresql-client
Suggests: egroupware-epl,
php5-ldap,
php5-mhash,
@ -67,9 +67,9 @@ Suggests: egroupware-epl,
Provides: egroupware-epl-addressbook, egroupware-epl-etemplate, egroupware-epl-pear
Replaces: egroupware-core, egroupware-addressbook, egroupware-epl-addressbook, egroupware-etemplate, egroupware-epl-etemplate,
egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupare-epl-phpsysinfo,
egroupware-epl-pear, egroupware-pear
egroupware-epl-pear, egroupware-pear, egroupware-epl-manual, egroupware-manual
Conflicts: egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupware-epl-phpsysinfo,
egroupware-epl-pear, egroupware-pear
egroupware-epl-pear, egroupware-pear, egroupware-epl-manual, egroupware-manual
Description: web-based groupware suite - core modules
${commondesc}
.
@ -204,18 +204,6 @@ Description: web-based groupware suite - infolog application
This EGroupware application allows tracking on-going and previous support
requests, phone calls, and other customer relations.
Package: egroupware-epl-manual
Architecture: all
Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-wiki (>= ${binary:Version}),
${misc:Depends}
Conflicts: egroupware-manual
Replaces: egroupware-manual
Description: web-based groupware suite - manual
${commondesc}
.
This package contains the EGroupware manual, provided as an
EGroupware application.
Package: egroupware-epl-news-admin
Architecture: all
Depends: egroupware-epl-core (>= ${binary:Version}),

3
doc/rpm-build/debian.postinst
View File

@ -32,9 +32,10 @@ then
then
/usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log
else
if grep -q '^DISTRIB_ID="Univention"$' /etc/lsb-release
if grep -q '^DISTRIB_ID="*Univention"*$' /etc/lsb-release
then
/usr/share/egroupware/doc/rpm-build/post_install.php \
--distro univention \
--admin_user "Administrator" \
--admin_passwd "*unchanged*" 2>&1 | /usr/bin/tee -a $install_log
else

4
doc/rpm-build/debian.rules
View File

@ -41,11 +41,11 @@ install: build
# customize apache config
mkdir -p $(CURDIR)/debian/egroupware-epl-core/etc/egroupware
cp $(CURDIR)/doc/rpm-build/apache.conf $(CURDIR)/debian/egroupware-epl-core/etc/egroupware/apache.conf
sed 's/\/usr\/share\/pear/\/usr\/share\/php:\/usr\/local\/zend\/share\/pear/' $(CURDIR)/doc/rpm-build/apache.conf > $(CURDIR)/debian/egroupware-epl-core/etc/egroupware/apache.conf
# install core modules
for DIR in admin home phpgwapi preferences etemplate addressbook setup doc; do \
for DIR in admin api home phpgwapi preferences etemplate addressbook setup doc; do \
cd $(CURDIR)/$${DIR}; \
find $(FINDOPT) $(APPFILES) \
-exec $(INSTALL) {} $(CURDIR)/$(COREDIR)/$${DIR}/{} \; ; \

2
doc/rpm-build/egroupware-epl-core.conffiles Normal file
View File

@ -0,0 +1,2 @@
/var/lib/egroupware/header.inc.php
/etc/egroupware/apache.conf

11
doc/rpm-build/egroupware-epl.dsc
View File

@ -1,11 +1,12 @@
Format: 1.0
Source: egroupware-epl
Binary: egroupware-epl, egroupware-epl-core, egroupware-epl-vendor, egroupware-epl-bookmarks, egroupware-epl-calendar, egroupware-epl-developer-tools, egroupware-epl-emailadmin, egroupware-epl-esync, egroupware-epl-mail, egroupware-epl-filemanager, egroupware-epl-infolog, egroupware-epl-manual, egroupware-epl-news-admin, egroupware-epl-notifications, egroupware-epl-phpbrain, egroupware-epl-projectmanager, egroupware-epl-registration, egroupware-epl-resources, egroupware-epl-sambaadmin, egroupware-epl-sitemgr, egroupware-epl-timesheet, egroupware-epl-tracker, egroupware-epl-wiki, egroupware-epl-jdots, egroupware-epl-pixelegg
Binary: egroupware-epl, egroupware-epl-core, egroupware-epl-vendor, egroupware-epl-bookmarks, egroupware-epl-calendar, egroupware-epl-developer-tools, egroupware-epl-emailadmin, egroupware-epl-esync, egroupware-epl-mail, egroupware-epl-filemanager, egroupware-epl-infolog, egroupware-epl-news-admin, egroupware-epl-notifications, egroupware-epl-phpbrain, egroupware-epl-projectmanager, egroupware-epl-registration, egroupware-epl-resources, egroupware-epl-sambaadmin, egroupware-epl-sitemgr, egroupware-epl-timesheet, egroupware-epl-tracker, egroupware-epl-wiki, egroupware-epl-jdots, egroupware-epl-pixelegg
Architecture: all
Version: 14.2.20141211-1
Version: 16.1.20151109
Maintainer: Ralf Becker <rb@stylite.de>
Homepage: http://www.stylite.de/EPL
Standards-Version: 3.8.0
Homepage: http://www.egroupware.org/
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 5), po-debconf
Debtransform-Tar: egroupware-epl-14.2.20141211.tar.gz
Debtransform-Tar: egroupware-epl-16.1.20151109.tar.gz
Debtransform-Files-Tar: debian.tar.gz phpfreechat_data_public.tar.gz
DEBTRANSFORM-RELEASE

67
doc/rpm-build/egroupware-epl.spec
View File

@ -1,5 +1,5 @@
Name: egroupware-epl
Version: 14.2.20141211
Version: 16.1.20151109
Release:
Summary: EGroupware is a web-based groupware suite written in php
Group: Web/Database
@ -33,11 +33,15 @@ Prefix: /usr/share
%define distribution SUSE Linux %{?suse_version}
%if 0%{?sles_version}
# sle 10 and 11 does NOT contain libtidy
%define extra_requires apache2 mod_php_any php_any_db php-dom php-bz2 php-openssl php-zip php-ctype php-sqlite %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom
# sles 10, 11 does NOT contain libtidy, 11sp3 does not contain php5-posix
%define extra_requires apache2 apache2-mod_php5 php_any_db %{php}-dom %{php}-bz2 %{php}-openssl %{php}-zip %{php}-ctype %{php}-sqlite %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom
%else
%define extra_requires apache2 apache2-mod_php5 php_any_db php5-dom php5-bz2 php5-openssl php5-zip php5-ctype php5-sqlite php5-tidy %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom
# SLES 12 no longer sets sles_version, but suse_version == 1315: does contain broken php5-tidy, because no libtidy
%if 0%{?suse_version} == 1315
%define extra_requires apache2 apache2-mod_php5 php_any_db %{php}-dom %{php}-bz2 %{php}-openssl %{php}-zip %{php}-ctype %{php}-sqlite %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom %{php}-posix
%else
%define extra_requires apache2 apache2-mod_php5 php_any_db %{php}-dom %{php}-bz2 %{php}-openssl %{php}-zip %{php}-ctype %{php}-sqlite %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom %{php}-posix %{php}-tidy
%endif
%endif
%define cron cron
@ -56,12 +60,12 @@ Prefix: /usr/share
%if 0%{?fedora_version}
%define osversion %{?fedora_version}
%define distribution Fedora Core %{?fedora_version}
%define extra_requires httpd php-mysql php-xml php-tidy
%define extra_requires httpd php-mysql php-xml php-tidy php-posix
%endif
%if 0%{?mandriva_version}
%define osversion %{?mandriva_version}
%define distribution Mandriva %{?mandriva_version}
%define extra_requires apache php-mysql php-dom php-pdo_mysql php-pdo_sqlite php-tidy
%define extra_requires apache php-mysql php-dom php-pdo_mysql php-pdo_sqlite php-tidy php-posix
# try to keep build from searching (for wrong) dependencys
%undefine __find_provides
%undefine __find_requires
@ -69,19 +73,19 @@ Prefix: /usr/share
%if 0%{?rhel_version}
%define osversion %{?rhel_version}
%define distribution Red Hat %{?rhel_version}
%define extra_requires httpd php-mysql php-xml php-tidy
%define extra_requires httpd php-mysql php-xml php-tidy php-posix
%endif
%if 0%{?centos_version}
%define osversion %{?centos_version}
%define distribution CentOS %{?centos_version}
%define extra_requires httpd php-mysql php-xml php-tidy
%define extra_requires httpd php-mysql php-xml php-tidy php-posix
%endif
Distribution: %{distribution}
Source0: %{name}-%{version}.tar.gz
Source2: %{name}-stylite-%{version}.tar.bz2
#Source3: %{name}-pixelegg-%{version}.tar.bz2
Source3: %{name}-archive-%{version}.tar.bz2
Source4: %{name}-esyncpro-%{version}.tar.bz2
#Source5: %{name}-jdots-%{version}.tar.bz2
Source6: phpfreechat_data_public.tar.gz
@ -111,7 +115,6 @@ Requires: %{name}-infolog = %{version}
Requires: %{name}-importexport = %{version}
Requires: %{name}-jdots = %{version}
Requires: %{name}-mail = %{version}
Requires: %{name}-manual = %{version}
Requires: %{name}-news_admin = %{version}
Requires: %{name}-notifications = %{version}
Requires: %{name}-phpbrain = %{version}
@ -165,6 +168,8 @@ Obsoletes: %{egw_packagename}-phpsysinfo
Obsoletes: %{egw_packagename}-polls
# packages no longer in 14.2
Obsoletes: %{name}-egw-pear
# packages no longer in 14.3
Obsoletes: %{name}-manual
%post
# Check binary paths and create links for opensuse/sles
@ -194,7 +199,7 @@ This package automatically requires the EGroupware default applications:
egroupware core with: admin, api, docs, etemplate, prefereces and setup,
addressbook, bookmarks, calendar, translation-tools, emailadmin, mail,
filemanager, infolog, manual, news admin, knowledgebase, polls, jdots, pixelegg,
filemanager, infolog, news admin, knowledgebase, polls, jdots, pixelegg,
projectmanager, resources, sambaadmin, sitemgr, eSync, timesheet, tracker, wiki
It also provides an API for developing additional applications.
@ -205,7 +210,7 @@ Further contributed applications are available as separate packages.
Summary: The EGroupware core
Group: Web/Database
Requires: %{php} >= 5.3.2
Requires: %{php}-mbstring %{php}-gd %{php}-mcrypt %{php}-posix %{extra_requires} %{cron} zip %{php}-json %{php}-xsl
Requires: %{php}-mbstring %{php}-gd %{php}-mcrypt %{extra_requires} %{cron} zip %{php}-json %{php}-xsl
Provides: egw-core %{version}
Provides: egw-etemplate %{version}
Provides: egw-addressbook %{version}
@ -228,6 +233,20 @@ Obsoletes: %{egw_packagename}-esync
%description esync
Z-Push based ActiveSync protocol implementation.
%package archive
Version: %{version}
Summary: Benno Mail Archive integration
Group: Web/Database
AutoReqProv: no
Requires: egw-core >= %{version}
Obsoletes: %{egw_packagename}-archive
%description archive
Shows (not included) Benno Mail Archive inside EGroupware and logs you in automatic.
%post archive
# update/install archive
%{post_install} --install-update-app archive 2>&1 | tee -a %{install_log}
%package bookmarks
Version: %{version}
Summary: The EGroupware bookmarks application
@ -332,17 +351,6 @@ Requires: %{name}-jdots >= %{version}
%description pixelegg
New 14.1 default template from Pixelegg.
%package manual
Version: %{version}
Summary: The EGroupware manual application
Group: Web/Database
AutoReqProv: no
Requires: egw-core >= %{version}
Requires: %{name}-wiki >= %{version}
Obsoletes: %{egw_packagename}-manual
%description manual
This is the manual app for EGroupware: online help system.
%package news_admin
Version: %{version}
Summary: The EGroupware news_admin application
@ -515,7 +523,7 @@ echo "post_install: %{post_install}"
%setup0 -c -n %{egwdirname}
#%setup1 -T -D -a 1 -n %{egwdirname}
%setup2 -T -D -a 2 -n %{egwdirname}
#%setup3 -T -D -a 3 -n %{egwdirname}
%setup3 -T -D -a 3 -n %{egwdirname}
%setup4 -T -D -a 4 -n %{egwdirname}
#%setup5 -T -D -a 5 -n %{egwdirname}
%setup6 -T -D -a 6 -n %{egwdirname}
@ -573,6 +581,7 @@ ln -s ../../..%{egwdatadir}/header.inc.php
%{egwdir}/webdav.php
%{egwdir}/addressbook
%{egwdir}/admin
%{egwdir}/api
%{egwdir}/doc
%{egwdir}/etemplate
%{egwdir}/files
@ -592,6 +601,10 @@ ln -s ../../..%{egwdatadir}/header.inc.php
%dir %attr(0700,%{apache_user},%{apache_group}) %{egwdatadir}/default/backup
%config(noreplace) %attr(0640,%{apache_user},%{apache_group}) %{egwdatadir}/header.inc.php
%files archive
%defattr(-,root,root)
%{egwdir}/archive
%files bookmarks
%defattr(-,root,root)
%{egwdir}/bookmarks
@ -640,10 +653,6 @@ ln -s ../../..%{egwdatadir}/header.inc.php
%defattr(-,root,root)
%{egwdir}/mail
%files manual
%defattr(-,root,root)
%{egwdir}/manual
%files news_admin
%defattr(-,root,root)
%{egwdir}/news_admin