From 5749076d0dd692c779c0e367c9f90e146d7e2c0c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Jan 24 2019 04:25:10 +0000 Subject: Update to latest version. --- diff --git a/.gitignore b/.gitignore index 59d4a60..1ac1a10 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /czmq-3.0.2.tar.gz /czmq-4.0.1.tar.gz /czmq-4.0.2.tar.gz +/czmq-4.1.1.tar.gz diff --git a/0001-Problem-build-error-in-zsys-with-GCC7.patch b/0001-Problem-build-error-in-zsys-with-GCC7.patch deleted file mode 100644 index 5b1121a..0000000 --- a/0001-Problem-build-error-in-zsys-with-GCC7.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 41866333eccc5bcc6e18dc823efb5fa8748719ce Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Tue, 7 Feb 2017 12:05:17 +0000 -Subject: [PATCH] Problem: build error in zsys with GCC7 - -Solution: use a larger buffer for the PID buffer in zsys_run_as to -avoid a possible overflow. ---- - src/zsys.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/zsys.c b/src/zsys.c -index 13caf667..c0b60305 100644 ---- a/src/zsys.c -+++ b/src/zsys.c -@@ -1135,7 +1135,7 @@ zsys_run_as (const char *lockfile, const char *group, const char *user) - } - } - // We record the current process id in the lock file -- char pid_buffer [10]; -+ char pid_buffer [32]; - snprintf (pid_buffer, sizeof (pid_buffer), "%6" PRIi64 "\n", (int64_t)getpid ()); - if ((size_t) write (handle, pid_buffer, strlen (pid_buffer)) != strlen (pid_buffer)) { - zsys_error ("cannot write to lockfile: %s", strerror (errno)); --- -2.11.1 - diff --git a/0002-Problem-build-error-with-GCC7-in-zgossip_engine.inc.patch b/0002-Problem-build-error-with-GCC7-in-zgossip_engine.inc.patch deleted file mode 100644 index cce1484..0000000 --- a/0002-Problem-build-error-with-GCC7-in-zgossip_engine.inc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b651cb479235751b22b8f9a822a2fc6bc1be01ab Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Tue, 7 Feb 2017 11:43:48 +0000 -Subject: [PATCH] Problem: build error with GCC7 in zgossip_engine.inc - -Solution: snprintf size parameter includes the NULL terminating char -as the manpage says, so don't pass sizeof(..) - 1 ---- - src/zgossip_engine.inc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/zgossip_engine.inc b/src/zgossip_engine.inc -index f66f76c1..b5596a8e 100644 ---- a/src/zgossip_engine.inc -+++ b/src/zgossip_engine.inc -@@ -257,7 +257,7 @@ engine_set_log_prefix (client_t *client, const char *string) - { - if (client) { - s_client_t *self = (s_client_t *) client; -- snprintf (self->log_prefix, sizeof (self->log_prefix) - 1, -+ snprintf (self->log_prefix, sizeof (self->log_prefix), - "%6d:%-33s", self->unique_id, string); - } - } --- -2.11.1 - diff --git a/czmq.spec b/czmq.spec index 2f598c5..fbfc382 100644 --- a/czmq.spec +++ b/czmq.spec @@ -1,13 +1,11 @@ Name: czmq -Version: 4.0.2 -Release: 7%{?dist} +Version: 4.1.1 +Release: 1%{?dist} Summary: High-level C binding for 0MQ (ZeroMQ) License: MPLv2.0 URL: http://czmq.zeromq.org/ Source0: https://github.com/zeromq/czmq/releases/download/v%{version}/czmq-%{version}.tar.gz -Patch0: 0001-Problem-build-error-in-zsys-with-GCC7.patch -Patch1: 0002-Problem-build-error-with-GCC7-in-zgossip_engine.inc.patch BuildRequires: gcc BuildRequires: libuuid-devel @@ -40,11 +38,6 @@ This package contains files needed to develop applications using czmq. %build %configure \ --with-docs - -# remove rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - %make_build @@ -55,7 +48,7 @@ rm -f %{buildroot}%{_libdir}/libczmq.{a,la} %check -# LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make check +make check %ldconfig_scriptlets @@ -63,7 +56,7 @@ rm -f %{buildroot}%{_libdir}/libczmq.{a,la} %files %doc AUTHORS NEWS LICENSE -%{_libdir}/*.so.* +%{_libdir}/*.so.4* %files devel %doc CONTRIBUTING.md README.md @@ -78,6 +71,10 @@ rm -f %{buildroot}%{_libdir}/libczmq.{a,la} %changelog +* Wed Jan 23 2019 Elliott Sales de Andrade - 4.1.1-1 +- Update to latest version +- Modernize some bits of the spec + * Thu Jul 12 2018 Fedora Release Engineering - 4.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index f95b19e..b78ed19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (czmq-4.0.2.tar.gz) = f4172f0735d69c779d407e7112ceb1dd160a2139f68c504e1fafde2aa899993512d40afe72a0bc4d5dac196dfe0aee4e59defd6d8c0c44299f6e7c74294b0b35 +SHA512 (czmq-4.1.1.tar.gz) = c0bcce54bd927ba51d5756ec43eba2deab176ebe8c927d6bc398bdf5e3595574730511ebfc6443a85fb118883357565c7ba6a32a5f2c352c488a4eccbe145397