Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump version to v4.4.0, setup for release #4550

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1321,15 +1321,15 @@ if(MSVC)
if(BUILD_SHARED)
# Whole Program Optimization flags. http://msdn.microsoft.com/en-us/magazine/cc301698.aspx
#
# "Finally, there's the subject of libraries. It's possible to create .LIB
# files with code in its IL form. The linker will happily work with these
# .LIB files. Be aware that these libraries will be tied to a specific
# version of the compiler and linker. If you distribute these libraries,
# you'll need to update them if Microsoft changes the format of IL in a
# "Finally, there's the subject of libraries. It's possible to create .LIB
# files with code in its IL form. The linker will happily work with these
# .LIB files. Be aware that these libraries will be tied to a specific
# version of the compiler and linker. If you distribute these libraries,
# you'll need to update them if Microsoft changes the format of IL in a
# future release."
#
# /GL and /LTCG can cause problems when libraries built with different
# versions of compiler are later linked into an executable while /LTCG is active.
#
# /GL and /LTCG can cause problems when libraries built with different
# versions of compiler are later linked into an executable while /LTCG is active.
# https://social.msdn.microsoft.com/Forums/vstudio/en-US/5c102025-c254-4f02-9a51-c775c6cc9f4b/problem-with-ltcg-when-building-a-static-library-in-vs2005?forum=vcgeneral
#
# For this reason, enable only when building a "Release" (e.g. non-DEBUG) DLL.
Expand Down Expand Up @@ -1403,7 +1403,7 @@ else()
# NOTE: the SOVERSION and VERSION MUST be the same as the one generated by libtool! It is NOT the same as the
# version of the package.
set_target_properties(
libzmq PROPERTIES COMPILE_DEFINITIONS "DLL_EXPORT" PUBLIC_HEADER "${public_headers}" VERSION "5.2.5"
libzmq PROPERTIES COMPILE_DEFINITIONS "DLL_EXPORT" PUBLIC_HEADER "${public_headers}" VERSION "5.2.6"
SOVERSION "5" OUTPUT_NAME "${ZMQ_OUTPUT_BASENAME}" PREFIX "lib")
if(ZMQ_BUILD_FRAMEWORK)
set_target_properties(
Expand Down
408 changes: 373 additions & 35 deletions NEWS

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

| Version | Supported |
| ------- | ------------------ |
| 4.4.x | :white_check_mark: |
| 4.3.x | :white_check_mark: |
| 4.2.x | :white_check_mark: |
| 4.1.x | :white_check_mark: |
Expand Down
2 changes: 1 addition & 1 deletion build_qnx/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ NAME=libzmq
#and USE_INSTALL_ROOT
LIBZMQ_INSTALL_ROOT ?= $(INSTALL_ROOT_$(OS))

LIBZMQ_VERSION = .4.3.4
LIBZMQ_VERSION = .4.4.0

#choose Release or Debug
CMAKE_BUILD_TYPE ?= Release
Expand Down
139 changes: 70 additions & 69 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config)
AC_CONFIG_HEADERS([src/platform.hpp])
AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar dist-zip)
# Allow "configure --disable-maintainer-mode" to disable timestamp checking
# Allow "configure --disable-maintainer-mode" to disable timestamp checking
AM_MAINTAINER_MODE([enable])

m4_pattern_allow([AC_PROG_CC_C99])
Expand Down Expand Up @@ -53,9 +53,10 @@ AC_SUBST(PACKAGE_VERSION)
# ZeroMQ version 4.3.3: 7:3:2 (ABI version 5)
# ZeroMQ version 4.3.4: 7:4:2 (ABI version 5)
# ZeroMQ version 4.3.5: 7:5:2 (ABI version 5)
# ZeroMQ version 4.4.0: 7:6:2 (ABI version 5)
#
# libzmq -version-info current:revision:age
LTVER="7:5:2"
LTVER="7:6:2"
AC_SUBST(LTVER)

