[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1092253: libei: diff for NMU version 1.3.0-1.2



Package: libei
Version: 1.3.0-1.1
Severity: normal
Tags: patch  pending


Dear maintainer,

I've prepared an NMU for libei (versioned as 1.3.0-1.2). The diff
is attached to this message to fix #1084287

I uploaded without delay since it was caused by a bug introduced in my NMU.

Regards.

diff -Nru libei-1.3.0/debian/changelog libei-1.3.0/debian/changelog
--- libei-1.3.0/debian/changelog	2025-01-04 13:56:48.000000000 +0000
+++ libei-1.3.0/debian/changelog	2025-01-06 15:19:16.000000000 +0000
@@ -1,3 +1,10 @@
+libei (1.3.0-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix typo in the patch from 1.3.0-1.1 that broke the package.
+
+ -- Niels Thykier <niels@thykier.net>  Mon, 06 Jan 2025 15:19:16 +0000
+
 libei (1.3.0-1.1) unstable; urgency=medium
    * Non-maintainer upload.
diff -Nru libei-1.3.0/debian/patches/fix-infinite-recursion.patch libei-1.3.0/debian/patches/fix-infinite-recursion.patch --- libei-1.3.0/debian/patches/fix-infinite-recursion.patch 2025-01-04 13:56:02.000000000 +0000 +++ libei-1.3.0/debian/patches/fix-infinite-recursion.patch 2025-01-06 15:18:16.000000000 +0000
@@ -9,16 +9,15 @@
  --- libei-1.3.0.orig/proto/ei-scanner
 +++ libei-1.3.0/proto/ei-scanner
-@@ -152,6 +152,13 @@ class Argument:
+@@ -152,6 +152,12 @@ class Argument:
              allow_null=allow_null,
          )
  -+    ++
 +# avoid infinite _arg / _arg_for recursion (#1084247)
-+inner_attribute_eq = Attribute.__eq__
-+Attribute.__eq__ = lambda self, other: (self is other or
-+           inner_attribute_eq(self, other))
-+del inner_attribute_eq
++inner_argument_eq = Argument.__eq__
++Argument.__eq__ = lambda self, other: (self is other or inner_argument_eq(self, other))
++del inner_argument_eq
 +
    @attr.s

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature


Reply to: