[arch-commits] Commit in roundcubemail/repos (4 files)

[Pierre Schmitz]

    Date: Saturday, January 23, 2021 @ 10:17:13
  Author: pierre
Revision: 825946

archrelease: copy trunk to community-testing-any

Added:
  roundcubemail/repos/community-testing-any/
  roundcubemail/repos/community-testing-any/0001-plugins-password-make-Python-3-compatible.patch
    (from rev 825945, roundcubemail/trunk/0001-plugins-password-make-Python-3-compatible.patch)
  roundcubemail/repos/community-testing-any/PKGBUILD
    (from rev 825945, roundcubemail/trunk/PKGBUILD)
  roundcubemail/repos/community-testing-any/apache.conf
    (from rev 825945, roundcubemail/trunk/apache.conf)

------------------------------------------------------+
 0001-plugins-password-make-Python-3-compatible.patch |   33 ++++++++++
 PKGBUILD                                             |   55 +++++++++++++++++
 apache.conf                                          |    7 ++
 3 files changed, 95 insertions(+)

Copied: roundcubemail/repos/community-testing-any/0001-plugins-password-make-Python-3-compatible.patch (from rev 825945, roundcubemail/trunk/0001-plugins-password-make-Python-3-compatible.patch)
===================================================================
--- community-testing-any/0001-plugins-password-make-Python-3-compatible.patch	                        (rev 0)
+++ community-testing-any/0001-plugins-password-make-Python-3-compatible.patch	2021-01-23 10:17:13 UTC (rev 825946)
@@ -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
+

Copied: roundcubemail/repos/community-testing-any/PKGBUILD (from rev 825945, roundcubemail/trunk/PKGBUILD)
===================================================================
--- community-testing-any/PKGBUILD	                        (rev 0)
+++ community-testing-any/PKGBUILD	2021-01-23 10:17:13 UTC (rev 825946)
@@ -0,0 +1,55 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=roundcubemail
+pkgver=1.4.10
+pkgrel=2
+pkgdesc="A PHP web-based mail client"
+arch=('any')
+url="https://roundcube.net/"
+license=('GPL')
+depends=('php7')
+options=('emptydirs')
+makedepends=('git')
+optdepends=('python: password change script'
+            'perl: for change_ldap_pass.pl helper'
+	    'php7-gd')
+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")
+sha512sums=('e0a661ae5b928ce2c93129775d32a679ad2512ca4af21e8dd1711d38a62818ff9ee1e1fc922aae68e0a8bca034ca780fc3e3e988731a2ce9b2190b2c1d8e08a6'
+            'SKIP'
+            '0e80317ae6f040386b0980d0764bc8a9aa5f7cbf028a210a896763cb7a7fea6d91600eda588922a0eb6d519f2ec1e0a2f723bd7ab554c8b1ad4af49a95101f6e')
+
+prepare() {
+  cd "$srcdir"/roundcubemail-${pkgver}
+  sed -i \
+    -e "s|RCUBE_INSTALL_PATH . 'temp.*|'/var/cache/roundcubemail';|" \
+    -e "s|RCUBE_INSTALL_PATH . 'logs.*|'/var/log/roundcubemail';|" \
+    config/defaults.inc.php \
+    program/lib/Roundcube/rcube_config.php
+}
+
+package() {
+  mkdir -p "$pkgdir"/etc/webapps/roundcubemail
+  mkdir -p "$pkgdir"/usr/share/webapps
+  cd "$pkgdir"/usr/share/webapps
+  cp -ra "$srcdir"/roundcubemail-${pkgver} roundcubemail
+  cd roundcubemail
+
+  mv .htaccess "$pkgdir"/etc/webapps/roundcubemail/
+  ln -s /etc/webapps/roundcubemail/.htaccess .htaccess
+
+  mv config "$pkgdir"/etc/webapps/roundcubemail/
+  ln -s /etc/webapps/roundcubemail/config config
+
+  install -Dm0644 "$srcdir"/apache.conf "$pkgdir"/etc/webapps/roundcubemail/apache.conf
+  chown 33:33 "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
+  chmod 0640 "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
+
+  install -dm0750 -o 33 -g 33 "$pkgdir"/var/cache/roundcubemail
+  install -dm0750 -o 33 -g 33 "$pkgdir"/var/log/roundcubemail
+
+  rm -rf temp logs
+}

Copied: roundcubemail/repos/community-testing-any/apache.conf (from rev 825945, roundcubemail/trunk/apache.conf)
===================================================================
--- community-testing-any/apache.conf	                        (rev 0)
+++ community-testing-any/apache.conf	2021-01-23 10:17:13 UTC (rev 825946)
@@ -0,0 +1,7 @@
+Alias /roundcube "/usr/share/webapps/roundcubemail"
+<Directory "/usr/share/webapps/roundcubemail">
+    AllowOverride All
+    Options FollowSymlinks
+    Require all granted
+    php_admin_value open_basedir "/tmp/:/var/cache/roundcubemail:/usr/share/webapps/roundcubemail:/etc/webapps/roundcubemail:/usr/share/pear/:/var/log/roundcubemail"
+</Directory>