mail/roundcube-plugin-password: fix runtime problem

Fix roundcube-plugin-password.

* Patch for roundcube-plugin-password had not been applied accidently.
* More changes were required to make it work on *BSD system.

Bump PKGREVISION.

5 files changed, 53 insertions, 27 deletions

diff --git a/mail/roundcube-plugin-password/Makefile b/mail/roundcube-plugin-password/Makefile
index 287d8c4e7df..cb21fb05a64 100644
--- a/mail/roundcube-plugin-password/Makefile
+++ b/mail/roundcube-plugin-password/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2020/01/14 14:33:16 taca Exp $
+# $NetBSD: Makefile,v 1.8 2020/04/26 08:48:24 taca Exp $
 
 PLUGIN=		password
+PKGREVISION=	1
 
 MAINTAINER=	taca@NetBSD.org
 COMMENT=	Password change plugin for roundcube
@@ -9,6 +10,8 @@ LICENSE=	gnu-gpl-v3
 REPLACE_PERL+=		plugins/password/helpers/change_ldap_pass.pl
 REPLACE_PYTHON+=	plugins/password/helpers/chpass-wrapper.py
 
+DISTINFO_FILE=	${PKGDIR}/distinfo
+
 .include "../../mail/roundcube/plugins.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/roundcube-plugin-password/distinfo b/mail/roundcube-plugin-password/distinfo
