[arch-commits] Commit in roundcubemail/repos/community-any (5 files)
Jelle van der Waa
jelle at archlinux.org
Wed Jan 1 17:36:46 UTC 2020
Date: Wednesday, January 1, 2020 @ 17:36:45
Author: jelle
Revision: 545877
archrelease: copy trunk to community-any
Added:
roundcubemail/repos/community-any/0001-plugins-password-make-Python-3-compatible.patch
(from rev 545876, roundcubemail/trunk/0001-plugins-password-make-Python-3-compatible.patch)
roundcubemail/repos/community-any/PKGBUILD
(from rev 545876, roundcubemail/trunk/PKGBUILD)
roundcubemail/repos/community-any/apache.conf
(from rev 545876, roundcubemail/trunk/apache.conf)
Deleted:
roundcubemail/repos/community-any/PKGBUILD
roundcubemail/repos/community-any/apache.conf
------------------------------------------------------+
0001-plugins-password-make-Python-3-compatible.patch | 33 +++++
PKGBUILD | 109 ++++++++---------
apache.conf | 14 +-
3 files changed, 96 insertions(+), 60 deletions(-)
Copied: roundcubemail/repos/community-any/0001-plugins-password-make-Python-3-compatible.patch (from rev 545876, roundcubemail/trunk/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:45 UTC (rev 545877)
@@ -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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-01 17:36:33 UTC (rev 545876)
+++ PKGBUILD 2020-01-01 17:36:45 UTC (rev 545877)
@@ -1,53 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=roundcubemail
-pkgver=1.4.1
-pkgrel=1
-pkgdesc="A PHP web-based mail client"
-arch=('any')
-url="https://roundcube.net/"
-license=('GPL')
-depends=('php' 'php-gd')
-options=('emptydirs')
-makedepends=('php-composer' 'git')
-optdepends=('python2')
-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")
-sha256sums=('640423d21e1aa733ddea7462f156e194b051f086a3f2a70430e0aa2c9b09b44a'
- 'SKIP'
- 'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0')
-
-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 http:http "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
- chmod 0640 "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
-
- install -dm0750 -o http -g http "$pkgdir"/var/cache/roundcubemail
- install -dm0750 -o http -g http "$pkgdir"/var/log/roundcubemail
-
- rm -rf temp logs
-}
Copied: roundcubemail/repos/community-any/PKGBUILD (from rev 545876, roundcubemail/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-01-01 17:36:45 UTC (rev 545877)
@@ -0,0 +1,56 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=roundcubemail
+pkgver=1.4.1
+pkgrel=2
+pkgdesc="A PHP web-based mail client"
+arch=('any')
+url="https://roundcube.net/"
+license=('GPL')
+depends=('php' 'php-gd')
+options=('emptydirs')
+makedepends=('php-composer' 'git')
+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" 0001-plugins-password-make-Python-3-compatible.patch)
+sha256sums=('640423d21e1aa733ddea7462f156e194b051f086a3f2a70430e0aa2c9b09b44a'
+ 'SKIP'
+ 'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0'
+ '1b30d0cc316decbdd668f47a39ed9d9a029bdeeb88e364a2002a1476d1d48cac')
+
+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
+
+ patch -Np1 -i ${srcdir}/0001-plugins-password-make-Python-3-compatible.patch
+}
+
+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 http:http "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
+ chmod 0640 "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
+
+ install -dm0750 -o http -g http "$pkgdir"/var/cache/roundcubemail
+ install -dm0750 -o http -g http "$pkgdir"/var/log/roundcubemail
+
+ rm -rf temp logs
+}
Deleted: apache.conf
===================================================================
--- apache.conf 2020-01-01 17:36:33 UTC (rev 545876)
+++ apache.conf 2020-01-01 17:36:45 UTC (rev 545877)
@@ -1,7 +0,0 @@
-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>
Copied: roundcubemail/repos/community-any/apache.conf (from rev 545876, roundcubemail/trunk/apache.conf)
===================================================================
--- apache.conf (rev 0)
+++ apache.conf 2020-01-01 17:36:45 UTC (rev 545877)
@@ -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>
More information about the arch-commits
mailing list