Bug 280467 - net/torsocks: multiple redefinition errors
Summary: net/torsocks: multiple redefinition errors
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: amd64 Any
: --- Affects Only Me
Assignee: Yuri Victorovich
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-07-27 10:08 UTC by Dan Kotowski
Modified: 2024-08-24 03:46 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (yuri)


Attachments
poudriere bulk -j FreeBSD:15:amd64 -p latest net/torsocks (51.81 KB, text/plain)
2024-07-27 10:08 UTC, Dan Kotowski
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Dan Kotowski 2024-07-27 10:08:26 UTC
Created attachment 252318 [details]
poudriere bulk -j FreeBSD:15:amd64 -p latest net/torsocks

port directory: /usr/ports/net/torsocks
package name: torsocks-2.4.0
building for: FreeBSD pkg1.a9development.com 15.0-CURRENT FreeBSD 15.0-CURRENT 1500021 amd64
maintained by: yuri@FreeBSD.org
Makefile datestamp: -rw-r--r--  1 root wheel 1188 May  6 05:07 /usr/ports/net/torsocks/Makefile
Ports top last git commit: 382aea5239
Ports top unclean checkout: no
Port dir last git commit: d5688719dd
Port dir unclean checkout: no
Poudriere version: poudriere-git-3.4.1_1
Host OSVERSION: 1500021
Jail OSVERSION: 1500021



libtool: compile:  cc -DHAVE_CONFIG_H -I../.. -I../.. -I../../src -I../../include -include config.h -I../../include -I../../src -I. -D_FORTIFY_SOURCE=2 -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -Wall -fwrapv --param ssp-buffer-size=1 -fstack-protector-all -MT getpeername.lo -MD -MP -MF .deps/getpeername.Tpo -c getpeername.c  -fPIC -DPIC -o .libs/getpeername.o

getpeername.c:98:1: error: redefinition of 'getpeername'
   98 | LIBC_GETPEERNAME_DECL
      | ^



libtool: compile:  cc -DHAVE_CONFIG_H -I../.. -I../.. -I../../src -I../../include -include config.h -I../../include -I../../src -I. -D_FORTIFY_SOURCE=2 -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -Wall -fwrapv --param ssp-buffer-size=1 -fstack-protector-all -MT recv.lo -MD -MP -MF .deps/recv.Tpo -c recv.c  -fPIC -DPIC -o .libs/recv.o

recv.c:179:1: error: redefinition of 'recvmsg'
  179 | LIBC_RECVMSG_DECL
      | ^
Comment 1 Yuri Victorovich freebsd_committer freebsd_triage 2024-07-27 20:19:04 UTC
Fixed, thanks for reporting this.
Comment 2 commit-hook freebsd_committer freebsd_triage 2024-07-27 20:20:09 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=97e12aa04d5dc00271ae925f01a4ec0432efb660

commit 97e12aa04d5dc00271ae925f01a4ec0432efb660
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-07-27 20:14:51 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-07-27 20:19:17 +0000

    net/torsocks: Fix build failure on 15

    PR:             280467
    Reported by:    Dan Kotowski <dan.kotowski@a9development.com>

 net/torsocks/files/patch-src_lib_getpeername.c | 14 +++++++-------
 net/torsocks/files/patch-src_lib_syscall.c     | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)
Comment 3 Dan Kotowski 2024-07-29 10:52:56 UTC
Yuri, it looks like the 2nd error in recv.c:179 is still there.
Comment 4 Dan Kotowski 2024-07-29 10:54:08 UTC
./torsocks.h:311:25: note: expanded from macro 'LIBC_RECVMSG_DECL'
  311 |                 LIBC_RECVMSG_RET_TYPE LIBC_RECVMSG_NAME(LIBC_RECVMSG_SIG)
      |                                       ^
./torsocks.h:198:27: note: expanded from macro 'LIBC_RECVMSG_NAME'
  198 | #define LIBC_RECVMSG_NAME recvmsg
      |                           ^
/usr/include/ssp/socket.h:89:34: note: previous definition is here
   89 | __ssp_redirect_raw_impl(ssize_t, recvmsg, recvmsg,
      |                                  ^
Comment 5 Yuri Victorovich freebsd_committer freebsd_triage 2024-07-29 18:51:14 UTC
(In reply to Dan Kotowski from comment #4)

Hi Dan,

On what system does it fail?
I can't reproduce on 15 amd64.
Comment 6 Dan Kotowski 2024-07-29 19:34:57 UTC
(In reply to Yuri Victorovich from comment #5)
Host OSVERSION: 1500021
Jail OSVERSION: 1500021
src/main@2ab551500190
Comment 7 Dan Kotowski 2024-07-30 20:54:59 UTC
(In reply to Yuri Victorovich from comment #5)

src@1f155d48f878495d31592c59cab82f975c210ad8 had some significant changes that I suspect are the root cause here
Comment 8 commit-hook freebsd_committer freebsd_triage 2024-08-24 03:46:43 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bf74bdd7fd0e4eb099261f16eea56fe54d1dce86

commit bf74bdd7fd0e4eb099261f16eea56fe54d1dce86
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-08-24 03:10:09 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-08-24 03:45:44 +0000

    net/torsocks: Fix build on 15

    One more function had to be fixed

    PR:             280467

 net/torsocks/files/patch-src_lib_recv.c (new) | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)