We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 13
roundcubemail.spec
Changed
x
1
2
%if 0%{?plesk} > 0 && 0%{?rhel} == 73
# On Plesk we can afford to build with an incompatible php version because we have the plesk supplied php versions4
Requires: php-common5
-Requires: plesk-php566
+Requires: plesk-php747
%else8
Requires: php-common >= 5.59
%endif10
11
%{__mkdir_p} %{buildroot}/%{_localstatedir}/lib/rpm-state/roundcubemail/12
13
14
-#%check15
-#pushd %{name}-%{version}%{?dash_rel_suffix}/tests16
-#phpunit --debug || :17
-#popd18
+%check19
+pushd %{name}-%{version}%{?dash_rel_suffix}/tests20
+phpunit --debug || :21
+popd22
23
%clean24
%{__rm} -rf %{buildroot}25
26
fi27
28
%if 0%{?plesk} > 0 && 0%{?rhel} == 729
-php="/opt/plesk/php/5.6/bin/php"30
+php="/opt/plesk/php/7.4/bin/php"31
%else32
php="/usr/bin/php"33
%endif34
35
# Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)36
-%{php} %{_datadir}/roundcubemail/bin/updatedb.sh \37
+${php} %{_datadir}/roundcubemail/bin/updatedb.sh \38
--dir %{_datadir}/doc/roundcubemail/SQL/ \39
--package roundcube || : \40
>/dev/null 2>&141
42
fi43
fi44
45
- %{php} %{_datadir}/roundcubemail/bin/updatedb.sh \46
+ ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \47
--dir $dir \48
--package $(basename ${plugin}) \49
>/dev/null 2>&1 || :50
buildroundcubemailtarball.sh
Changed
143
1
2
set -e3
4
VERSION=1.5.35
-GIT_REF=1.5.36
+GIT_REF=release-1.57
+PLUGINS_GIT_REF=master8
NAME=roundcubemail-$VERSION9
source buildroundcubemailtarball.config10
11
12
}13
,14
"require": {15
- "php": ">=5.4.0 <8",16
+ "php": ">=7.2.0 <8",17
"pear/pear-core-minimal": "~1.10.1",18
"pear/auth_sasl": "~1.1.0",19
- "pear/net_idna2": "~0.2.0",20
"pear/mail_mime": "~1.10.0",21
- "pear/http_request2": "~2.3.0",22
- "pear/net_smtp": "~1.8.1",23
+ "pear/http_request2": "~2.5.0",24
+ "pear/net_smtp": "~1.10.0",25
"pear/crypt_gpg": "~1.6.3",26
- "pear/net_sieve": "~1.4.3",27
- "roundcube/plugin-installer": "~0.2.0",28
- "masterminds/html5": "~2.5.0",29
+ "pear/net_sieve": "~1.4.5",30
+ "roundcube/plugin-installer": "~0.3.0",31
+ "roundcube/rtf-html-php": "~2.1",32
+ "masterminds/html5": "~2.7.0",33
"endroid/qr-code": "~1.6.5",34
- "kolab/calendar": "~3.5.9",35
+ "guzzlehttp/guzzle": "^6.5.5"36
+ "kolab/calendar": "~3.5.11",37
"kolab/kolab_activesync": "~3.5.6",38
"kolab/kolab_addressbook": "~3.5.6",39
"kolab/kolab_auth": "~3.5.6",40
41
"kolab/net_ldap3": "~1.1.1",42
"kolab/odfviewer": "~3.4.0",43
"kolab/pdfviewer": "~3.4.0",44
- "kolab/tasklist": "~3.5.9",45
+ "kolab/tasklist": "~3.5.10",46
"johndoh/contextmenu": "~3.2.1",47
"zf1/zend-json": "~1.12.11",48
"zf1/zend-log": "~1.12.11",49
"zf1/zend-controller": "~1.12.11",50
- "sabre/dav" : "~2.1.6",51
+ "sabre/vobject" : "~4.5.1",52
+ "sabre/dav" : "~4.0",53
+ "sabre/http" : "~5.0",54
"smarty/smarty" : "~3.1.7"55
},56
"require-dev": {57
- "phpunit/phpunit": "^4.8.36 || ^5.7.21"58
+ "phpunit/phpunit": "^4.8.36 || ^5.7.21",59
+ "phpstan/phpstan": "^1.4"60
},61
"suggest": {62
"mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver"63
64
65
rm -f $NAME.tar.gz66
-d "$NAME" && rm -rf "$NAME"67
-git clone --branch release-1.4 https://github.com/roundcube/roundcubemail.git $NAME68
+git clone --branch release-1.5 https://github.com/roundcube/roundcubemail.git $NAME69
pushd $NAME70
git reset --hard $GIT_REF71
popd72
73
74
-d roundcubemail-plugins-kolab-latest && rm -rf roundcubemail-plugins-kolab-latest75
git clone --branch master ssh://git@git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git roundcubemail-plugins-kolab-latest76
+pushd roundcubemail-plugins-kolab-latest77
+git reset --hard $PLUGINS_GIT_REF78
+popd79
80
# Run composer and other install processes81
mv composer.json $NAME/composer.json82
83
bin/updatecss.sh --dir skins/$skin84
done85
86
+87
+# cat << EOF > ./phpstan.neon88
+# includes:89
+# parameters:90
+# level: 191
+# parallel:92
+# processTimeout: 300.093
+# paths:94
+# - app/95
+# EOF96
+97
+# php -dmemory_limit=500M vendor/bin/phpstan analyse98
+99
+popd100
+101
+ -d chwala && rm -rf chwala102
+git clone --branch master ssh://git@git.kolab.org/diffusion/C/chwala.git chwala103
+pushd chwala104
+mkdir -p lib/ext105
+ln -s ../../../$NAME/program/lib/Roundcube lib/ext/Roundcube106
+ln -s ../../../../$NAME/plugins lib/drivers/kolab/plugins107
+ln -s ../$NAME/vendor vendor108
+php -dmemory_limit=500M vendor/bin/phpstan analyse109
+popd110
+111
+ -d irony && rm -rf irony112
+git clone --branch master ssh://git@git.kolab.org/diffusion/rI/iRony.git irony113
+pushd irony114
+ln -s ../chwala/lib FileAPI115
+ln -s ../$NAME/program/lib/Roundcube Roundcube116
+ln -s ../$NAME/plugins plugins117
+ln -s ../$NAME/vendor vendor118
+php -dmemory_limit=500M vendor/bin/phpstan analyse119
+popd120
+121
+ -d syncroton && rm -rf syncroton122
+git clone --branch master ssh://git@git.kolab.org/diffusion/S/syncroton.git syncroton123
+pushd syncroton124
+mkdir -p lib/ext125
+ln -s ../../../$NAME/program/lib/Roundcube lib/ext/Roundcube126
+ln -s ../../$NAME/plugins lib/plugins127
+ln -s ../$NAME/vendor vendor128
+cat << EOF > ./phpstan.neon129
+includes:130
+parameters:131
+ level: 0132
+ parallel:133
+ processTimeout: 300.0134
+ ignoreErrors:135
+ - '#Function console not found#'136
+ paths:137
+ - lib/138
+EOF139
+php -dmemory_limit=500M vendor/bin/phpstan analyse140
popd141
142
tar --exclude="$NAME/.git" -czf "$ROOT_DIR/$NAME.tar.gz" $NAME143
debian.control
Changed
26
1
2
Architecture: all3
Depends: apache2 | httpd,4
libmagic1,5
- php-auth-sasl,6
- php-mail-mime (>= 1.8.5),7
php-mdb2 (>= 2.5.0),8
php-bindings-libkolab,9
php-bindings-libkolabxml,10
- php | php5,11
- php-cli | php5-cli,12
- php-gd | php5-gd,13
- php-intl | php5-intl,14
- php-ldap | php5-ldap,15
- php-pspell | php5-pspell,16
+ php,17
+ php-cli,18
+ php-gd,19
+ php-intl,20
+ php-ldap,21
+ php-mysql,22
+ php-pspell,23
ucf,24
${misc:Depends}25
Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry26
plesk.libkolab.inc.php
Changed
13
1
2
<?php3
-4
- /*5
- Managed by Puppet6
- */7
-8
- $config'kolab_freebusy_server' = 'https://' . $_SERVER"HTTP_HOST" . '/freebusy/';9
+ $config'kolab_freebusy_server' = false;10
11
if (file_exists(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {12
include_once(RCUBE_CONFIG_DIR . '/' . $_SERVER"HTTP_HOST" . '/' . basename(__FILE__));13
roundcubemail-1.5.3.tar.gz
Changed