Fix tests not passing

author: Lucas Grzegorczyk 2024-04-26 23:23:43 +0200
committer: Lucas Grzegorczyk 2024-04-26 23:23:43 +0200
commit: cc0a42d9dbb4a614d4c181fe87b0b7d6a5a54f11 (patch)
tree: 1fe4f1101727ea00132b905c06d58928c838ec36
parent: 39ea0354ec19d47875e2d04e9cd195233187dd9b (diff)
download: aur-cc0a42d9dbb4a614d4c181fe87b0b7d6a5a54f11.tar.gz
6 files changed, 92 insertions, 109 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 654494f26844..8738f245595e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = valkey-git
 	pkgdesc = A new project to resume development on the formerly open-source Redis project (development version)
-	pkgver = r12186.125a2987a
+	pkgver = r12278.a5a1377
 	pkgrel = 1
 	url = https://github.com/valkey-io/valkey
 	arch = x86_64
 	license = BSD-3-Clause
 	makedepends = systemd
-	makedepends = openssl
+	makedepends = git
+	makedepends = tcl
+	makedepends = procps-ng
 	depends = jemalloc
-	depends = grep
-	depends = shadow
 	depends = systemd-libs
+	depends = openssl
+	depends = glibc
 	provides = valkey
 	conflicts = valkey
 	backup = etc/valkey/valkey.conf
@@ -20,14 +22,12 @@ pkgbase = valkey-git
 	source = valkey-sentinel.service
 	source = valkey.sysusers
 	source = valkey.tmpfiles
-	source = valkey.conf-sane-defaults.patch
-	source = valkey-5.0-use-system-jemalloc.patch
-	sha512sums = SKIP
-	sha512sums = 286ce5be525166814f8ffce64fdb8ddc3abbaefe75bfc3044e8a4ee2111359fda3b35b3e548538bc05e4393bb4f5c716f549a23d069e5c1f4327b9a60594fbb9
-	sha512sums = 8cb8aab70192b83ee90b184ae2115f401c95539296ffcd3e1888ae3134aaf32380969f1360a52d259628a78113f760f8677591cb050d561f6abe35749df1c30e
-	sha512sums = 21f7bf33bdabb4ab783e440f9991875cb3b50c3f640e9cc999970e80c1931431bf7e7794aaf6daf9c8b35365ddfa475c7d752f55cf61834699cabd302795d427
-	sha512sums = 11cf6d6999329af7a9fa4bcbbcf22242b461cec0c16ad949cc6b0383703f19417092782569bf6224f94167a560de0b4ba53ec0d8522683736a14f01bc5986b28
-	sha512sums = 5ec15f8380c9e0515f120288ea8b53e62c754054e5c51c30ca7e60f0293b36c82ab3e3c5f8373b3eff9d98378849a6fba0d12b7088c7c63ca46464410a645dc8
-	sha512sums = 0acb08a6e0eaba239db7461bcfeddfbe0c1aaa517dc33c3918c9e991a1d5067cfe135b7f75085caade8c3ababd51ec9cefcc4120f57818bea1f7029a548a7732
+	source = valkey.dir-jemalloc.patch
+	b2sums = SKIP
+	b2sums = d04ddea27e56af9ef6b42a0adf9772079f754632b5bf5f150826f488272d3870c3cd877953f36503c511411025daf78f630a49986a9d5ed8288d868673bff72b
+	b2sums = 98655ce2bb511fcda5aa656d7393bc44c3647a03b1bcc7d86fd18525212eee2cc8766c9aeb2f91dd2c665ae48b091ed6f7144d6481455cb115d64ca67b01adf6
+	b2sums = 3080be28343535008db179fb6b1c11f508e2f6cfa39d83f21388f19deb01503a76d2e1ac9b1057110fa331ec9bb6f863b1c0897782bf304e792f9808d361ceb0
+	b2sums = 6222a87edab159f85e96fa7e4db13dc5144eb9e523dd65324f7bd579bf5c331a71cf8148ab2e23a9fcd5879bedc72121585e0df45aa1d77979d444975694ae76
+	b2sums = 24db5f9fd3e23d88684601b1abd68ba1a72711ef8a4d87c2cfc4153a6fd9788f1acfc8d895fb324f6c78ba9e1c89a8db50715e87f99c4ae5b073c337aa0773ee
 
 pkgname = valkey-git
diff --git a/.gitignore b/.gitignore
index 8b6f630ab264..7ac28cfacd8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,5 @@
-redict/
-
-# ---> ArchLinuxPackages
-*.tar
-*.tar.*
-*.jar
-*.exe
-*.msi
-*.zip
-*.tgz
-*.log
-*.log.*
-*.sig
-
-pkg/
-src/
+/valkey/
+/valkey*.tar.zst
+/valkey*.tar.gz
+/valkey*.log
+/PKGBUILD*.log
diff --git a/PKGBUILD b/PKGBUILD
index 690a6e21355d..3dab3abb9143 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: fossdd <fossdd@pwned.life>
+# Maintainer: Furai <lucasgrzegroczyk+archlinux at gmail dot com>
+# Contributor: fossdd <fossdd@pwned.life>
 
 pkgname=valkey-git
 _pkgname=valkey
