Re: git: 5963119a132c - main - net/norm: Update 1.5r6 => 1.5.9, fix fetch, take maintainership

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Sat, 10 Oct 2026 06:14:11 UTC
IPPTOTO_DIVERT is deprecated.

Fix:


--- protolib/src/bsd/bsdDetour.cpp.orig 2021-01-17 15:48:09 UTC
+++ protolib/src/bsd/bsdDetour.cpp
@@ -358,7 +358,7 @@ bool BsdDetour::Open(int                 hookFlags,
      }

      // Open a divert socket ...
-    if ((descriptor = socket(domain, SOCK_RAW, IPPROTO_DIVERT)) < 0)
+    if ((descriptor = socket(domain, SOCK_RAW, PF_DIVERT)) < 0)
      {
          PLOG(PL_ERROR, "BsdDetour::Open() socket() error: %s\n", GetErrorString());
          Close();



On 10.10.2026 09:03, Dima Panov wrote:
> Hello!
> 
> On 10.10.2026 02:00, Älven wrote:
>> The branch main has been updated by alven:
>>
>> URL: https://cgit.FreeBSD.org/ports/commit/?id=5963119a132cd71510998f9173c54522a8e56678
>>
>> commit 5963119a132cd71510998f9173c54522a8e56678
>> Author:     Älven <alven@FreeBSD.org>
>> AuthorDate: 2026-10-09 22:05:31 +0000
>> Commit:     Älven <alven@FreeBSD.org>
>> CommitDate: 2026-10-09 22:57:23 +0000
>>
>>      net/norm: Update 1.5r6 => 1.5.9, fix fetch, take maintainership
>>      * Switch MASTER_SITES to new official upstream
>>      * Upstream tarball already contains latest Waf
>>      * Update WWW to now official site URL
>>      * Add custom NRL License [0]
>>      * Add DOCS and EXAMPLES options
>>      [0] https://spdx.org/licenses/NRL.html
>>      PR:             298554
>>      Reported by:    diizzyy@
>>      Approved by:    hd@oc.dk (maintainer, timeout: inactive for > 10 years)
>> ---
>>   net/norm/Makefile                                  | 48 ++++++++++---------
>>   net/norm/distinfo                                  | 12 ++---
>>   net/norm/files/patch-protolib_include_protoSpace.h | 11 -----
>>   net/norm/pkg-plist                                 | 56 ++++++++++++++++++++++
>>   4 files changed, 86 insertions(+), 41 deletions(-)
>>
> 
> 
> And it fails on -current now:
> 
> 05:56:23 runner ['c++', '-O2', '-pipe', '-fstack-protector-strong', '-fno-strict-aliasing', '-std=gnu++98', '-fPIC', '-O3', '-fvisibility=hidden', '-Wno-attributes', '-Iprotolib/include', '-I../protolib/include', '-Iprotolib/include
> /unix', '-I../protolib/include/unix', '-DUNIX', '-DHAVE_DIRFD', '-DHAVE_IPV6', '-DHAVE_ASSERT', '-DHAVE_GETLOGIN', '-DHAVE_FLOCK', '-D_FILE_OFFSET_BITS=64', '-DHAVE_PSELECT', '-DUSE_SELECT', '-DNDEBUG', '-DPROTO_DEBUG', '../protolib
> /src/common/protoLFSR.cpp', '-c', '-o/wrkdirs/usr/ports/net/norm/work/norm-1.5.9/build/protolib/src/common/protoLFSR.cpp.1.o']
> ../protolib/src/bsd/bsdDetour.cpp:106:12: warning: first argument in call to 'memset' is a pointer to non-trivially copyable type 'ProtoAddress' [-Wnontrivial-memcall]
>    106 |     memset(&pkt_addr, 0, sizeof(struct sockaddr_storage));
>        |            ^
> ../protolib/src/bsd/bsdDetour.cpp:106:12: note: explicitly cast the pointer to silence this warning
>    106 |     memset(&pkt_addr, 0, sizeof(struct sockaddr_storage));
>        |            ^
>        |            (void*)
> ../protolib/src/bsd/bsdDetour.cpp:361:48: error: use of undeclared identifier 'IPPROTO_DIVERT'
>    361 |     if ((descriptor = socket(domain, SOCK_RAW, IPPROTO_DIVERT)) < 0)
>        |                                                ^~~~~~~~~~~~~~
> 1 warning and 1 error generated.
> 
> Waf: Leaving directory `/wrkdirs/usr/ports/net/norm/work/norm-1.5.9/build'
> Build failed
>   -> task in 'protoObjs' failed with exit status 1:
>          {task 1123951440: cxx bsdDetour.cpp -> bsdDetour.cpp.1.o}
> ['c++', '-O2', '-pipe', '-fstack-protector-strong', '-fno-strict-aliasing', '-std=gnu++98', '-fPIC', '-O3', '-fvisibility=hidden', '-Wno-attributes', '-Iprotolib/include', '-I../protolib/include', '-Iprotolib/include/unix', '-I../pr
> otolib/include/unix', '-DUNIX', '-DHAVE_DIRFD', '-DHAVE_IPV6', '-DHAVE_ASSERT', '-DHAVE_GETLOGIN', '-DHAVE_FLOCK', '-D_FILE_OFFSET_BITS=64', '-DHAVE_PSELECT', '-DUSE_SELECT', '-DNDEBUG', '-DPROTO_DEBUG', '../protolib/src/bsd/bsdDeto
> ur.cpp', '-c', '-o/wrkdirs/usr/ports/net/norm/work/norm-1.5.9/build/protolib/src/bsd/bsdDetour.cpp.1.o']
> ===> Compilation failed unexpectedly.
> 

-- 
Sincerely,
Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD, @fluffy:matrix-dev.freebsd.org)
(desktop, kde, x11, office, ports-secteam)@FreeBSD team