From 5313b099b036f6cfeb12e07d01096e05bf970dea Mon Sep 17 00:00:00 2001 From: Relected Date: Fri, 5 Aug 2022 21:57:12 +0200 Subject: [PATCH 01/10] godot: update to 3.5 --- srcpkgs/godot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index c38f3f8c525a..b1d393b582ac 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,6 +1,6 @@ # Template file for 'godot' pkgname=godot -version=3.4 +version=3.5 revision=1 archs="x86_64* i686* aarch64* armv7* ppc64*" wrksrc="${pkgname}-${version}-stable" @@ -27,7 +27,7 @@ maintainer="Nick Hahn " license="MIT" homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" -checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88 +checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio CFLAGS+=" -fPIE -fPIC" From 2637094a8c25fb0edbb97c89504a84052147e46e Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 30 Jul 2022 22:57:27 +0200 Subject: [PATCH 02/10] apt: update to 2.5.2 --- srcpkgs/apt/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template index 9e477574ead0..17f842c34843 100644 --- a/srcpkgs/apt/template +++ b/srcpkgs/apt/template @@ -1,24 +1,30 @@ # Template file for 'apt' pkgname=apt -version=2.1.12 +version=2.5.2 revision=1 build_style=cmake configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian -DDOCBOOK_XSL=/usr/share/xsl/docbook" hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash" makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel - libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel" + libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel + libgcrypt-devel xxHash-devel" +checkdepends="dpkg runit-void tar" short_desc="APT package management tools" maintainer="Elie ROUDNINSKI " license="GPL-2.0-or-later" homepage="https://salsa.debian.org/apt-team/apt" distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz" -checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9 +checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68 case "$XBPS_TARGET_MACHINE" in *-musl) broken="error: void value not ignored as it ought to be" ;; esac +pre_check() { + export GTEST_FILTER="-FileUtlTest.GetTempDir" +} + apt-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" From 7a88c53114a1641024e9500170955e72103c95c4 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 5 Aug 2022 11:53:40 -0500 Subject: [PATCH 03/10] sqlmap: update to 1.6.8. --- srcpkgs/sqlmap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template index 4b6eb70fee68..312a20b710ee 100644 --- a/srcpkgs/sqlmap/template +++ b/srcpkgs/sqlmap/template @@ -1,6 +1,6 @@ # Template file for 'sqlmap' pkgname=sqlmap -version=1.6.7 +version=1.6.8 revision=1 pycompile_dirs="usr/libexec/sqlmap" depends="python3" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="http://sqlmap.org" distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz" -checksum=397472048c3b454da3e5448944002661fff376edd38f6fe902ab1db0f9fd8d2b +checksum=35c51f4bd6f5cb8dd8efee4cf87d49bc7e7311ed6f42ffdd038394f7f98e69a2 python_version=3 do_install() { From 2ca94dea0ce2e3c22097c0292ae7bc63f2711b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 5 Aug 2022 17:24:47 +0200 Subject: [PATCH 04/10] cargo-deny: update to 0.12.2. --- srcpkgs/cargo-deny/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template index 7de8e764ec90..ec8ad592b9c6 100644 --- a/srcpkgs/cargo-deny/template +++ b/srcpkgs/cargo-deny/template @@ -1,6 +1,6 @@ # Template file for 'cargo-deny' pkgname=cargo-deny -version=0.12.1 +version=0.12.2 revision=1 build_style=cargo configure_args="--no-default-features" @@ -12,7 +12,7 @@ license="MIT, Apache-2.0" homepage="https://github.com/EmbarkStudios/cargo-deny" changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md" distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz" -checksum=9f77445008553b4de1f74c4f903b68f318842f769dc8bfffa5a17af2460c0963 +checksum=7d8a034fe0219f8b7adc0ab25c90f7f253b4c387d7d5c8f74f6ad79f4810dc1e if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then broken="bitvec crate unimplemented for big endian" From 625373b8250ca4acd909ad977622bac09e2fb3cb Mon Sep 17 00:00:00 2001 From: Kenneth Dodrill Date: Fri, 5 Aug 2022 09:53:28 -0500 Subject: [PATCH 05/10] gamemode: update to 1.7 --- srcpkgs/gamemode/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template index 0bf9bea530ec..c70be770dee5 100644 --- a/srcpkgs/gamemode/template +++ b/srcpkgs/gamemode/template @@ -1,9 +1,9 @@ # Template file for 'gamemode' pkgname=gamemode -version=1.6.1 +version=1.7 revision=1 build_style=meson -configure_args="-Dwith-sd-bus-provider=elogind" +configure_args="-Dwith-sd-bus-provider=elogind -Dwith-pam-group=gamemode" hostmakedepends="pkg-config" makedepends="inih-devel dbus-devel elogind-devel" depends="lib${pkgname}>=${version}_${revision}" @@ -11,8 +11,10 @@ short_desc="Optimise Linux system performance on demand" maintainer="Kenneth Dodrill " license="BSD-3-Clause" homepage="https://github.com/FeralInteractive/gamemode" +changelog="https://raw.githubusercontent.com/FeralInteractive/gamemode/master/CHANGELOG.md" distfiles="https://github.com/FeralInteractive/gamemode/archive/${version}.tar.gz" -checksum=4377b88b5147ebf8d3f9a7a1f94c6d00f1e9624cd171d5af942ce9766be3747f +checksum=8a1718c657cb1d3c8269edfd397faf3cb41fccd885198ef0225bf8f82217c42f +system_groups=gamemode post_install() { vsconf example/gamemode.ini From bcf85b554c8497354cba7034bc71c4bcfe7b21fa Mon Sep 17 00:00:00 2001 From: Christian Poulwey Date: Sun, 31 Jul 2022 13:50:21 +0200 Subject: [PATCH 06/10] gitlab-runner: update to 15.2.1 --- srcpkgs/gitlab-runner/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template index c79af7de41df..40337f584196 100644 --- a/srcpkgs/gitlab-runner/template +++ b/srcpkgs/gitlab-runner/template @@ -1,6 +1,6 @@ # Template file for 'gitlab-runner' pkgname=gitlab-runner -version=15.1.0 +version=15.2.1 revision=1 wrksrc="${pkgname}-v${version}" build_style=go @@ -9,8 +9,9 @@ short_desc="Official GitLab CI runner written in Go" maintainer="Christian Poulwey " license="MIT" homepage="https://docs.gitlab.com/runner/" +changelog="https://gitlab.com/gitlab-org/gitlab-runner/-/raw/main/CHANGELOG.md" distfiles="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${version}/gitlab-runner-v${version}.tar.gz" -checksum=b65ca751e433fd32f186d3d59f617216f3509c5f8b7089ede25aa39e40ec43f4 +checksum=@93240a62fb7e41375f2b4447c8e13c4f28c98714daa1046d209445f2a04fe2a1 post_install() { vsv gitlab-runner From 9971c180b8b53c10ecaf9e5d91cc0bd53c91b9cc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 Aug 2022 22:49:45 +0200 Subject: [PATCH 07/10] New package: cyanrip-0.8.1 --- srcpkgs/cyanrip/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/cyanrip/template diff --git a/srcpkgs/cyanrip/template b/srcpkgs/cyanrip/template new file mode 100644 index 000000000000..2790252889c7 --- /dev/null +++ b/srcpkgs/cyanrip/template @@ -0,0 +1,13 @@ +# Template file for 'cyanrip' +pkgname=cyanrip +version=0.8.1 +revision=1 +build_style=meson +hostmakedepends="pkg-config" +makedepends="ffmpeg-devel libcdio-devel libcdio-paranoia-devel libcurl-devel libmusicbrainz5-devel" +short_desc="Bule-ish CD ripper" +maintainer="Duncaen " +license="LGPL-2.1-or-later" +homepage="https://github.com/cyanreg/cyanrip" +distfiles="https://github.com/cyanreg/cyanrip/archive/refs/tags/v${version}.tar.gz" +checksum=a65a454d111bb0852280b9410409e39e63cc7d36757e5e8a9358b4c4fba52183 From 59809030b47b65090f0b01cdda5e76561120b8e7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 Aug 2022 22:51:31 +0200 Subject: [PATCH 08/10] common/travis: use https for repo-ci.voidlinux.org This reverts commit 2233ca2edf8c029522e89be5e13801f225c8072f. We now have a cert on repo-ci and http to https redirects so that each request results in a redirect. --- common/travis/set_mirror.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/common/travis/set_mirror.sh b/common/travis/set_mirror.sh index c14f6ac70e34..5d8e47781b58 100755 --- a/common/travis/set_mirror.sh +++ b/common/travis/set_mirror.sh @@ -1,16 +1,8 @@ #!/bin/sh -TRAVIS_PROTO=http TRAVIS_MIRROR=repo-ci.voidlinux.org for _i in etc/xbps.d/repos-remote*.conf ; do /bin/echo -e "\x1b[32mUpdating $_i...\x1b[0m" - # First fix the proto, ideally we'd serve everything with HTTPS, - # but key management and rotation is a pain, and things are signed - # so we can afford to be a little lazy at times. - sed -i "s:https:$TRAVIS_PROTO:g" $_i - - # Now set the mirror - sed -i "s:alpha\.de\.repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i - sed -i "s:repo-default\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i + sed -i "s:repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i done From 08ebfae438de05be3d0a5674ac91ad9b6bea6fc8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 Aug 2022 22:59:41 +0200 Subject: [PATCH 09/10] common/travis: mirror replace pattern --- common/travis/set_mirror.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/travis/set_mirror.sh b/common/travis/set_mirror.sh index 5d8e47781b58..8159daceb613 100755 --- a/common/travis/set_mirror.sh +++ b/common/travis/set_mirror.sh @@ -4,5 +4,5 @@ TRAVIS_MIRROR=repo-ci.voidlinux.org for _i in etc/xbps.d/repos-remote*.conf ; do /bin/echo -e "\x1b[32mUpdating $_i...\x1b[0m" - sed -i "s:repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i + sed -i "s:repo-default\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i done From d0747ae4fcc97983463650110da80fd7675183fd Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 Aug 2022 23:06:21 +0200 Subject: [PATCH 10/10] .github/workflows: switch to repo-ci.voidlinux.org --- .github/workflows/build.yaml | 3 +++ .github/workflows/cycles.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bb05364b5e74..ce995e2d9c79 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -65,6 +65,9 @@ jobs: steps: - name: Prepare container run: | + # switch to repo-ci mirror + mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/ + sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf # Sync and upgrade once, assume error comes from xbps update xbps-install -Syu || xbps-install -yu xbps # Upgrade again (in case there was a xbps update) diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml index 018c0909bdb1..3f85ac6fa74a 100644 --- a/.github/workflows/cycles.yml +++ b/.github/workflows/cycles.yml @@ -14,6 +14,9 @@ jobs: steps: - name: Prepare container run: | + # switch to repo-ci mirror + mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/ + sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf # Sync and upgrade once, assume error comes from xbps update xbps-install -Syu || xbps-install -yu xbps # Upgrade again (in case there was a xbps update)