update openpgp.js v1.4.0, zimlet to 1.8.3

drop support for zmzimletctl (git -> _dev is now recommended) If you still want the zip, see: https://github.com/Zimbra-Community/pgp-zimlet/wiki/Building-ZIP-for-use-with-zmzimletctl
Zimbra-Community · Dec 13, 2015 · df816f4 · df816f4
1 parent 39863a7
commit df816f4
Show file tree

Hide file tree

Showing 21 changed files with 194 additions and 85 deletions.
diff --git a/README.md b/README.md
@@ -22,22 +22,28 @@ Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 
 ========================================================================
 
-### Installing
-
-    su zimbra
-    cd /tmp
-    rm tk_barrydegraaff_zimbra_openpgp*
-    wget https://github.com/Zimbra-Community/pgp-zimlet-binaries/raw/master/1.8.2/tk_barrydegraaff_zimbra_openpgp.zip
-    zmzimletctl deploy tk_barrydegraaff_zimbra_openpgp.zip
-    (wait 15 minutes for the deploy to propagate; or zmprov fc all && zmmailboxdctl restart)
+### Install Zimbra OpenPGP Zimlet
+
+The recommended method is to deploy using git. (I no longer support zmzimletctl, although that still works.)
+
+    [root@myzimbra ~]# su zimbra
+    [zimbra@myzimbra ~]# zmzimletctl undeploy tk_barrydegraaff_zimbra_openpgp
+    [zimbra@myzimbra ~]# exit
+    [root@myzimbra ~]# yum install -y git 
+    [root@myzimbra ~]# apt-get -y install git
+    [root@myzimbra ~]# cd ~
+    [root@myzimbra ~]# rm pgp-zimlet -Rf
+    [root@myzimbra ~]# git clone https://github.com/Zimbra-Community/pgp-zimlet
+    [root@myzimbra ~]# cd pgp-zimlet
+    [root@myzimbra pgp-zimlet]# git checkout 1.8.3
+    [root@myzimbra pgp-zimlet]# chmod +rx install-dev.sh
+    [root@myzimbra pgp-zimlet]# ./install-dev.sh
+    [root@myzimbra pgp-zimlet]# su zimbra
+    [zimbra@myzimbra pgp-zimlet] zmprov mc default zimbraPrefZimletTreeOpen TRUE
+    [zimbra@myzimbra pgp-zimlet] zmcontrol restart
 
-    Modify the default COS to expand the Zimlets menu by default:
-    zmprov mc default zimbraPrefZimletTreeOpen TRUE
-
 Please be warned, if you undeploy this Zimlet after some time Zimbra will truncate your users preferences (public keys) of this Zimlet.
 
-For debugging in production I recommend to disable the Zimlet via user preferences or via COS.
-
 ========================================================================
 
 ### About private key security
@@ -69,7 +75,7 @@ See: https://bugzilla.zimbra.com/show_bug.cgi?id=97496
 
 ### License
 
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/build.sh b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of the Zimbra OpenPGP Zimlet project.
-# Copyright (C) 2014-2015  Barry de Graaff
+# Copyright (C) 2014-2016  Barry de Graaff
 # 
 # Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 # 
