[arch-commits] Commit in roundcubemail/trunk (2 files)

[Jelle van der Waa]

    Date: Wednesday, January 1, 2020 @ 17:36:33
  Author: jelle
Revision: 545876

upgpkg: roundcubemail 1.4.1-2

Port python2 dependency to python 3

Added:
  roundcubemail/trunk/0001-plugins-password-make-Python-3-compatible.patch
Modified:
  roundcubemail/trunk/PKGBUILD

------------------------------------------------------+
 0001-plugins-password-make-Python-3-compatible.patch |   33 +++++++++++++++++
 PKGBUILD                                             |   11 +++--
 2 files changed, 40 insertions(+), 4 deletions(-)

Added: 0001-plugins-password-make-Python-3-compatible.patch
===================================================================
--- 0001-plugins-password-make-Python-3-compatible.patch	                        (rev 0)
+++ 0001-plugins-password-make-Python-3-compatible.patch	2020-01-01 17:36:33 UTC (rev 545876)
@@ -0,0 +1,33 @@
+From d1163b12a1da183d9e8a8df4180b03afe4ef775d Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle at vdwaa.nl>
+Date: Wed, 1 Jan 2020 18:30:49 +0100
+Subject: [PATCH] plugins: password: make Python 3 compatible
+
+Remove the ", e" as the exception is never printed and this makes it
+Python 3 compatible as well
+---
+ plugins/password/helpers/chpass-wrapper.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/password/helpers/chpass-wrapper.py b/plugins/password/helpers/chpass-wrapper.py
+index 61bba849e..e56811561 100644
+--- a/plugins/password/helpers/chpass-wrapper.py
++++ b/plugins/password/helpers/chpass-wrapper.py
+@@ -11,12 +11,12 @@ BLACKLIST = (
+ 
+ try:
+     username, password = sys.stdin.readline().split(':', 1)
+-except ValueError, e:
++except ValueError:
+     sys.exit('Malformed input')
+ 
+ try:
+     user = pwd.getpwnam(username)
+-except KeyError, e:
++except KeyError:
+     sys.exit('No such user: %s' % username)
+ 
+ if user.pw_uid < 1000:
+-- 
+2.24.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-01 17:35:48 UTC (rev 545875)
+++ PKGBUILD	2020-01-01 17:36:33 UTC (rev 545876)
@@ -2,7 +2,7 @@
 
 pkgname=roundcubemail
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A PHP web-based mail client"
 arch=('any')
 url="https://roundcube.net/"
@@ -10,15 +10,16 @@
 depends=('php' 'php-gd')
 options=('emptydirs')
 makedepends=('php-composer' 'git')
-optdepends=('python2')
+optdepends=('python: password change script')
 backup=('etc/webapps/roundcubemail/.htaccess'
         'etc/webapps/roundcubemail/apache.conf')
 validpgpkeys=('F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5')
 source=("https://github.com/roundcube/roundcubemail/releases/download/$pkgver/roundcubemail-$pkgver-complete.tar.gz"{,.asc}
-        "apache.conf")
+        "apache.conf" 0001-plugins-password-make-Python-3-compatible.patch)
 sha256sums=('640423d21e1aa733ddea7462f156e194b051f086a3f2a70430e0aa2c9b09b44a'
             'SKIP'
-            'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0')
+            'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0'
+            '1b30d0cc316decbdd668f47a39ed9d9a029bdeeb88e364a2002a1476d1d48cac')
 
 prepare() {
   cd "$srcdir"/roundcubemail-${pkgver}
@@ -27,6 +28,8 @@
     -e "s|RCUBE_INSTALL_PATH . 'logs.*|'/var/log/roundcubemail';|" \
     config/defaults.inc.php \
     program/lib/Roundcube/rcube_config.php
+
+    patch -Np1 -i ${srcdir}/0001-plugins-password-make-Python-3-compatible.patch
 }
 
 package() {