Request 3090 (accepted)

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.

Overview

Request 3090 (accepted)

Updated dependencies and tarball.

Created by mollekopf almost 2 years ago
In state accepted
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit roundcubemail-selfcontained

Submit package Kolab:16:Testing / roundcubema...fcontained to package Kolab:16 / roundcubemail-selfcontained

roundcubemail.spec Changed

@@ -104,7 +104,7 @@
 %if 0%{?plesk} > 0 && 0%{?rhel} == 7
 # On Plesk we can afford to build with an incompatible php version because we have the plesk supplied php versions
 Requires:       php-common
-Requires:       plesk-php56
+Requires:       plesk-php74
 %else
 Requires:       php-common >= 5.5
 %endif
@@ -496,10 +496,10 @@
 %{__mkdir_p} %{buildroot}/%{_localstatedir}/lib/rpm-state/roundcubemail/
 
 
-#%check
-#pushd %{name}-%{version}%{?dash_rel_suffix}/tests
-#phpunit --debug || :
-#popd
+%check
+pushd %{name}-%{version}%{?dash_rel_suffix}/tests
+phpunit --debug || :
+popd
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -567,13 +567,13 @@
 fi
 
 %if 0%{?plesk} > 0 && 0%{?rhel} == 7
-php="/opt/plesk/php/5.6/bin/php"
+php="/opt/plesk/php/7.4/bin/php"
 %else
 php="/usr/bin/php"
 %endif
 
 # Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
