[PR PATCH] sbt: update to 1.6.1

[PR PATCH] sbt: update to 1.6.1

[hiljusti]

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

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

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: **briefly**

(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1988 bytes --]

From f9d359d6b0b9c81931b9640a8b8097893a9e04eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 31 Mar 2021 00:51:03 -0700
Subject: [PATCH 1/2] New package: sigi-2.1.1

---
 srcpkgs/sigi/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/sigi/template

diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
new file mode 100644
index 000000000000..c5c25501b974
--- /dev/null
+++ b/srcpkgs/sigi/template
@@ -0,0 +1,11 @@
+# Template file for 'sigi'
+pkgname=sigi
+version=2.1.1
+revision=1
+build_style=cargo
+short_desc="Organization tool suitable for your to-do lists or notes"
+maintainer="J.R. Hill <hiljusti@so.dang.cool>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/hiljusti/sigi/"
+distfiles="https://github.com/hiljusti/sigi/archive/refs/tags/v${version}.tar.gz"
+checksum=6652a58a3d777260a3265f97dfa508a1f1b15d9cbab78b1daeaf156f97c27cf1

From 6a8fb7f9ac6e7f65127a41b19db478e61c083c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH 2/2] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..06ab9ef52aef 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,6 +1,6 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
+version=1.6.1
 revision=2
 wrksrc="$pkgname"
 depends="virtual?java-environment"
@@ -9,7 +9,7 @@ maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
 distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
 	vmkdir usr/share/sbt

Re: [PR PATCH] [Updated] sbt: update to 1.6.1

[hiljusti]

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

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

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: **briefly**

(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1025 bytes --]

From a77a4c97a4cedaad1f0a6629bd82dff155e1b98f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..06ab9ef52aef 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,6 +1,6 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
+version=1.6.1
 revision=2
 wrksrc="$pkgname"
 depends="virtual?java-environment"
@@ -9,7 +9,7 @@ maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
 distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
 	vmkdir usr/share/sbt

Re: [PR PATCH] [Updated] sbt: update to 1.6.1

[hiljusti]

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

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

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: **briefly**

(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1095 bytes --]

From 3dbd4cf45474391efdb3fb4c2935e07667b464e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..8647f98f8231 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,7 +1,7 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=3
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
@@ -9,7 +9,7 @@ maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
 distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
 	vmkdir usr/share/sbt

Re: [PR PATCH] [Updated] sbt: update to 1.6.1

[hiljusti]

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

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

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: **briefly**

(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1095 bytes --]

From 045169fa51ff1bd7207d8ac2e6f1f70d3b05c7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..da53bb0d2644 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,7 +1,7 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=1
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
@@ -9,7 +9,7 @@ maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
 distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
 	vmkdir usr/share/sbt

Re: [PR PATCH] [Updated] sbt: update to 1.6.1

[hiljusti]

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

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

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: **briefly**

(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1180 bytes --]

From c8394aa1766fb695c0cbd434ebbef8acbaace1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..b5c9e013ad31 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,15 +1,15 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=1
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
 maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
-distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+distfiles="https://github.com/sbt/sbt/releases/download/v${version}/${pkgname}-${version}.tgz"
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
 	vmkdir usr/share/sbt

Re: sbt: update to 1.6.1

[hiljusti]

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

New comment by hiljusti on void-packages repository

https://github.com/void-linux/void-packages/pull/34882#issuecomment-1007072445

Comment:
I got my testing issues figured out on IRC. Turns out you need to run `xbps-src binary-bootstrap` unless you know otherwise.