-pkgver=r12186.125a2987a
+pkgver=r12278.a5a1377
 pkgrel=1
 pkgdesc='A new project to resume development on the formerly open-source Redis project (development version)'
 arch=('x86_64')
@@ -10,68 +11,63 @@ url="https://github.com/$_pkgname-io/$_pkgname"
 license=('BSD-3-Clause')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-depends=('jemalloc' 'grep' 'shadow' 'systemd-libs')
-# pkg-config fails to detect systemd libraries if systemd is not installed
-makedepends=('systemd' 'openssl')
-backup=("etc/$_pkgname/$_pkgname.conf"
-        "etc/$_pkgname/sentinel.conf")
-
-source=("git+$url.git"
-        $_pkgname.service
-        $_pkgname-sentinel.service
-        $_pkgname.sysusers
-        $_pkgname.tmpfiles
-        $_pkgname.conf-sane-defaults.patch
-        $_pkgname-5.0-use-system-jemalloc.patch)
-sha512sums=('SKIP'
-            '286ce5be525166814f8ffce64fdb8ddc3abbaefe75bfc3044e8a4ee2111359fda3b35b3e548538bc05e4393bb4f5c716f549a23d069e5c1f4327b9a60594fbb9'
-            '8cb8aab70192b83ee90b184ae2115f401c95539296ffcd3e1888ae3134aaf32380969f1360a52d259628a78113f760f8677591cb050d561f6abe35749df1c30e'
-            '21f7bf33bdabb4ab783e440f9991875cb3b50c3f640e9cc999970e80c1931431bf7e7794aaf6daf9c8b35365ddfa475c7d752f55cf61834699cabd302795d427'
-            '11cf6d6999329af7a9fa4bcbbcf22242b461cec0c16ad949cc6b0383703f19417092782569bf6224f94167a560de0b4ba53ec0d8522683736a14f01bc5986b28'
-            '5ec15f8380c9e0515f120288ea8b53e62c754054e5c51c30ca7e60f0293b36c82ab3e3c5f8373b3eff9d98378849a6fba0d12b7088c7c63ca46464410a645dc8'
-            '0acb08a6e0eaba239db7461bcfeddfbe0c1aaa517dc33c3918c9e991a1d5067cfe135b7f75085caade8c3ababd51ec9cefcc4120f57818bea1f7029a548a7732')
+depends=('jemalloc' 'systemd-libs' 'openssl' 'glibc')
+makedepends=('systemd' 'git' 'tcl' 'procps-ng')
+backup=(
+  "etc/$_pkgname/$_pkgname.conf"
+  "etc/$_pkgname/sentinel.conf"
+)
+source=(
+  "git+$url.git"
+  "${_pkgname}.service"
+  "${_pkgname}-sentinel.service"
+  "${_pkgname}.sysusers"
+  "${_pkgname}.tmpfiles"
+  "${_pkgname}.dir-jemalloc.patch"
+)
+b2sums=(
+  'SKIP'
+  'd04ddea27e56af9ef6b42a0adf9772079f754632b5bf5f150826f488272d3870c3cd877953f36503c511411025daf78f630a49986a9d5ed8288d868673bff72b'
+  '98655ce2bb511fcda5aa656d7393bc44c3647a03b1bcc7d86fd18525212eee2cc8766c9aeb2f91dd2c665ae48b091ed6f7144d6481455cb115d64ca67b01adf6'
+  '3080be28343535008db179fb6b1c11f508e2f6cfa39d83f21388f19deb01503a76d2e1ac9b1057110fa331ec9bb6f863b1c0897782bf304e792f9808d361ceb0'
+  '6222a87edab159f85e96fa7e4db13dc5144eb9e523dd65324f7bd579bf5c331a71cf8148ab2e23a9fcd5879bedc72121585e0df45aa1d77979d444975694ae76'
+  '24db5f9fd3e23d88684601b1abd68ba1a72711ef8a4d87c2cfc4153a6fd9788f1acfc8d895fb324f6c78ba9e1c89a8db50715e87f99c4ae5b073c337aa0773ee'
+)
 
 pkgver() {
-	cd "$srcdir/$_pkgname"
-	# Git, tags available
-	# printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
-	# Git, no tags available
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${_pkgname}" || exit 1
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
 }
 
 prepare() {
-	cd $_pkgname
-	patch -Np1 < ../$_pkgname.conf-sane-defaults.patch
-	patch -Np1 < ../$_pkgname-5.0-use-system-jemalloc.patch
+  cd "${_pkgname}" || exit 1
+  patch -Np1 <../valkey.dir-jemalloc.patch
 }
 
 build() {
-	make BUILD_TLS=yes \
-		USE_SYSTEMD=yes \
-		-C $_pkgname
+  make BUILD_TLS=yes \
+    USE_SYSTEMD=yes \
+    USE_REDIS_SYMLINKS=no \
+    -C "${_pkgname}"
 }
 
 check() {
-	make test \
-		BUILD_TLS=yes \
-		USE_SYSTEMD=yes \
-		-C $_pkgname
-	}
+  make test \
+    BUILD_TLS=yes \
+    USE_SYSTEMD=yes \
+    USE_REDIS_SYMLINKS=no \
+    -C "${_pkgname}"
+}
 
 package() {
-	cd $_pkgname
-
-	# make install
-	make PREFIX="$pkgdir"/usr install
-
-	# configuration files
-	install -Dm644 -t "$pkgdir"/etc/$_pkgname $_pkgname.conf sentinel.conf
-
-	# systemd integration
-	install -Dm644 -t "$pkgdir"/usr/lib/systemd/system/ ../$_pkgname.service ../$_pkgname-sentinel.service
-	install -Dm644 "$srcdir"/$_pkgname.sysusers "$pkgdir"/usr/lib/sysusers.d/$_pkgname.conf
-	install -Dm644 "$srcdir"/$_pkgname.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/$_pkgname.conf
+  cd "${_pkgname}" || exit 1
+  make PREFIX="$pkgdir"/usr \
+    USE_REDIS_SYMLINKS=no \
+    install
 
-	# license
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$_pkgname/COPYING
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 -t "${pkgdir}"/etc/valkey valkey.conf sentinel.conf
+  install -Dm644 -t "${pkgdir}"/usr/lib/systemd/system/ ../valkey.service ../valkey-sentinel.service
+  install -Dm644 "${srcdir}"/valkey.sysusers "${pkgdir}"/usr/lib/sysusers.d/valkey.conf
+  install -Dm644 "${srcdir}"/valkey.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/valkey.conf
 }
