From 596bf2249121533b93ed932bfd192d2f5a5555b0 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sun, 8 Mar 2020 22:47:01 +0100 Subject: [PATCH] upgrading package: supervisord-go 0.6.7.20200125 -> 0.6.7.20200308 --- supervisord-go/supervisord-go.patch | 17 +++++++++++++++++ supervisord-go/supervisord-go.spec | 6 ++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 supervisord-go/supervisord-go.patch diff --git a/supervisord-go/supervisord-go.patch b/supervisord-go/supervisord-go.patch new file mode 100644 index 0000000000..c37ad2b700 --- /dev/null +++ b/supervisord-go/supervisord-go.patch @@ -0,0 +1,17 @@ +Index: src/github.com/ochinchina/supervisord/rlimit.go +--- src/github.com/ochinchina/supervisord/rlimit.go.orig 2020-03-08 22:43:16.000000000 +0100 ++++ src/github.com/ochinchina/supervisord/rlimit.go 2020-03-08 22:46:18.539286000 +0100 +@@ -41,11 +41,11 @@ + return fmt.Errorf("fail to get the %s limit", resourceName) + } + +- if minRequiredSource > limit.Max { ++ if minRequiredSource > uint64(limit.Max) { + return fmt.Errorf("%s %d is greater than Hard limit %d", resourceName, minRequiredSource, limit.Max) + } + +- if limit.Cur >= minRequiredSource { ++ if uint64(limit.Cur) >= minRequiredSource { + return nil + } + diff --git a/supervisord-go/supervisord-go.spec b/supervisord-go/supervisord-go.spec index f14a8998fa..60c49ad9f2 100644 --- a/supervisord-go/supervisord-go.spec +++ b/supervisord-go/supervisord-go.spec @@ -23,7 +23,7 @@ # package version %define V_opkg 0.6.7 -%define V_dist 20200125 +%define V_dist 20200308 # package information Name: supervisord-go @@ -36,12 +36,13 @@ Class: EVAL Group: System License: MIT Version: %{V_opkg}.%{V_dist} -Release: 20200125 +Release: 20200308 # list of sources Source0: http://download.openpkg.org/components/versioned/supervisord/supervisord-%{V_dist}.tar.xz Source1: rc.supervisord Source2: supervisord.conf +Patch0: supervisord-go.patch # build information BuildPreReq: OpenPKG, openpkg >= 20160101, go @@ -68,6 +69,7 @@ Provides: supervisord = %{version} %prep %setup -q -n supervisord + %patch -p0 %build # build program