Builds are failing on my side due to [11-pkglint-elf-in-usrshare.sh](https://github.com/void-linux/void-packages/blob/a279abf769ef7cab6ebb49d8c99bf774a2ff97b8/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh) which I'm not sure I understand  the motivation for. Is the idea that elf files should only live in certain places?

Re: [PR PATCH] [Updated] sbt: update to 1.6.1

[hiljusti]

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

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

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: **briefly**

(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1502 bytes --]

From e73891b3df5a4c1815be944ac74c93bc84c24a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..cfb97fb48bff 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,21 +1,21 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=1
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
 maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
-distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+distfiles="https://github.com/sbt/sbt/releases/download/v${version}/${pkgname}-${version}.tgz"
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
-	vmkdir usr/share/sbt
+	vmkdir usr/lib/sbt
 	vmkdir usr/bin
-	vcopy "*" usr/share/sbt
-	ln -rs ${DESTDIR}/usr/share/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
+	vcopy "*" usr/lib/sbt
+	ln -rs ${DESTDIR}/usr/lib/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
 
-	rm ${DESTDIR}/usr/share/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.bat
 }

Re: [PR PATCH] [Updated] sbt: update to 1.6.1

[hiljusti]

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

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

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: ~~briefly~~ **yes**

~~(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)~~

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1603 bytes --]

From d2679d04072a4ffcf9d8a22e046831fd05e8c149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..cfd4de77c263 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,21 +1,23 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=1
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
 maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
-distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+distfiles="https://github.com/sbt/sbt/releases/download/v${version}/${pkgname}-${version}.tgz"
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
-	vmkdir usr/share/sbt
+	vmkdir usr/lib/sbt
 	vmkdir usr/bin
-	vcopy "*" usr/share/sbt
-	ln -rs ${DESTDIR}/usr/share/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
+	vcopy "*" usr/lib/sbt
+	ln -rs ${DESTDIR}/usr/lib/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
 
-	rm ${DESTDIR}/usr/share/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.exe
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*apple-darwin
 }

Re: [PR PATCH] [Updated] sbt: update to 1.6.1

[hiljusti]

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

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

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: ~~briefly~~ **yes**

~~(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)~~

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1782 bytes --]

From 71204b2a7df1f6d53d9a5f01b21389192e688e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..6c554e96974e 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,21 +1,29 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=1
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
 maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
-distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+distfiles="https://github.com/sbt/sbt/releases/download/v${version}/${pkgname}-${version}.tgz"
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
-	vmkdir usr/share/sbt
+	vmkdir usr/lib/sbt
 	vmkdir usr/bin
-	vcopy "*" usr/share/sbt
-	ln -rs ${DESTDIR}/usr/share/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
+	vcopy "*" usr/lib/sbt
+	ln -rs ${DESTDIR}/usr/lib/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
 
-	rm ${DESTDIR}/usr/share/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.exe
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*apple-darwin
+
+	# Remove x86_64 binaries when it doesn't match the machine.
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64) ;;
+		*) rm ${DESTDIR}/usr/lib/${pkgname}/bin/*x86_64* ;;
+	esac
 }

Re: sbt: update to 1.6.1

[hiljusti]

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

New comment by hiljusti on void-packages repository

https://github.com/void-linux/void-packages/pull/34882#issuecomment-1007182461

Comment:
Ok, updated and building for (at least) `x86_64` and `aarch64` -- didn't test others.

Re: sbt: update to 1.6.1

[hiljusti]

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

New comment by hiljusti on void-packages repository

https://github.com/void-linux/void-packages/pull/34882#issuecomment-1007184525

Comment:
Some notes on my changes:

SBT (Scala Build Tool) ships with a shell script (`sbt`), and then jars and native bindings for x86_64 linux, mac, and windows. ([Other platforms don't have native bindings yet](https://github.com/sbt/sbt/blob/ccc6cf681870f826e8403ba62a325fa287d118e3/sbt#L174-L187))

Thus to clean up a bit, I've removed unnecessary native bindings that are packaged together. Other platforms should be fine running on a JVM, although maybe less efficient than the native versions?

Re: [PR PATCH] [Merged]: sbt: update to 1.6.1

[leahneukirchen]

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

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

sbt: update to 1.6.1
https://github.com/void-linux/void-packages/pull/34882

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: ~~briefly~~ **yes**

~~(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)~~

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->