Date: Friday, February 10, 2023 @ 18:56:39 Author: spupykin Revision: 1399612
roundcubemail: FS#72530 Added: roundcubemail/trunk/roundcube.install Modified: roundcubemail/trunk/PKGBUILD Deleted: roundcubemail/trunk/0001-plugins-password-make-Python-3-compatible.patch ------------------------------------------------------+ 0001-plugins-password-make-Python-3-compatible.patch | 33 ----------------- PKGBUILD | 1 roundcube.install | 4 ++ 3 files changed, 5 insertions(+), 33 deletions(-) Deleted: 0001-plugins-password-make-Python-3-compatible.patch =================================================================== --- 0001-plugins-password-make-Python-3-compatible.patch 2023-02-10 18:49:56 UTC (rev 1399611) +++ 0001-plugins-password-make-Python-3-compatible.patch 2023-02-10 18:56:39 UTC (rev 1399612) @@ -1,33 +0,0 @@ -From d1163b12a1da183d9e8a8df4180b03afe4ef775d Mon Sep 17 00:00:00 2001 -From: Jelle van der Waa <[email protected]> -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 2023-02-10 18:49:56 UTC (rev 1399611) +++ PKGBUILD 2023-02-10 18:56:39 UTC (rev 1399612) @@ -15,6 +15,7 @@ 'php-gd') backup=('etc/webapps/roundcubemail/.htaccess' 'etc/webapps/roundcubemail/apache.conf') +install=roundcube.install validpgpkeys=('F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5') source=("https://github.com/roundcube/roundcubemail/releases/download/$pkgver/roundcubemail-$pkgver-complete.tar.gz"{,.asc} "apache.conf") Added: roundcube.install =================================================================== --- roundcube.install (rev 0) +++ roundcube.install 2023-02-10 18:56:39 UTC (rev 1399612) @@ -0,0 +1,4 @@ +post_upgrade() { + echo "Do not forget to run updatedb.sh script to update database schema" + echo "See https://github.com/roundcube/roundcubemail/blob/master/UPGRADING"; +}
