[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/purple-lurch][debian/master] 3 commits: d/patches: Fix test failure on mipsel

Thu Oct 29 20:48:24 GMT 2020


Evangelos Ribeiro Tzaras pushed to branch debian/master at Debian On Mobile / purple-lurch


Commits:
40170928 by Evangelos Ribeiro Tzaras at 2020-10-29T21:36:37+01:00
d/patches: Fix test failure on mipsel

The patches by Guido should fix the build failures
on mipsel and likely mipsel64 and armel

- - - - -
5893d68f by Evangelos Ribeiro Tzaras at 2020-10-29T21:38:25+01:00
d/patches: mention forwarded patches

- - - - -
889a2ebd by Evangelos Ribeiro Tzaras at 2020-10-29T21:47:56+01:00
d/changelog: update to 0.6.8+git20200527.388605-3

- - - - -


6 changed files:

- debian/changelog
- debian/patches/0000-use-packaged-libraries.patch
- debian/patches/0002-report-decrypt-failures.patch
- + debian/patches/0003-__wrap_purple_account_get_connection-Return-a-pointe.patch
- + debian/patches/0004-test_lurch_api_id_remove_handler-Use-purple-account.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+purple-lurch (0.6.8+git20200527.388605-3) unstable; urgency=medium
+
+  [ Evangelos Ribeiro Tzaras ]
+  * d/patches: Fix test failure on mipsel
+  * d/patches: mention forwarded patches
+
+ --  Evangelos Ribeiro Tzaras <devrtz-debian at fortysixandtwo.eu>  Thu, 29 Oct 2020 21:43:15 +0100
+
 purple-lurch (0.6.8+git20200527.388605-2) unstable; urgency=medium
 
   * Updated VCS fields in d/control to point to the right repo


=====================================
debian/patches/0000-use-packaged-libraries.patch
=====================================
@@ -1,5 +1,6 @@
 From: Evangelos Ribeiro Tzaras <devrtz-debian at fortysixandtwo.eu>
 Subject: Switch to packaged libraries instead of using git submodules
+Forwarded: https://github.com/gkdr/lurch/pull/151
 --- a/Makefile
 +++ b/Makefile
 @@ -25,6 +25,15 @@


=====================================
debian/patches/0002-report-decrypt-failures.patch
=====================================
@@ -2,6 +2,7 @@ From: Evangelos Ribeiro Tzaras <devrtz-debian at fortysixandtwo.eu>
 Subject: Report decryption failure to user
 Origin: https://github.com/gkdr/lurch/pull/150
 Description: This makes sure users know they are missing messages
+Forwarded: now merged
 --- a/src/lurch.c
 +++ b/src/lurch.c
 @@ -1806,7 +1806,11 @@


=====================================
debian/patches/0003-__wrap_purple_account_get_connection-Return-a-pointe.patch
=====================================
@@ -0,0 +1,30 @@
+From 7e3a8567ba0ae86b46078ba09211bbcdf33f2854 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 28 Oct 2020 20:47:00 +0100
+Subject: [PATCH 1/2] __wrap_purple_account_get_connection: Return a pointer
+ when expected
+
+Architectures like mips are not that forgiving when we claim to return
+a pointer but are void.
+---
+ test/test_lurch_api.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/test_lurch_api.c b/test/test_lurch_api.c
+index 8ce6f3a..a00f950 100644
+--- a/test/test_lurch_api.c
++++ b/test/test_lurch_api.c
+@@ -31,8 +31,9 @@ int __wrap_omemo_storage_user_devicelist_retrieve(const char * user, const char
+     return ret_val;
+ }
+ 
+-void __wrap_purple_account_get_connection(PurpleAccount * acc_p) {
++void *__wrap_purple_account_get_connection(PurpleAccount * acc_p) {
+     function_called();
++    return NULL;
+ }
+ 
+ void __wrap_purple_signal_register() {
+-- 
+2.28.0
+


=====================================
debian/patches/0004-test_lurch_api_id_remove_handler-Use-purple-account.patch
=====================================
@@ -0,0 +1,34 @@
+From dcfd349b29b3e48205cbb22a3d8d0822d86bfb45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 28 Oct 2020 20:47:02 +0100
+Subject: [PATCH 2/2] test_lurch_api_id_remove_handler: Use purple account
+
+Otherwise we pass in a too small structure.
+---
+ test/test_lurch_api.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/test_lurch_api.c b/test/test_lurch_api.c
+index a00f950..f457331 100644
+--- a/test/test_lurch_api.c
++++ b/test/test_lurch_api.c
+@@ -248,6 +248,7 @@ static void lurch_api_id_remove_handler_cb_mock(int32_t err, void * user_data_p)
+  */
+ static void test_lurch_api_id_remove_handler(void ** state) {
+     (void) state;
++    PurpleAccount p = { 0 };
+ 
+     const char * test_jid = "me-testing at test.org/resource";
+     will_return(__wrap_purple_account_get_username, test_jid);
+@@ -274,7 +275,7 @@ static void test_lurch_api_id_remove_handler(void ** state) {
+     expect_value(lurch_api_id_remove_handler_cb_mock, err, EXIT_SUCCESS);
+     expect_value(lurch_api_id_remove_handler_cb_mock, user_data_p, test_user_data);
+ 
+-    lurch_api_id_remove_handler((void *) "ignored", 1337, lurch_api_id_remove_handler_cb_mock, test_user_data);
++    lurch_api_id_remove_handler(&p, 1337, lurch_api_id_remove_handler_cb_mock, test_user_data);
+ }
+ 
+ /**
+-- 
+2.28.0
+


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,6 @@
 0000-use-packaged-libraries.patch
 0001-fix_reprotest_by_sorting.patch
 0002-report-decrypt-failures.patch
+0003-__wrap_purple_account_get_connection-Return-a-pointe.patch
+0004-test_lurch_api_id_remove_handler-Use-purple-account.patch
+



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/purple-lurch/-/compare/2bd099b574dfb12bc728c40a5bd373964dd8dda9...889a2ebd04599e3e71b040d305a5e0dc9ba4cfd5

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/purple-lurch/-/compare/2bd099b574dfb12bc728c40a5bd373964dd8dda9...889a2ebd04599e3e71b040d305a5e0dc9ba4cfd5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20201029/3ff7ab83/attachment-0001.html>
