[Pkg-roundcube-maintainers] [PATCH] Re-add 'password' plugin to roundcube-plugins

[Jérémy Bobbio]

Ship Python and C wrappers as examples.
---

After deeper investigations, I think the password plugin drivers that
need C and Python are either very site specific or would require
quite some work to fit better in Debian.

So my proposal is to keep roundcube-plugins as Arch:all, and simply ship
those files in examples directory.

 debian/roundcube-plugins.examples              |    3 +++
 debian/roundcube-plugins.install               |    1 +
 debian/rules                                   |    5 +++++
 plugins/password/README                        |   11 +++++++----
 plugins/password/drivers/chgsaslpasswd.c       |    2 +-
 plugins/password/drivers/chgvirtualminpasswd.c |    2 +-
 7 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 debian/roundcube-plugins.examples

diff --git a/debian/roundcube-plugins.examples b/debian/roundcube-plugins.examples
new file mode 100644
index 0000000..46a06f1
--- /dev/null
+++ b/debian/roundcube-plugins.examples
@@ -0,0 +1,3 @@
+plugins/password/drivers/chgsaslpasswd.c
+plugins/password/drivers/chgvirtualminpasswd.c
+plugins/password/drivers/chpass-wrapper.py
diff --git a/debian/roundcube-plugins.install b/debian/roundcube-plugins.install
index f99e3ff..f05ac1a 100644
--- a/debian/roundcube-plugins.install
+++ b/debian/roundcube-plugins.install
@@ -10,6 +10,7 @@ plugins/managesieve/ usr/share/roundcube/plugins
 plugins/markasjunk/ usr/share/roundcube/plugins
 plugins/new_user_dialog/ usr/share/roundcube/plugins
 plugins/new_user_identity/ usr/share/roundcube/plugins
+plugins/password /usr/share/roundcube/plugins
 plugins/show_additional_headers/ usr/share/roundcube/plugins
 plugins/squirrelmail_usercopy/ usr/share/roundcube/plugins
 plugins/subscriptions_option/ usr/share/roundcube/plugins
diff --git a/debian/rules b/debian/rules
index 195617e..e3452ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG
 
+DEB_DH_INSTALL_ARGS = \
+	--exclude=chgsaslpasswd.c \
+	--exclude=chgvirtualminpasswd.c \
+	--exclude=chpass-wrapper.py
+
 binary-install/roundcube-core::
 	# Install config files
 	install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube-core/etc/roundcube/db.inc.php
diff --git a/plugins/password/README b/plugins/password/README
index 81e4f1e..bdb8264 100644
--- a/plugins/password/README
+++ b/plugins/password/README
@@ -133,7 +133,8 @@
 
  Installation:
 
- Change into the drivers directory. Edit the chgsaslpasswd.c file as is
+ Change into the drivers directory. Copy and edit
+ /usr/share/roundcube-plugins/examples/chgsaslpasswd.c as is
  documented within it.
 
  Compile the wrapper program:
@@ -200,7 +201,8 @@
  ----------------------------
 
  As in sasl driver this one allows to change password using shell
- utility called "virtualmin". See drivers/chgvirtualminpasswd.c for
+ utility called "virtualmin". See
+ /usr/share/doc/roundcube-plugins/examples/chgvirtualminpasswd.c for
  installation instructions. See also config.inc.php.dist file.
 
 
@@ -225,8 +227,9 @@
  Driver that adds functionality to change the systems user password via 
  the 'chpasswd' command. See config.inc.php.dist file.
 
- Attached wrapper script (chpass-wrapper.py) restricts password changes
- to uids >= 1000 and can deny requests based on a blacklist.
+ Attached wrapper script
+ (/usr/share/doc/roundcube-plugins/examples/chpass-wrapper.py) restricts
+ password changes to uids >= 1000 and can deny requests based on a blacklist.
 
 
  2.12.  LDAP - no PEAR (ldap_simple)
diff --git a/plugins/password/drivers/chgsaslpasswd.c b/plugins/password/drivers/chgsaslpasswd.c
index bcdcb2e..2c3bbf9 100644
--- a/plugins/password/drivers/chgsaslpasswd.c
+++ b/plugins/password/drivers/chgsaslpasswd.c
@@ -8,7 +8,7 @@
 
 /* INSTALLING:
   gcc -o chgsaslpasswd chgsaslpasswd.c
-  chown cyrus.apache chgsaslpasswd
+  chown cyrus:www-data chgsaslpasswd
   strip chgsaslpasswd
   chmod 4550 chgsaslpasswd
 */
diff --git a/plugins/password/drivers/chgvirtualminpasswd.c b/plugins/password/drivers/chgvirtualminpasswd.c
index 4e2299c..12989c6 100644
--- a/plugins/password/drivers/chgvirtualminpasswd.c
+++ b/plugins/password/drivers/chgvirtualminpasswd.c
@@ -7,7 +7,7 @@
 
 /* INSTALLING:
   gcc -o chgvirtualminpasswd chgvirtualminpasswd.c
-  chown root.apache chgvirtualminpasswd
+  chown root:www-data chgvirtualminpasswd
   strip chgvirtualminpasswd
   chmod 4550 chgvirtualminpasswd
 */
-- 
Jérémy Bobbio                        .''`. 
lunar at debian.org                    : :Ⓐ  :  # apt-get install anarchism
                                    `. `'` 
                                      `-   
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-roundcube-maintainers/attachments/20110620/227c505a/attachment.pgp>