Request 3321 (superseded)

This request is superseded by request 3322 (Show diff)

You're not reviewing the full diff of request 3321 , but the diff to the superseded request 3320 (Show full diff)

Overview

Request 3321 (superseded)

New release 2.4.2.30

Created by mollekopf 2 months ago
In state superseded
Supersedes 3320
Superseded by 3322
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

Submit package Kolab:16:Testing / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

@@ -17,6 +17,12 @@
 
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
+%endif
+
 %if 0%{?suse_version}
 %global httpd_group www
 %global httpd_name apache2
@@ -37,7 +43,7 @@
 %global upstream_version 2.4.2
 
 Name:           kolab-syncroton
-Version: 2.4.2.29
+Version: 2.4.2.30
 Release:        1%{?dist}
 Summary:        ActiveSync for Kolab Groupware
 
@@ -165,7 +171,7 @@
 %post
 if  -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ; then
     if  ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null`" ; then
-%if 0%{?fedora} > 15
+%if 0%{?with_systemd}
         /bin/systemctl condrestart %{httpd_name}.service
 %else
         /sbin/service %{httpd_name} condrestart
@@ -177,6 +183,27 @@
     /bin/systemctl reload php-fpm.service || :
 fi
 
+if  -f "/usr/lib/systemd/system/plesk-php74-fpm.service" ; then
+    /bin/systemctl reload plesk-php74-fpm.service || :
+fi
+
+if  -f "/usr/lib/systemd/system/plesk-php80-fpm.service" ; then
+    /bin/systemctl reload plesk-php80-fpm.service || :
+fi
+
+if  -f "/usr/lib/systemd/system/plesk-php81-fpm.service" ; then
+    /bin/systemctl reload plesk-php81-fpm.service || :
+fi
+
+if  -f "/usr/lib/systemd/system/plesk-php82-fpm.service" ; then
+    /bin/systemctl reload plesk-php82-fpm.service || :
+fi
+
+if  -f "/usr/lib/systemd/system/plesk-php83-fpm.service" ; then
+    /bin/systemctl reload plesk-php83-fpm.service || :
+fi
+
+
 
 %if 0%{?plesk} > 0 && 0%{?rhel} == 7
 php="/opt/plesk/php/7.4/bin/php"

debian.changelog Changed

kolab-syncroton-2.4.2.tar.gz/bin/inspect.php Changed

@@ -51,18 +51,27 @@
     rcube::raise_error("Email address not specified (--email).", false, true);
 }
 $email = $opts'email';
-if (empty($opts'adminpassword')) {
-    rcube::raise_error("Admin password not specified (--adminpassword).", false, true);
+
+$proxyAuth = false;
+if ($password = $opts'adminpassword') {
+    $proxyAuth = true;
+    $user = "cyrus-admin";
+} else {
+    $password = $opts'password';
+}
+
+if (empty($password)) {
+    rcube::raise_error("Password not specified (--adminpassword/--password).", false, true);
 }
-$password = $opts'adminpassword';
 
 $rcube = rcube::get_instance();
 $default_port = $rcube->config->get('default_port', 143);
 $default_host = $rcube->config->get('default_host');
-$user = "cyrus-admin";
 $imap = new \rcube_imap_generic();
-$options'auth_cid' = $user;
-$options'auth_pw' = $password;
+if ($proxyAuth) {
+    $options'auth_cid' = $user;
+    $options'auth_pw' = $password;
+}
 $options'auth_type' = 'PLAIN';
 $options'port' = $default_port;
 $options'socket_options' = 
@@ -96,7 +105,7 @@
 if ($data = $db->fetch_assoc($select)) {
     $userid = $data'user_id';
 } else {
-    rcube::raise_error("User not found: $email.", false, true);
+    rcube::raise_error("User not found in roundcube database (only available after first login): $email.", false, true);
 }
 
 print("Found the user with id: $userid\n");

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3321 0

Request History

mollekopf created request 2 months ago

New release 2.4.2.30

mollekopf superseded request 2 months ago

superseded by 3322