[PR PATCH] New package: chroot-curl-7.79.1

[PR PATCH] New package: chroot-curl-7.79.1

[ericonr]

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

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

https://github.com/ericonr/void-packages chroot-curl
https://github.com/void-linux/void-packages/pull/33851

New package: chroot-curl-7.79.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chroot-curl-33851.patch --]
[-- Type: text/x-diff, Size: 1395 bytes --]

From 61d05f72f836d538807311658567c312409fe24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 31 Oct 2021 15:48:02 -0300
Subject: [PATCH] New package: chroot-curl-7.79.1

---
 srcpkgs/chroot-curl/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/chroot-curl/template

diff --git a/srcpkgs/chroot-curl/template b/srcpkgs/chroot-curl/template
new file mode 100644
index 000000000000..e2c744f08e3c
--- /dev/null
+++ b/srcpkgs/chroot-curl/template
@@ -0,0 +1,25 @@
+# Template file for 'chroot-curl'
+pkgname=chroot-curl
+version=7.79.1
+revision=1
+bootstrap=yes
+wrksrc=curl-${version}
+build_style=gnu-configure
+configure_args="--enable-threaded-resolver --enable-ipv6 --with-openssl
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt ac_cv_sizeof_off_t=8
+ --disable-shared"
+hostmakedepends="perl pkg-config"
+makedepends="openssl-devel zlib-devel"
+depends="ca-certificates"
+short_desc="Client that groks URLs - chroot package"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://curl.haxx.se"
+changelog="https://curl.haxx.se/changes.html#${version//./_}"
+distfiles="${homepage}/download/curl-${version}.tar.bz2"
+checksum=de62c4ab9a9316393962e8b94777a570bb9f71feb580fb4475e412f2f9387851
+
+do_install() {
+	vbin src/curl chroot-curl
+	vlicense COPYING
+}

Re: [PR REVIEW] New package: chroot-curl-7.79.1

[the-maldridge]

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

New review comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/33851#discussion_r739953905

Comment:
This should not be flagged as bootstrap=yes.

Re: [PR REVIEW] New package: chroot-curl-7.79.1

[the-maldridge]

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

New review comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/33851#discussion_r739953857

Comment:
This can be assigned to me.  Ultimately I'd like to have infrastructure@ own things like this, but that can come later.

Re: [PR REVIEW] New package: chroot-curl-7.79.1

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/33851#discussion_r740641681

Comment:
Then this package could be a sub-package of `curl`, no?

Re: [PR REVIEW] New package: chroot-curl-7.79.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33851#discussion_r740645992

Comment:
Would require two builds done in the same template, which is kind of ugly...

Re: [PR REVIEW] New package: chroot-curl-7.79.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33851#discussion_r740646149

Comment:
Here we are also omitting the more complicated dependencies.

Re: [PR REVIEW] New package: chroot-curl-7.79.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33851#discussion_r740646149

Comment:
Here we are also omitting the more complicated dependencies, and avoiding `libcurl.so`

Re: New package: chroot-curl-7.79.1

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33851#issuecomment-960351191

Comment:
I was going to add a comment to the curl template, which might be viewed more often.

Either way, per #33888, we already have libcurl in the chroot because of binutils, so we might as well use libcurl directly. I will make `chroot-curl` a subpackage that copies `/usr/bin/curl` into `/usr/bin/chroot-curl`.

Re: [PR PATCH] [Updated] New package: chroot-curl-7.79.1

[ericonr]

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

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

https://github.com/ericonr/void-packages chroot-curl
https://github.com/void-linux/void-packages/pull/33851

New package: chroot-curl-7.79.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chroot-curl-33851.patch --]
[-- Type: text/x-diff, Size: 1312 bytes --]

From 8a6e3e88aeeef23cd25bfa124535778f6af9fa53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 3 Nov 2021 22:16:03 -0300
Subject: [PATCH] chroot: create chroot-curl subpackage.

The new potential build infrastructure needs a curl binary to send build
results to outside the chroot, but we don't want it to be picked up by
build systems. libcurl is part of the masterdir environment already,
through binutils -> libdebuginfod -> libcurl, so we can simply copy the
binary with a different name, and have the package also depend on
libcurl.
---
 srcpkgs/chroot-curl   | 1 +
 srcpkgs/curl/template | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 120000 srcpkgs/chroot-curl

diff --git a/srcpkgs/chroot-curl b/srcpkgs/chroot-curl
new file mode 120000
index 000000000000..8b258ec33430
--- /dev/null
+++ b/srcpkgs/chroot-curl
@@ -0,0 +1 @@
+curl
\ No newline at end of file
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 1ccf71d6d3d7..0d7ea1d62610 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -71,3 +71,10 @@ libcurl-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+chroot-curl_package() {
+	short_desc+=" - for build infra use"
+	pkg_install() {
+		cp $DESTDIR/usr/bin/curl $PKGDESTDIR/usr/bin/chroot-curl
+	}
+}

Re: [PR PATCH] [Updated] New package: chroot-curl-7.79.1

[ericonr]

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

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

https://github.com/ericonr/void-packages chroot-curl
https://github.com/void-linux/void-packages/pull/33851

New package: chroot-curl-7.79.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chroot-curl-33851.patch --]
[-- Type: text/x-diff, Size: 1595 bytes --]

From ca0cc668690296180d5d814e92c827c64f9c2d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 3 Nov 2021 22:16:03 -0300
Subject: [PATCH] chroot: create chroot-curl subpackage.

The new potential build infrastructure needs a curl binary to send build
results to outside the chroot, but we don't want it to be picked up by
build systems. libcurl is part of the masterdir environment already,
through binutils -> libdebuginfod -> libcurl, so we can simply copy the
binary with a different name, and have the package also depend on
libcurl.
---
 srcpkgs/chroot-curl   | 1 +
 srcpkgs/curl/template | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/chroot-curl

diff --git a/srcpkgs/chroot-curl b/srcpkgs/chroot-curl
new file mode 120000
index 000000000000..8b258ec33430
--- /dev/null
+++ b/srcpkgs/chroot-curl
@@ -0,0 +1 @@
+curl
\ No newline at end of file
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 1ccf71d6d3d7..901f674b8c18 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.79.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -71,3 +71,10 @@ libcurl-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+chroot-curl_package() {
+	short_desc+=" - for build infra use"
+	pkg_install() {
+		vbin $DESTDIR/usr/bin/curl chroot-curl
+	}
+}

Re: [PR PATCH] [Merged]: New package: chroot-curl-7.79.1

[ericonr]

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

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

New package: chroot-curl-7.79.1
https://github.com/void-linux/void-packages/pull/33851

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

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->