@@ -62,7 +62,7 @@ cat <<EOF > tk_barrydegraaff_zimbra_openpgp/lang.js
 
 /*
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015 Barry de Graaff
+Copyright (C) 2014-2016 Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/install-dev.sh b/install-dev.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of the Zimbra OpenPGP Zimlet project.
-# Copyright (C) 2014-2015  Barry de Graaff
+# Copyright (C) 2014-2016  Barry de Graaff
 # 
 # Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 # 

diff --git a/services/index.html b/services/index.html
@@ -152,7 +152,7 @@ <h1>Zimbra OpenPGP Zimlet - Web Services</h1>
 </script>
 <br><br><br><br><br>
 <p style="text-align: center"><small>
-Copyright (C) 2014-2015  Barry de Graaff<br>
+Copyright (C) 2014-2016  Barry de Graaff<br>
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues<br><br>
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by

diff --git a/test/decrypt-test1.html b/test/decrypt-test1.html
@@ -185,7 +185,7 @@ <h1>OpenPGP.js - Decrypt test for Zimbra OpenPGP Zimlet</h1>
 </script>
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/dummy-keypair.txt b/test/dummy-keypair.txt
@@ -1,5 +1,5 @@
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/encrypt-test1.html b/test/encrypt-test1.html
@@ -55,7 +55,7 @@ <h1>OpenPGP.js - Encrypt test for Zimbra OpenPGP Zimlet</h1>
 </script>
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/html5-file-api-read-test1.html b/test/html5-file-api-read-test1.html
@@ -36,7 +36,7 @@ <h1>OpenPGP.js - HTML5 File API test for Zimbra OpenPGP Zimlet</h1>
 
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/html5-localstorage-test1.html b/test/html5-localstorage-test1.html
@@ -18,7 +18,7 @@ <h1>OpenPGP.js - HTML5 localStorage test for Zimbra OpenPGP Zimlet</h1>
 
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/keygen-test1.html b/test/keygen-test1.html
@@ -16,7 +16,7 @@ <h1>OpenPGP.js - Keygen test for Zimbra OpenPGP Zimlet</h1>
 </script>
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/openpgpjs-bugs/ Improperly formatted armor header/sign-test1.html b/test/openpgpjs-bugs/ Improperly formatted armor header/sign-test1.html
@@ -123,7 +123,7 @@ <h1>OpenPGP.js - Sign test for Zimbra OpenPGP Zimlet</h1>
 </script>
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/openpgpjs-bugs/ Improperly formatted armor header/verify-test1.html b/test/openpgpjs-bugs/ Improperly formatted armor header/verify-test1.html
@@ -153,7 +153,7 @@ <h1>OpenPGP.js - Sign test for Zimbra OpenPGP Zimlet</h1>
 </script>
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/privkey-to-ducky.html b/test/privkey-to-ducky.html
@@ -66,7 +66,7 @@ <h1>Private key to Duck script converter</h1>
 
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/sign-test1.html b/test/sign-test1.html
@@ -119,7 +119,7 @@ <h1>OpenPGP.js - Sign test for Zimbra OpenPGP Zimlet</h1>
 </script>
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/test/verify-test1.html b/test/verify-test1.html
@@ -148,7 +148,7 @@ <h1>OpenPGP.js - Sign test for Zimbra OpenPGP Zimlet</h1>
 </script>
 <pre>
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015  Barry de Graaff
+Copyright (C) 2014-2016  Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues
 

diff --git a/tk_barrydegraaff_zimbra_openpgp/help/index.html b/tk_barrydegraaff_zimbra_openpgp/help/index.html
@@ -205,7 +205,7 @@ <h1>Zimbra OpenPGP Zimlet</h1>If you find Zimbra OpenPGP Zimlet useful and want
 
 <br><br></section><section id="licenses">
 <h1>License and third party FOSS libraries</h1>
-Copyright (C) 2014-2015&nbsp; Barry de Graaff 
+Copyright (C) 2014-2016&nbsp; Barry de Graaff 
 <br><br>This program is free software: you can redistribute it and/or modify
 <br> it under the terms of the GNU General Public License as published by
 <br> the Free Software Foundation, either version 2 of the License, or

diff --git a/tk_barrydegraaff_zimbra_openpgp/lang.js b/tk_barrydegraaff_zimbra_openpgp/lang.js
@@ -11,7 +11,7 @@
 
 /*
 This file is part of the Zimbra OpenPGP Zimlet project.
-Copyright (C) 2014-2015 Barry de Graaff
+Copyright (C) 2014-2016 Barry de Graaff
 
 Bugs and feedback: https://github.com/Zimbra-Community/pgp-zimlet/issues