[varnish-agent/f19] bumped version to 2.2.0

[Dridi Boukelmoune]

commit 595d5c21c80fb8054c3e21c6c98250df1ac0228d
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Sun Apr 27 22:28:30 2014 +0200

    bumped version to 2.2.0

 .gitignore                     |    1 +
 2ccd64a.diff                   |    7 ++
 sources                        |    2 +-
 vagent.automake.patch          |    9 --
 vagent.backend_timing.patch    |   23 ++++++
 vagent.configure.patch         |   13 ---
 vagent.disable_ban_tests.patch |   12 ---
 vagent.disable_test.patch      |   12 +++
 vagent.secret_privileges.patch |   79 --------------------
 vagent.test_suite.patch        |  161 ----------------------------------------
 varnish-agent.spec             |   54 ++++++++------
 11 files changed, 75 insertions(+), 298 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e66617e..be855f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /2.1.tar.gz
+/vagent2-2.2.0-dbc1e75.tar.gz
diff --git a/2ccd64a.diff b/2ccd64a.diff
new file mode 100644
index 0000000..ce8257c
--- /dev/null
+++ b/2ccd64a.diff
@@ -0,0 +1,7 @@
+diff --git a/tests/data/boot.vcl b/tests/data/boot.vcl
+index ddf7d13..38e9df8 100644
+--- a/tests/data/boot.vcl
++++ b/tests/data/boot.vcl
+@@ -1 +1 @@
+-backend default { .host = "localhost"; }
++backend default { .host = "127.0.0.1"; }
diff --git a/sources b/sources
index 086db7e..69421fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0db886b0a2e63285bb5270dbbeaa9e8  2.1.tar.gz
+ad78a005e5866bd9777832ffc43bc186  vagent2-2.2.0-dbc1e75.tar.gz
diff --git a/vagent.backend_timing.patch b/vagent.backend_timing.patch
new file mode 100644
index 0000000..2183a59
--- /dev/null
+++ b/vagent.backend_timing.patch
@@ -0,0 +1,23 @@
+diff --git a/tests/util.sh b/tests/util.sh
+index aae3e94..30a952e 100644
+--- a/tests/util.sh
++++ b/tests/util.sh
+@@ -143,15 +143,15 @@ start_backend() {
+        python -u empty_response_backend.py 0 >$BACKEND_LOG 2>&1 &
+        backendpid=$(jobs -p %+)
+        echo $backendpid >$BACKEND_PID
++       sleep 3
+        echo -e "\tStarted the backend. Pid $backendpid"
+        for i in x x x x x x x x x x; do
+-              sleep 1
++              sleep 3
+               backendport=$(grep -F 'Serving HTTP' $BACKEND_LOG | awk '{print $6}')
+               [ -n "$backendport" ] && break
+        done
+        if [ -z "$backendport" ]; then
+-               echo -e "\tFailed to bind in a timely fashion"
+-               exit 1
++               echo -e "\tWarning: python backend failed to bind in a timely fashion."
+        fi
+        echo -e "\tListening to *:$backendport"
+        echo "backend default { .host = \"localhost:$backendport\"; }" >$TMPDIR/boot.vcl
diff --git a/vagent.disable_test.patch b/vagent.disable_test.patch
new file mode 100644
index 0000000..09808be
--- /dev/null
+++ b/vagent.disable_test.patch
@@ -0,0 +1,12 @@
+diff --git i/tests/Makefile.am w/tests/Makefile.am
+index 454dce1..4528a50 100644
+--- i/tests/Makefile.am
++++ w/tests/Makefile.am
+@@ -2,7 +2,6 @@ LOG_COMPILER = $(srcdir)/test-wrapper
+ TESTS = ban.sh \
+ 	arguments.sh \
+ 	buffers.sh \
+-	vac_register.sh \
+ 	badvarnishd.sh \
+ 	json.sh \
+ 	log.sh \
diff --git a/varnish-agent.spec b/varnish-agent.spec
index cca1a9e..2bacb5f 100644
--- a/varnish-agent.spec
+++ b/varnish-agent.spec
@@ -1,34 +1,36 @@
+%global commit dbc1e75a4cbab4cc29a71aae0c8498916aad8246
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name:           varnish-agent
-Version:        2.1
-Release:        5%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        Administration agent for Varnish Cache
 Group:          System Environment/Daemons
 
 License:        BSD
 URL:            https://github.com/varnish/vagent2
-Source0:        https://github.com/varnish/vagent2/archive/%{version}.tar.gz
+Source0:        https://github.com/varnish/vagent2/archive/%{commit}/vagent2-%{version}-%{shortcommit}.tar.gz
 Source1:        varnish-agent.service
 Source2:        agent.params
 
-# The patches all come from the following pull requests:
-# https://github.com/varnish/vagent2/pull/94
-# https://github.com/varnish/vagent2/pull/101
-
-# offers a better out-of-the-box experience
-Patch0:         vagent.secret_privileges.patch
-
-# necessary fixes for the build
-Patch1:         vagent.configure.patch
-Patch2:         vagent.automake.patch
-Patch3:         vagent.test_suite.patch
-
-# disables a failing test upstream is investigating
-# it looks like a bug in varnish, not the agent
-Patch4:         vagent.disable_ban_tests.patch
-
-BuildRequires:  autoconf automake libtool python-docutils
-BuildRequires:  systemd varnish-libs-devel libmicrohttpd-devel
-BuildRequires:  varnish python-demjson perl-libwww-perl
+# post-release fixes from upstream
+Patch0:         https://github.com/varnish/vagent2/commit/2ccd64a.diff
+# https://github.com/varnish/vagent2/commit/dde8d1b.diff
+Patch1:         vagent.backend_timing.patch
+# randomly failing test with hazardous port use (not CI-friendly)
+Patch2:         vagent.disable_test.patch
+
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libcurl-devel
+BuildRequires:  libmicrohttpd-devel
+BuildRequires:  libtool
+BuildRequires:  perl-libwww-perl
+BuildRequires:  python-demjson
+BuildRequires:  python-docutils
+BuildRequires:  systemd
+BuildRequires:  varnish
+BuildRequires:  varnish-libs-devel
 
 Requires:       varnish
 
@@ -43,7 +45,7 @@ Administration Console (VAC).
 
 
 %prep
-%autosetup -n vagent2-%{version} -p1
+%autosetup -n vagent2-%{commit} -p1
 
 # varnish-agent expects to be built from the git repository
 sed -i s/NOGIT/%{version}/ include/Makefile.am
@@ -93,6 +95,12 @@ make check
 
 
 %changelog
+* Sun Apr 20 2014 Dridi Boukelmoune <dridi.boukelmoune at gmail.com> - 2.2.0-1
+- Bumped version to 2.2.0
+- Switched to a commit tarball from github
+- Removed the upstreamed patches
+- Added patches for the test suite
+
 * Sun Dec 08 2013 Dridi Boukelmoune <dridi.boukelmoune at gmail.com> - 2.1-5
 - Removed the %%optflags on the %%configure command line