From db994bcb4ca60f76ac4e513d43e57035141be7bd Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Feb 18 2023 19:23:25 +0000
Subject: Rebase to version 0.0.8


---

diff --git a/.gitignore b/.gitignore
index bd416ac..6451f48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /freeipa-fas-0.0.4.tar.gz
 /freeipa-fas-0.0.6.tar.gz
+/freeipa-fas-0.0.8.tar.gz
diff --git a/0001-create-agreement.py-fix-syntax-issue-and-blacken.patch b/0001-create-agreement.py-fix-syntax-issue-and-blacken.patch
new file mode 100644
index 0000000..c3fa290
--- /dev/null
+++ b/0001-create-agreement.py-fix-syntax-issue-and-blacken.patch
@@ -0,0 +1,37 @@
+From 59b673f3f314f564581532ed9df051191303abf8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
+Date: Mon, 4 Oct 2021 14:29:56 +0200
+Subject: [PATCH 1/2] create-agreement.py: fix syntax issue and blacken
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
+---
+ create-agreement.py | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/create-agreement.py b/create-agreement.py
+index 1c4cf37..a7fa30a 100755
+--- a/create-agreement.py
++++ b/create-agreement.py
+@@ -26,7 +26,15 @@ def main():
+     run_cmd(cmd)
+     # Create the corresponding group
+     group_name = f"signed_{agreement_name}"
+-    run_cmd(["ipa", "group-add", group_name, "--desc", f"Signers of the {agreement_name}""])
++    run_cmd(
++        [
++            "ipa",
++            "group-add",
++            group_name,
++            "--desc",
++            f"Signers of the {agreement_name}",
++        ]
++    )
+     # Add the automember rule
+     run_cmd(["ipa", "automember-add", "--type", "group", group_name])
+     run_cmd(
+-- 
+2.39.2
+
diff --git a/0002-Allow-IRC-channels-to-contain-Matrix-rooms-too.patch b/0002-Allow-IRC-channels-to-contain-Matrix-rooms-too.patch
new file mode 100644
index 0000000..b739084
--- /dev/null
+++ b/0002-Allow-IRC-channels-to-contain-Matrix-rooms-too.patch
@@ -0,0 +1,33 @@
+From 90108b83fbe0b9d93fbc0ff51ece424f50d36bb9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
+Date: Mon, 4 Oct 2021 14:30:46 +0200
+Subject: [PATCH 2/2] Allow IRC channels to contain Matrix rooms too
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is related to https://github.com/fedora-infra/noggin/pull/766
+
+Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
+---
+ ipaserver/plugins/fasutils.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/ipaserver/plugins/fasutils.py b/ipaserver/plugins/fasutils.py
+index f8fa9ec..f0844e0 100644
+--- a/ipaserver/plugins/fasutils.py
++++ b/ipaserver/plugins/fasutils.py
+@@ -42,7 +42,8 @@ class IRCChannel(Str):
+ 
+     def _convert_scalar(self, value, index=None):
+         value = super()._convert_scalar(value, index)
+-        value = value.lstrip("#")
+-        if not value.startswith("irc:"):
++        if ":/" not in value:
++            # Default to IRC
++            value = value.lstrip("#")
+             value = "irc:///{}".format(value)
+         return value
+-- 
+2.39.2
+
diff --git a/freeipa-fas.spec b/freeipa-fas.spec
index 636dc0e..9378e76 100644
--- a/freeipa-fas.spec
+++ b/freeipa-fas.spec
@@ -10,14 +10,18 @@
 %endif
 
 Name:           freeipa-%{plugin_name}
-Version:        0.0.6
-Release:        7%{?dist}
+Version:        0.0.8
+Release:        1%{?dist}
 Summary:        Fedora Account System extension for FreeIPA
 
 License:        GPLv3+
 URL:            https://github.com/fedora-infra/freeipa-%{plugin_name}
 Source0:        %{url}/archive/v%{version}/freeipa-%{plugin_name}-%{version}.tar.gz
 
+# Backports from upstream
+Patch0001:      0001-create-agreement.py-fix-syntax-issue-and-blacken.patch
+Patch0002:      0002-Allow-IRC-channels-to-contain-Matrix-rooms-too.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -45,7 +49,7 @@ A module for IdM with extensions for Fedora Account System.
 %endif
 
 %prep
-%autosetup -n freeipa-%{plugin_name}-%{version}
+%autosetup -n freeipa-%{plugin_name}-%{version} -p1
 
 %build
 # Nothing to build
@@ -103,6 +107,10 @@ fi
 %{_bindir}/ipa-create-agreement
 
 %changelog
+* Sat Feb 18 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.0.8-1
+- Rebase to version 0.0.8
+- Backport a couple of upstream fixes for the build
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 7eb6c2b..e5a592e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (freeipa-fas-0.0.6.tar.gz) = 90abf50eb817c48f7c2d0b355ea83322fce6f50470e8a4de0939315d4034a3831126201feeca404267df3e5853cb4684523c569a4e974e1228cb40f2d431af18
+SHA512 (freeipa-fas-0.0.8.tar.gz) = 2862efafddf19083a0e9741a9f17700358761af0e99c59a632ad53f2c866b528f1d6ae47a2bd838c606350ebf1055a9e59f0909f3fd48f26549dcf24ee570f15