From 26869740ec79cb7943eead958f687b106d2f15c1 Mon Sep 17 00:00:00 2001
From: omni <omni+alpine@hack.org>
Date: Wed, 10 Apr 2024 15:36:11 +0000
Subject: [PATCH] testing/rset: upgrade to 3.0
---
testing/rset/APKBUILD | 11 +++++++----
testing/rset/tests_Makefile.patch | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+), 4 deletions(-)
create mode 100644 testing/rset/tests_Makefile.patch
diff --git a/testing/rset/APKBUILD b/testing/rset/APKBUILD
index 5751dd916e0e..d4b9b542f1ef 100644
--- a/testing/rset/APKBUILD
+++ b/testing/rset/APKBUILD
@@ -1,14 +1,16 @@
# Maintainer: omni <omni+alpine@hack.org>
pkgname=rset
-pkgver=2.9
+pkgver=3.0
pkgrel=0
pkgdesc="Configure systems using any scripting language"
url="https://scriptedconfiguration.org/"
license="ISC"
arch="all"
-checkdepends="ruby-bundler"
+checkdepends="curl ruby-bundler"
subpackages="$pkgname-doc"
-source="https://scriptedconfiguration.org/code/rset-$pkgver.tar.gz"
+source="https://scriptedconfiguration.org/code/rset-$pkgver.tar.gz
+ tests_Makefile.patch
+ "
build() {
./configure
@@ -26,5 +28,6 @@ package() {
}
sha512sums="
-f0e0958dc249bc755209e8c90bd5471b2b5e1f8c58723601d74961004eefc2c6734fa4b8678c8ec97e7c9e9ea06f500374e3cb8acfad120696b5d85efe57c4e3 rset-2.9.tar.gz
+54b031c64ceddd7ee8992be6bbdb0d5299f668789978a1267a30b082629f74f0609cf37d58b8b13ed83df55c7fa117aae55e124b0684fbc3540784718ae753ce rset-3.0.tar.gz
+7c2ea008aa3bb0a6259d4fd81ecdcf6fa21eeaee949fcff5d1e89f3a6e13884432d7274ca2e86a70673e07c439d57f6b4c085078a94421a0f039cdd672f7b6a8 tests_Makefile.patch
"
diff --git a/testing/rset/tests_Makefile.patch b/testing/rset/tests_Makefile.patch
new file mode 100644
index 000000000000..793181772535
--- /dev/null
+++ b/testing/rset/tests_Makefile.patch
@@ -0,0 +1,20 @@
+make -C tests
+make[1]: Entering directory '/home/user/tmp/rset-3.0/tests'
+ld -r ../compat.o ../rutils.o ../input.o ../execute.o -o rset.o -Wl,--as-needed,-O1,--sort-common
+ld: unrecognized option '-Wl,--as-needed,-O1,--sort-common'
+ld: use the --help option for usage information
+make[1]: *** [Makefile.bsd:18: rset.o] Error 1
+make[1]: Leaving directory '/home/user/tmp/rset-3.0/tests'
+make: *** [Makefile.bsd:78: test] Error 2
+
+--- a/tests/Makefile.bsd
++++ b/tests/Makefile.bsd
+@@ -15,7 +15,7 @@ RSET_LIBS = ../compat.o ../rutils.o ../i
+ all: rset.o test
+
+ rset.o: ${RSET_LIBS}
+- ${LD} -r ${RSET_LIBS} -o $@ ${LDFLAGS}
++ ${LD} -r ${RSET_LIBS} -o $@
+
+ .c: rset.o ${RSET_LIBS}
+ ${CC} -I.. ${CFLAGS} ${CPPFLAGS} $< rset.o -o $@ ${LDFLAGS}
--
GitLab