-%{php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
     --dir %{_datadir}/doc/roundcubemail/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
@@ -588,7 +588,7 @@
                 fi
             fi
 
-            %{php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+            ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
                 --dir $dir \
                 --package $(basename ${plugin}) \
                 >/dev/null 2>&1 || :

buildroundcubemailtarball.sh Changed

@@ -3,7 +3,8 @@
 set -e
 
 VERSION=1.5.3
-GIT_REF=1.5.3
+GIT_REF=release-1.5
+PLUGINS_GIT_REF=master
 NAME=roundcubemail-$VERSION
 source buildroundcubemailtarball.config
 
@@ -149,19 +150,20 @@
         }
     ,
     "require": {
-        "php": ">=5.4.0 <8",
+        "php": ">=7.2.0 <8",
         "pear/pear-core-minimal": "~1.10.1",
         "pear/auth_sasl": "~1.1.0",
-        "pear/net_idna2": "~0.2.0",
         "pear/mail_mime": "~1.10.0",
-        "pear/http_request2": "~2.3.0",
-        "pear/net_smtp": "~1.8.1",
+        "pear/http_request2": "~2.5.0",
+        "pear/net_smtp": "~1.10.0",
         "pear/crypt_gpg": "~1.6.3",
-        "pear/net_sieve": "~1.4.3",
-        "roundcube/plugin-installer": "~0.2.0",
-        "masterminds/html5": "~2.5.0",
+        "pear/net_sieve": "~1.4.5",
+        "roundcube/plugin-installer": "~0.3.0",
+        "roundcube/rtf-html-php": "~2.1",
+        "masterminds/html5": "~2.7.0",
         "endroid/qr-code": "~1.6.5",
-        "kolab/calendar": "~3.5.9",
+        "guzzlehttp/guzzle": "^6.5.5"
+        "kolab/calendar": "~3.5.11",
         "kolab/kolab_activesync": "~3.5.6",
         "kolab/kolab_addressbook": "~3.5.6",
         "kolab/kolab_auth": "~3.5.6",
@@ -175,16 +177,19 @@
         "kolab/net_ldap3": "~1.1.1",
         "kolab/odfviewer": "~3.4.0",
         "kolab/pdfviewer": "~3.4.0",
-        "kolab/tasklist": "~3.5.9",
+        "kolab/tasklist": "~3.5.10",
         "johndoh/contextmenu": "~3.2.1",
         "zf1/zend-json": "~1.12.11",
         "zf1/zend-log": "~1.12.11",
         "zf1/zend-controller": "~1.12.11",
-        "sabre/dav" : "~2.1.6",
+        "sabre/vobject" : "~4.5.1",
+        "sabre/dav" : "~4.0",
+        "sabre/http" : "~5.0",
         "smarty/smarty" : "~3.1.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.7.21"
+        "phpunit/phpunit": "^4.8.36 || ^5.7.21",
+        "phpstan/phpstan": "^1.4"
     },
     "suggest": {
         "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver"
@@ -194,7 +199,7 @@
 
 rm -f $NAME.tar.gz
  -d "$NAME"  && rm -rf "$NAME"
-git clone --branch release-1.4 https://github.com/roundcube/roundcubemail.git $NAME
+git clone --branch release-1.5 https://github.com/roundcube/roundcubemail.git $NAME
 pushd $NAME
 git reset --hard $GIT_REF
 popd
@@ -204,6 +209,9 @@
 
  -d roundcubemail-plugins-kolab-latest  && rm -rf roundcubemail-plugins-kolab-latest
 git clone --branch master ssh://git@git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git roundcubemail-plugins-kolab-latest
+pushd roundcubemail-plugins-kolab-latest
+git reset --hard $PLUGINS_GIT_REF
+popd
 
 # Run composer and other install processes
 mv composer.json $NAME/composer.json
@@ -278,6 +286,60 @@
     bin/updatecss.sh --dir skins/$skin
 done
 
+
+# cat << EOF > ./phpstan.neon
+# includes:
+# parameters:
+#     level: 1
+#     parallel:
+#         processTimeout: 300.0
+#     paths:
+#         - app/
+# EOF
+
+# php -dmemory_limit=500M vendor/bin/phpstan analyse
+
+popd
+
+ -d chwala  && rm -rf chwala
+git clone --branch master ssh://git@git.kolab.org/diffusion/C/chwala.git chwala
+pushd chwala
+mkdir -p lib/ext
+ln -s ../../../$NAME/program/lib/Roundcube lib/ext/Roundcube
+ln -s ../../../../$NAME/plugins lib/drivers/kolab/plugins
+ln -s ../$NAME/vendor vendor
+php -dmemory_limit=500M vendor/bin/phpstan analyse
+popd
+
+ -d irony  && rm -rf irony
+git clone --branch master ssh://git@git.kolab.org/diffusion/rI/iRony.git irony
+pushd irony
+ln -s ../chwala/lib FileAPI
+ln -s ../$NAME/program/lib/Roundcube Roundcube
+ln -s ../$NAME/plugins plugins
+ln -s ../$NAME/vendor vendor
+php -dmemory_limit=500M vendor/bin/phpstan analyse
+popd
+
+ -d syncroton  && rm -rf syncroton
+git clone --branch master ssh://git@git.kolab.org/diffusion/S/syncroton.git syncroton
+pushd syncroton
+mkdir -p lib/ext
+ln -s ../../../$NAME/program/lib/Roundcube lib/ext/Roundcube
+ln -s ../../$NAME/plugins lib/plugins
+ln -s ../$NAME/vendor vendor
+cat << EOF > ./phpstan.neon
+includes:
+parameters:
+    level: 0
+    parallel:
+        processTimeout: 300.0
+    ignoreErrors:
+        - '#Function console not found#'
+    paths:
+        - lib/
+EOF
+php -dmemory_limit=500M vendor/bin/phpstan analyse
 popd
 
 tar --exclude="$NAME/.git" -czf "$ROOT_DIR/$NAME.tar.gz" $NAME

debian.control Changed

@@ -13,17 +13,16 @@
 Architecture: all
 Depends:    apache2 | httpd,
             libmagic1,
-            php-auth-sasl,
-            php-mail-mime (>= 1.8.5),
             php-mdb2 (>= 2.5.0),
             php-bindings-libkolab,
             php-bindings-libkolabxml,
-            php | php5,
-            php-cli | php5-cli,
-            php-gd | php5-gd,
-            php-intl | php5-intl,
-            php-ldap | php5-ldap,
-            php-pspell | php5-pspell,
+            php,
+            php-cli,
+            php-gd,
+            php-intl,
+            php-ldap,
+            php-mysql,
+            php-pspell,
             ucf,
             ${misc:Depends}
 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-larry

plesk.libkolab.inc.php Changed

roundcubemail-1.5.3.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 3090 0

Request History

mollekopf created request almost 2 years ago

Updated dependencies and tarball.

mollekopf accepted request almost 2 years ago