diff --git a/doc/rpm-build/debian.control b/doc/rpm-build/debian.control index 92ed823028..6ca9fecbff 100644 --- a/doc/rpm-build/debian.control +++ b/doc/rpm-build/debian.control @@ -8,8 +8,37 @@ Homepage: http://www.stylite.de/EPL Package: egroupware-epl Architecture: all -Depends: egroupware-epl-core, egroupware-epl-stylite, egroupware-epl-jdots, egroupware-epl-pixelegg, ${egw:Modules}, ${misc:Depends} +Depends: + egroupware-epl-core (= ${binary:Version}), + egroupware-epl-egw-pear (= ${binary:Version}), + egroupware-epl-jdots (= ${binary:Version}), + egroupware-epl-pixelegg (= ${binary:Version}), + egroupware-epl-stylite (= ${binary:Version}), + egroupware-epl-esync (= ${binary:Version}), + egroupware-epl-bookmarks (= ${binary:Version}), + egroupware-epl-calendar (= ${binary:Version}), + egroupware-epl-developer-tools (= ${binary:Version}), + egroupware-epl-emailadmin (= ${binary:Version}), + egroupware-epl-mail (= ${binary:Version}), + 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}), + egroupware-epl-phpfreechat (= ${binary:Version}), + egroupware-epl-projectmanager (= ${binary:Version}), + egroupware-epl-registration (= ${binary:Version}), + egroupware-epl-resources (= ${binary:Version}), + egroupware-epl-sambaadmin (= ${binary:Version}), + egroupware-epl-sitemgr (= ${binary:Version}), + egroupware-epl-timesheet (= ${binary:Version}), + egroupware-epl-tracker (= ${binary:Version}), + egroupware-epl-wiki (= ${binary:Version}), + ${misc:Depends} Replaces: egroupware +Conflicts: egroupware Description: web-based groupware suite - metapackage ${commondesc} . @@ -20,22 +49,25 @@ Description: web-based groupware suite - metapackage Package: egroupware-epl-core Architecture: all Depends: apache2, - libapache2-mod-php5, + php5 (>= 5.3.3), php5-cli, php5-sqlite, php5-mysql | php5-pgsql | php5-odbc, - php5-gd, php-log, php-pear, + php5-json, + php5-gd, php-pear, egroupware-epl-egw-pear, - perl, php5-mcrypt, + php5-xsl, ${misc:Depends} -Recommends: mysql-server, php-apc, mysql-client | postgresql-client +Recommends: mysql-server, php-apc, php5-tidy, mysql-client | postgresql-client Suggests: egroupware-epl, php5-ldap, php5-mhash, php5-auth-pam Provides: egroupware-epl-addressbook, egroupware-epl-etemplate -Replaces: egroupware-core, egroupware-addressbook, egroupware-epl-addressbook, egroupware-etemplate, egroupware-epl-etemplate +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 +Conflicts: egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupware-epl-phpsysinfo Description: web-based groupware suite - core modules ${commondesc} . @@ -49,6 +81,7 @@ Package: egroupware-epl-bookmarks Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-bookmarks Replaces: egroupware-bookmarks Description: web-based groupware suite - bookmark management application ${commondesc} @@ -60,6 +93,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-infolog (>= ${binary:Version}), egroupware-epl-notifications (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-calendar Replaces: egroupware-calendar Description: web-based groupware suite - calendar management application ${commondesc} @@ -71,6 +105,7 @@ Package: egroupware-epl-developer-tools Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-developer-tools Replaces: egroupware-developer-tools Description: web-based groupware suite - developer tools ${commondesc} @@ -83,7 +118,9 @@ Description: web-based groupware suite - developer tools Package: egroupware-epl-emailadmin Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), - ${misc:Depends}, php5-imap + ${misc:Depends} +Recommends: php5-bcmath +Conflicts: egroupware-emailadmin Replaces: egroupware-emailadmin Description: web-based groupware suite - e-mail user administration application ${commondesc} @@ -96,17 +133,30 @@ Package: egroupware-epl-esync Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-esync Replaces: egroupware-esync Description: web-based groupware suite - esync application ${commondesc} . Z-Push based ActiveSync protocol implementation. +Package: egroupware-epl-phpfreechat +Architecture: all +Depends: egroupware-epl-core (>= ${binary:Version}), + ${misc:Depends} +Replaces: egroupware-phpfreechat +Conflicts: egroupware-phpfreechat +Description: web-based groupware suite - chat application + ${commondesc} + . + Chat application based on phpFreeChat. + Package: egroupware-epl-mail Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-emailadmin (>= ${binary:Version}), ${misc:Depends} Provides: mail-reader, imap-client +Conflicts: egroupware-felamimail, egroupware-epl-felamimail Replaces: egroupware-felamimail, egroupware-epl-felamimail Description: web-based groupware suite - e-mail application ${commondesc} @@ -118,6 +168,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} Suggests: php5-cli +Conflicts: egroupware-filemanager Replaces: egroupware-filemanager Description: web-based groupware suite - file manager application ${commondesc} @@ -132,6 +183,7 @@ Package: egroupware-epl-importexport Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-importexport Replaces: egroupware-importexport Description: web-based groupware suite - importexport application ${commondesc} @@ -142,6 +194,7 @@ Description: web-based groupware suite - importexport application Package: egroupware-epl-infolog Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-infolog Replaces: egroupware-infolog Description: web-based groupware suite - infolog application ${commondesc} @@ -153,6 +206,7 @@ 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} @@ -164,6 +218,7 @@ Package: egroupware-epl-news-admin Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-news-admin Replaces: egroupware-news-admin Description: web-based groupware suite - news administration interface ${commondesc} @@ -175,6 +230,7 @@ Package: egroupware-epl-notifications Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-notifications Replaces: egroupware-notifications Description: web-based groupware suite - notifications ${commondesc} @@ -186,6 +242,7 @@ Package: egroupware-epl-phpbrain Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-phpbrain Replaces: egroupware-phpbrain Description: web-based groupware suite - phpbrain application ${commondesc} @@ -194,8 +251,9 @@ Description: web-based groupware suite - phpbrain application Package: egroupware-epl-projectmanager Architecture: all -Depends: egroupware-epl-core (>= ${binary:Version}), php5-gd, jpgraph-epl, +Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-projectmanager Replaces: egroupware-projectmanager Description: web-based groupware suite - project management application ${commondesc} @@ -206,6 +264,7 @@ Package: egroupware-epl-registration Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-registration Replaces: egroupware-registration Description: web-based groupware suite - registration application ${commondesc} @@ -219,6 +278,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-filemanager (>= ${binary:Version}), ${misc:Depends} Suggests: egroupware-epl-calendar +Conflicts: egroupware-resources Replaces: egroupware-resources Description: web-based groupware suite - resource manager application ${commondesc} @@ -231,6 +291,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), php5-ldap, ${misc:Depends} +Conflicts: egroupware-sambaadmin Replaces: egroupware-sambaadmin Description: web-based groupware suite - Samba administration application ${commondesc} @@ -241,6 +302,7 @@ Package: egroupware-epl-sitemgr Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-sitemgr Replaces: egroupware-sitemgr Description: web-based groupware suite - site manager application ${commondesc} @@ -252,6 +314,7 @@ Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} Suggests: egroupware-epl-projectmanager +Conflicts: egroupware-timesheet Replaces: egroupware-timesheet Description: web-based groupware suite - timesheet application ${commondesc} @@ -263,6 +326,7 @@ Package: egroupware-epl-tracker Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-notifications (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-tracker Replaces: egroupware-tracker Description: web-based groupware suite - tracker application ${commondesc} @@ -274,6 +338,7 @@ Package: egroupware-epl-wiki Architecture: all Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends} +Conflicts: egroupware-wiki Replaces: egroupware-wiki Description: web-based groupware suite - wiki application ${commondesc} diff --git a/doc/rpm-build/debian.postinst b/doc/rpm-build/debian.postinst new file mode 100644 index 0000000000..7eb25a157e --- /dev/null +++ b/doc/rpm-build/debian.postinst @@ -0,0 +1,117 @@ +#! /bin/sh + +#export DEBCONF_DEBUG=developer +set -e +# das hier muss ganz oben stehen (man debconf-devel) +. /usr/share/debconf/confmodule +db_version 2.0 + + +webserver_soft_reload() { + if command -v invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d "$1" force-reload || : + else + [ -x /etc/init.d/"$1" ] && /etc/init.d/"$1" force-reload || : + fi +} + + + + +if [ "$1" = configure -o "$1" = upgrade ]; then + #mkdir -p /var/lib/egroupware/files/users + #mkdir -p /var/lib/egroupware/files/groups + #mkdir -p /var/lib/egroupware/files/db_backup + mkdir -p /var/lib/egroupware/sessions + mkdir -p /var/lib/egroupware/default/files + mkdir -p /var/lib/egroupware/default/backup + + config="/var/lib/egroupware/header.inc.php" + template="/usr/share/egroupware/header.inc.php.template" + +# We now ask in "./config" + + # Get configuration passwords. + db_get "egroupware/header/user" + header_user="$RET" + db_get "egroupware/header/password" + header_password="$RET" + + # Get first egroupware user / pw + db_get "egroupware/admin/user" + admin_user="$RET" + db_get "egroupware/admin/password" + admin_password="$RET" + + # Get egroupware language + db_get "egroupware/lang" + lang="$RET" + + # Get mysql root / pw + db_get "egroupware/db_root" + db_root="$RET" + db_get "egroupware/db_root_pw" + db_root_pw="$RET" + + install_log="/root/egroupware-epl-install.log" + date >> $install_log + + #if [ "x$header_password" == "x" -a "x$admin_password" == "x" -a "x$db_root_pw" ] + # If upgrading, $2 contains the release currently installed, otherwise it's empty + if [ "$2" ]; then + /usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log + else + /usr/share/egroupware/doc/rpm-build/post_install.php \ + --config_user "$header_user" \ + --config_passwd "$header_password" \ + --admin_user "$admin_user" \ + --admin_passwd "$admin_password" \ + --lang "$lang" \ + --db_type mysql \ + --db_root "$db_root" \ + --db_root_pw "$db_root_pw" 2>&1 | /usr/bin/tee -a $install_log + fi + echo "EGroupware install log saved to $install_log" + + # Build egroupware header manager configuration file. + #perl -MDigest::MD5 -0777 -p -e " + # s/.*//s; + # s/{domains}//; + # s#{SERVER_ROOT}#/usr/share/egroupware#; + # s#{INCLUDE_ROOT}#/usr/share/egroupware#; + # s/{SETUP_ACL}//; + # s/{DOMAIN_SELECTBOX}/false/; + # s/{DB_PERSISTENT}/false/; + # s/{SESSIONS_TYPE}/db/; + # s/{ENABLE_MCRYPT}/false/; + # s/{MCRYPT_VERSION}/none/; + # s/{MCRYPT_IV}/none/; + # s/{HEADER_ADMIN_PASSWORD}/Digest::MD5::md5_hex('$header_password')/e; + # # put this at the end in case someone picks a user name that matches a placeholder + # s/{HEADER_ADMIN_USER}/$header_user/; + #" < $template > $config + #fi + + # Only change permissions during initial installation, in case + # someone wants a different setup. + if [ -z "$2" ]; then + chown -R www-data:www-data /var/lib/egroupware/ + chmod 600 $config + fi + + # Set up web server and reload it. + if [ -d /etc/apache2/conf.d ] ; then + ln -fs ../../egroupware/apache.conf /etc/apache2/conf.d/egroupware + else + if [ -d /etc/apache2/sites-available ] ; then + ln -fs ../../egroupware/apache.conf /etc/apache2/sites-available/egroupware.conf + a2ensite egroupware + fi + fi + a2enmod actions >/dev/null + webserver_soft_reload apache2 +fi + +#DEBHELPER# + +db_stop diff --git a/doc/rpm-build/debian.tar.gz b/doc/rpm-build/debian.tar.gz index 9aa6b91c75..0ec057f6f7 100644 Binary files a/doc/rpm-build/debian.tar.gz and b/doc/rpm-build/debian.tar.gz differ diff --git a/doc/rpm-build/egroupware-epl-rpmlintrc b/doc/rpm-build/egroupware-epl-rpmlintrc new file mode 100644 index 0000000000..a471ba0adc --- /dev/null +++ b/doc/rpm-build/egroupware-epl-rpmlintrc @@ -0,0 +1,3 @@ +#addFilter("eGroupware-gallery* wrong-script-interpreter") +setBadness('wrong-script-interpreter', 0) + diff --git a/doc/rpm-build/egroupware-epl.dsc b/doc/rpm-build/egroupware-epl.dsc index 3856826752..d41efdc79c 100644 --- a/doc/rpm-build/egroupware-epl.dsc +++ b/doc/rpm-build/egroupware-epl.dsc @@ -2,10 +2,10 @@ Format: 1.0 Source: egroupware-epl Binary: egroupware-epl, egroupware-epl-core, 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-esync, egroupware-phpfreechat Architecture: all -Version: 14.1.20140417-1 +Version: 14.1.20141106-1 Maintainer: Ralf Becker Homepage: http://www.stylite.de/EPL Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5), po-debconf -Debtransform-Tar: egroupware-epl-14.1.20140417.tar.gz +Debtransform-Tar: egroupware-epl-14.1.20141106.tar.gz Debtransform-Files-Tar: debian.tar.gz phpfreechat_data_public.tar.gz diff --git a/doc/rpm-build/egroupware-epl.spec b/doc/rpm-build/egroupware-epl.spec index aa2364c6a8..a90c439149 100644 --- a/doc/rpm-build/egroupware-epl.spec +++ b/doc/rpm-build/egroupware-epl.spec @@ -1,10 +1,10 @@ Name: egroupware-epl -Version: 14.1.20140417 +Version: 14.1.20141106 Release: Summary: EGroupware is a web-based groupware suite written in php Group: Web/Database -License: GPLv2 -URL: http://www.egroupware.org/ +License: GPLv2 with exception of stylite and esyncpro module, which is proprietary +URL: http://www.stylite.de/EPL Vendor: Stylite GmbH, http://www.stylite.de/ Packager: Ralf Becker Prefix: /usr/share @@ -83,9 +83,9 @@ Distribution: %{distribution} Source0: %{name}-%{version}.tar.gz Source1: %{name}-egw-pear-%{version}.tar.bz2 -#Source2: %{name}-stylite-%{version}.tar.bz2 +Source2: %{name}-stylite-%{version}.tar.bz2 Source3: %{name}-pixelegg-%{version}.tar.bz2 -#Source4: %{name}-esyncpro-%{version}.tar.bz2 +Source4: %{name}-esyncpro-%{version}.tar.bz2 Source5: %{name}-jdots-%{version}.tar.bz2 Source6: phpfreechat_data_public.tar.gz Source8: %{name}-rpmlintrc @@ -103,7 +103,7 @@ AutoReqProv: no Requires: %{name}-core = %{version} Requires: %{name}-egw-pear = %{version} -#Requires: %{name}-stylite = %{version} +Requires: %{name}-stylite = %{version} Requires: %{name}-jdots = %{version} Requires: %{name}-esync = %{version} Requires: %{name}-bookmarks = %{version} @@ -159,8 +159,13 @@ Obsoletes: %{egw_packagename}-tracker Obsoletes: %{egw_packagename}-wiki # packages no longer in 14.1 Obsoletes: %{name}-felamimail +Obsoletes: %{name}-syncml Obsoletes: %{name}-phpsysinfo Obsoletes: %{name}-polls +Obsoletes: %{egw_packagename}-felamimail +Obsoletes: %{egw_packagename}-syncml +Obsoletes: %{egw_packagename}-phpsysinfo +Obsoletes: %{egw_packagename}-polls %post # Check binary paths and create links for opensuse/sles @@ -278,7 +283,7 @@ Summary: The EGroupware emailadmin application Group: Web/Database AutoReqProv: no Requires: egw-core >= %{version} -Requires: %{php}-imap +Requires: %{php}-bcmath Requires: %{name}-egw-pear >= %{version} Obsoletes: %{egw_packagename}-emailadmin %description emailadmin @@ -343,6 +348,7 @@ Summary: New default template for EGroupware Group: Web/Database AutoReqProv: no Requires: egw-core >= %{version} +Requires: %{name}-jdots >= %{version} %description pixelegg New 14.1 default template from Pixelegg. @@ -470,17 +476,18 @@ Obsoletes: %{egw_packagename}-sitemgr %description sitemgr This is the Sitemanager CMS app for EGroupware. -#%package stylite -#Version: %{version} -#Summary: Stylite EPL enhancements -#License: proprietary, see http://www.stylite.de/EPL -#Group: Web/Database -#AutoReqProv: no -#Requires: egw-core >= %{version} -#%description stylite -#The package contains Stylite proprietary EPL enhancements: -#- stylite.links stream wrapper allows browsing of app directories -#- filemanger favorites +%package stylite +Version: %{version} +Summary: Stylite EPL enhancements +License: proprietary, see http://www.stylite.de/EPL +Group: Web/Database +AutoReqProv: no +Requires: egw-core >= %{version} +Obsoletes: %{name}-groups +%description stylite +The package contains Stylite proprietary EPL enhancements: +- stylite.links stream wrapper allows browsing of app directories +- filemanger favorites %package timesheet Version: %{version} @@ -514,30 +521,30 @@ Obsoletes: %{egw_packagename}-wiki %description wiki This is the wiki app for EGroupware. -#%package esyncpro -#Version: %{version} -#Summary: Stylite eSync Provisioning -#License: proprietary -#Group: Web/Database -#AutoReqProv: no -#Requires: egw-core >= %{version}, %{name}-esync >= %{version} -#%description esyncpro -#Stylite's eSync Provisioning app allows to edit and assign -#policies to devices and keeps a central list of syncing devices. -#It also allows to remote wipe or view sync logs of all devices. +%package esyncpro +Version: %{version} +Summary: Stylite eSync Provisioning +License: proprietary +Group: Web/Database +AutoReqProv: no +Requires: egw-core >= %{version}, %{name}-esync >= %{version} +%description esyncpro +Stylite's eSync Provisioning app allows to edit and assign +policies to devices and keeps a central list of syncing devices. +It also allows to remote wipe or view sync logs of all devices. -#%post esyncpro +%post esyncpro # update/install esyncpro -#%{post_install} --install-update-app esyncpro 2>&1 | tee -a %{install_log} +%{post_install} --install-update-app esyncpro 2>&1 | tee -a %{install_log} %prep echo "Detected php: %{php}" echo "post_install: %{post_install}" %setup0 -c -n %{egwdirname} %setup1 -T -D -a 1 -n %{egwdirname} -#%setup2 -T -D -a 2 -n %{egwdirname} +%setup2 -T -D -a 2 -n %{egwdirname} %setup3 -T -D -a 3 -n %{egwdirname} -#%setup4 -T -D -a 4 -n %{egwdirname} +%setup4 -T -D -a 4 -n %{egwdirname} %setup5 -T -D -a 5 -n %{egwdirname} %setup6 -T -D -a 6 -n %{egwdirname} #%setup9 -T -D -a 9 -n %{egwdirname} @@ -618,9 +625,9 @@ ln -s ../../..%{egwdatadir}/header.inc.php %defattr(-,root,root) %{egwdir}/activesync -#%files esyncpro -#%defattr(-,root,root) -#%{egwdir}/esyncpro +%files esyncpro +%defattr(-,root,root) +%{egwdir}/esyncpro %%files calendar %defattr(-,root,root) @@ -710,9 +717,9 @@ ln -s ../../..%{egwdatadir}/header.inc.php %defattr(-,root,root) %{egwdir}/sitemgr -#%files stylite -#%defattr(-,root,root) -#%{egwdir}/stylite +%files stylite +%defattr(-,root,root) +%{egwdir}/stylite %files timesheet %defattr(-,root,root)