[PR PATCH] chroot-git: allow to fetch from http(s) remotes

[PR PATCH] chroot-git: allow to fetch from http(s) remotes

[sgn]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages chroot-git-http-fetch
https://github.com/void-linux/void-packages/pull/33888

chroot-git: allow to fetch from http(s) remotes
libcurl has been part of stage2 chroot from a long time ago due to:

	binutils -> libdebuginfod -> libcurl

<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

A patch file from https://github.com/void-linux/void-packages/pull/33888.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chroot-git-http-fetch-33888.patch --]
[-- Type: text/x-diff, Size: 2016 bytes --]

From 24cb9bdbb1909844d30fcdd25ec485f20641bba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 4 Nov 2021 06:40:16 +0700
Subject: [PATCH] chroot-git: allow to fetch from http(s) remotes

libcurl has been part of stage2 chroot from a long time ago due to:

	binutils -> libdebuginfod -> libcurl
---
 srcpkgs/chroot-git/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 66a46988cdcd..659cb124fc1d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
 version=2.33.1
-revision=1
+revision=2
 bootstrap=yes
 wrksrc="git-${version}"
 makedepends="zlib-devel"
@@ -14,6 +14,7 @@ checksum=e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
+	makedepends+=" libcurl-devel"
 fi
 
 do_configure() {
@@ -30,7 +31,6 @@ do_configure() {
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
 	USE_LIBPCRE2 :=
-	NO_CURL = Yes
 	NO_EXPAT = Yes
 	NO_PERL = Yes
 	NO_PYTHON = Yes
@@ -50,12 +50,15 @@ do_configure() {
 		EOF
 	fi
 	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+		cat <<-EOF >>config.mak
+		ZLIB_PATH = ${XBPS_MASTERDIR}/usr
+		NO_CURL = Yes
+		EOF
 	fi
 }
 
 do_build() {
-	make ${makejobs} git
+	make ${makejobs} git git-http-fetch git-remote-http
 }
 
 do_check() {
@@ -64,8 +67,10 @@ do_check() {
 
 do_install() {
 	vbin git chroot-git
-	vmkdir usr/libexec/chroot-git
+	vinstall git-http-fetch 755 usr/libexec/chroot-git
+	vinstall git-remote-http 755 usr/libexec/chroot-git
 	ln -s ../../bin/chroot-git $DESTDIR/usr/libexec/chroot-git/git
 	ln -s git $DESTDIR/usr/libexec/chroot-git/git-upload-pack
 	ln -s git $DESTDIR/usr/libexec/chroot-git/git-receive-pack
+	ln -s git-remote-http $DESTDIR/usr/libexec/chroot-git/git-remote-https
 }

Re: [PR REVIEW] chroot-git: allow to fetch from http(s) remotes

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33888#discussion_r742434929

Comment:
Shouldn't this also be conditional?

Re: [PR REVIEW] chroot-git: allow to fetch from http(s) remotes

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33888#discussion_r742435089

Comment:
Same with these?

Re: [PR PATCH] [Updated] chroot-git: allow to fetch from http(s) remotes

[sgn]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages chroot-git-http-fetch
https://github.com/void-linux/void-packages/pull/33888

chroot-git: allow to fetch from http(s) remotes
libcurl has been part of stage2 chroot from a long time ago due to:

	binutils -> libdebuginfod -> libcurl

<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

A patch file from https://github.com/void-linux/void-packages/pull/33888.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chroot-git-http-fetch-33888.patch --]
[-- Type: text/x-diff, Size: 2027 bytes --]

From fa34832eafd22f60685fd9ae6c83ad0bfc810f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 4 Nov 2021 06:40:16 +0700
Subject: [PATCH] chroot-git: allow to fetch from http(s) remotes

libcurl has been part of stage2 chroot from a long time ago due to:

	binutils -> libdebuginfod -> libcurl
---
 srcpkgs/chroot-git/template | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 66a46988cdcd..3a65c9c0617b 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
 version=2.33.1
-revision=1
+revision=2
 bootstrap=yes
 wrksrc="git-${version}"
 makedepends="zlib-devel"
@@ -14,6 +14,7 @@ checksum=e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
+	makedepends+=" libcurl-devel"
 fi
 
 do_configure() {
@@ -30,7 +31,6 @@ do_configure() {
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
 	USE_LIBPCRE2 :=
-	NO_CURL = Yes
 	NO_EXPAT = Yes
 	NO_PERL = Yes
 	NO_PYTHON = Yes
@@ -50,12 +50,18 @@ do_configure() {
 		EOF
 	fi
 	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+		cat <<-EOF >>config.mak
+		ZLIB_PATH = ${XBPS_MASTERDIR}/usr
+		NO_CURL = Yes
+		EOF
 	fi
 }
 
 do_build() {
 	make ${makejobs} git
+	if [ "$CHROOT_READY" ]; then
+		make ${makejobs} git-http-fetch git-remote-http
+	fi
 }
 
 do_check() {
@@ -68,4 +74,10 @@ do_install() {
 	ln -s ../../bin/chroot-git $DESTDIR/usr/libexec/chroot-git/git
 	ln -s git $DESTDIR/usr/libexec/chroot-git/git-upload-pack
 	ln -s git $DESTDIR/usr/libexec/chroot-git/git-receive-pack
+	if [ "$CHROOT_READY" ]; then
+		vinstall git-http-fetch 755 usr/libexec/chroot-git
+		vinstall git-remote-http 755 usr/libexec/chroot-git
+		ln -s git-remote-http \
+			$DESTDIR/usr/libexec/chroot-git/git-remote-https
+	fi
 }

Re: [PR REVIEW] chroot-git: allow to fetch from http(s) remotes

[sgn]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/33888#discussion_r742476923

Comment:
yes

Re: chroot-git: allow to fetch from http(s) remotes

[the-maldridge]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/33888#issuecomment-961644481

Comment:
All tests pass and the review feedback has been addressed.  Any other concerns @Johnnynator ?

Re: chroot-git: allow to fetch from http(s) remotes

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33888#issuecomment-961815575

Comment:
:shipit: 

Re: [PR PATCH] [Merged]: chroot-git: allow to fetch from http(s) remotes

[the-maldridge]

[-- Attachment #1: Type: text/plain, Size: 511 bytes --]

There's a merged pull request on the void-packages repository

chroot-git: allow to fetch from http(s) remotes
https://github.com/void-linux/void-packages/pull/33888

Description:
libcurl has been part of stage2 chroot from a long time ago due to:

	binutils -> libdebuginfod -> libcurl

<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me