From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jens Schmidt via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#63627: Improve plstore.el and fix various issues of it Date: Thu, 14 Sep 2023 23:24:54 +0200 Message-ID: References: <2063d5d2-ae9e-020a-3c19-54508ddbabab@vodafonemail.de> <37949bc5-c572-ff98-ebe6-9217ab7067cc@vodafonemail.de> <83cz2gfypg.fsf@gnu.org> <0101e7f1-970b-297c-836f-e9c0aa5e38a0@vodafonemail.de> <83cyz3g6oc.fsf@gnu.org> <8b00a564-c0d2-3072-50bc-530c50fa25b2@vodafonemail.de> <83pm319g3i.fsf@gnu.org> <24a502cc-9151-31bf-e0c6-078a400c6761@vodafonemail.de> <83r0naz6s1.fsf@gnu.org> <82b540c7-403b-3904-a16d-bda3c084f78a@vodafonemail.de> <83sf7pxlx9.fsf@gnu.org> <837cp0yk3q.fsf@gnu.org> Reply-To: Jens Schmidt Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------MaQ90VbJDIUcrtxjjUjdLe0h" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2145"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Cc: 63627@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Sep 14 23:26:30 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qgtr4-0000KP-9P for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 14 Sep 2023 23:26:30 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgtqZ-0000yH-6Q; Thu, 14 Sep 2023 17:25:59 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgtqW-0000xw-Pk for bug-gnu-emacs@gnu.org; Thu, 14 Sep 2023 17:25:56 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgtqW-00006i-Hy for bug-gnu-emacs@gnu.org; Thu, 14 Sep 2023 17:25:56 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qgtqc-00085U-Hy for bug-gnu-emacs@gnu.org; Thu, 14 Sep 2023 17:26:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jens Schmidt Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 Sep 2023 21:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63627 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 63627-submit@debbugs.gnu.org id=B63627.169472672831040 (code B ref 63627); Thu, 14 Sep 2023 21:26:02 +0000 Original-Received: (at 63627) by debbugs.gnu.org; 14 Sep 2023 21:25:28 +0000 Original-Received: from localhost ([127.0.0.1]:41321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgtq3-00084a-La for submit@debbugs.gnu.org; Thu, 14 Sep 2023 17:25:28 -0400 Original-Received: from mr5.vodafonemail.de ([145.253.228.165]:45398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgtq1-00084K-Dd for 63627@debbugs.gnu.org; Thu, 14 Sep 2023 17:25:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-21dec; t=1694726713; bh=oczIoSd8WzcbCjEi5w6++jTH1pNgk/LqzGbm0MT4V+o=; h=Content-Type:Message-ID:Date:User-Agent:Subject:To:References: Content-Language:From:In-Reply-To:From; b=EseTpQR5sBsSyCurptRV0qoXeUlJ4zvaHmP1AqqYdw+Q7vp9kWq2Agt57vOaEkOW/ u+Oc5OuI3V+F7KN8KpZF4Nco7cVqUBi/6BPq+Gx+p9idNy/I+HgSdSVhExH3L3AK9X 5LLhrGS5gK3XLcHxfUPw6n/uYFrS5h5lw0ho3Qs4= Original-Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr5.vodafonemail.de (Postfix) with ESMTPS id 4Rmr2K1lqfz1yLR; Thu, 14 Sep 2023 21:25:13 +0000 (UTC) Original-Received: from [192.168.178.41] (port-92-194-43-113.dynamic.as20676.net [92.194.43.113]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4Rmr294tnszHpxb; Thu, 14 Sep 2023 21:25:02 +0000 (UTC) Content-Language: de-DE-frami, en-US In-Reply-To: <837cp0yk3q.fsf@gnu.org> X-purgate-type: clean X-purgate: clean X-purgate-size: 4426 X-purgate-ID: 155817::1694726708-A3FFE18D-86A9E9EC/0/0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:270461 Archived-At: This is a multi-part message in MIME format. --------------MaQ90VbJDIUcrtxjjUjdLe0h Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 2023-09-08 13:34, Eli Zaretskii wrote: >> Date: Fri, 8 Sep 2023 11:16:50 +0200 >> From: Jens Schmidt >> Cc: 63627@debbugs.gnu.org >> >> Independently of the tests, I'll do the Emacs 29 bugs next, also on this >> bug. > > Thanks. After some consideration actually only one Emacs 29 bug requires fixing. Namely that the sequence: (setq plstore (plstore-open plstore-test-file)) (plstore-save plstore) (plstore-close plstore) silently drops any encrypted data in PLSTORE. Verified in my local master with the new ERT tests, and also verified that the attached patch fixes the issue. Please consider for committing on emacs-29. Thanks --------------MaQ90VbJDIUcrtxjjUjdLe0h Content-Type: text/x-patch; charset=UTF-8; name="0001-Fix-loss-of-encrypted-data-in-plstore.el.patch" Content-Disposition: attachment; filename="0001-Fix-loss-of-encrypted-data-in-plstore.el.patch" Content-Transfer-Encoding: base64 RnJvbSA3MGViZGNlZTc4MjAyMDcwYTU5Y2M5ZGJiMWZlOTZlYWJlZmQ5M2MxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGpzY2htaWR0NGdudUB2b2Rh Zm9uZW1haWwuZGU+CkRhdGU6IFR1ZSwgMzAgTWF5IDIwMjMgMjM6MDA6NTYgKzAyMDAKU3Vi amVjdDogW1BBVENIXSBGaXggbG9zcyBvZiBlbmNyeXB0ZWQgZGF0YSBpbiBwbHN0b3JlLmVs CgoqIGxpc3AvcGxzdG9yZS5lbCAocGxzdG9yZS0taW5zZXJ0LWJ1ZmZlcik6IEZpeCBsb3Nz IG9mIGVuY3J5cHRlZCBkYXRhCndoZW4gYSBwbHN0b3JlIGdldHMgb3BlbmVkIGFuZCBzYXZl ZCB3aXRob3V0IGJlaW5nIGRlY3J5cHRlZCBiZXR3ZWVuCnRoZXNlIHN0ZXBzLiAgKEJ1ZyM2 MzYyNykKLS0tCiBsaXNwL3Bsc3RvcmUuZWwgfCAyNCArKysrKysrKysrKysrKystLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2xpc3AvcGxzdG9yZS5lbCBiL2xpc3AvcGxzdG9yZS5lbAppbmRleCA3 ZGM5OTFhZWVjNy4uNzU4ZjlmYzcyOTIgMTAwNjQ0Ci0tLSBhL2xpc3AvcGxzdG9yZS5lbAor KysgYi9saXNwL3Bsc3RvcmUuZWwKQEAgLTU3MCwxOCArNTcwLDIzIEBAIHBsc3RvcmUtZGVs ZXRlCiAKIChkZWZ2YXIgcHAtZXNjYXBlLW5ld2xpbmVzKQogKGRlZnVuIHBsc3RvcmUtLWlu c2VydC1idWZmZXIgKHBsc3RvcmUpCi0gICJJbnNlcnQgdGhlIGZpbGUgcmVwcmVzZW50YXRp b24gb2YgUExTVE9SRSBhdCBwb2ludC4KLUFzc3VtZXMgdGhhdCBQTFNUT1JFIGhhcyBiZWVu IGRlY3J5cHRlZC4iCisgICJJbnNlcnQgdGhlIGZpbGUgcmVwcmVzZW50YXRpb24gb2YgUExT VE9SRSBhdCBwb2ludC4iCiAgIChpbnNlcnQgIjs7OyBwdWJsaWMgZW50cmllcyAtKi0gbW9k ZTogcGxzdG9yZSAtKi0gXG4iCiAJICAocHAtdG8tc3RyaW5nIChwbHN0b3JlLS1nZXQtYWxp c3QgcGxzdG9yZSkpKQotICAoaWYgKHBsc3RvcmUtLWdldC1zZWNyZXQtYWxpc3QgcGxzdG9y ZSkKKyAgKGxldCAoKHBwLWVzY2FwZS1uZXdsaW5lcyBuaWwpCisgICAgICAgIChjaXBoZXIg bmlsKSkKKyAgICAoY29uZAorICAgICA7OyBSZXVzZSB0aGUgZW5jcnlwdGVkIGRhdGEgYXMg Y2lwaGVyIHRleHQgaWYgdGhpcyBzdG9yZSBoYXMgbm90CisgICAgIDs7IGJlZW4gZGVjcnlw dGVkIHlldC4KKyAgICAgKChwbHN0b3JlLS1nZXQtZW5jcnlwdGVkLWRhdGEgcGxzdG9yZSkK KyAgICAgIChzZXRxIGNpcGhlciAocGxzdG9yZS0tZ2V0LWVuY3J5cHRlZC1kYXRhIHBsc3Rv cmUpKSkKKyAgICAgOzsgRW5jcnlwdCB0aGUgc2VjcmV0IGFsaXN0IHRvIGdlbmVyYXRlIHRo ZSBjaXBoZXIgdGV4dC4KKyAgICAgKChwbHN0b3JlLS1nZXQtc2VjcmV0LWFsaXN0IHBsc3Rv cmUpCiAgICAgICAobGV0ICgoY29udGV4dCAoZXBnLW1ha2UtY29udGV4dCAnT3BlblBHUCkp Ci0JICAgIChwcC1lc2NhcGUtbmV3bGluZXMgbmlsKQogCSAgICAocmVjaXBpZW50cwogCSAg ICAgKGNvbmQKIAkgICAgICAoKGxpc3RwIHBsc3RvcmUtZW5jcnlwdC10bykgcGxzdG9yZS1l bmNyeXB0LXRvKQotCSAgICAgICgoc3RyaW5ncCBwbHN0b3JlLWVuY3J5cHQtdG8pIChsaXN0 IHBsc3RvcmUtZW5jcnlwdC10bykpKSkKLQkgICAgY2lwaGVyKQorCSAgICAgICgoc3RyaW5n cCBwbHN0b3JlLWVuY3J5cHQtdG8pIChsaXN0IHBsc3RvcmUtZW5jcnlwdC10bykpKSkpCiAJ KHNldGYgKGVwZy1jb250ZXh0LWFybW9yIGNvbnRleHQpIHQpCiAJKGVwZy1jb250ZXh0LXNl dC1wYXNzcGhyYXNlLWNhbGxiYWNrCiAJIGNvbnRleHQKQEAgLTYwMSw5ICs2MDYsMTAgQEAg cGxzdG9yZS0taW5zZXJ0LWJ1ZmZlcgogSWYgbm8gb25lIGlzIHNlbGVjdGVkLCBzeW1tZXRy aWMgZW5jcnlwdGlvbiB3aWxsIGJlIHBlcmZvcm1lZC4gICIKIAkJCSAgIHJlY2lwaWVudHMp CiAJCQkoaWYgcGxzdG9yZS1lbmNyeXB0LXRvCi0JCQkgICAgKGVwZy1saXN0LWtleXMgY29u dGV4dCByZWNpcGllbnRzKSkpKSkKLQkoZ290by1jaGFyIChwb2ludC1tYXgpKQotCShpbnNl cnQgIjs7OyBzZWNyZXQgZW50cmllc1xuIiAocHAtdG8tc3RyaW5nIGNpcGhlcikpKSkpCisJ CQkgICAgKGVwZy1saXN0LWtleXMgY29udGV4dCByZWNpcGllbnRzKSkpKSkpKSkKKyAgICAo d2hlbiBjaXBoZXIKKyAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1heCkpCisgICAgICAoaW5z ZXJ0ICI7Ozsgc2VjcmV0IGVudHJpZXNcbiIgKHBwLXRvLXN0cmluZyBjaXBoZXIpKSkpKQog CiAoZGVmdW4gcGxzdG9yZS1zYXZlIChwbHN0b3JlKQogICAiU2F2ZSBQTFNUT1JFIHRvIGl0 cyBhc3NvY2lhdGVkIGZpbGUuCi0tIAoyLjMwLjIKCg== --------------MaQ90VbJDIUcrtxjjUjdLe0h--