Bug#979175: src:zeromq3: FTBFS on kFreeBSD due to undefined variable s_ in src/stream_engine_base.cpp

[Jonas Smedegaard]

Package: src:zeromq3
Version: 4.3.3-4
Severity: normal
Tags: patch upstream

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

This package currentl fails to build from source on kFreeBSD:

src/stream_engine_base.cpp: In function ‘std::string 
get_peer_address(zmq::fd_t)’:
src/stream_engine_base.cpp:87:26: error: ‘_s’ was not declared in this scope; 
did you mean ‘s_’?
   87 |         if (!getsockopt (_s, 0, LOCAL_PEERCRED, &cred, &size)
      |                          ^~
      |                          s_
src/stream_engine_base.cpp:94:13: error: ‘_peer_address’ was not declared in 
this scope; did you mean ‘peer_address’?
   94 |             _peer_address += buf.str ();
      |             ^~~~~~~~~~~~~
      |             peer_address
make[2]: *** [Makefile:5866: src/libzmq_la-stream_engine_base.lo] Error 1

Full log: 
https://buildd.debian.org/status/fetch.php?pkg=zeromq3&arch=kfreebsd-amd64&ver=4.3.3-4&stamp=1608930571&raw=0


Untested patch attached.

Reported upstream: https://github.com/zeromq/libzmq/issues/4113

 - Jonas

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAl/yMKYACgkQLHwxRsGg
ASG6mQ/8DoFLDN9hvTDMCBh+JVy5/+JFKKYTsRdbIZUXEMsJjoYrsldhRXPYZzXV
uFEqWR3KmSZ3vbdXIxBnk7kpCdyG2J9iKz1WyXelB77CuUoBQ9myIXLSB28siujg
/j0Rd7jEr7/idCxfEf13ryd9zQfOIkq86/kAELSsbU9EhIvDB+Opt4Ak0r0nWeJ5
osbTKg9fhvrqeCm6Y5DVfR0DMn4cUUhFz3c4bEJirOd6/AsceTr4EFOGxqbuHrUh
hHZO6Y4j7oRXAZxJPf34OzAYOlfbJSKcAZhroT63Mm/OfI/Um/jiTn3EAgerD6gd
5NhQK3A7hPgemnOWlGMu4QocCqs51GDY2YRAQ4Mme6Bm4r/LJ/WTH6ZSrQRMf44e
w+8mzrYGe4MSIyzuUgqUVtwCXOtUUGK0EE/rWpRXYNf4SchIlcQiTjF793F425I0
GUWpEj7QncVv80IHBteqZz7494qdjN2C7KawHsKhV2AjPNvUUE4+TY3blZMRJzI/
efuPROo5KczkAAW+sF/0lx3tzO5Ovx3Bi9OGeW6b5q1BBlBwKosAz1vbos2+duEd
fAI+6F/YMBkb3NLMQwKHpHxs/TYiAyYQDKXp06m0fyzXTjzfj9ebAOzxBzqt7QDr
pkd85romPScyU538g6zTxP/uhHM6jOLOqrHC0ttAlzxHPxxx7kA=
=zDmN
-----END PGP SIGNATURE-----

--- a/src/stream_engine_base.cpp
+++ b/src/stream_engine_base.cpp
@@ -63,18 +63,18 @@
 #include "likely.hpp"
 #include "wire.hpp"
 
-static std::string get_peer_address (zmq::fd_t s_)
+static std::string get_peer_address (zmq::fd_t _s)
 {
     std::string peer_address;
 
-    const int family = zmq::get_peer_ip_address (s_, peer_address);
+    const int family = zmq::get_peer_ip_address (_s, peer_address);
     if (family == 0)
         peer_address.clear ();
 #if defined ZMQ_HAVE_SO_PEERCRED
     else if (family == PF_UNIX) {
         struct ucred cred;
         socklen_t size = sizeof (cred);
-        if (!getsockopt (s_, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
+        if (!getsockopt (_s, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
             std::ostringstream buf;
             buf << ":" << cred.uid << ":" << cred.gid << ":" << cred.pid;
             peer_address += buf.str ();

--- a/src/stream_engine_base.cpp
+++ b/src/stream_engine_base.cpp
@@ -63,18 +63,18 @@
 #include "likely.hpp"
 #include "wire.hpp"
 
-static std::string get_peer_address (zmq::fd_t s_)
+static std::string get_peer_address (zmq::fd_t _s)
 {
     std::string peer_address;
 
-    const int family = zmq::get_peer_ip_address (s_, peer_address);
+    const int family = zmq::get_peer_ip_address (_s, peer_address);
     if (family == 0)
         peer_address.clear ();
 #if defined ZMQ_HAVE_SO_PEERCRED
     else if (family == PF_UNIX) {
         struct ucred cred;
         socklen_t size = sizeof (cred);
-        if (!getsockopt (s_, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
+        if (!getsockopt (_s, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
             std::ostringstream buf;
             buf << ":" << cred.uid << ":" << cred.gid << ":" << cred.pid;
             peer_address += buf.str ();