# Take a copy of original flags
Expand Down Expand Up @@ -367,8 +368,8 @@ case "${host_os}" in
CPPFLAGS="-DZMQ_STATIC $CPPFLAGS"
PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -liphlpapi"
fi
# Set FD_SETSIZE to 16384
CPPFLAGS=" -DFD_SETSIZE=16384 $CPPFLAGS"
# Set FD_SETSIZE to 16384
CPPFLAGS=" -DFD_SETSIZE=16384 $CPPFLAGS"
;;
*cygwin*)
# Define on Cygwin to enable all library features
Expand All @@ -387,7 +388,7 @@ case "${host_os}" in
fi
AC_DEFINE(ZMQ_HAVE_GNU, 1, [Have GNU/Hurd OS])
libzmq_on_gnu="yes"
AC_CHECK_LIB(rt, sem_init)
AC_CHECK_LIB(rt, sem_init)
;;
*)
AC_MSG_ERROR([unsupported system: ${host_os}.])
Expand Down Expand Up @@ -827,30 +828,30 @@ AC_CHECK_HEADERS([alloca.h])
# AC_CHECK_FUNCS(fork) fails on gcc 7
AC_MSG_CHECKING([whether fork is available])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <unistd.h>]],
[[return fork();]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FORK, [1], [fork is available])
AM_CONDITIONAL(HAVE_FORK, true)
],[
AC_MSG_RESULT([no])
AM_CONDITIONAL(HAVE_FORK, false)
[AC_LANG_PROGRAM(
[[#include <unistd.h>]],
[[return fork();]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FORK, [1], [fork is available])
AM_CONDITIONAL(HAVE_FORK, true)
],[
AC_MSG_RESULT([no])
AM_CONDITIONAL(HAVE_FORK, false)
])

# string.h doesn't seem to be included by default in Fedora 30
AC_MSG_CHECKING([whether strnlen is available])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <string.h>]],
[[size_t bar = strnlen ("foo", 1); (void)bar; return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_STRNLEN, [1],
[strnlen is available])
],[
AC_MSG_RESULT([no])
[AC_LANG_PROGRAM(
[[#include <string.h>]],
[[size_t bar = strnlen ("foo", 1); (void)bar; return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_STRNLEN, [1],
[strnlen is available])
],[
AC_MSG_RESULT([no])
])

AC_MSG_CHECKING([whether if_nametoindex is available])
Expand Down Expand Up @@ -912,66 +913,66 @@ AC_COMPILE_IFELSE(
# pthread_setname is non-posix, and there are at least 4 different implementations
AC_MSG_CHECKING([whether signature of pthread_setname_np() has 1 argument])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[pthread_setname_np ("foo"); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_1, [1],
[Whether pthread_setname_np() has 1 argument])
],[
AC_MSG_RESULT([no])
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[pthread_setname_np ("foo"); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_1, [1],
[Whether pthread_setname_np() has 1 argument])
],[
AC_MSG_RESULT([no])
])
AC_MSG_CHECKING([whether signature of pthread_setname_np() has 2 arguments])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[pthread_setname_np (pthread_self (), "foo"); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_2, [1],
[Whether pthread_setname_np() has 2 arguments])
],[
AC_MSG_RESULT([no])
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[pthread_setname_np (pthread_self (), "foo"); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_2, [1],
[Whether pthread_setname_np() has 2 arguments])
],[
AC_MSG_RESULT([no])
])
AC_MSG_CHECKING([whether signature of pthread_setname_np() has 3 arguments])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[pthread_setname_np (pthread_self(), "foo", (void *)0); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_3, [1],
[Whether pthread_setname_np() has 3 arguments])
],[
AC_MSG_RESULT([no])
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[pthread_setname_np (pthread_self(), "foo", (void *)0); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_3, [1],
[Whether pthread_setname_np() has 3 arguments])
],[
AC_MSG_RESULT([no])
])
AC_MSG_CHECKING([whether pthread_set_name_np() exists])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[pthread_set_name_np (pthread_self(), "foo"); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SET_NAME, [1],
[Whether pthread_set_name_np() exists])
],[
AC_MSG_RESULT([no])
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[pthread_set_name_np (pthread_self(), "foo"); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SET_NAME, [1],
[Whether pthread_set_name_np() exists])
],[
AC_MSG_RESULT([no])
])


# pthread_setaffinity_np is non-posix:
AC_MSG_CHECKING([whether pthread_setaffinity_np() exists])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[cpu_set_t test; pthread_setaffinity_np (pthread_self(), sizeof(cpu_set_t), &test); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SET_AFFINITY, [1],
[Whether pthread_setaffinity_np() exists])
],[
AC_MSG_RESULT([no])
[AC_LANG_PROGRAM(
[[#include <pthread.h>]],
[[cpu_set_t test; pthread_setaffinity_np (pthread_self(), sizeof(cpu_set_t), &test); return 0;]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(ZMQ_HAVE_PTHREAD_SET_AFFINITY, [1],
[Whether pthread_setaffinity_np() exists])
],[
AC_MSG_RESULT([no])
])


Expand Down
4 changes: 2 additions & 2 deletions include/zmq.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@

/* Version macros for compile-time API version detection */
#define ZMQ_VERSION_MAJOR 4
#define ZMQ_VERSION_MINOR 3
#define ZMQ_VERSION_PATCH 5
#define ZMQ_VERSION_MINOR 4
#define ZMQ_VERSION_PATCH 0

#define ZMQ_MAKE_VERSION(major, minor, patch) \
((major) *10000 + (minor) *100 + (patch))
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
zeromq (4.3.5-0.1) UNRELEASED; urgency=low
zeromq (4.4.0-0.1) UNRELEASED; urgency=low

* Initial packaging.

Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/zeromq.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: zeromq
Binary: libzmq5, libzmq3-dev, libzmq5-dbg
Architecture: any
Version: 4.3.5-0.1
Version: 4.4.0-0.1
Maintainer: libzmq Developers <[email protected]>
Homepage: http://www.zeromq.org/
Standards-Version: 3.9.8
Expand Down
2 changes: 1 addition & 1 deletion packaging/redhat/zeromq.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%endif
%define lib_name libzmq5
Name: zeromq
Version: 4.3.5
Version: 4.4.0
Release: 1%{?dist}
Summary: The ZeroMQ messaging library
Group: Development/Libraries/C and C++
Expand Down