upgpkg: valkey-git r12186.125a2987a-1

upstream release

9 files changed, 205 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..654494f26844
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,33 @@
+pkgbase = valkey-git
+	pkgdesc = A new project to resume development on the formerly open-source Redis project (development version)
+	pkgver = r12186.125a2987a
+	pkgrel = 1
+	url = https://github.com/valkey-io/valkey
+	arch = x86_64
+	license = BSD-3-Clause
+	makedepends = systemd
+	makedepends = openssl
+	depends = jemalloc
+	depends = grep
+	depends = shadow
+	depends = systemd-libs
+	provides = valkey
+	conflicts = valkey
+	backup = etc/valkey/valkey.conf
+	backup = etc/valkey/sentinel.conf
+	source = git+https://github.com/valkey-io/valkey.git
+	source = valkey.service
+	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
+
+pkgname = valkey-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..8b6f630ab264
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+redict/
+
+# ---> ArchLinuxPackages
+*.tar
+*.tar.*
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..690a6e21355d
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,77 @@
+# Maintainer: fossdd <fossdd@pwned.life>
+
+pkgname=valkey-git
+_pkgname=valkey
+pkgver=r12186.125a2987a
+pkgrel=1
+pkgdesc='A new project to resume development on the formerly open-source Redis project (development version)'
+arch=('x86_64')
+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')
+
+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)"
+}
+
+prepare() {
+	cd $_pkgname
+	patch -Np1 < ../$_pkgname.conf-sane-defaults.patch
+	patch -Np1 < ../$_pkgname-5.0-use-system-jemalloc.patch
+}
+
+build() {
+	make BUILD_TLS=yes \
+		USE_SYSTEMD=yes \
+		-C $_pkgname
+}
+
+check() {
+	make test \
+		BUILD_TLS=yes \
+		USE_SYSTEMD=yes \
+		-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
+
+	# license
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$_pkgname/COPYING
+}
diff --git a/valkey-5.0-use-system-jemalloc.patch b/valkey-5.0-use-system-jemalloc.patch
new file mode 100644
index 000000000000..7597a7e49b36
--- /dev/null
+++ b/valkey-5.0-use-system-jemalloc.patch
@@ -0,0 +1,15 @@
+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-sentinel.service b/valkey-sentinel.service
new file mode 100644
index 000000000000..a6e1fd546082
--- /dev/null
+++ b/valkey-sentinel.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=High availability daemon for Valkey
+After=network.target
+
+[Service]
+Type=notify
+User=valkey
+Group=valkey
+ExecStart=/usr/bin/valkey-sentinel /etc/valkey/sentinel.conf --supervised systemd
+TimeoutStartSec=60
+TimeoutStopSec=60
+CapabilityBoundingSet=
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+ProtectHome=true
+ReadWritePaths=/etc/valkey/
+NoNewPrivileges=true
+RuntimeDirectory=valkey
+RuntimeDirectoryMode=755
+LimitNOFILE=10032
+
+[Install]
+WantedBy=multi-user.target
diff --git a/valkey.conf-sane-defaults.patch b/valkey.conf-sane-defaults.patch
new file mode 100644
index 000000000000..ee0cb6813f60
--- /dev/null
+++ b/valkey.conf-sane-defaults.patch
@@ -0,0 +1,13 @@
+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.service b/valkey.service
new file mode 100644
index 000000000000..76bf1ba59e1c
--- /dev/null
+++ b/valkey.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+Type=notify
+User=valkey
+Group=valkey
+ExecStart=/usr/bin/valkey-server /etc/valkey/valkey.conf --supervised systemd
+TimeoutStartSec=60
+TimeoutStopSec=60
+CapabilityBoundingSet=
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+RuntimeDirectory=valkey
+RuntimeDirectoryMode=755
+LimitNOFILE=10032
+
+[Install]
+WantedBy=multi-user.target
diff --git a/valkey.sysusers b/valkey.sysusers
new file mode 100644
index 000000000000..cb77ab59b675
--- /dev/null
+++ b/valkey.sysusers
@@ -0,0 +1 @@
+u valkey - "Valkey in-memory data structure store" /var/lib/valkey
diff --git a/valkey.tmpfiles b/valkey.tmpfiles
new file mode 100644
index 000000000000..4bd3f21957f1
--- /dev/null
+++ b/valkey.tmpfiles
@@ -0,0 +1,3 @@
+d /var/lib/valkey 0700 valkey valkey
+d /etc/valkey 0755 root valkey
+f /etc/valkey/sentinel.conf 0664 root valkey