Request 3091 (accepted)

Overview

Request 3091 (accepted)

Updated tarball, symlink to roundcube vendor dir.

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

Submit chwala

Submit package Kolab:16:Testing / chwala to package Kolab:16 / chwala

chwala.spec Changed

@@ -37,7 +37,7 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:           chwala
-Version:        0.5.11
+Version:        0.5.12
 Release:        1%{?dist}
 Summary:        Glorified WebDAV, done right
 
@@ -51,16 +51,10 @@
 
 BuildArch:      noarch
 
-%if 0%{?rhel} < 8
-Requires:       php-pear(HTTP_Request2)
-Requires:       php-Smarty >= 3.1.7
-%endif
-
 Requires(post): roundcubemail(core)
 
 %if 0%{?plesk} < 1
 Requires:       roundcubemail
-Requires:       roundcubemail-plugins-kolab
 %endif
 
 %if 0%{?suse_version}
@@ -71,7 +65,6 @@
 
 %if 0%{?suse_version}
 BuildRequires:  roundcubemail
-BuildRequires:  roundcubemail-plugins-kolab
 %endif
 
 %description
@@ -117,14 +110,9 @@
 
 pushd %{buildroot}/%{_datadir}/%{name}
 
-mkdir -p lib/drivers/kolab/plugins
-
-pushd lib/drivers/kolab/plugins
-%if 0%{?plesk} < 1
-ln -s ../../../../../roundcubemail/plugins/kolab_auth kolab_auth
-%endif
-ln -s ../../../../../roundcubemail/plugins/kolab_folders kolab_folders
-ln -s ../../../../../roundcubemail/plugins/libkolab libkolab
+mkdir -p lib/drivers/kolab
+pushd lib/drivers/kolab
+ln -s ../../../../roundcubemail/plugins plugins
 popd
 
 pushd lib
@@ -136,11 +124,15 @@
 ln -s ../../..%{_localstatedir}/lib/%{name} temp
 ln -s ../../..%{_localstatedir}/log/%{name} logs
 
-%if 0%{?rhel} >= 8
 ln -s ../roundcubemail/vendor vendor
-%endif
 popd
 
+%pretrans
+# upgrade path for `plugins` directory -> symlink change. It only contains symlinks, so we don't do the rpmmoved dance.
+if  -d "/usr/share/chwala/lib/drivers/kolab/plugins" -a ! -L "/usr/share/chwala/lib/drivers/kolab/plugins" ; then
+    rm -rf /usr/share/chwala/lib/drivers/kolab/plugins
+fi
+
 %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
