From fc8fb73d806542fac56797c9e06e85c801a4860c Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 25 Jan 2021 10:55:50 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/memcached.git#20d4c2fb45fb668ff259ea83ea1c5222d78a22b8
---
 ci.fmf          | 13 -------------
 gating.yaml     |  8 ++++++++
 memcached.spec  |  8 ++++++--
 plans/basic.fmf |  7 +++++++
 4 files changed, 21 insertions(+), 15 deletions(-)
 delete mode 100644 ci.fmf
 create mode 100644 gating.yaml
 create mode 100644 plans/basic.fmf

diff --git a/ci.fmf b/ci.fmf
deleted file mode 100644
index c25f306..0000000
--- a/ci.fmf
+++ /dev/null
@@ -1,13 +0,0 @@
-/test:
-    summary:
-        CI plan, picks Tier1 tests, runs in beakerlib.
-    description:
-        This special plan has to be named ci.fmf to run in CI.
-        It selects test which have 'tier 1' in their main.fmf file
-    discover:
-      - name: tier1
-        how: fmf
-        filter: 'tier: 1'
-        repository: "https://src.fedoraproject.org/tests/memcached.git"
-    execute:
-        how: beakerlib
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..9222cad
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - fedora-34
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0-tf.functional}
+
diff --git a/memcached.spec b/memcached.spec
index 0a5b92a..cb4ad9b 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -12,7 +12,7 @@
 
 Name:           memcached
 Version:        1.6.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        High Performance, Distributed Memory Object Cache
 
@@ -25,6 +25,7 @@ Source2:        https://releases.pagure.org/memcached-selinux/memcached-selinux-
 
 Patch1:         memcached-unit.patch
 
+BuildRequires:  make
 BuildRequires:  gcc libevent-devel systemd
 BuildRequires:  perl-generators
 BuildRequires:  perl(Test::More), perl(Test::Harness)
@@ -71,7 +72,7 @@ optimised for use with this version of memcached.
 
 %build
 %configure \
-  %{?with_sasl: --enable-sasl} \
+  %{?with_sasl: --enable-sasl --enable-sasl-pwdb} \
   %{?with_seccomp: --enable-seccomp} \
   %{?with_tls: --enable-tls}
 
@@ -173,6 +174,9 @@ fi
 %license ../%{selinuxmoduledir}/COPYING
 
 %changelog
+* Mon Jan 25 2021 Tomas Korbar <tkorbar@redhat.com> - 0:1.6.9-2
+- Enable sasl pwdb (#1909724)
+
 * Tue Nov 24 2020 Tomas Korbar <tkorbar@redhat.com> - 0:1.6.9-1
 - Update to 1.6.9
 
diff --git a/plans/basic.fmf b/plans/basic.fmf
new file mode 100644
index 0000000..0a1c3d1
--- /dev/null
+++ b/plans/basic.fmf
@@ -0,0 +1,7 @@
+summary:
+    Verify that cheat works
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/memcached
+execute:
+    how: beakerlib