new file mode 100644
index 00000000000..28415a1b9af
--- /dev/null
+++ b/mail/roundcube-plugin-password/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.16 2020/04/26 08:48:24 taca Exp $
+
+SHA1 (roundcubemail-1.4.2-complete.tar.gz) = d53fcd7f1109a63364d5d4a43f879c6f47d34a89
+RMD160 (roundcubemail-1.4.2-complete.tar.gz) = f043c3e55156625a9f4a8f95aeab704502be9b9d
+SHA512 (roundcubemail-1.4.2-complete.tar.gz) = 3f705bc38b44a0b7ea3241b0222f607b040ec01c8ea400b6b6222fbe346570c5f3450e5a188bab99ea171481453eb3f5b1e7457070ace1144558ec662a4273bb
+Size (roundcubemail-1.4.2-complete.tar.gz) = 7006013 bytes
+SHA1 (patch-plugins_password_helpers_passwd-expect) = 15e427a3c90bf7c0437a023b3f099abb5a139165
diff --git a/mail/roundcube-plugin-password/patches/patch-plugins_password_helpers_passwd-expect b/mail/roundcube-plugin-password/patches/patch-plugins_password_helpers_passwd-expect
new file mode 100644
index 00000000000..af345285603
--- /dev/null
+++ b/mail/roundcube-plugin-password/patches/patch-plugins_password_helpers_passwd-expect
@@ -0,0 +1,41 @@
+$NetBSD: patch-plugins_password_helpers_passwd-expect,v 1.1 2020/04/26 08:48:24 taca Exp $
+
+* Make password plugin work on NetBSD (and maybe other *BSD).
+* Allocate pty on ssh session.
+
+--- plugins/password/helpers/passwd-expect.orig	2020-01-01 20:00:50.000000000 +0000
++++ plugins/password/helpers/passwd-expect
+@@ -46,10 +46,10 @@ set prompt_string      "(%|\\\$|>)"
+ set fingerprint_string "The authenticity of host.* can't be established.*\n(RSA|ECDSA) key fingerprint is.*\nAre you sure you want to continue connecting.*"
+ set password_string    "(P|p)assword.*"
+ set oldpassword_string "((O|o)ld|login|\\\(current\\\) UNIX) (P|p)assword.*"
+-set newpassword_string "(N|n)ew.* (P|p)assword.*"
++set newpassword_string "(N|n)ew.*(P|p)assword.*"
+ set badoldpassword_string "(Authentication token manipulation error).*"
+ set badpassword_string "((passwd|BAD PASSWORD).*|(passwd|Bad:).*\r)"
+-set verify_string      "((R|r)e-*enter.*(P|p)assword|Retype new( UNIX)? password|(V|v)erification|(V|v)erify|(A|a)gain).*"
++set verify_string      "((R|r)e-*enter.*(P|p)assword|Retype (N|n)ew( UNIX)? (P|p)assword|(V|v)erification|(V|v)erify|(A|a)gain).*"
+ set success_string     "((P|p)assword.* changed|successfully)"
+ set login_string       "(((L|l)ogin|(U|u)sername).*)"
+ set timeout            20
+@@ -162,9 +162,9 @@ if {[string match $login "rlogin"]} {
+ } elseif {[string match $login "slogin"]} {
+    set pid [spawn slogin $host -l $user]
+ } elseif {[string match $login "ssh"]} {
+-   set pid [spawn ssh $host -l $user]
++   set pid [spawn ssh -t $host -l $user]
+ } elseif {[string match $login "ssh-exec"]} {
+-   set pid [spawn ssh $host -l $user $program]
++   set pid [spawn ssh -t $host -l $user $program]
+ } elseif {[string match $login "sudo"]} {
+    set pid [spawn sudo -u $user $program]
+ } elseif {[string match $login "telnet"]} {
+@@ -254,6 +254,8 @@ expect {
+   -re $badpassword_string {puts $err "$expect_out(0,string)"
+                            close $err
+                            exit 1}
++  -re $prompt_string { sleep .5
++                       send exit\r}
+   timeout             {puts $err "Could not change password.\n"
+                        close $err
+                        exit 1}
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 63c4258582f..646388e2010 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2020/01/14 14:30:00 taca Exp $
+$NetBSD: distinfo,v 1.67 2020/04/26 08:48:23 taca Exp $
 
 SHA1 (roundcubemail-1.4.2-complete.tar.gz) = d53fcd7f1109a63364d5d4a43f879c6f47d34a89
 RMD160 (roundcubemail-1.4.2-complete.tar.gz) = f043c3e55156625a9f4a8f95aeab704502be9b9d
@@ -6,5 +6,4 @@ SHA512 (roundcubemail-1.4.2-complete.tar.gz) = 3f705bc38b44a0b7ea3241b0222f607b0
 Size (roundcubemail-1.4.2-complete.tar.gz) = 7006013 bytes
 SHA1 (patch-af) = 7f29b0310a2a6b2e71858787e08b025e30d8bd12
 SHA1 (patch-config_config.inc.php.sample) = 92a48a97b16fe3f5f4b9441fce762a559d8daca7
-SHA1 (patch-plugins_password_helpers_passwd-expect) = 9e0082f23e37bbab26e8bb1439668132d5aacca2
 SHA1 (patch-rcube_mime_default) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c
diff --git a/mail/roundcube/patches/patch-plugins_password_helpers_passwd-expect b/mail/roundcube/patches/patch-plugins_password_helpers_passwd-expect
deleted file mode 100644
index 9ba494b8fdd..00000000000
--- a/mail/roundcube/patches/patch-plugins_password_helpers_passwd-expect
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-plugins_password_helpers_passwd-expect,v 1.1 2016/05/26 03:23:38 taca Exp $
-
-Make password plugin work on NetBSD (and maybe other *BSD).
-
---- plugins/password/helpers/passwd-expect.orig	2016-04-17 16:22:20.000000000 +0000
-+++ plugins/password/helpers/passwd-expect
-@@ -49,7 +49,7 @@ set oldpassword_string "((O|o)ld|login|\
- set newpassword_string "(N|n)ew.* (P|p)assword.*"
- set badoldpassword_string "(Authentication token manipulation error).*"
- set badpassword_string "((passwd|BAD PASSWORD).*|(passwd|Bad:).*\r)"
--set verify_string      "((R|r)e-*enter.*(P|p)assword|Retype new( UNIX)? password|(V|v)erification|(V|v)erify|(A|a)gain).*"
-+set verify_string      "((R|r)e-*enter.*(P|p)assword|Retype (N|n)ew( UNIX)? (P|p)assword|(V|v)erification|(V|v)erify|(A|a)gain).*"
- set success_string     "((P|p)assword.* changed|successfully)"
- set login_string       "(((L|l)ogin|(U|u)sername).*)"
- set timeout            20
-@@ -251,6 +251,8 @@ expect {
- expect {
-   -re $success_string {sleep .5
-                        send exit\r}
-+  -re $prompt_string { sleep .5
-+                       send exit\r}
-   -re $badpassword_string {puts $err "$expect_out(0,string)"
-                            close $err
-                            exit 1}