@@ -168,6 +160,9 @@
 %attr(0750,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Mon Dec 19 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 0.5.12-1
+- Release of version 0.5.12
+
 * Wed Apr 29 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.10-1
 - Release of version 0.5.10

fix-autoload-path-debian.patch Deleted

chwala-0.5.11.tar.gz/lib/api/common.php -> chwala-0.5.12.tar.gz/lib/api/common.php Changed

@@ -71,6 +71,7 @@
                 if ($err = $_FILES'file''error'$i) {
                     if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
                         $maxsize = ini_get('upload_max_filesize');
+                        //@phpstan-ignore-next-line
                         $maxsize = $this->show_bytes(parse_bytes($maxsize));
 
                         throw new Exception("Maximum file size ($maxsize) exceeded", file_api_core::ERROR_CODE);
@@ -90,6 +91,7 @@
         else if ($_SERVER'REQUEST_METHOD' == 'POST') {
             // if filesize exceeds post_max_size then $_FILES array is empty,
             if ($maxsize = ini_get('post_max_size')) {
+                //@phpstan-ignore-next-line
                 $maxsize = $this->show_bytes(parse_bytes($maxsize));
                 throw new Exception("Maximum file size ($maxsize) exceeded", file_api_core::ERROR_CODE);
             }
@@ -103,7 +105,7 @@
     /**
      * Return built-in viewer opbject for specified mimetype
      *
-     * @return object Viewer object
+     * @return object|null Viewer object
      */
     protected function find_viewer($mimetype)
     {

chwala-0.5.11.tar.gz/lib/api/folder_list.php -> chwala-0.5.12.tar.gz/lib/api/folder_list.php Changed

@@ -33,7 +33,7 @@
 
         $params   = $this->folder_list_params();
         $search   = isset($params'search') ? mb_strtoupper($params'search') : null;
-        $drivers  = $this->api->get_drivers(true, $admin_drivers);
+        $drivers  = $this->api->get_drivers(true, $this->admin_drivers);
         $errors   = array();
         $has_more = false;
 
@@ -49,7 +49,7 @@
             catch (Exception $e) {
                 $folders = array();
                 if ($e->getCode() == file_storage::ERROR_NOAUTH) {
-                    if (!in_array($title, $admin_drivers)) {
+                    if (!in_array($title, $this->admin_drivers)) {
                         // inform UI about to ask user for credentials
                         $errors$title = $this->parse_metadata($driver->driver_metadata());
                     }
@@ -108,7 +108,7 @@
                 }
                 catch (Exception $e) {
                     if ($e->getCode() == file_storage::ERROR_NOAUTH) {
-                        if (!in_array($title, $admin_drivers)) {
+                        if (!in_array($title, $this->admin_drivers)) {
                             // inform UI about to ask user for credentials
                             $errors$title = $this->parse_metadata($driver->driver_metadata());
                         }

chwala-0.5.11.tar.gz/lib/drivers/kolab/kolab_file_storage.php -> chwala-0.5.12.tar.gz/lib/drivers/kolab/kolab_file_storage.php Changed

chwala-0.5.11.tar.gz/lib/drivers/seafile/seafile_api.php -> chwala-0.5.12.tar.gz/lib/drivers/seafile/seafile_api.php Changed

chwala-0.5.11.tar.gz/lib/drivers/seafile/seafile_file_storage.php -> chwala-0.5.12.tar.gz/lib/drivers/seafile/seafile_file_storage.php Changed

@@ -1058,7 +1058,7 @@
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->uri2resource($path);
+        $uri = $this->path2uri($path);
 
         if (!$this->lock_db->lock($uri, $lock)) {
             throw new Exception("Database error. Unable to create a lock.", file_storage::ERROR);
@@ -1610,36 +1610,6 @@
     }
 
     /**
-     * Get file object.
-     *
-     * @param string               $file_name Name of a file (with folder path)
-     * @param kolab_storage_folder $folder    Reference to folder object
-     *
-     * @return array File data
-     * @throws Exception
-     */
-    protected function get_file_object(&$file_name, &$folder = null)
-    {
-        // extract file path and file name
-        $path        = explode(file_storage::SEPARATOR, $file_name);
-        $file_name   = array_pop($path);
-        $folder_name = implode(file_storage::SEPARATOR, $path);
-
-        if ($folder_name === '') {
-            throw new Exception("Missing folder name", file_storage::ERROR);
-        }
-
-        // get folder object
-        $folder = $this->get_folder_object($folder_name);
-        $files  = $folder->select(array(
-            array('type', '=', 'file'),
-            array('filename', '=', $file_name)
-        ));
-
-        return $files0;
-    }
-
-    /**
      * Simplify internal structure of the file object
      */
     protected function from_file_object($file)

chwala-0.5.11.tar.gz/lib/file_api.php -> chwala-0.5.12.tar.gz/lib/file_api.php Changed

chwala-0.5.11.tar.gz/lib/file_api_core.php -> chwala-0.5.12.tar.gz/lib/file_api_core.php Changed

chwala-0.5.11.tar.gz/lib/file_document.php -> chwala-0.5.12.tar.gz/lib/file_document.php Changed

chwala-0.5.11.tar.gz/lib/file_ui.php -> chwala-0.5.12.tar.gz/lib/file_ui.php Changed

chwala-0.5.11.tar.gz/lib/file_ui_api.php -> chwala-0.5.12.tar.gz/lib/file_ui_api.php Changed

chwala-0.5.11.tar.gz/lib/file_utils.php -> chwala-0.5.12.tar.gz/lib/file_utils.php Changed

chwala-0.5.12.tar.gz/phpstan.neon Added

chwala.dsc Changed

debian.changelog Changed

debian.control Changed

debian.rules Changed

debian.series Changed

debian.tar.gz/links Changed

debian.tar.gz/preinst Changed

Build Results
RPM Lint

Refresh

Comments for request 3091 0

Request History

mollekopf created request about 2 years ago

Updated tarball, symlink to roundcube vendor dir.

mollekopf accepted request about 2 years ago