Accepting request 982939 from home:matwey:branches:server:database
- Update to version 2.2.0, see * https://github.com/influxdata/influxdb/releases/tag/v2.2.0 Add 0001-fix-executor-do-not-assume-ints-are-64bits-4652.patch: fix build on 32-bit architectures OBS-URL: https://build.opensuse.org/request/show/982939 OBS-URL: https://build.opensuse.org/package/show/server:database/influxdb2?expand=0&rev=10
This commit is contained in:
Martin Pluskal
Git OBS Bridge
parent
7793d4be24
commit
3948eea0a7
27
0001-fix-executor-do-not-assume-ints-are-64bits-4652.patch
Normal file
27
0001-fix-executor-do-not-assume-ints-are-64bits-4652.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From e2371476454022b1ef9f8b8e53b8dc21b1f2b535 Mon Sep 17 00:00:00 2001
|
||||
From: Alfonso Acosta <fons@syntacticsugar.consulting>
|
||||
Date: Tue, 12 Apr 2022 20:18:56 +0200
|
||||
Subject: [PATCH] fix(executor): do not assume ints are 64bits (#4652)
|
||||
|
||||
`getResourceLimits(int64, int)` tries to `return 0, math.MaxInt64` which,
|
||||
in 32-bit architectures causes an overflow.
|
||||
---
|
||||
execute/executor.go | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/execute/executor.go b/execute/executor.go
|
||||
index 9da4af71..26f4ec68 100644
|
||||
--- a/vendor/github.com/influxdata/flux/execute/executor.go
|
||||
+++ b/vendor/github.com/influxdata/flux/execute/executor.go
|
||||
@@ -366,7 +366,7 @@ func (es *executionState) validate() error {
|
||||
func getResourceLimits(ctx context.Context) (int64, int) {
|
||||
// Initialize resources from the execution dependencies and/or properties of the plan.
|
||||
if !HaveExecutionDependencies(ctx) {
|
||||
- return 0, math.MaxInt64
|
||||
+ return 0, math.MaxInt
|
||||
}
|
||||
|
||||
execOptions := GetExecutionDependencies(ctx).ExecutionOptions
|
||||
--
|
||||
2.36.0
|
||||
|
||||
4
_service
4
_service
@ -1,8 +1,8 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">git://github.com/influxdata/influxdb.git</param>
|
||||
<param name="url">https://github.com/influxdata/influxdb.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">v2.1.1</param>
|
||||
<param name="revision">v2.2.0</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="changesgenerate">disable</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c7c288c1441996c6da0143494cc264a09c971beef75af17aedc5bba6eccc9699
|
||||
size 9073440
|
||||
3
influxdb2-2.2.0.tar.xz
Normal file
3
influxdb2-2.2.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ea1431bc73fd5a22a01d0dbf36b90d25ca5ca9a9a4eacda18413a8973c60b857
|
||||
size 8985100
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 9 15:54:42 UTC 2022 - Matwey Kornilov <matwey.kornilov@gmail.com>
|
||||
|
||||
- Update to version 2.2.0, see
|
||||
* https://github.com/influxdata/influxdb/releases/tag/v2.2.0
|
||||
Add 0001-fix-executor-do-not-assume-ints-are-64bits-4652.patch:
|
||||
fix build on 32-bit architectures
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 16 17:06:09 UTC 2021 - Matwey Kornilov <matwey.kornilov@gmail.com>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ Name: influxdb2
|
||||
Summary: Scalable datastore for metrics, events, and real-time analytics
|
||||
License: MIT
|
||||
Group: Productivity/Databases/Servers
|
||||
Version: 2.1.1
|
||||
Version: 2.2.0
|
||||
Release: 0
|
||||
URL: https://github.com/influxdata/influxdb
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
@ -28,9 +28,11 @@ Source1: influxdb.service
|
||||
Source2: influxdb.tmpfiles
|
||||
Source3: influxdb-user.conf
|
||||
Source4: config.yaml
|
||||
# Prebuild UI assets as specified in ./ui/fetch_ui_assets.sh
|
||||
Source98: ui-assets-%{version}.tar.xz
|
||||
# Prebuild UI assets as specified in ./scripts/fetch_ui_assets.sh
|
||||
# https://github.com/influxdata/ui/releases/download/OSS-2.1.2/build.tar.gz
|
||||
Source98: ui-assets-2.1.2.tar.xz
|
||||
Source99: vendor.tar.xz
|
||||
Patch0: 0001-fix-executor-do-not-assume-ints-are-64bits-4652.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: sysuser-tools
|
||||
%{sysusers_requires}
|
||||
@ -38,7 +40,7 @@ BuildRequires: fdupes
|
||||
BuildRequires: go >= 1.17
|
||||
BuildRequires: golang-packaging >= 15.0.8
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(flux) >= 0.139.0
|
||||
BuildRequires: pkgconfig(flux) >= 0.161.0
|
||||
%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
|
||||
%{systemd_requires}
|
||||
Requires(post): systemd
|
||||
@ -59,6 +61,7 @@ Go sources and other development files for InfluxDB
|
||||
%setup -q
|
||||
%setup -q -T -D -a 99
|
||||
%setup -q -T -D -a 98
|
||||
%patch0 -p1
|
||||
mv build ui
|
||||
echo 'UI assets predownloaded!' > ui/fetch_ui_assets.sh
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7b8dd8dc1aa4b091575ea76eec827334a8d74c150c715b812c5f1fcc2eaf3391
|
||||
size 46736856
|
||||
3
ui-assets-2.1.2.tar.xz
Normal file
3
ui-assets-2.1.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8c209c63e5eca86450470d2bdd2b980f0b37196918c06ab017b4f620b3546bdc
|
||||
size 42114268
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce38c72ed08b4579fafe1b113f53ff867e8e3858d3237df81d51678da48c86db
|
||||
size 10366544
|
||||
oid sha256:78970790642f247b0f3fe9c8b5ee78710eeaebb4442c39fe64a48d6d22e19e88
|
||||
size 10841844
|
||||
|
||||
Loading…
Reference in New Issue
Block a user