Re-add 'password' plugin to roundcube-plugins

Ship Python and C wrappers as examples.

diff --git a/debian/changelog b/debian/changelog
index 063bb410d85ccc566f6341b3924b94d818e8fda4..881d4a729ebf614ba7a6eae8c2ea706bda30f76c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 roundcube (0.5.3+dfsg-2) UNRELEASED; urgency=low
 
+  [ Vincent Bernat ]
   * Switch to Git for version control thanks to Jérémy
     Bobbio. debian/control updated.
 
+  [ Jérémy Bobbio ]
+  * Re-add 'password' plugin to roundcube-plugins.
+
  -- Vincent Bernat <bernat@debian.org>  Sat, 25 Jun 2011 09:36:02 +0200
 
 roundcube (0.5.3+dfsg-1) unstable; urgency=low

diff --git a/debian/patches/debianize_password_plugin.patch b/debian/patches/debianize_password_plugin.patch
new file mode 100644 (file)
index 0000000..3b23ab2
--- /dev/null
+++ b/debian/patches/debianize_password_plugin.patch
@@ -0,0 +1,66 @@
+Description: specify Debian path and group names in password plugin
+Forwarded: not-needed
+Author: Jérémy Bobbio <lunar@debian.org>
+
+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
+ */

diff --git a/debian/patches/series b/debian/patches/series
index dcad3af6a17f6396255557aad6a89be6c6c3a389..1394dfcd09dbf4e041ba6f60e26d86cf720336b1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ use_packaged_tinymce.patch
 use_pspell.patch
 loginbox-size.patch
 default-charset-utf8.patch
+debianize_password_plugin.patch

diff --git a/debian/roundcube-plugins.examples b/debian/roundcube-plugins.examples
new file mode 100644 (file)
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 f99e3fffa02493b8dd4abe0b554924ddafbed67a..f05ac1a906331f110ba702f212cc37f91f069615 100644 (file)
--- 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 195617e7ad54afdc6812d647fd5783ae7e2c08bb..e3452ee1245d2bf1d9eb2d638cc8fdb3b44d25b0 100755 (executable)
--- 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