diff --git a/valkey-5.0-use-system-jemalloc.patch b/valkey-5.0-use-system-jemalloc.patch
deleted file mode 100644
index 7597a7e49b36..000000000000
--- a/valkey-5.0-use-system-jemalloc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 3bc9f11c0..a4b23d986 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -229,8 +229,8 @@ endif
- 
- ifeq ($(MALLOC),jemalloc)
- 	DEPENDENCY_TARGETS+= jemalloc
--	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
--	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
-+	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
-+	FINAL_LIBS := -ljemalloc $(FINAL_LIBS)
- endif
- 
- ifeq ($(BUILD_TLS),yes)
diff --git a/valkey.conf-sane-defaults.patch b/valkey.conf-sane-defaults.patch
deleted file mode 100644
index ee0cb6813f60..000000000000
--- a/valkey.conf-sane-defaults.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/valkey.conf b/valkey.conf
-index 465d56fc0..9c1bd1ed1 100644
---- a/valkey.conf
-+++ b/valkey.conf
-@@ -441,7 +441,7 @@ rdb-del-sync-files no
- # The Append Only File will also be created inside this directory.
- #
- # Note that you must specify a directory here, not a file name.
--dir ./
-+dir /var/lib/valkey/
- 
- ################################# REPLICATION #################################
- 
diff --git a/valkey.dir-jemalloc.patch b/valkey.dir-jemalloc.patch
new file mode 100644
index 000000000000..62aee72683f2
--- /dev/null
+++ b/valkey.dir-jemalloc.patch
@@ -0,0 +1,26 @@
+diff --unified --recursive --text valkey.orig/src/Makefile valkey.new/src/Makefile
+--- valkey.orig/src/Makefile	2024-04-16 06:18:47.000000000 +0200
++++ valkey.new/src/Makefile	2024-04-24 22:24:12.967476997 +0200
+@@ -275,8 +275,8 @@
+ 
+ ifeq ($(MALLOC),jemalloc)
+ 	DEPENDENCY_TARGETS+= jemalloc
+-	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+-	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
++	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
++	FINAL_LIBS := -ljemalloc $(FINAL_LIBS)
+ endif
+ 
+ # LIBSSL & LIBCRYPTO
+diff --unified --recursive --text valkey.orig/valkey.conf valkey.new/valkey.conf
+--- valkey.orig/valkey.conf	2024-04-16 06:18:47.000000000 +0200
++++ valkey.new/valkey.conf	2024-04-24 22:23:23.050733391 +0200
+@@ -504,7 +504,7 @@
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir /var/lib/valkey/
+ 
+ ################################# REPLICATION #################################
+
author	Lucas Grzegorczyk	2024-04-26 23:23:43 +0200
committer	Lucas Grzegorczyk	2024-04-26 23:23:43 +0200
commit	cc0a42d9dbb4a614d4c181fe87b0b7d6a5a54f11 (patch)
tree	1fe4f1101727ea00132b905c06d58928c838ec36
parent	39ea0354ec19d47875e2d04e9cd195233187dd9b (diff)
download	aur-cc0a42d9dbb4a614d4c181fe87b0b7d6a5a54f11.tar.gz