Re: git: e7d9c6346761 - main - net/openpgm: Update version 5-2-122=>5-3-128
- In reply to: Vladimir Druzenko : "Re: git: e7d9c6346761 - main - net/openpgm: Update version 5-2-122=>5-3-128"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 23 Feb 2026 16:11:06 UTC
> On Feb 23, 2026, at 16:58, Vladimir Druzenko <vvd@freebsd.org> wrote:
>
> Hello!
>
> This update break consumer net/libzmq4 (in poudriere and on live system 14.3 amd64):
> In file included from src/ip.cpp:53:
> In file included from /usr/local/include/pgm-5.3/pgm/pgm.h:37:
> In file included from /usr/local/include/pgm-5.3/pgm/engine.h:29:
> /usr/local/include/pgm-5.3/pgm/error.h:99:77: error: redefinition of parameter 'restrict'
> 99 | void pgm_set_error (pgm_error_t**restrict, const int, const int, const char*restrict, ...) PGM_GNUC_PRINTF (4, 5);
> | ^
> /usr/local/include/pgm-5.3/pgm/error.h:99:34: note: previous declaration is here
> 99 | void pgm_set_error (pgm_error_t**restrict, const int, const int, const char*restrict, ...) PGM_GNUC_PRINTF (4, 5);
> | ^
> /usr/local/include/pgm-5.3/pgm/error.h:100:62: error: redefinition of parameter 'restrict'
> 100 | void pgm_propagate_error (pgm_error_t**restrict, pgm_error_t*restrict);
> | ^
> /usr/local/include/pgm-5.3/pgm/error.h:100:40: note: previous declaration is here
> 100 | void pgm_propagate_error (pgm_error_t**restrict, pgm_error_t*restrict);
> | ^
> /usr/local/include/pgm-5.3/pgm/error.h:102:58: error: redefinition of parameter 'restrict'
> 102 | void pgm_prefix_error (pgm_error_t**restrict, const char*restrict, ...) PGM_GNUC_PRINTF (2, 3);
> | ^
> /usr/local/include/pgm-5.3/pgm/error.h:102:37: note: previous declaration is here
> 102 | void pgm_prefix_error (pgm_error_t**restrict, const char*restrict, ...) PGM_GNUC_PRINTF (2, 3);
> | ^
> In file included from src/ip.cpp:53:
> In file included from /usr/local/include/pgm-5.3/pgm/pgm.h:39:
> /usr/local/include/pgm-5.3/pgm/gsi.h:44:69: error: redefinition of parameter 'restrict'
> 44 | bool pgm_gsi_create_from_hostname (pgm_gsi_t*restrict, pgm_error_t**restrict);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:44:46: note: previous declaration is here
> 44 | bool pgm_gsi_create_from_hostname (pgm_gsi_t*restrict, pgm_error_t**restrict);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:45:65: error: redefinition of parameter 'restrict'
> 45 | bool pgm_gsi_create_from_addr (pgm_gsi_t*restrict, pgm_error_t**restrict);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:45:42: note: previous declaration is here
> 45 | bool pgm_gsi_create_from_addr (pgm_gsi_t*restrict, pgm_error_t**restrict);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:46:66: error: redefinition of parameter 'restrict'
> 46 | bool pgm_gsi_create_from_data (pgm_gsi_t*restrict, const uint8_t*restrict, const size_t);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:46:42: note: previous declaration is here
> 46 | bool pgm_gsi_create_from_data (pgm_gsi_t*restrict, const uint8_t*restrict, const size_t);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:47:65: error: redefinition of parameter 'restrict'
> 47 | bool pgm_gsi_create_from_string (pgm_gsi_t*restrict, const char*restrict, ssize_t);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:47:44: note: previous declaration is here
> 47 | bool pgm_gsi_create_from_string (pgm_gsi_t*restrict, const char*restrict, ssize_t);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:48:53: error: redefinition of parameter 'restrict'
> 48 | int pgm_gsi_print_r (const pgm_gsi_t*restrict, char*restrict, const size_t);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:48:38: note: previous declaration is here
> 48 | int pgm_gsi_print_r (const pgm_gsi_t*restrict, char*restrict, const size_t);
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:50:53: error: redefinition of parameter 'restrict'
> 50 | bool pgm_gsi_equal (const void*restrict, const void*restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> /usr/local/include/pgm-5.3/pgm/gsi.h:50:32: note: previous declaration is here
> 50 | bool pgm_gsi_equal (const void*restrict, const void*restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> In file included from src/ip.cpp:53:
> In file included from /usr/local/include/pgm-5.3/pgm/pgm.h:43:
> /usr/local/include/pgm-5.3/pgm/messages.h:61:70: error: redefinition of parameter 'restrict'
> 61 | typedef void (*pgm_log_func_t) (const int, const char*restrict, void*restrict);
> | ^
> /usr/local/include/pgm-5.3/pgm/messages.h:61:55: note: previous declaration is here
> 61 | typedef void (*pgm_log_func_t) (const int, const char*restrict, void*restrict);
> | ^
> In file included from src/ip.cpp:53:
> In file included from /usr/local/include/pgm-5.3/pgm/pgm.h:44:
> In file included from /usr/local/include/pgm-5.3/pgm/msgv.h:33:
> In file included from /usr/local/include/pgm-5.3/pgm/skbuff.h:36:
> /usr/local/include/pgm-5.3/pgm/time.h:33:83: error: redefinition of parameter 'restrict'
> 33 | typedef void (*pgm_time_since_epoch_func)(const pgm_time_t*const restrict, time_t*restrict);
> | ^
> /usr/local/include/pgm-5.3/pgm/time.h:33:66: note: previous declaration is here
> 33 | typedef void (*pgm_time_since_epoch_func)(const pgm_time_t*const restrict, time_t*restrict);
> | ^
> In file included from src/ip.cpp:53:
> In file included from /usr/local/include/pgm-5.3/pgm/pgm.h:44:
> In file included from /usr/local/include/pgm-5.3/pgm/msgv.h:33:
> In file included from /usr/local/include/pgm-5.3/pgm/skbuff.h:38:
> /usr/local/include/pgm-5.3/pgm/tsi.h:47:53: error: redefinition of parameter 'restrict'
> 47 | int pgm_tsi_print_r (const pgm_tsi_t*restrict, char*restrict, size_t);
> | ^
> /usr/local/include/pgm-5.3/pgm/tsi.h:47:38: note: previous declaration is here
> 47 | int pgm_tsi_print_r (const pgm_tsi_t*restrict, char*restrict, size_t);
> | ^
> /usr/local/include/pgm-5.3/pgm/tsi.h:48:53: error: redefinition of parameter 'restrict'
> 48 | bool pgm_tsi_equal (const void*restrict, const void*restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> /usr/local/include/pgm-5.3/pgm/tsi.h:48:32: note: previous declaration is here
> 48 | bool pgm_tsi_equal (const void*restrict, const void*restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> In file included from src/ip.cpp:53:
> In file included from /usr/local/include/pgm-5.3/pgm/pgm.h:44:
> In file included from /usr/local/include/pgm-5.3/pgm/msgv.h:33:
> In file included from /usr/local/include/pgm-5.3/pgm/skbuff.h:39:
> /usr/local/include/pgm-5.3/pgm/socket.h:61:39: error: expected ';' at end of declaration list
> 61 | struct pgm_group_source_req* restrict ai_recv_addrs;
> | ^
> | ;
> /usr/local/include/pgm-5.3/pgm/socket.h:63:31: error: duplicate member 'restrict'
> 63 | struct pgm_group_source_req* restrict ai_send_addrs;
> | ^
> /usr/local/include/pgm-5.3/pgm/socket.h:61:31: note: previous declaration is here
> 61 | struct pgm_group_source_req* restrict ai_recv_addrs;
> | ^
> /usr/local/include/pgm-5.3/pgm/socket.h:63:39: error: expected ';' at end of declaration list
> 63 | struct pgm_group_source_req* restrict ai_send_addrs;
> | ^
> | ;
> /usr/local/include/pgm-5.3/pgm/socket.h:176:94: error: redefinition of parameter 'restrict'
> 176 | bool pgm_socket (pgm_sock_t**restrict, const sa_family_t, const int, const int, pgm_error_t**restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> /usr/local/include/pgm-5.3/pgm/socket.h:176:30: note: previous declaration is here
> 176 | bool pgm_socket (pgm_sock_t**restrict, const sa_family_t, const int, const int, pgm_error_t**restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> /usr/local/include/pgm-5.3/pgm/socket.h:177:71: error: redefinition of parameter 'restrict'
> 177 | bool pgm_bind (pgm_sock_t*restrict, const struct pgm_sockaddr_t*const restrict, const socklen_t, pgm_error_t**restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> /usr/local/include/pgm-5.3/pgm/socket.h:177:27: note: previous declaration is here
> 177 | bool pgm_bind (pgm_sock_t*restrict, const struct pgm_sockaddr_t*const restrict, const socklen_t, pgm_error_t**restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> /usr/local/include/pgm-5.3/pgm/socket.h:177:111: error: redefinition of parameter 'restrict'
> 177 | bool pgm_bind (pgm_sock_t*restrict, const struct pgm_sockaddr_t*const restrict, const socklen_t, pgm_error_t**restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> /usr/local/include/pgm-5.3/pgm/socket.h:177:27: note: previous declaration is here
> 177 | bool pgm_bind (pgm_sock_t*restrict, const struct pgm_sockaddr_t*const restrict, const socklen_t, pgm_error_t**restrict) PGM_GNUC_WARN_UNUSED_RESULT;
> | ^
> fatal error: too many errors emitted, stopping now [-ferror-limit=]
> 20 errors generated.
>
> 23.02.2026 14:14, Muhammad Moinur Rahman пишет:
>> The branch main has been updated by bofh:
>>
>> URL: https://cgit.FreeBSD.org/ports/commit/?id=e7d9c634676161a5dd24e36b249b63f29861f1f7
>>
>> commit e7d9c634676161a5dd24e36b249b63f29861f1f7
>> Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
>> AuthorDate: 2026-02-23 09:47:01 +0000
>> Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
>> CommitDate: 2026-02-23 11:14:03 +0000
>>
>> net/openpgm: Update version 5-2-122=>5-3-128
>> - Pet portclippy
>> - Adopt port
>> Changelog: https://github.com/steve-o/openpgm/releases/tag/release-5-3-128
>> ---
>> net/openpgm/Makefile | 22 ++++++------
>> net/openpgm/distinfo | 8 ++---
>> net/openpgm/files/patch-version__generator.py | 19 ----------
>> net/openpgm/pkg-plist | 50 +++++++++++++--------------
>> 4 files changed, 40 insertions(+), 59 deletions(-)
>>
>> diff --git a/net/openpgm/Makefile b/net/openpgm/Makefile
>> index 3fd9f9cc3e8f..6e5b8ea1d53c 100644
>> --- a/net/openpgm/Makefile
>> +++ b/net/openpgm/Makefile
>> @@ -1,12 +1,8 @@
>> PORTNAME= openpgm
>> DISTVERSIONPREFIX= release-
>> -DISTVERSION= 5-2-122
>> -PORTREVISION= 6
>> +DISTVERSION= 5-3-128
>> CATEGORIES= net devel
>> -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
>> -PATCHFILES= ee25ff3d13f2639b4c3a42125e79f77f921c3320.patch:-p3
>> -
>> MAINTAINER= ports@FreeBSD.org
>> COMMENT= Implementation of the PGM reliable multicast protocol
>> WWW= https://code.google.com/p/openpgm/
>> @@ -14,20 +10,26 @@ WWW= https://code.google.com/p/openpgm/
>> LICENSE= LGPL21+
>> LICENSE_FILE= ${WRKSRC}/COPYING
>> +USES= autoreconf compiler:c11 pathfix perl5 libtool python:build
>> USE_GITHUB= yes
>> GH_ACCOUNT= steve-o
>> +USE_LDCONFIG= yes
>> +USE_PERL5= build
>> GNU_CONFIGURE= yes
>> -USES= autoreconf compiler:c11 pathfix perl5 libtool python:build
>> -USE_PERL5= build
>> -USE_LDCONFIG= yes
>> -WRKSRC_SUBDIR= openpgm/pgm
>> +
>> INSTALL_TARGET= install-strip
>> -OPTIONS_DEFINE= DOCS EXAMPLES
>> +WRKSRC_SUBDIR= openpgm/pgm
>> +
>> PORTDOCS= draft-ietf-rmt-bb-pgmcc-03.txt rfc3208.txt
>> PORTEXAMPLES= *
>> +OPTIONS_DEFINE= DOCS EXAMPLES
>> +
>> +post-extract:
>> + ${MV} ${WRKSRC}/openpgm-5.2.pc.in ${WRKSRC}/openpgm-5.3.pc.in
>> +
>> post-install-DOCS-on:
>> @${MKDIR} ${STAGEDIR}${DOCSDIR}
>> ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../doc/,} ${STAGEDIR}${DOCSDIR}
>> diff --git a/net/openpgm/distinfo b/net/openpgm/distinfo
>> index 0485d8b2470c..ee3c0d9ab9c8 100644
>> --- a/net/openpgm/distinfo
>> +++ b/net/openpgm/distinfo
>> @@ -1,5 +1,3 @@
>> -TIMESTAMP = 1551424949
>> -SHA256 (steve-o-openpgm-release-5-2-122_GH0.tar.gz) = acc1545fd8060aa66b17327110e2859e451cfc685ebd3b2211619728e3471b66
>> -SIZE (steve-o-openpgm-release-5-2-122_GH0.tar.gz) = 583469
>> -SHA256 (ee25ff3d13f2639b4c3a42125e79f77f921c3320.patch) = 4a9fc7fbb6e73e325639a895cd19c1ac6918b575f715c057caa01f826de40114
>> -SIZE (ee25ff3d13f2639b4c3a42125e79f77f921c3320.patch) = 990
>> +TIMESTAMP = 1771839261
>> +SHA256 (steve-o-openpgm-release-5-3-128_GH0.tar.gz) = 8d707ef8dda45f4a7bc91016d7f2fed6a418637185d76c7ab30b306499c6d393
>> +SIZE (steve-o-openpgm-release-5-3-128_GH0.tar.gz) = 673842
>> diff --git a/net/openpgm/files/patch-version__generator.py b/net/openpgm/files/patch-version__generator.py
>> deleted file mode 100644
>> index 28fc951d2e4f..000000000000
>> --- a/net/openpgm/files/patch-version__generator.py
>> +++ /dev/null
>> @@ -1,19 +0,0 @@
>> ---- version_generator.py.orig 2012-12-04 02:57:22 UTC
>> -+++ version_generator.py
>> -@@ -8,7 +8,7 @@ build_date = time.strftime ("%Y-%m-%d")
>> - build_time = time.strftime ("%H:%M:%S")
>> - build_rev = filter (str.isdigit, "$Revision: 1487 $")
>> -
>> --print """
>> -+print("""
>> - /* vim:ts=8:sts=8:sw=4:noai:noexpandtab
>> - *
>> - * OpenPGM version.
>> -@@ -50,6 +50,6 @@ const char* pgm_build_revision = "%s";
>> -
>> -
>> - /* eof */
>> --"""%(build_date, build_time, platform.system(), platform.machine(), build_rev)
>> -+"""%(build_date, build_time, platform.system(), platform.machine(), build_rev))
>> -
>> - # end of file
>> diff --git a/net/openpgm/pkg-plist b/net/openpgm/pkg-plist
>> index e30c34515a0e..a2d02558a1ea 100644
>> --- a/net/openpgm/pkg-plist
>> +++ b/net/openpgm/pkg-plist
>> @@ -1,27 +1,27 @@
>> -include/pgm-5.2/pgm/atomic.h
>> -include/pgm-5.2/pgm/engine.h
>> -include/pgm-5.2/pgm/error.h
>> -include/pgm-5.2/pgm/gsi.h
>> -include/pgm-5.2/pgm/if.h
>> -include/pgm-5.2/pgm/in.h
>> -include/pgm-5.2/pgm/list.h
>> -include/pgm-5.2/pgm/macros.h
>> -include/pgm-5.2/pgm/mem.h
>> -include/pgm-5.2/pgm/messages.h
>> -include/pgm-5.2/pgm/msgv.h
>> -include/pgm-5.2/pgm/packet.h
>> -include/pgm-5.2/pgm/pgm.h
>> -include/pgm-5.2/pgm/skbuff.h
>> -include/pgm-5.2/pgm/socket.h
>> -include/pgm-5.2/pgm/time.h
>> -include/pgm-5.2/pgm/tsi.h
>> -include/pgm-5.2/pgm/types.h
>> -include/pgm-5.2/pgm/version.h
>> -include/pgm-5.2/pgm/winint.h
>> -include/pgm-5.2/pgm/wininttypes.h
>> -include/pgm-5.2/pgm/zinttypes.h
>> -lib/libpgm-5.2.so.0
>> -lib/libpgm-5.2.so.0.0.122
>> +include/pgm-5.3/pgm/atomic.h
>> +include/pgm-5.3/pgm/engine.h
>> +include/pgm-5.3/pgm/error.h
>> +include/pgm-5.3/pgm/gsi.h
>> +include/pgm-5.3/pgm/if.h
>> +include/pgm-5.3/pgm/in.h
>> +include/pgm-5.3/pgm/list.h
>> +include/pgm-5.3/pgm/macros.h
>> +include/pgm-5.3/pgm/mem.h
>> +include/pgm-5.3/pgm/messages.h
>> +include/pgm-5.3/pgm/msgv.h
>> +include/pgm-5.3/pgm/packet.h
>> +include/pgm-5.3/pgm/pgm.h
>> +include/pgm-5.3/pgm/skbuff.h
>> +include/pgm-5.3/pgm/socket.h
>> +include/pgm-5.3/pgm/time.h
>> +include/pgm-5.3/pgm/tsi.h
>> +include/pgm-5.3/pgm/types.h
>> +include/pgm-5.3/pgm/version.h
>> +include/pgm-5.3/pgm/winint.h
>> +include/pgm-5.3/pgm/wininttypes.h
>> +include/pgm-5.3/pgm/zinttypes.h
>> +lib/libpgm-5.3.so.0
>> +lib/libpgm-5.3.so.0.0.128
>> lib/libpgm.a
>> lib/libpgm.so
>> -libdata/pkgconfig/openpgm-5.2.pc
>> +libdata/pkgconfig/openpgm-5.3.pc
>>
>
> --
> Best regards,
> Vladimir Druzenko
>
> <OpenPGP_0x8006FAABBF942F73.asc>
Ouch. Sorry I forgot to commit that.
Should be fixed in https://cgit.FreeBSD.org/ports/commit/?id=b9fbce0ff5a78b8efe8bb60cce8440c923401c87
Kind regards,
Moin