Bug#927259: release.debian.org: unblock request: nheko
Control: tags -1 - moreinfo
On Sat, 20 Apr 2019 18:20:00 +, Niels Thykier said:
> Please go ahead with the upload including the two extra changes you
> mentioned above and remove the moreinfo tag when it is in unstable and
> ready to be unblocked.
Done. Thank you for approving the changes.
> For future reference: We generally prefer seeing the debdiff before
> approving the changes. Had the two extra changes not been obvious
> from your description, then it would have been necessary for me to ask
> you for the full debdiff. Please make it easier for us by always
> including the changes you want us to consider (modulo filterdiff of
> auto-generated files).
Noted. I wasn't sure about the process, but will do so in the future.
For reference, here is the complete debdiff.
--
Hubert Chathi -- https://www.uhoreg.ca/
Jabber: hub...@uhoreg.ca -- Matrix: @uhoreg:matrix.org
PGP/GnuPG key: 4096R/F24C F749 6C73 DDB8 DCB8 72DE B2DE 88D3 113A 1368
diff -Nru nheko-0.6.3/debian/changelog nheko-0.6.3/debian/changelog
--- nheko-0.6.3/debian/changelog 2019-02-08 15:35:59.0 -0500
+++ nheko-0.6.3/debian/changelog 2019-04-22 14:42:00.0 -0400
@@ -1,3 +1,11 @@
+nheko (0.6.3-2) unstable; urgency=medium
+
+ * Support v3 rooms (Closes: #926671)
+ * debian/rules: clean up fakehome (Closes: #926680)
+ * debian/README.source: fix filename (Closes: #926659)
+
+ -- Hubert Chathi Mon, 22 Apr 2019 14:42:00 -0400
+
nheko (0.6.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru nheko-0.6.3/debian/patches/series nheko-0.6.3/debian/patches/series
--- nheko-0.6.3/debian/patches/series 2019-02-08 15:35:01.0 -0500
+++ nheko-0.6.3/debian/patches/series 2019-04-08 17:57:30.0 -0400
@@ -1,2 +1,3 @@
no_rpath
nlohmann-json
+v3_support
diff -Nru nheko-0.6.3/debian/patches/v3_support nheko-0.6.3/debian/patches/v3_support
--- nheko-0.6.3/debian/patches/v3_support 1969-12-31 19:00:00.0 -0500
+++ nheko-0.6.3/debian/patches/v3_support 2019-04-08 17:56:34.0 -0400
@@ -0,0 +1,27 @@
+Author: redsky17
+Bug: https://github.com/Nheko-Reborn/mtxclient/issues/3
+Bug-Debian: https://bugs.debian.org/926671
+Description: Fix Room v3 Issue
+ This at least partially addresses #3. I have a feeling that
+ additional updates will be needed at some point, but this
+ fixes the issue where mtxclient would throw an exception for
+ unrecognized event id formats, which caused nheko to crash.
+Origin: backport, https://github.com/Nheko-Reborn/mtxclient/commit/67d39691666bcdf3cc660db19ccc0d9941df13fd
+Last-Update: 2019-04-08
+
+diff --git a/mtxclient/include/mtx/identifiers.hpp b/mtxclient/include/mtx/identifiers.hpp
+index 87acc43..7885885 100644
+--- a/mtxclient/include/mtx/identifiers.hpp
b/mtxclient/include/mtx/identifiers.hpp
+@@ -90,7 +90,10 @@ parse(const std::string )
+ identifier.hostname_ = id.substr(parts + 1);
+ identifier.id_= id;
+ } else {
+-throw std::invalid_argument(id + ": invalid format\n");
++// V3 event ids don't use ':' at all, don't parse them the same way.
++identifier.localpart_ = id;
++identifier.hostname_ = id;
++identifier.id_ = id;
+ }
+
+ return identifier;
diff -Nru nheko-0.6.3/debian/README.source nheko-0.6.3/debian/README.source
--- nheko-0.6.3/debian/README.source 1969-12-31 19:00:00.0 -0500
+++ nheko-0.6.3/debian/README.source 2019-02-08 15:35:01.0 -0500
@@ -0,0 +1,13 @@
+nheko for Debian
+
+
+Since nheko is currently the only package that uses mtxclient, and nheko links
+to it statically, we include the sources for mtxclient with nheko's source. If
+you have separate tarballs for nheko and mtxclient, the tarball for nheko
+should be named normally for an orig.tar.* file, and the tarball for
+matrix-structs should be named nheko_.orig-mtxclient.tar.*. If
+you have an unpacked source (with the appropriate version of mtxclient placed
+in the mtxclient directory), then you can run "debian/rules make-orig-source"
+to create the tarballs for nheko and mtxclient.
+
+ -- Hubert Chathi , Wed, 26 Sep 2018 19:38:58 -0400
diff -Nru nheko-0.6.3/debian/README.sources nheko-0.6.3/debian/README.sources
--- nheko-0.6.3/debian/README.sources 2019-02-08 15:35:01.0 -0500
+++ nheko-0.6.3/debian/README.sources 1969-12-31 19:00:00.0 -0500
@@ -1,13 +0,0 @@
-nheko for Debian
-
-
-Since nheko is currently the only package that uses mtxclient, and nheko links
-to it statically, we include the sources for mtxclient with nheko's source. If
-you have separate tarballs for nheko and mtxclient, the tarball for nheko
-should be named normally for an orig.tar.* file, and the tarball for
-matrix-structs should be named nheko_.orig-mtxclient.tar.*. If
-you have an unpacked source (with the appropriate version of mtxclient placed
-in the mtxclient directory), then you can
Bug#927259: release.debian.org: unblock request: nheko
Control: tags -1 moreinfo confirmed Hubert Chathi: > Package: release.debian.org > Severity: normal > > Hello release team. > > I would like to upload a new version of nheko to fix #926671. It is an > "important" bug (though in reality, it could be argued that it is > "serious", as Matrix will be bumping the default room version soon, > which will cause the bug to manifest much more commonly, making the > program less usable). > > The fix is to apply a small patch from upstream. Attached is a debdiff. > > In addition to the above issue, I would like to also include fixes for > the following bugs, which are not included in the attached debdiff, but > are fairly trivial: > > - #926659 - incorrectly named file (debian/README.sources instead of > debian/README.source) -- has an obvious fix > - #926680 - a working directory is not properly cleaned up if the build > fails -- I would just add the working directory to the list of files > that are "rm -rf"-ed in override_dh_auto_clean. > > [...] > Hi, Please go ahead with the upload including the two extra changes you mentioned above and remove the moreinfo tag when it is in unstable and ready to be unblocked. For future reference: We generally prefer seeing the debdiff before approving the changes. Had the two extra changes not been obvious from your description, then it would have been necessary for me to ask you for the full debdiff. Please make it easier for us by always including the changes you want us to consider (modulo filterdiff of auto-generated files). Thanks, ~Niels
Bug#927259: release.debian.org: unblock request: nheko
Package: release.debian.org
Severity: normal
Hello release team.
I would like to upload a new version of nheko to fix #926671. It is an
"important" bug (though in reality, it could be argued that it is
"serious", as Matrix will be bumping the default room version soon,
which will cause the bug to manifest much more commonly, making the
program less usable).
The fix is to apply a small patch from upstream. Attached is a debdiff.
In addition to the above issue, I would like to also include fixes for
the following bugs, which are not included in the attached debdiff, but
are fairly trivial:
- #926659 - incorrectly named file (debian/README.sources instead of
debian/README.source) -- has an obvious fix
- #926680 - a working directory is not properly cleaned up if the build
fails -- I would just add the working directory to the list of files
that are "rm -rf"-ed in override_dh_auto_clean.
-- System Information:
Debian Release: 9.8
APT prefers stable
APT policy: (990, 'stable'), (500, 'stable-updates'), (300, 'testing'), (200,
'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.19.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en_GB (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru nheko-0.6.3/debian/changelog nheko-0.6.3/debian/changelog
--- nheko-0.6.3/debian/changelog 2019-02-08 15:35:59.0 -0500
+++ nheko-0.6.3/debian/changelog 2019-04-08 18:00:01.0 -0400
@@ -1,3 +1,9 @@
+nheko (0.6.3-2) unstable; urgency=medium
+
+ * Support v3 rooms (Closes: #926671)
+
+ -- Hubert Chathi Mon, 08 Apr 2019 18:00:01 -0400
+
nheko (0.6.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru nheko-0.6.3/debian/patches/series nheko-0.6.3/debian/patches/series
--- nheko-0.6.3/debian/patches/series 2019-02-08 15:35:01.0 -0500
+++ nheko-0.6.3/debian/patches/series 2019-04-08 17:57:30.0 -0400
@@ -1,2 +1,3 @@
no_rpath
nlohmann-json
+v3_support
diff -Nru nheko-0.6.3/debian/patches/v3_support nheko-0.6.3/debian/patches/v3_support
--- nheko-0.6.3/debian/patches/v3_support 1969-12-31 19:00:00.0 -0500
+++ nheko-0.6.3/debian/patches/v3_support 2019-04-08 17:56:34.0 -0400
@@ -0,0 +1,27 @@
+Author: redsky17
+Bug: https://github.com/Nheko-Reborn/mtxclient/issues/3
+Bug-Debian: https://bugs.debian.org/926671
+Description: Fix Room v3 Issue
+ This at least partially addresses #3. I have a feeling that
+ additional updates will be needed at some point, but this
+ fixes the issue where mtxclient would throw an exception for
+ unrecognized event id formats, which caused nheko to crash.
+Origin: backport, https://github.com/Nheko-Reborn/mtxclient/commit/67d39691666bcdf3cc660db19ccc0d9941df13fd
+Last-Update: 2019-04-08
+
+diff --git a/mtxclient/include/mtx/identifiers.hpp b/mtxclient/include/mtx/identifiers.hpp
+index 87acc43..7885885 100644
+--- a/mtxclient/include/mtx/identifiers.hpp
b/mtxclient/include/mtx/identifiers.hpp
+@@ -90,7 +90,10 @@ parse(const std::string )
+ identifier.hostname_ = id.substr(parts + 1);
+ identifier.id_= id;
+ } else {
+-throw std::invalid_argument(id + ": invalid format\n");
++// V3 event ids don't use ':' at all, don't parse them the same way.
++identifier.localpart_ = id;
++identifier.hostname_ = id;
++identifier.id_ = id;
+ }
+
+ return identifier;
