8 files changed, 59 insertions, 16 deletions
diff --git a/debian/README.md b/debian/README.md
deleted file mode 100644
index 75296e5..0000000
--- a/debian/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-zeromq3-deb
-===========
-
-Debian package for zeromq3, linked against libsodium.
-
-This is temporarily needed by the LEAP project, until libsodium is added to official debian/ubuntu repos for the versions we support.
diff --git a/debian/changelog b/debian/changelog
index 918aa19..e6eb711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,23 @@
-zeromq3 (4.0.4+leap-2) unstable; urgency=medium
+zeromq3 (4.0.5+dfsg-2) unstable; urgency=medium
 
-  * Move libsodium-dev to Build-dep
+  * Don't use test_security_curve to prevent FTBFS.
 
- -- Micah Anderson <micah@debian.org>  Tue, 12 Aug 2014 17:38:01 -0400
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Thu, 23 Oct 2014 06:29:29 +0000
 
-zeromq3 (4.0.4+leap-1) unstable; urgency=medium
+zeromq3 (4.0.5+dfsg-1) unstable; urgency=high
 
-  * Local build forcing libsodium dep.
+  * New upstream release with important fixes, including:
+    - CVE-2014-7202 - stream_engine.cpp security can be downgraded,
+    - CVE-2014-7203 - curve messages can be replayed.
 
- -- Ben Carrillo <ben@futeisha.org>  Fri, 08 Aug 2014 19:22:49 -0500
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Wed, 22 Oct 2014 15:07:39 +0000
+
+zeromq3 (4.0.4+dfsg-3) unstable; urgency=medium
+
+  * Build with libsodium for crypto support (closes: #744969).
+  * Update Standards-Version to 3.9.6 .
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Mon, 20 Oct 2014 19:16:16 +0000
 
 zeromq3 (4.0.4+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c9dd5e4..3759408 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
 Build-Depends: debhelper (>= 9),
  dh-autoreconf,
  libpgm-dev,
- pkg-config,
- libsodium-dev
-Standards-Version: 3.9.5
+ libsodium-dev,
+ pkg-config
+Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/zeromq3.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/zeromq3.git
 Homepage: http://www.zeromq.org/
diff --git a/debian/libzmq3.docs b/debian/libzmq3.docs
index ef8359b..3cc350b 100644
--- a/debian/libzmq3.docs
+++ b/debian/libzmq3.docs
@@ -1,3 +1,2 @@
 AUTHORS
 NEWS
-debian/README.md
diff --git a/debian/libzmq3.symbols b/debian/libzmq3.symbols
index fd92c4d..5f6d93a 100644
--- a/debian/libzmq3.symbols
+++ b/debian/libzmq3.symbols
@@ -29,6 +29,7 @@ libzmq.so.3 libzmq3 #MINVER#
  zmq_msg_size@Base 3.2.3+dfsg
  zmq_poll@Base 3.2.3+dfsg
  zmq_proxy@Base 3.2.3+dfsg
+ zmq_proxy_steerable@Base 4.0.5+dfsg
  zmq_recv@Base 3.2.3+dfsg
  zmq_recviov@Base 3.2.3+dfsg
  zmq_recvmsg@Base 3.2.3+dfsg
diff --git a/debian/patches/disable-test_security_curve.patch b/debian/patches/disable-test_security_curve.patch
new file mode 100644
index 0000000..174f9f7
--- /dev/null
+++ b/debian/patches/disable-test_security_curve.patch
@@ -0,0 +1,18 @@
+Description: disable test_security_curve
+ It hangs in buildds that not x86/x64 based.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Forwarded: no
+Last-Update: 2014-10-23
+
+---
+
+--- zeromq3-4.0.5+dfsg.orig/tests/Makefile.am
++++ zeromq3-4.0.5+dfsg/tests/Makefile.am
+@@ -27,7 +27,6 @@ noinst_PROGRAMS = test_system \
+                   test_ctx_destroy \
+                   test_security_null \
+                   test_security_plain \
+-                  test_security_curve \
+                   test_iov \
+                   test_spec_req \
+                   test_spec_rep \
diff --git a/debian/patches/revert-soname-to-3.patch b/debian/patches/revert-soname-to-3.patch
new file mode 100644
index 0000000..fc84d4e
--- /dev/null
+++ b/debian/patches/revert-soname-to-3.patch
@@ -0,0 +1,20 @@
+Description: revert late upstream soname update
+ Upstream just updated library soname which should have happened sooner. Now
+ it's not for Jessie.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Forwarded: not-needed
+Last-Update: 2014-10-22
+
+---
+
+--- zeromq3-4.0.5+dfsg.orig/configure.ac
++++ zeromq3-4.0.5+dfsg/configure.ac
+@@ -32,7 +32,7 @@ AC_SUBST(PACKAGE_VERSION)
+ # ZeroMQ version 4.0: 4:0:0 (ABI version 4)
+ #
+ # libzmq -version-info current:revision:age
+-LTVER="4:0:0"
++LTVER="4:0:1"
+ AC_SUBST(LTVER)
+ 
+ # Take a copy of original flags
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8c92f72
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+revert-soname-to-3.patch
+disable-test_security_curve.patch