From 6f987364f34531f4cc810d01c6152ea9f660df97 Mon Sep 17 00:00:00 2001
From: Matthew Martin <matthew@mttmartin.com>
Date: Jul 02 2024 16:48:03 +0000
Subject: [PATCH 1/3] Add directions for getting fedpkg working with http after MBS was decommissioned


Add directions for getting fedpkg working with http after MBS was decommissioned.  This shouldn't be relevant once https://pagure.io/fedpkg/pull-request/548 is merged and its package has been updated.
---

diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc
index 16ac612..b8fcc51 100644
--- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc
+++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc
@@ -590,6 +590,39 @@ check the `.git/config` file
 to ensure the remote repository is being accessed via an ssh:// protocol,
 and not git://.
 
+[#problems_pushing_to_forked_repository]
+=== Problems pushing to forked repisitory using http
+
+Pushing to your forked repository using http might fail with an error like this:
+
+```
+Please visit https://id.fedoraproject.org/openidc/Authorization?scope=openid+https%3A%2F%2Fid.fedoraproject.org%2Fscope%2Fgroups+https%3A%2F%2Fmbs.fedoraproject.org%2Foidc%2Fsubmit-build+https%3A%2F%2Fsrc.fedoraproject.org%2Fpush&response_type=code&client_id=fedpkg&redirect_uri=http%3A%2F%2Flocalhost%3A12345%2F&response_mode=query to grant authorization
+127.0.0.1 - - [14/Jun/2024 21:23:41] "GET /?error=invalid_scope&error_description=unknown+scope+https%3A%2F%2Fmbs.fedoraproject.org%2Foidc%2Fsubmit-build+requested HTTP/1.1" 200 47
+No token received.
+fatal: credential helper '/usr/bin/fedpkg gitcred' told us to quit
+Could not execute push: Failed to execute command.
+```
+
+This is caused by `fedpkg` failing to connect to MBS which has now been decomissioned. Removing the reference to MBS in `/etc/rpkg/fedpkg.conf` should fix this.
+
+Change this line in `fedpkg.conf`:
+```
+oidc_scopes = openid,https://id.fedoraproject.org/scope/groups,https://mbs.fedoraproject.org/oidc/submit-build,https://src.fedoraproject.org/push
+```
+
+to:
+```
+oidc_scopes = openid,https://id.fedoraproject.org/scope/groups,https://src.fedoraproject.org/push
+```
+
+The `fedpkg` tool clones repositories using the ssh:// protocol,
+so this should not be a problem normally
+(as long as you have your ssh key).
+If you cloned using the `git` utility itself,
+check the `.git/config` file
+to ensure the remote repository is being accessed via an ssh:// protocol,
+and not git://.
+
 [#it_builds_here_why_doesnt_it_build_there]
 === It builds here, why doesn't it build there?
 

From f7107c425f3760f1c993290f6ae1f4c14938dc5d Mon Sep 17 00:00:00 2001
From: Matthew Martin <matthew@mttmartin.com>
Date: Jul 02 2024 21:15:29 +0000
Subject: [PATCH 2/3] remove extra block


---

diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc
index b8fcc51..97077a6 100644
--- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc
+++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc
@@ -615,14 +615,6 @@ to:
 oidc_scopes = openid,https://id.fedoraproject.org/scope/groups,https://src.fedoraproject.org/push
 ```
 
-The `fedpkg` tool clones repositories using the ssh:// protocol,
-so this should not be a problem normally
-(as long as you have your ssh key).
-If you cloned using the `git` utility itself,
-check the `.git/config` file
-to ensure the remote repository is being accessed via an ssh:// protocol,
-and not git://.
-
 [#it_builds_here_why_doesnt_it_build_there]
 === It builds here, why doesn't it build there?
 

From df2a29ff48dca5860d5439b0f8790c9f2acd3864 Mon Sep 17 00:00:00 2001
From: Matthew Martin <matthew@mttmartin.com>
Date: Jul 02 2024 21:27:38 +0000
Subject: [PATCH 3/3] spelling


---

diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc
index 97077a6..a6a8006 100644
--- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc
+++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc
@@ -591,7 +591,7 @@ to ensure the remote repository is being accessed via an ssh:// protocol,
 and not git://.
 
 [#problems_pushing_to_forked_repository]
-=== Problems pushing to forked repisitory using http
+=== Problems pushing to forked repository using http
 
 Pushing to your forked repository using http might fail with an error like this: