[packages/czmq] - updated to 4.2.1

[qboosh]

commit 863f2f74294fe8a9975f1c57715b8d4ddb128114
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 2 19:58:33 2024 +0200

    - updated to 4.2.1

 czmq-link.patch | 10 +++++-----
 czmq-nss.patch  | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 czmq.spec       | 11 ++++++++---
 3 files changed, 70 insertions(+), 8 deletions(-)
---
diff --git a/czmq.spec b/czmq.spec
index d4eba51..2584ee7 100644
--- a/czmq.spec
+++ b/czmq.spec
@@ -7,13 +7,14 @@
 Summary:	High-level C binding for 0MQ
 Summary(pl.UTF-8):	Wysokopoziomowe wiązania C dla 0MQ
 Name:		czmq
-Version:	4.2.0
-Release:	6
+Version:	4.2.1
+Release:	1
 License:	LGPL v3+
 Group:		Libraries
 #Source0Download: https://github.com/zeromq/czmq/releases
 Source0:	https://github.com/zeromq/czmq/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	7e09997db6ac3b25e8ed104053040722
+# Source0-md5:	471e9ec120fc66a2fe2aae14359e3cfa
+Patch0:		%{name}-nss.patch
 Patch1:		%{name}-link.patch
 URL:		http://zeromq.org/
 BuildRequires:	asciidoc
@@ -24,6 +25,7 @@ BuildRequires:	libmicrohttpd-devel
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	lz4-devel
+BuildRequires:	nss-devel
 %if %{with python2}
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	python-setuptools
@@ -57,6 +59,7 @@ Requires:	curl-devel >= 7.28.0
 Requires:	libmicrohttpd-devel
 Requires:	libuuid-devel
 Requires:	lz4-devel
+Requires:	nss-devel
 %{?with_systemd:Requires:	systemd-devel >= 1:200}
 Requires:	zeromq-devel >= 4
 
@@ -104,6 +107,7 @@ Wiązania Pythona 3 do CZMQ - wysokopoziomowego wiązania C do 0MQ.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 %build
@@ -199,6 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/zloop.3*
 %{_mandir}/man3/zmonitor.3*
 %{_mandir}/man3/zmsg.3*
+%{_mandir}/man3/zosc.3*
 %{_mandir}/man3/zpoller.3*
 %{_mandir}/man3/zproc.3*
 %{_mandir}/man3/zproxy.3*
diff --git a/czmq-link.patch b/czmq-link.patch
index d88309a..3440375 100644
--- a/czmq-link.patch
+++ b/czmq-link.patch
@@ -1,11 +1,11 @@
---- czmq-4.2.0/Makefile.am.orig	2020-04-07 19:34:47.841128420 +0200
-+++ czmq-4.2.0/Makefile.am	2020-04-07 19:35:40.744175153 +0200
-@@ -15,7 +15,7 @@
+--- czmq-4.2.1/Makefile.am.orig	2024-06-02 19:17:27.116348884 +0200
++++ czmq-4.2.1/Makefile.am	2024-06-02 19:18:17.452742855 +0200
+@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
      ${libmicrohttpd_CFLAGS} \
      -I$(srcdir)/include
  
--project_libs = ${libzmq_LIBS} ${uuid_LIBS} ${systemd_LIBS} ${lz4_LIBS} ${libcurl_LIBS} ${libmicrohttpd_LIBS}
-+project_libs = ${libzmq_LIBS} ${uuid_LIBS} ${systemd_LIBS} ${lz4_LIBS} ${libcurl_LIBS} ${libmicrohttpd_LIBS} -lpthread
+-project_libs = ${libzmq_LIBS} ${uuid_LIBS} ${systemd_LIBS} ${lz4_LIBS} ${libcurl_LIBS} ${nss_LIBS} ${libmicrohttpd_LIBS}
++project_libs = ${libzmq_LIBS} ${uuid_LIBS} ${systemd_LIBS} ${lz4_LIBS} ${libcurl_LIBS} ${nss_LIBS} ${libmicrohttpd_LIBS} -lpthread
  
  SUBDIRS = doc
  SUBDIRS += include
diff --git a/czmq-nss.patch b/czmq-nss.patch
new file mode 100644
index 0000000..0b7ecf0
--- /dev/null
+++ b/czmq-nss.patch
@@ -0,0 +1,57 @@
+zdigest.c uses HAVE_LIBNSS while configure/cmake defines HAVE_NSS
+--- czmq-4.2.1/src/zdigest.c.orig	2021-01-17 15:29:08.000000000 +0100
++++ czmq-4.2.1/src/zdigest.c	2024-06-02 19:44:50.274113801 +0200
+@@ -24,7 +24,7 @@
+ */
+ 
+ #include "czmq_classes.h"
+-#ifdef HAVE_LIBNSS
++#ifdef HAVE_NSS
+ #include <secoid.h>
+ #include <sechash.h>
+ #define SHA_DIGEST_LENGTH 20
+@@ -36,7 +36,7 @@
+ //  Structure of our class
+ 
+ struct _zdigest_t {
+-#ifdef HAVE_LIBNSS
++#ifdef HAVE_NSS
+     HASHContext *context;       //  Digest context
+     bool begun;                 //  Calculating has already started
+ #else
+@@ -59,7 +59,7 @@ zdigest_new (void)
+ {
+     zdigest_t *self = (zdigest_t *) zmalloc (sizeof (zdigest_t));
+     assert (self);
+-#ifdef HAVE_LIBNSS
++#ifdef HAVE_NSS
+     HASH_HashType type = HASH_GetHashTypeByOidTag (SEC_OID_SHA1);
+     self->context = HASH_Create (type);
+     assert (self->context);
+@@ -79,7 +79,7 @@ zdigest_destroy (zdigest_t **self_p)
+     assert (self_p);
+     if (*self_p) {
+         zdigest_t *self = *self_p;
+-#ifdef HAVE_LIBNSS
++#ifdef HAVE_NSS
+         HASH_Destroy (self->context);
+ #endif
+         freen (self);
+@@ -97,7 +97,7 @@ zdigest_update (zdigest_t *self, const b
+     //  Calling this after zdigest_data() is illegal use of the API
+     assert (self);
+     assert (!self->final);
+-#ifdef HAVE_LIBNSS
++#ifdef HAVE_NSS
+     if (!self->begun) {
+         HASH_Begin (self->context);
+         self->begun = true;
+@@ -118,7 +118,7 @@ zdigest_data (zdigest_t *self)
+ {
+     assert (self);
+     if (!self->final) {
+-#ifdef HAVE_LIBNSS
++#ifdef HAVE_NSS
+         unsigned int len;
+         HASH_End (self->context, self->hash, &len, SHA_DIGEST_LENGTH);
+ #else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/czmq.git/commitdiff/863f2f74294fe8a9975f1c57715b8d4ddb128114