From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEsIn-0006IH-Iz for guix-patches@gnu.org; Wed, 15 Nov 2017 02:40:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEsIk-0004jV-Dn for guix-patches@gnu.org; Wed, 15 Nov 2017 02:40:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:60479) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEsIk-0004jC-9r for guix-patches@gnu.org; Wed, 15 Nov 2017 02:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eEsIj-000388-PO for guix-patches@gnu.org; Wed, 15 Nov 2017 02:40:01 -0500 Subject: [bug#29210] [PATCH] gnu: messaging: Add libsignal-protocol-c and enable OMEMO for dino. Resent-Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_f843cc9c972d0e1fd48d74e4873cca2f" Date: Wed, 15 Nov 2017 08:39:29 +0100 From: Rutger Helling In-Reply-To: <87bmk4lbr8.fsf@gnu.org> References: <5a2d4159793c664e2f6277b9ad0345f5@mykolab.com> <87bmk4lbr8.fsf@gnu.org> Message-ID: <66fce890efdd9b607c1c9962fabfced6@mykolab.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: ludo@gnu.org Cc: 29210@debbugs.gnu.org --=_f843cc9c972d0e1fd48d74e4873cca2f Content-Type: multipart/alternative; boundary="=_57cfe50bb5a985e93b06c2ac8c6da897" --=_57cfe50bb5a985e93b06c2ac8c6da897 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Hey Ludo, thanks for the review. Here's a second version of the first patch with your changes. I've tried adding only -DBUILD_TESTING, and I think that fixed the timestamp issues. The tests now run properly and it seems to build in a reproducible way. The second patch is unchanged, but added again for convenience. On 2017-11-14 23:46, ludo@gnu.org wrote: > Hi Rutger, > > Rutger Helling skribis: > >> From 4212f0c4ffe43464ed7bd2e9f1a8f10e308ec792 Mon Sep 17 00:00:00 2001 >> From: Rutger Helling >> Date: Wed, 8 Nov 2017 11:16:29 +0100 >> Subject: [PATCH] gnu: messaging: Add libsignal-protocol-c. >> >> * gnu/packages/messaging.scm (libsignal-protocol-c): New variable. > > [...] > >> + (arguments >> + `(#:tests? #f >> + ; Required for proper linking. >> + #:configure-flags '("-DBUILD_SHARED_LIBS=on"))) >> + ; FIXME: With the below additional flags the tests pass, however this >> + ; causes problems with timestamps, therefore the tests are disabled for >> + ; now: >> + ; -DCMAKE_BUILD_TYPE=Debug >> + ; -DBUILD_TESTING=1 > > What are the timestamp issues you're referring to above? It would be > nice if we could have our cake and eat it too. :-) > > Besides, the default in 'cmake-build-system' is > "-DCMAKE_BUILD_TYPE=RelWithDebugInfo" (i.e., "-O2 -g"), and I think we > should keep it this way here. > > Nipick: please use two semicolons for block comments like this (one > semicolon is for margin comments). > >> + (home-page "https://github.com/WhisperSystems/libsignal-protocol-c") >> + (synopsis "Ratcheting forward secrecy protocol") >> + (description "libsignal-protocol-c is a ratcheting forward secrecy protocol >> +that works in synchronous and asynchronous messaging environments.") > > Nitpicking here as well: it's an /implementation/ of the protocol. > Could you also expound the description a little bit? > >> + (license license:gpl3))) > > Since source file headers don't say anything particular, it's 'gpl3+' > ("or any later version".) > > Could you send an updated patch? > >> From db99f5874d24e0aa3e74005bf7200f459451aeb7 Mon Sep 17 00:00:00 2001 >> From: Rutger Helling >> Date: Wed, 8 Nov 2017 11:18:38 +0100 >> Subject: [PATCH] gnu: messaging: Enable OMEMO for dino. >> >> * gnu/packages/messaging.scm (dino) Update to commit f6ac5bbd26638412a2289fd1d28ef12de1d7e8b5. [inputs]: Add libsignal-protocol-c, libgcrypt. [arguments]: Change #configure-flags to "-DSHARED_SIGNAL_PROTOCOL=yes". > > OK! > > Thank you, > Ludo'. --=_57cfe50bb5a985e93b06c2ac8c6da897 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=UTF-8

Hey Ludo,

thanks for the review. Here's a second version of the first patch with y= our changes.
I've tried adding only -DBUILD_TESTING, and I think that = fixed the timestamp issues.
The tests now run properly and it seems to= build in a reproducible way.

The second patch is unchanged, but added again for convenience.

On 2017-11-14 23:46, ludo@gnu.org wrote:

= Hi Rutger,

Rutger Helling <rhelling@mykolab.com> skribis:

From 4212f0c4ffe43464ed7bd2e9f1a8f10e308ec792 Mon Sep = 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 8 Nov 2017 11:16= :29 +0100
Subject: [PATCH] gnu: messaging: Add libsignal-protocol-c= =2E

* gnu/packages/messaging.scm (libsignal-protocol-c): New v= ariable.

[...]

+  (arguments
+   `(#:tests? #f +     ; Required for proper linking.
+  = ;   #:configure-flags '("-DBUILD_SHARED_LIBS=3Don")))
= +     ; FIXME: With the below additional flags the test= s pass, however this
+     ; causes problems with= timestamps, therefore the tests are disabled for
+    = ; ; now:
+     ; -DCMAKE_BUILD_TYPE=3DDebug<= br /> +     ; -DBUILD_TESTING=3D1

What are the timestamp issues you're referring to above?  It wo= uld be
nice if we could have our cake and eat it too.  :-)
=
Besides, the default in 'cmake-build-system' is
"-DCMAKE_BUIL= D_TYPE=3DRelWithDebugInfo" (i.e., "-O2 -g"), and I think we
should ke= ep it this way here.

Nipick: please use two semicolons for blo= ck comments like this (one
semicolon is for margin comments).
<= br />
+  (home-page "https://github.com/WhisperSystems/libsignal-protocol-c")
+ &n= bsp;(synopsis "Ratcheting forward secrecy protocol")
+  (descrip= tion "libsignal-protocol-c is a ratcheting forward secrecy protocol
+= that works in synchronous and asynchronous messaging environments.")
Nitpicking here as well: it's an /implementation/ of the protocol. Could you also expound the description a little bit?

+  (license license:gpl3)))

Since source file headers don't say anything particular, it's 'gpl3+= '
("or any later version".)

Could you send an updated pa= tch?

From db99f5874d24e0aa3e74005bf7200f459451aeb7 Mon Sep = 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 8 Nov 2017 11:18= :38 +0100
Subject: [PATCH] gnu: messaging: Enable OMEMO for dino.

* gnu/packages/messaging.scm (dino) Update to commit f6ac5bbd2663= 8412a2289fd1d28ef12de1d7e8b5. [inputs]: Add libsignal-protocol-c, libgcrypt= =2E [arguments]: Change #configure-flags to "-DSHARED_SIGNAL_PROTOCOL=3Dyes= ".

OK!

Thank you,
Ludo'.


--=_57cfe50bb5a985e93b06c2ac8c6da897-- --=_f843cc9c972d0e1fd48d74e4873cca2f Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-gnu-messaging-Add-libsignal-protocol-c-v2.patch Content-Disposition: attachment; filename=0001-gnu-messaging-Add-libsignal-protocol-c-v2.patch; size=2384 RnJvbSBmODA1ZGM5MzE0OTY0ZjNjNjBkODI2NTFlN2YzMWUyYjQwMTExMTZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSdXRnZXIgSGVsbGluZyA8cmhlbGxpbmdAbXlrb2xhYi5jb20+ CkRhdGU6IFdlZCwgMTUgTm92IDIwMTcgMDg6MjY6MTcgKzAxMDAKU3ViamVjdDogW1BBVENIXSBn bnU6IG1lc3NhZ2luZzogQWRkIGxpYnNpZ25hbC1wcm90b2NvbC1jLgoKKiBnbnUvcGFja2FnZXMv bWVzc2FnaW5nLnNjbSAobGlic2lnbmFsLXByb3RvY29sLWMpOiBOZXcgdmFyaWFibGUuCi0tLQog Z251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20gfCAzMCArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251 L3BhY2thZ2VzL21lc3NhZ2luZy5zY20gYi9nbnUvcGFja2FnZXMvbWVzc2FnaW5nLnNjbQppbmRl eCA3MmRiYmNkMWUuLjc3YzEzZTJlNyAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL21lc3NhZ2lu Zy5zY20KKysrIGIvZ251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20KQEAgLTEyLDYgKzEyLDcgQEAK IDs7OyBDb3B5cmlnaHQgwqkgMjAxNyBBcnVuIElzYWFjIDxhcnVuaXNhYWNAc3lzdGVtcmVib290 Lm5ldD4KIDs7OyBDb3B5cmlnaHQgwqkgMjAxNyBUb2JpYXMgR2VlcmluY2t4LVJpY2UgPG1lQHRv Ymlhcy5ncj4KIDs7OyBDb3B5cmlnaHQgwqkgMjAxNyBUaGVvZG9yb3MgRm9yYWRpcyA8dGhlb2Rv cm9zQGZvcmFkaXMub3JnPgorOzs7IENvcHlyaWdodCDCqSAyMDE3IFJ1dGdlciBIZWxsaW5nIDxy aGVsbGluZ0BteWtvbGFiLmNvbT4KIDs7OwogOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBH dWl4LgogOzs7CkBAIC0xMjQsNiArMTI1LDM1IEBAIGtleXMsIG5vIHByZXZpb3VzIGNvbnZlcnNh dGlvbiBpcyBjb21wcm9taXNlZC4iKQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vb3RyLmN5cGhl cnB1bmtzLmNhLyIpCiAgICAgKGxpY2Vuc2UgKGxpc3QgbGljZW5zZTpsZ3BsMi4xIGxpY2Vuc2U6 Z3BsMikpKSkKIAorKGRlZmluZS1wdWJsaWMgbGlic2lnbmFsLXByb3RvY29sLWMKKyAgKHBhY2th Z2UKKyAgKG5hbWUgImxpYnNpZ25hbC1wcm90b2NvbC1jIikKKyAgKHZlcnNpb24gIjIuMy4xIikK KyAgKHNvdXJjZSAob3JpZ2luCisgICAgICAgICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAg ICAgICAodXJpIChzdHJpbmctYXBwZW5kICJodHRwczovL2dpdGh1Yi5jb20vV2hpc3BlclN5c3Rl bXMvIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJsaWJzaWduYWwtcHJvdG9jb2wt Yy9hcmNoaXZlL3YiIHZlcnNpb24KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLnRh ci5neiIpKQorICAgICAgICAgICAoZmlsZS1uYW1lIChzdHJpbmctYXBwZW5kIG5hbWUgIi0iIHZl cnNpb24gIi50YXIuZ3oiKSkKKyAgICAgICAgICAgKHNoYTI1NgorICAgICAgICAgICAgKGJhc2Uz MgorICAgICAgICAgICAgICIxa2x6OWp2Ym5tZmMzcXkyeDZxY3N3encxNGE3a3l6czUxZGxnMTh5 bGx2aXIxZjFrejBzIikpKSkKKyAgKGFyZ3VtZW50cworICAgYCg7OyBSZXF1aXJlZCBmb3IgcHJv cGVyIGxpbmtpbmcgYW5kIGZvciB0ZXN0cyB0byBydW4uCisgICAgICM6Y29uZmlndXJlLWZsYWdz ICcoIi1EQlVJTERfU0hBUkVEX0xJQlM9b24iICItREJVSUxEX1RFU1RJTkc9MSIpKSkKKyAgKGJ1 aWxkLXN5c3RlbSBjbWFrZS1idWlsZC1zeXN0ZW0pCisgIChpbnB1dHMgYCggOzsgUmVxdWlyZWQg Zm9yIHRlc3RzOgorICAgICAgICAgICAgKCJjaGVjayIsIGNoZWNrKQorICAgICAgICAgICAgKCJv cGVuc3NsIiwgb3BlbnNzbCkpKQorICAobmF0aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIsIHBr Zy1jb25maWcpKSkKKyAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL1doaXNwZXJTeXN0 ZW1zL2xpYnNpZ25hbC1wcm90b2NvbC1jIikKKyAgKHN5bm9wc2lzICJJbXBsZW1lbnRhdGlvbiBv ZiBhIHJhdGNoZXRpbmcgZm9yd2FyZCBzZWNyZWN5IHByb3RvY29sIikKKyAgKGRlc2NyaXB0aW9u ICJsaWJzaWduYWwtcHJvdG9jb2wtYyBpcyBhbiBpbXBsZW1lbnRhdGlvbiBvZiBhIHJhdGNoZXRp bmcKK2ZvcndhcmQgc2VjcmVjeSBwcm90b2NvbCB0aGF0IHdvcmtzIGluIHN5bmNocm9ub3VzIGFu ZCBhc3luY2hyb25vdXMKK21lc3NhZ2luZyBlbnZpcm9ubWVudHMuICBJdCBjYW4gYmUgdXNlZCB3 aXRoIG1lc3NhZ2luZyBzb2Z0d2FyZSB0byBwcm92aWRlCitlbmQtdG8tZW5kIGVuY3J5cHRpb24u IikKKyAgKGxpY2Vuc2UgbGljZW5zZTpncGwzKykpKQorCiAoZGVmaW5lLXB1YmxpYyBiaXRsYmVl CiAgIChwYWNrYWdlCiAgICAgKG5hbWUgImJpdGxiZWUiKQotLSAKMi4xNS4wCgo= --=_f843cc9c972d0e1fd48d74e4873cca2f Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0002-gnu-messaging-Enable-OMEMO-for-dino.patch Content-Disposition: attachment; filename=0002-gnu-messaging-Enable-OMEMO-for-dino.patch; size=2804 RnJvbSBkYjk5ZjU4NzRkMjRlMGFhM2U3NDAwNWJmNzIwMGY0NTk0NTFhZWI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSdXRnZXIgSGVsbGluZyA8cmhlbGxpbmdAbXlrb2xhYi5jb20+ CkRhdGU6IFdlZCwgOCBOb3YgMjAxNyAxMToxODozOCArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIGdu dTogbWVzc2FnaW5nOiBFbmFibGUgT01FTU8gZm9yIGRpbm8uCgoqIGdudS9wYWNrYWdlcy9tZXNz YWdpbmcuc2NtIChkaW5vKSBVcGRhdGUgdG8gY29tbWl0IGY2YWM1YmJkMjY2Mzg0MTJhMjI4OWZk MWQyOGVmMTJkZTFkN2U4YjUuIFtpbnB1dHNdOiBBZGQgbGlic2lnbmFsLXByb3RvY29sLWMsIGxp YmdjcnlwdC4gW2FyZ3VtZW50c106IENoYW5nZSAjY29uZmlndXJlLWZsYWdzIHRvICItRFNIQVJF RF9TSUdOQUxfUFJPVE9DT0w9eWVzIi4KLS0tCiBnbnUvcGFja2FnZXMvbWVzc2FnaW5nLnNjbSB8 IDE2ICsrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20gYi9n bnUvcGFja2FnZXMvbWVzc2FnaW5nLnNjbQppbmRleCA0ZjQzNmI1YTUuLjY3ZDM2OWZiZCAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20KKysrIGIvZ251L3BhY2thZ2VzL21l c3NhZ2luZy5zY20KQEAgLTU3MCw3ICs1NzAsNyBAQCBlbmQtdG8tZW5kIGVuY3J5cHRpb24gc3Vw cG9ydDsgWE1MIGNvbnNvbGUuIikKIChkZWZpbmUtcHVibGljIGRpbm8KICAgOzsgVGhlIG9ubHkg cmVsZWFzZSB0YXJiYWxsIGlzIGZvciB2ZXJzaW9uIDAuMCwgYnV0IGl0IGlzIHZlcnkgb2xkIGFu ZCBmYWlscwogICA7OyB0byBidWlsZC4KLSAgKGxldCAoKGNvbW1pdCAiNTRhMjVmZDkyNjA3MGE5 NzcxMzhjZWM5NDkwOGM1NTgwNmUyMmY0YSIpCisgIChsZXQgKChjb21taXQgImY2YWM1YmJkMjY2 Mzg0MTJhMjI4OWZkMWQyOGVmMTJkZTFkN2U4YjUiKQogICAgICAgICAocmV2aXNpb24gIjEiKSkK ICAgICAocGFja2FnZQogICAgICAgKG5hbWUgImRpbm8iKQpAQCAtNTc5LDE5ICs1NzksMTkgQEAg ZW5kLXRvLWVuZCBlbmNyeXB0aW9uIHN1cHBvcnQ7IFhNTCBjb25zb2xlLiIpCiAgICAgICAgICAg ICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCiAgICAgICAgICAgICAgICAgKHVyaSAoZ2l0LXJlZmVy ZW5jZQogICAgICAgICAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9kaW5v L2Rpbm8uZ2l0IikKLSAgICAgICAgICAgICAgICAgICAgICAoY29tbWl0IGNvbW1pdCkpKQorICAg ICAgICAgICAgICAgICAgICAgIChjb21taXQgY29tbWl0KQorICAgICAgICAgICAgICAgICAgICAg IChyZWN1cnNpdmU/ICN0KSkpIDsgTmVlZGVkIGZvciB0aGUgJ2xpYnNpZ25hbC1wcm90b2NvbC1j JworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDsgc3VibW9kdWxlLgog ICAgICAgICAgICAgICAgIChmaWxlLW5hbWUgKHN0cmluZy1hcHBlbmQgbmFtZSAiLSIgdmVyc2lv biAiLWNoZWNrb3V0IikpCiAgICAgICAgICAgICAgICAgKHNoYTI1NgogICAgICAgICAgICAgICAg ICAoYmFzZTMyCi0gICAgICAgICAgICAgICAgICAiMW0xMDB3enI1eHFhajNyNHZwcnhqMDk2MTgz M3dxazBwN3o5NG5tanNmMmYwczY3djVyMyIpKSkpCisgICAgICAgICAgICAgICAgICAiMTR2azVq bXZuOGlnamlrcnZnN3BpbnJ6YWh3OGdyeXlzYjF2OXkzdnc0N25jeWljOGI3cCIpKSkpCiAgICAg ICAoYnVpbGQtc3lzdGVtIGNtYWtlLWJ1aWxkLXN5c3RlbSkKICAgICAgIChhcmd1bWVudHMKICAg ICAgICBgKCM6dGVzdHM/ICNmIDsgdGhlcmUgYXJlIG5vIHRlc3RzCiAgICAgICAgICAjOnBhcmFs bGVsLWJ1aWxkPyAjZiA7IG5vdCBzdXBwb3J0ZWQKLSAgICAgICAgICM6Y29uZmlndXJlLWZsYWdz Ci0gICAgICAgICA7OyBGSVhNRTogd2UgZGlzYWJsZSB0aGUgb21lbW8gcGx1Z2luIGJlY2F1c2Ug aXQgbmVlZHMKLSAgICAgICAgIDs7IGxpYnNpZ25hbC1wcm90b2NvbCwgZm9yIHdoaWNoIHdlIGRv bid0IGhhdmUgYSBwYWNrYWdlIHlldC4KLSAgICAgICAgICcoIi1ERElTQUJMRURfUExVR0lOUz1v bWVtbyIpCisgICAgICAgICA7IFVzZSBvdXIgbGlic2lnbmFsLXByb3RvY29sLWMgaW5zdGVhZCBv ZiB0aGUgZ2l0IHN1Ym1vZHVsZS4KKyAgICAgICAgICM6Y29uZmlndXJlLWZsYWdzICcoIi1EU0hB UkVEX1NJR05BTF9QUk9UT0NPTD15ZXMiKQogICAgICAgICAgIzptb2R1bGVzICgoZ3VpeCBidWls ZCBjbWFrZS1idWlsZC1zeXN0ZW0pCiAgICAgICAgICAgICAgICAgICAgICgoZ3VpeCBidWlsZCBn bGliLW9yLWd0ay1idWlsZC1zeXN0ZW0pICM6cHJlZml4IGdsaWItb3ItZ3RrOikKICAgICAgICAg ICAgICAgICAgICAgKGd1aXggYnVpbGQgdXRpbHMpKQpAQCAtNjA0LDYgKzYwNCw4IEBAIGVuZC10 by1lbmQgZW5jcnlwdGlvbiBzdXBwb3J0OyBYTUwgY29uc29sZS4iKQogICAgICAgICAgICAgIChh c3NvYy1yZWYgZ2xpYi1vci1ndGs6JXN0YW5kYXJkLXBoYXNlcyAnZ2xpYi1vci1ndGstd3JhcCkp KSkpCiAgICAgICAoaW5wdXRzCiAgICAgICAgYCgoImxpYmdlZSIgLGxpYmdlZSkKKyAgICAgICAg ICgibGlic2lnbmFsLXByb3RvY29sLWMiLCBsaWJzaWduYWwtcHJvdG9jb2wtYykKKyAgICAgICAg ICgibGliZ2NyeXB0IiwgbGliZ2NyeXB0KQogICAgICAgICAgKCJsaWJzb3VwIiAsbGlic291cCkK ICAgICAgICAgICgic3FsaXRlIiAsc3FsaXRlKQogICAgICAgICAgKCJncGdtZSIgLGdwZ21lKQot LSAKMi4xNS4wCgo= --=_f843cc9c972d0e1fd48d74e4873cca2f--