Request 2261 (superseded)

This request is superseded by request 2262 (Show diff)

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

Overview

Request 2261 (superseded)

Patch issues fixed upstream

Created by vanmeeuwen over 6 years ago
In state superseded
Supersedes 2260
Superseded by 2262
Open review for Admin
Open review for vanmeeuwen

Submit roundcubemail

Submit package Kolab:Winterfell / roundcubemail to package Kolab:16 / roundcubemail

roundcubemail.spec Changed

0001-Fix-PHP-Warning-Use-of-undefined-constant-IDNA_DEFAU.patch Deleted

@@ -1,40 +0,0 @@
-From 8477b881e5515d6520eb64f760fb49d586fb5689 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Thu, 12 Apr 2018 09:39:33 +0200
-Subject: [PATCH 1/5] Fix PHP Warning: Use of undefined constant IDNA_DEFAULT
- on systems without php-intl (#6244)
-
----
- CHANGELOG                             | 2 ++
- program/lib/Roundcube/rcube_utils.php | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 3021068ac..b9044a497 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,6 +1,8 @@
- CHANGELOG Roundcube Webmail
- ===========================
- 
-+- Fix PHP Warning: Use of undefined constant IDNA_DEFAULT on systems without php-intl (#6244)
-+
- RELEASE 1.3.6
- -------------
- - Fix parsing date strings (e.g. from a Date: mail header) with comments (#6216)
-diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
-index c9afe1e14..77b084a99 100644
---- a/program/lib/Roundcube/rcube_utils.php
-+++ b/program/lib/Roundcube/rcube_utils.php
-@@ -905,7 +905,7 @@ class rcube_utils
-         // Note that in PHP 7.2/7.3 calling idn_to_* functions with default arguments
-         // throws a warning, so we have to set the variant explicitely (#6075)
-         $variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : null;
--        $options = IDNA_DEFAULT;
-+        $options = 0;
- 
-         // Because php-intl extension lowercases domains and return false
-         // on invalid input (#6224), we skip conversion when not needed
--- 
-2.14.3
-

debian.series Changed

Build Results
RPM Lint

Refresh

Comments for request 2261 0

Request History

vanmeeuwen created request over 6 years ago

Patch issues fixed upstream

vanmeeuwen superseded request over 6 years ago

superseded by 2262