diff options
| author | Martin Lucina <mato@kotelna.sk> | 2011-10-03 17:09:06 +0200 |
|---|---|---|
| committer | Martin Lucina <martin@lucina.net> | 2012-01-23 08:54:33 +0100 |
| commit | c3363afa881b46f3df8a6b72ed15cfbac18f4713 (patch) | |
| tree | 832e8075a038b49f81e8a7635344f1647007fd15 | |
| parent | 88f712b4a31c95caef4f34c4ec65793c392314a6 (diff) | |
| parent | 978e33ba253a997b41b331b449b474a5cee7bccc (diff) | |
Imported Debian patch 2.1.10-1debian/2.1.10-1
79 files changed, 2435 insertions, 2146 deletions
@@ -1,5 +1,157 @@ # Generated by Makefile. Do not edit. +commit ab64a395a01293453da606f08e0983ae8bbeb210 +Author: Pieter Hintjens <ph@imatix.com> +Date: Mon Oct 3 07:24:15 2011 -0500 + + Updated news for 2.1.10 release + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit ddc75f9e54f1fc95a057e935c51c0c22e53df6e7 +Author: Pieter Hintjens <ph@imatix.com> +Date: Wed Sep 28 08:37:41 2011 -0500 + + Applied workaround for issue 261 + + NEWS | 7 ++++--- + src/kqueue.cpp | 4 +++- + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit 80b0041ea1685ed49c222d237b4c9c49bd495b64 +Author: Pieter Hintjens <ph@imatix.com> +Date: Fri Sep 16 10:33:24 2011 -0500 + + Added diagnostics for issue 254 + + src/tcp_socket.cpp | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +commit 4fc2b0fee7cd98ef4d1b69ce079539773bb5b76b +Author: Pieter Hintjens <ph@imatix.com> +Date: Fri Sep 16 10:33:10 2011 -0500 + + Whitespace fixes + + src/tcp_connecter.cpp | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +commit e7f29bfccb915d129bc55b9ff1b48b1a7c2e6661 +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Sep 13 10:15:31 2011 -0500 + + Fixed issue 252 + + NEWS | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit fffd7701a5bece99767b6e10e2cafbe7670c5f2f +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Sep 13 10:13:52 2011 -0500 + + Fixed issue 252 + + src/req.cpp | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +commit 3e1aa20233c8bc4d29fecf9e74f6ee6857cdca44 +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Sep 6 08:02:27 2011 -0500 + + Fixed issue 250 + + NEWS | 2 ++ + src/ip.cpp | 1 + + 2 files changed, 3 insertions(+), 0 deletions(-) + +commit 930c3ef246a5f2a58a614778a9512d61d222de16 +Author: Pieter Hintjens <ph@imatix.com> +Date: Sun Sep 4 10:58:07 2011 +0200 + + Fixed windows build + + src/err.hpp | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit afb68fd07be76bd037761d7b54416f7d29255866 +Author: Pieter Hintjens <ph@imatix.com> +Date: Fri Sep 2 16:09:50 2011 +0200 + + Updated NEWS for issue 218 + + Signed-off-by: Pieter Hintjens <ph@imatix.com> + + NEWS | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 3d91c037657c74c79dfa49f1781eb633bf31de98 +Author: Pieter Hintjens <ph@imatix.com> +Date: Fri Sep 2 16:08:46 2011 +0200 + + Fixed issue 218 + + Signed-off-by: Pieter Hintjens <ph@imatix.com> + + src/ip.cpp | 49 +++++++++++++++++++++++++++++++++++++++---------- + src/ip.hpp | 2 ++ + src/signaler.cpp | 6 +++--- + src/tcp_connecter.cpp | 6 +++--- + src/tcp_listener.cpp | 2 +- + 5 files changed, 48 insertions(+), 17 deletions(-) + +commit 9fcbf166da89f73b010950b264f4573b25804e5e +Author: Pieter Hintjens <ph@imatix.com> +Date: Fri Sep 2 11:53:25 2011 +0200 + + Updated NEWS for issue 140 fix + + NEWS | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 6c07e8d94453fbabe818a639c8d6021aa95f14c4 +Author: Pieter Hintjens <ph@imatix.com> +Date: Fri Sep 2 11:51:11 2011 +0200 + + Fixed issue 140 + + src/options.cpp | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +commit 66d69d7d6393d6d097c9a89e20c061e61167a091 +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Aug 30 14:09:30 2011 +0200 + + Updated for issue 207 + + NEWS | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +commit a41271a0c1840729f4a439b0bd240ca78af04f02 +Merge: c514fb9 81602d4 +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Aug 30 13:52:49 2011 +0200 + + Merge branch 'issue-207' + +commit 81602d41aae0cbc284e3d13d7bd7b30357dd8083 +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Aug 30 13:52:42 2011 +0200 + + Fixed issue 207 + + src/socket_base.cpp | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +commit c514fb93902fc8f9423d888b5d70bde87b357cd8 +Author: Pieter Hintjens <ph@imatix.com> +Date: Tue Aug 30 13:11:12 2011 +0200 + + Updated for 2.1.9 + + include/zmq.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 392c3771c22d0dfe793cc9c4ee5c27d18d38d428 Author: Pieter Hintjens <ph@imatix.com> Date: Mon Aug 29 20:25:11 2011 +0200 @@ -1,3 +1,27 @@ +0MQ version 2.1.10 (Stable), released on 2011/10/03 +=================================================== + +Bug fixes +--------- + +* Fixed issue 140, SWAP failed with assertion failure in pipe.cpp:187 + if the current directory was not writeable. Behavior now is to return + -1 at zmq_setsockopt in this situation. + +* Fixed issue 207, assertion failure in zmq_connecter.cpp:48, when an + invalid zmq_connect() string was used, or the hostname could not be + resolved. The zmq_connect() call now returns -1 in both those cases. + +* Fixed issue 218, sockets not opened with SOCK_CLOEXEC, causing fork/exec + to sit on sockets unnecessarily. + +* Fixed issue 250, build errors on Windows. + +* Fixed issue 252, assertion failure in req.cpp:87 and req.cpp:88. + +* Fixed issue 261, assertion failure in kqueue.cpp:76 on OS/X. + + 0MQ version 2.1.9 (Stable), released on 2011/08/29 ================================================== @@ -156,7 +156,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])[]dnl +_PKG_TEXT])dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -167,7 +167,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff --git a/config/ltmain.sh b/config/ltmain.sh index fa4b1e1..7ed280b 100755 --- a/config/ltmain.sh +++ b/config/ltmain.sh @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6b Debian-2.2.6b-2ubuntu3" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" package_revision=1.3017 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for zeromq 2.1.9. +# Generated by GNU Autoconf 2.67 for zeromq 2.1.10. # # Report bugs to <zeromq-dev@lists.zeromq.org>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='zeromq' PACKAGE_TARNAME='zeromq' -PACKAGE_VERSION='2.1.9' -PACKAGE_STRING='zeromq 2.1.9' +PACKAGE_VERSION='2.1.10' +PACKAGE_STRING='zeromq 2.1.10' PACKAGE_BUGREPORT='zeromq-dev@lists.zeromq.org' PACKAGE_URL='' @@ -1467,7 +1467,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zeromq 2.1.9 to adapt to many kinds of systems. +\`configure' configures zeromq 2.1.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1537,7 +1537,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zeromq 2.1.9:";; + short | recursive ) echo "Configuration of zeromq 2.1.10:";; esac cat <<\_ACEOF @@ -1659,7 +1659,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zeromq configure 2.1.9 +zeromq configure 2.1.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2414,7 +2414,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zeromq $as_me 2.1.9, which was +It was created by zeromq $as_me 2.1.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3233,7 +3233,7 @@ fi # Define the identity of the package. PACKAGE='zeromq' - VERSION='2.1.9' + VERSION='2.1.10' cat >>confdefs.h <<_ACEOF @@ -19413,7 +19413,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zeromq $as_me 2.1.9, which was +This file was extended by zeromq $as_me 2.1.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19479,7 +19479,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -zeromq config.status 2.1.9 +zeromq config.status 2.1.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/debian/changelog b/debian/changelog index 21d2f1d..6d947ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zeromq (2.1.10-1) unstable; urgency=low + + * New upstream version. + + -- Martin Lucina <mato@kotelna.sk> Mon, 03 Oct 2011 17:09:06 +0200 + zeromq (2.1.9-1) unstable; urgency=low * New upstream version. @@ -2,12 +2,12 @@ .\" Title: zmq .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 08/29/2011 +.\" Date: 07/01/2011 .\" Manual: 0MQ Manual -.\" Source: 0MQ 2.1.9 +.\" Source: 0MQ 2.1.8 .\" Language: English .\" -.TH "ZMQ" "7" "08/29/2011" "0MQ 2\&.1\&.9" "0MQ Manual" +.TH "ZMQ" "7" "07/01/2011" "0MQ 2\&.1\&.8" "0MQ Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/zmq.html b/doc/zmq.html index bce168f..e44f8a1 100644 --- a/doc/zmq.html +++ b/doc/zmq.html @@ -2,28 +2,15 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.3" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.5.2" />
<title>zmq(7)</title>
<style type="text/css">
-/* Sans-serif font. */
-h1, h2, h3, h4, h5, h6,
-div.title, caption.title,
-thead, p.table.header,
-div#toctitle,
-span#author, span#revnumber, span#revdate, span#revremark,
-div#footer {
- font-family: Arial,Helvetica,sans-serif;
-}
-
-/* Serif font. */
-div.sectionbody {
- font-family: Georgia,"Times New Roman",Times,serif;
-}
-
-/* Monospace font. */
-tt {
- font-size: inherit;
+/* Debug borders */
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
+/*
+ border: 1px solid red;
+*/
}
body {
@@ -49,12 +36,12 @@ strong { }
tt {
- font-size: inherit;
color: navy;
}
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
+ font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
@@ -74,6 +61,7 @@ h3 + * { }
div.sectionbody {
+ font-family: serif;
margin-left: 0;
}
@@ -89,8 +77,6 @@ p { ul, ol, li > p {
margin-top: 0;
}
-ul > li { color: #aaa; }
-ul > li > * { color: black; }
pre {
padding: 0;
@@ -99,15 +85,18 @@ pre { span#author {
color: #527bbd;
+ font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
span#email {
}
span#revnumber, span#revdate, span#revremark {
+ font-family: sans-serif;
}
div#footer {
+ font-family: sans-serif;
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
@@ -146,6 +135,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
color: #527bbd;
+ font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
@@ -167,15 +157,13 @@ div.content + div.title { div.sidebarblock > div.content {
background: #ffffee;
- border: 1px solid #dddddd;
- border-left: 4px solid #f0f0f0;
+ border: 1px solid silver;
padding: 0.5em;
}
div.listingblock > div.content {
- border: 1px solid #dddddd;
- border-left: 5px solid #f0f0f0;
- background: #f8f8f8;
+ border: 1px solid silver;
+ background: #f4f4f4;
padding: 0.5em;
}
@@ -183,7 +171,7 @@ div.quoteblock, div.verseblock { padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
- border-left: 5px solid #f0f0f0;
+ border-left: 5px solid #dddddd;
color: #777777;
}
@@ -192,9 +180,8 @@ div.quoteblock > div.attribution { text-align: right;
}
-div.verseblock > pre.content {
- font-family: inherit;
- font-size: inherit;
+div.verseblock > div.content {
+ white-space: pre;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
@@ -271,8 +258,8 @@ div.tableblock > table { border: 3px solid #527bbd;
}
thead, p.table.header {
+ font-family: sans-serif;
font-weight: bold;
- color: #527bbd;
}
tfoot {
font-weight: bold;
@@ -352,14 +339,6 @@ span.footnote, span.footnoteref { min-width: 100px;
}
-div.colist td {
- padding-right: 0.5em;
- padding-bottom: 0.3em;
- vertical-align: top;
-}
-div.colist td img {
- margin-top: 0.3em;
-}
@media print {
div#footer-badges { display: none; }
@@ -371,6 +350,7 @@ div#toc {
</ |