From f2df4d109caf63724a4f9e59298eab46b3283088532922a3883478d8705f8370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Thu, 16 Oct 2014 08:42:54 +0000
Subject: [PATCH] - Remove sle11 support, not really needed for us here - Add
 libsodium dep for testsuite where possible - Version bump to 4.0.5 fixes
 bnc#898917 CVE-2014-7202 and   CVE-2014-7203:   * Fixed #1191; CURVE
 mechanism does not verify short term nonces.   * Fixed #1190; stream_engine
 is vulnerable to downgrade attacks.   * Fixed #1088; assertion failure for
 WSAENOTSOCK on Windows.   * Fixed #1015; race condition while connecting
 inproc sockets.   * Fixed #994; bump so library number to 4.0.0   * Fixed
 #939, assertion failed: !more (fq.cpp:99) after many ZAP requests.   * Fixed
 #872; lost first part of message over inproc://.   * Fixed #797, keep-alive
 on Windows.

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zeromq?expand=0&rev=19
---
 zeromq-4.0.4.tar.gz |  3 ---
 zeromq-4.0.5.tar.gz |  3 +++
 zeromq.changes      | 16 ++++++++++++++++
 zeromq.spec         | 12 ++++++------
 4 files changed, 25 insertions(+), 9 deletions(-)
 delete mode 100644 zeromq-4.0.4.tar.gz
 create mode 100644 zeromq-4.0.5.tar.gz

diff --git a/zeromq-4.0.4.tar.gz b/zeromq-4.0.4.tar.gz
deleted file mode 100644
index 3b808e6..0000000
--- a/zeromq-4.0.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ef71d46e94f33e27dd5a1661ed626cd39be4d2d6967792a275040e34457d399
-size 2149732
diff --git a/zeromq-4.0.5.tar.gz b/zeromq-4.0.5.tar.gz
new file mode 100644
index 0000000..21b7d2f
--- /dev/null
+++ b/zeromq-4.0.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bc93c5f67370341428364ce007d448f4bb58a0eaabd0a60697d8086bc43342b
+size 2153667
diff --git a/zeromq.changes b/zeromq.changes
index 2e8901a..4a05563 100644
--- a/zeromq.changes
+++ b/zeromq.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Oct 16 08:40:27 UTC 2014 - tchvatal@suse.com
+
+- Remove sle11 support, not really needed for us here
+- Add libsodium dep for testsuite where possible
+- Version bump to 4.0.5 fixes bnc#898917 CVE-2014-7202 and
+  CVE-2014-7203: 
+  * Fixed #1191; CURVE mechanism does not verify short term nonces.
+  * Fixed #1190; stream_engine is vulnerable to downgrade attacks.
+  * Fixed #1088; assertion failure for WSAENOTSOCK on Windows.
+  * Fixed #1015; race condition while connecting inproc sockets.
+  * Fixed #994; bump so library number to 4.0.0
+  * Fixed #939, assertion failed: !more (fq.cpp:99) after many ZAP requests.
+  * Fixed #872; lost first part of message over inproc://.
+  * Fixed #797, keep-alive on Windows.
+
 -------------------------------------------------------------------
 Mon May 12 09:23:17 UTC 2014 - tchvatal@suse.com
 
diff --git a/zeromq.spec b/zeromq.spec
index 8ceeb07..5d721b1 100644
--- a/zeromq.spec
+++ b/zeromq.spec
@@ -16,12 +16,12 @@
 #
 
 
-%define lib_name libzmq3
+%define lib_name libzmq4
 %ifarch %ix86 x86_64
 %define with_pgm 1
 %endif
 Name:           zeromq
-Version:        4.0.4
+Version:        4.0.5
 Release:        0
 Summary:        Lightweight messaging kernel
 License:        LGPL-3.0+
@@ -31,15 +31,15 @@ Source:         http://download.zeromq.org/%{name}-%{version}.tar.gz
 BuildRequires:  gcc-c++
 BuildRequires:  libuuid-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# Required for tests only
+%if 0%{?suse_version} > 1310
+BuildRequires:  libsodium-devel
+%endif
 %if 0%{?with_pgm}
 BuildRequires:  pkgconfig
 BuildRequires:  python
-%if 0%{?suse_version} && 0%{?suse_version} < 1130
-BuildRequires:  glib2 >= 2.8
-%else
 BuildRequires:  pkgconfig(glib-2.0) >= 2.8
 %endif
-%endif
 
 %description
 The 0MQ lightweight messaging kernel is a library which extends the