From e5975b2b674df0b3b1020064547f3ceaeb02c2ce Mon Sep 17 00:00:00 2001
From: 0x1eef <0x1eef@protonmail.com>
Date: Tue, 10 Sep 2024 21:56:35 -0300
Subject: [PATCH] Default to a "stable" clone URL
---
README.md | 2 +-
bin/portzap | 2 +-
man/man8/portzap.8 | 2 +-
share/portzap/CHANGELOG | 12 ++++++++++++
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index fea683c..c82e7e2 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Install `/home/_portzap/ports/` into `/usr/ports/`
* __$PORTZAP\_CLONEURL__
The URL of a git repository
- Default: https://git.HardenedBSD.org/HardenedBSD/ports.git
+ Default: https://github.com/HardenedBSD/ports
* __$PORTZAP\_INSTALLDIR__
The directory where the ports collection will be installed
diff --git a/bin/portzap b/bin/portzap
index d93c919..c8defae 100755
--- a/bin/portzap
+++ b/bin/portzap
@@ -6,7 +6,7 @@ set -e
localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/..)}
libexec="${localbase}"/libexec/portzap
gitdir="/home/_portzap/ports"
-giturl="${PORTZAP_CLONEURL:-https://git.hardenedbsd.org/hardenedbsd/ports.git}"
+giturl="${PORTZAP_CLONEURL:-https://github.com/hardenedbsd/ports}"
installdir="${PORTZAP_INSTALLDIR:-/usr/ports}"
defaultbranch="hardenedbsd/main"
commitfile="${installdir}"/.portzap
diff --git a/man/man8/portzap.8 b/man/man8/portzap.8
index 53722c6..06b30b8 100644
--- a/man/man8/portzap.8
+++ b/man/man8/portzap.8
@@ -84,7 +84,7 @@ This command requires root privileges
.br
The URL of a git repository
.br
-Default: https://git.HardenedBSD.org/HardenedBSD/ports.git
+Default: https://github.com/HardenedBSD/ports
.sp
.Nm PORTZAP_INSTALLDIR
.br
diff --git a/share/portzap/CHANGELOG b/share/portzap/CHANGELOG
index 4dad4af..8912c43 100644
--- a/share/portzap/CHANGELOG
+++ b/share/portzap/CHANGELOG
@@ -2,6 +2,18 @@
* vNEXT
+**** Change default clone url
+After this change, the default clone URL points at
+the GitHub mirror: https://github.com/hardenedbsd/ports
+
+This change was made because clone and pull operations
+from ~git.hardenedbsd.org~ are not always stable, especially
+with big repositories like the ports collection
+
+The default can be changed through the environment variable
+~$PORTZAP_CLONEURL~, or by modifying the ~origin~ remote
+after a successful clone
+
**** Fix ~libexec/portzap/scripts/setup-doas~ bug
This change fixes a bug in ~setup-doas~ that could hang
the ~portzap setup~ command