diff -Nru ceph-iscsi-3.4/debian/changelog ceph-iscsi-3.4/debian/changelog --- ceph-iscsi-3.4/debian/changelog 2021-06-24 06:33:10.000000000 +0100 +++ ceph-iscsi-3.4/debian/changelog 2022-03-15 10:07:52.000000000 +0000 @@ -1,3 +1,10 @@ +ceph-iscsi (3.4-1ubuntu2) impish; urgency=medium + + * d/p/ceph-rm-blacklist-decode.patch: Remove attempt to look for + string in a byte type (LP: #1883112). + + -- Liam Young Tue, 15 Mar 2022 10:07:52 +0000 + ceph-iscsi (3.4-1ubuntu1) impish; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru ceph-iscsi-3.4/debian/patches/ceph-rm-blacklist-decode.patch ceph-iscsi-3.4/debian/patches/ceph-rm-blacklist-decode.patch --- ceph-iscsi-3.4/debian/patches/ceph-rm-blacklist-decode.patch 1970-01-01 01:00:00.000000000 +0100 +++ ceph-iscsi-3.4/debian/patches/ceph-rm-blacklist-decode.patch 2022-03-15 10:07:36.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/ceph_iscsi_config/gateway.py ++++ b/ceph_iscsi_config/gateway.py +@@ -43,7 +43,7 @@ + client_name=conf.cluster_client_name, + cephconf=conf.cephconf), + stderr=subprocess.STDOUT, shell=True) +- if ("un-blacklisting" in result) or ("isn't blacklisted" in result): ++ if (b"un-blacklisting" in result) or (b"isn't blacklisted" in result): + self.logger.info("Successfully removed blacklist entry") + return True + else: diff -Nru ceph-iscsi-3.4/debian/patches/series ceph-iscsi-3.4/debian/patches/series --- ceph-iscsi-3.4/debian/patches/series 2021-01-20 15:21:38.000000000 +0000 +++ ceph-iscsi-3.4/debian/patches/series 2022-03-15 10:06:54.000000000 +0000 @@ -1,2 +1,3 @@ 0001-Replace-etc-sysconfig-ceph-by-etc-default-ceph-in-se.patch ubuntu-support.patch +ceph-rm-blacklist-decode.patch