From cf99b3d9c63fcfc9b51cef5c0c6bb459b9e0b603 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 12 Jun 2020 12:15:04 -0700 Subject: [PATCH] Update to 1.21.1. (really this time!) --- .gitignore | 1 + 1576.patch | 34 --------------------------- 2203.patch | 67 ------------------------------------------------------ koji.spec | 14 ++++++------ sources | 2 +- 5 files changed, 9 insertions(+), 109 deletions(-) delete mode 100644 1576.patch delete mode 100644 2203.patch diff --git a/.gitignore b/.gitignore index d767b9a..7d4defd 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ koji-1.4.0.tar.bz2 /koji-1.20.0.tar.bz2 /koji-1.20.1.tar.bz2 /koji-1.21.0.tar.bz2 +/koji-1.21.1.tar.bz2 diff --git a/1576.patch b/1576.patch deleted file mode 100644 index 7439d01..0000000 --- a/1576.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ad0da60a380499e7b1ed8ca84ce606b183f79e39 Mon Sep 17 00:00:00 2001 -From: Kevin Fenzi -Date: Jul 19 2019 23:27:30 +0000 -Subject: builder/kojid: revert using only 2 processors for xz compression and lower preset to 6 - - -In c360c791ec24b567a16553dca38b24645dd80a36 we changed xz to use only -2 cpus for compression. That commit notes that xz threads are really -memory hungry. However, preset -9 is many times as memory hungry as -preset -6. If we switch to preset 6, xz compressed artifacts will be -a little bit larger, but will compress (and decompress!) a lot larger. -This is obviously a trade off, but I think lowering the preset and -using more cpus will be a better tradeoff. - -This commit moves xz to preset 6 and using all cpus the builder has. - -Signed-off-by: Kevin Fenzi - ---- - -diff --git a/builder/kojid b/builder/kojid -index 3f84887..09a48a9 100755 ---- a/builder/kojid -+++ b/builder/kojid -@@ -3989,7 +3989,7 @@ class BaseImageTask(OzImageTask): - 'xz-cp-%s-%s.log' % (format, self.arch)) - log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(), - logerror=1) -- cmd = ['/usr/bin/xz', '-z9T2', rawimg] -+ cmd = ['/usr/bin/xz', '-z6T0', rawimg] - conlog = os.path.join(self.workdir, - 'xz-%s-%s.log' % (format, self.arch)) - log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(), - diff --git a/2203.patch b/2203.patch deleted file mode 100644 index bd6e110..0000000 --- a/2203.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ce86d84c87709ea6efa4bbc16fabe593de5b4a66 Mon Sep 17 00:00:00 2001 -From: Tomas Kopecek -Date: Apr 28 2020 08:10:24 +0000 -Subject: [PATCH 1/2] hub: admin can't force tag now - - -Fixes: https://pagure.io/koji/issue/2202 - ---- - -diff --git a/hub/kojihub.py b/hub/kojihub.py -index 960c0c6..9ec9bb8 100644 ---- a/hub/kojihub.py -+++ b/hub/kojihub.py -@@ -9760,7 +9760,7 @@ def check_policy(name, data, default='deny', strict=False, force=False): - access: True if the policy result is allow, false otherwise - reason: reason for the access - If strict is True, will raise ActionNotAllowed if the action is not 'allow' -- If force is True, policy will pass, but action will be logged -+ If force is True, policy will pass (under admin), but action will be logged - """ - ruleset = context.policy.get(name) - if not ruleset: -@@ -9791,12 +9791,14 @@ def check_policy(name, data, default='deny', strict=False, force=False): - if result != 'deny': - reason = 'error in policy' - logger.error("Invalid action in policy %s, rule: %s", name, lastrule) -- if force and context.session.hasPerm('admin'): -- msg = "Policy %s overriden by force: %s" % (name, context.session.user_data["name"]) -- if reason: -- msg += ": %s" % reason -- logger.info(msg) -- return True, "overriden by force" -+ if force: -+ user = policy_get_user(data) -+ if 'admin' in koji.auth.get_user_perms(user['id']): -+ msg = "Policy %s overriden by force: %s" % (name, user["name"]) -+ if reason: -+ msg += ": %s" % reason -+ logger.info(msg) -+ return True, "overriden by force" - if not strict: - return False, reason - err_str = "policy violation (%s)" % name - -From 8da87dfd42d63d9252117b331223b4a70f517ac6 Mon Sep 17 00:00:00 2001 -From: Tomas Kopecek -Date: Apr 28 2020 14:08:21 +0000 -Subject: [PATCH 2/2] don't traceback on missing user - - ---- - -diff --git a/hub/kojihub.py b/hub/kojihub.py -index 9ec9bb8..92fb389 100644 ---- a/hub/kojihub.py -+++ b/hub/kojihub.py -@@ -9793,7 +9793,7 @@ def check_policy(name, data, default='deny', strict=False, force=False): - logger.error("Invalid action in policy %s, rule: %s", name, lastrule) - if force: - user = policy_get_user(data) -- if 'admin' in koji.auth.get_user_perms(user['id']): -+ if user and 'admin' in koji.auth.get_user_perms(user['id']): - msg = "Policy %s overriden by force: %s" % (name, user["name"]) - if reason: - msg += ": %s" % reason - diff --git a/koji.spec b/koji.spec index c760845..ffb08d6 100644 --- a/koji.spec +++ b/koji.spec @@ -78,8 +78,8 @@ %endif Name: koji -Version: 1.21.0 -Release: 3%{?dist} +Version: 1.21.1 +Release: 1%{?dist} # the included arch lib from yum's rpmUtils is GPLv2+ License: LGPLv2 and GPLv2+ Summary: Build system tools @@ -87,9 +87,6 @@ URL: https://pagure.io/koji/ Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2 # Patches already upstream -# Patch to allow admin to force tag packages again -# https://pagure.io/koji/issue/2202 -Patch1: https://pagure.io/koji/pull-request/2203.patch # Not upstreamable Patch100: fedora-config.patch @@ -709,6 +706,9 @@ fi %endif %changelog +* Fri Jun 12 2020 Kevin Fenzi - 1.21.1-1 +- Update to 1.21.1. (really this time!) + * Sun May 24 2020 Miro Hrončok - 1.21.0-3 - Rebuilt for Python 3.9 @@ -717,10 +717,10 @@ fi - Fixes https://pagure.io/koji/issue/2202 upstream. * Tue Apr 21 2020 Kevin Fenzi - 1.21.0-1 -- Update to 1.21.1. Fixes bug #1826406 +- Update to 1.21.0. Fixes bug #1826406 * Fri Mar 06 2020 Kevin Fenzi - 1.20.1-1 -- Update to 1.20.1 +- Update to 1.20.0 * Wed Jan 29 2020 Fedora Release Engineering - 1.20.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8ea6253..0fc41d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (koji-1.21.0.tar.bz2) = ab7a839a668312800d6a3a838bde9664585f9ef9de67f906f3c28f08698f16235e6570dd6aebe1f549c28342bb1c4c6ce8eb7f7f11e7a688f3e00ed9b45bca56 +SHA512 (koji-1.21.1.tar.bz2) = d4ff6355acf383e5e55bacc42d22b9071c7fc3236e4d7817c4dadc5fda6516719b92a0269571803090746e9556dbb15f5f92a425452677e01ee2a9a7c53583bf