Your message dated Tue, 05 Sep 2017 18:06:51 +0000 with message-id <e1dpifp-000ccz...@fasolo.debian.org> and subject line Bug#872568: fixed in rsyslog 8.29.0-2 has caused the Debian Bug report #872568, regarding rsyslog: FTBFS on mips, mipsel - error: 'pThis' undeclared to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 872568: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872568 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Source: rsyslog Version: 8.29.0-1 Severity: serious Tags: sid buster patch Hi, rsyslog FTBFS on mips, mipsel and various ports architectures with the error: > In file included from ../../runtime/prop.h:25:0, > from ../../runtime/glbl.h:38, > from ../../runtime/stream.h:73, > from ../../runtime/obj.h:48, > from ../../runtime/rsyslog.h:634, > from imptcp.c:61: > imptcp.c: In function 'AcceptConnReq': > imptcp.c:831:39: error: 'pThis' undeclared (first use in this function) > STATSCOUNTER_INC(pLstn->ctrSessOpen, pThis->pLstn->mutCtrSessOpen); > ^ > ../../runtime/atomic.h:206:22: note: in definition of macro > 'ATOMIC_INC_uint64' > pthread_mutex_lock(phlpmut); \ > ^~~~~~~ > imptcp.c:831:2: note: in expansion of macro 'STATSCOUNTER_INC' > STATSCOUNTER_INC(pLstn->ctrSessOpen, pThis->pLstn->mutCtrSessOpen); > ^~~~~~~~~~~~~~~~ > imptcp.c:831:39: note: each undeclared identifier is reported only once for > each function it appears in > STATSCOUNTER_INC(pLstn->ctrSessOpen, pThis->pLstn->mutCtrSessOpen); > ^ > ../../runtime/atomic.h:206:22: note: in definition of macro > 'ATOMIC_INC_uint64' > pthread_mutex_lock(phlpmut); \ > ^~~~~~~ > imptcp.c:831:2: note: in expansion of macro 'STATSCOUNTER_INC' > STATSCOUNTER_INC(pLstn->ctrSessOpen, pThis->pLstn->mutCtrSessOpen); > ^~~~~~~~~~~~~~~~ As the error suggests, pThis is not declared in that function. The code is only used on architectures which do not have 64-bit atomics which is why it only fails on some architectures. There is an upstream pull request to fix this: https://github.com/rsyslog/rsyslog/pull/1725 I've also attached the patch from that PR which should fix this. Thanks, JamesFrom 2ea84c47b208214370034500f0aab19fe93cce7f Mon Sep 17 00:00:00 2001 From: Pete Nelson <pete.nel...@unitedlex.com> Date: Wed, 16 Aug 2017 17:19:33 -0400 Subject: [PATCH] correct paste oversight on mutex arg Remove the 'pThis->' from the second argument to STATSCOUNTER_INC macro. This only affects architectures without atomic uint64 actions, like aarm64. Others do not use the mut argument, and it gets compiled out. --- plugins/imptcp/imptcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c index c373c17e6..ab2a17e5b 100644 --- a/plugins/imptcp/imptcp.c +++ b/plugins/imptcp/imptcp.c @@ -828,7 +828,7 @@ AcceptConnReq(ptcplstn_t *pLstn, int *newSock, prop_t **peerName, prop_t **peerI LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, "imptcp: connection established with host: %s", propGetSzStr(*peerName)); } - STATSCOUNTER_INC(pLstn->ctrSessOpen, pThis->pLstn->mutCtrSessOpen); + STATSCOUNTER_INC(pLstn->ctrSessOpen, pLstn->mutCtrSessOpen); *newSock = iNewSock; finalize_it: @@ -837,7 +837,7 @@ AcceptConnReq(ptcplstn_t *pLstn, int *newSock, prop_t **peerName, prop_t **peerI if(iRet != RS_RET_NO_MORE_DATA && pLstn->pSrv->bEmitMsgOnOpen) { LogError(0, NO_ERRCODE, "imptcp: connection could not be established with host: %s", propGetSzStr(*peerName)); } - STATSCOUNTER_INC(pLstn->ctrSessOpenErr, pThis->pLstn->mutCtrSessOpenErr); + STATSCOUNTER_INC(pLstn->ctrSessOpenErr, pLstn->mutCtrSessOpenErr); /* the close may be redundant, but that doesn't hurt... */ if(iNewSock != -1) close(iNewSock);
signature.asc
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---Source: rsyslog Source-Version: 8.29.0-2 We believe that the bug you reported is fixed in the latest version of rsyslog, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 872...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Michael Biebl <bi...@debian.org> (supplier of updated rsyslog package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Tue, 05 Sep 2017 19:09:49 +0200 Source: rsyslog Binary: rsyslog rsyslog-mysql rsyslog-pgsql rsyslog-mongodb rsyslog-elasticsearch rsyslog-kafka rsyslog-gssapi rsyslog-gnutls rsyslog-relp rsyslog-czmq rsyslog-hiredis Architecture: source Version: 8.29.0-2 Distribution: unstable Urgency: medium Maintainer: Michael Biebl <bi...@debian.org> Changed-By: Michael Biebl <bi...@debian.org> Description: rsyslog - reliable system and kernel logging daemon rsyslog-czmq - ZeroMQ protocol support for rsyslog via CZMQ rsyslog-elasticsearch - Elasticsearch output plugin for rsyslog rsyslog-gnutls - TLS protocol support for rsyslog rsyslog-gssapi - GSSAPI authentication and encryption support for rsyslog rsyslog-hiredis - Redis output plugin for rsyslog rsyslog-kafka - Apache Kafka support for rsyslog rsyslog-mongodb - MongoDB output plugin for rsyslog rsyslog-mysql - MySQL output plugin for rsyslog rsyslog-pgsql - PostgreSQL output plugin for rsyslog rsyslog-relp - RELP protocol support for rsyslog Closes: 872568 Changes: rsyslog (8.29.0-2) unstable; urgency=medium . * Change priority of all extra packages to optional * Bump Standards-Version to 4.0.1 * Cherry-pick upstream patch to fix build failures on platforms without 64-bit atomics (Closes: #872568) Checksums-Sha1: 6b5a6c04c2ca16025cc463ee779aad258ae92202 2862 rsyslog_8.29.0-2.dsc e14582cb2ecee3022df487095ecc63c8955bcb27 26264 rsyslog_8.29.0-2.debian.tar.xz c67fd5ecaf327004abec3b0ce10acd31210c643a 6870 rsyslog_8.29.0-2_source.buildinfo Checksums-Sha256: 1eb4bda8eb9d0696ca1788499dcb1e07d65dc76881f9509affc6a1aeee2dac3a 2862 rsyslog_8.29.0-2.dsc 24a2aa9fecc4803b61a66a3a3d2a1d82c5ccd9298af8dcac4e8bc36c3536882e 26264 rsyslog_8.29.0-2.debian.tar.xz 9ba87cc4bd53717e0dd215f6977c2e2384efaf81d8b9ea9809ffb22b67b91b62 6870 rsyslog_8.29.0-2_source.buildinfo Files: e44ae738e81e9955543b289c179d3726 2862 admin important rsyslog_8.29.0-2.dsc d4ef3ead9920d372093ca9aeffbb9f59 26264 admin important rsyslog_8.29.0-2.debian.tar.xz a8813238bbfc627a9ca4bbe5b23e960d 6870 admin important rsyslog_8.29.0-2_source.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEECbOsLssWnJBDRcxUauHfDWCPItwFAlmu4dwACgkQauHfDWCP ItwLYw//c3t5NqbuYb1ebb7GgE1QxRJuVFjOEMAA60akZXgMTcCIm340QHV7kndB GvBOJ+0luoqdgsXu6Pa4WGOPjamyf5LVmXGzlcz1lPHUmU0XMT1qlKwNGViw6vH4 gJmO6LN7nPJ95ceq5ZB3bxnQociLHQBLMUF//qZi9xZsYccMXpFqL7y7Z/UvQJr6 qfOwPsIBjeIkSJnI34W1430TX8KnSJUHBopUlYDjedyCfr8WDTh9CJvuGJDKeyhd M9+RW2ZW0CUSS/cvMUOZueNw51YYHmJiuGSaL6ArfC6QZROcK07Tj9fgjHDhhhfY UaIGnAxpmfq26y6M7Ssbs9JS/GulfhPDreWlDh5rX+hfUFb84Vc8RSTDm2mlp99i j12o0O5iCDfZmAXGJF37qzP8cvENaNE0e4xXUQou37SFcwoaeGpNduORvpmtw+g3 rA4NWXGQCRtrsmKGT8RH8kkdlS8yO6xVkxjkc9rhc8YxpgaLYEqUMz1DewFZn7c4 rM6fc4eOotiqa/E2wrBzx7VQkq038+kR4RGjSVIUTWa2SSR8QBaeZXqykjQipV4c 9up3yCxqH0q2BE1ppRnpVOqiAsgn6BQsv3n87t73gXj+PXkAfXNGTIJr5Q/MRXj5 Gmdmu7ZHPgxq874QdpR/vu3qNfap+HMcAlovXFXqULF0ktff8jE= =9tPT -----END PGP SIGNATURE-----
--- End Message ---
