Bug 280876 - devel/objfw: Update to 1.1.6
Summary: devel/objfw: Update to 1.1.6
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-08-17 07:54 UTC by Jonathan Schleifer
Modified: 2024-08-18 15:05 UTC (History)
2 users (show)

See Also:
uzsolt: maintainer-feedback+
vvd: merge-quarterly+


Attachments
objfw-1.1.6.patch (1.22 KB, patch)
2024-08-17 07:54 UTC, Jonathan Schleifer
no flags Details | Diff
v1: sort options, rename SSL to TLS (2.07 KB, patch)
2024-08-18 13:31 UTC, Vladimir Druzenko
vvd: maintainer-approval?
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Schleifer 2024-08-17 07:54:13 UTC
Created attachment 252839 [details]
objfw-1.1.6.patch

Please also apply to quarterly.

Given there were some changes for ARM, can you test if it works on ARM on FreeBSD now?

ObjFW 1.1.5 -> ObjFW 1.1.6, 2024-08-11
 * Fixes ObjC++ with GCC.
 * Adds handling of EINTR in OFKernelEventObserver.
 * Fixes overriding / reusing stack arguments in super calls on x86.
 * Makes headers compatible with -Wunused-parameter.

ObjFW 1.1.4 -> ObjFW 1.1.5, 2024-07-06
 * Fixes MIPS32.
 * Properly hides private symbols in the runtime so they can't be used
   accidentally anymore.

ObjFW 1.1.3 -> ObjFW 1.1.4, 2024-05-22
 * Fixes ofarc failing to extract from stdin on macOS.
 * Fixes the workaround for missing blx on ARM.
 * Avoids Clang's integrated assembler on MIPS64 for .S files (as it cannot
   calcualte the offset between two labels).
 * Fixes X32 being mistaken for AMD64.

ObjFW 1.1.2 -> ObjFW 1.1.3, 2024-05-12
 * Fixes +[OFSystemInfo networkInterfaces] on NetBSD.
 * Properly hides private symbols so they can't be used accidentally anymore.
 * Adds missing documentation for various functions and macros.
 * Uses RtlGenRandom to get proper randomness on Windows now.
 * No longer uses _wutime64, which is buggy in some MinGW distributions.
 * Only uses blx on ARM if it is available now.
 * Adds a workaround for OFSubprocess tests on Windows 9x.
 * Skips symlink tests if symlinks are unavailable.
Comment 1 Zsolt Udvari freebsd_committer freebsd_triage 2024-08-17 18:19:52 UTC
^Triage: if you're the maintainer please set maintainer-feedback to plus!
Comment 2 Jonathan Schleifer 2024-08-17 19:08:14 UTC
I think you already set it to +, but I'm the maintainer.
Comment 3 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-17 20:47:16 UTC
====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/OFException_8h.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPlainCondition_8h.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPlainMutex_8h.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPlainThread_8h.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/OFTLSKey_8h.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/globals_e.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/globals_u.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/macros_8h.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/objfw/search/files_1.js
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.
Comment 4 Jonathan Schleifer 2024-08-17 20:53:05 UTC
Hm, it seems that doxygen changed behavior here - and it works fine for me locally. It's safe to just add those.

Do you want me to post a new patch or just add those on import?
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-17 20:58:24 UTC
(In reply to Jonathan Schleifer from comment #4)
I already add files to pkg-plist.

Also a lot of warnings from portclippy.
Comment 6 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-17 20:59:58 UTC
(In reply to Vladimir Druzenko from comment #5)
# Options definitions
OPTIONS_DEFINE
+OPTIONS_DEFAULT
OPTIONS_SINGLE
OPTIONS_SINGLE_SSL
-OPTIONS_DEFAULT

# Options descriptions
NOSSL_DESC

# Options helpers
DOCS_BUILD_DEPENDS
+GNUTLS_LIB_DEPENDS
+GNUTLS_USES
-OPENSSL_CONFIGURE_ON
-OPENSSL_PLIST_SUB
-OPENSSL_CPPFLAGS
-OPENSSL_LDFLAGS
-OPENSSL_USES
GNUTLS_CONFIGURE_ON
GNUTLS_PLIST_SUB
+MBEDTLS_LIB_DEPENDS
-GNUTLS_LIB_DEPENDS
-GNUTLS_USES
MBEDTLS_CONFIGURE_ON
-MBEDTLS_PLIST_SUB
-MBEDTLS_LIB_DEPENDS
MBEDTLS_CPPFLAGS
MBEDTLS_LDFLAGS
+MBEDTLS_PLIST_SUB
NOSSL_CONFIGURE_ON
NOSSL_PLIST_SUB
+OPENSSL_USES
+OPENSSL_CONFIGURE_ON
+OPENSSL_CPPFLAGS
+OPENSSL_LDFLAGS
+OPENSSL_PLIST_SUB

# Out of order targets
do-build-DOCS-on:
do-install-DOCS-on:
post-install:
+post-install-GNUTLS-on:
post-install-OPENSSL-on:
-post-install-GNUTLS-on:
Comment 7 Jonathan Schleifer 2024-08-18 09:17:03 UTC
(In reply to Vladimir Druzenko from comment #6)

This seems to be just out of order. Is this an issue or just a minor style nit?
Comment 8 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-18 11:12:18 UTC
(In reply to Jonathan Schleifer from comment #7)
Yes, it's out of order warnings.

You can create separate patch if you want.
Comment 9 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-18 13:04:57 UTC
(In reply to Jonathan Schleifer from comment #0)
> Given there were some changes for ARM, can you test if it works on ARM on FreeBSD now?
I don't have ARM hardware. I can ask fuz to test build and probably he can help.
Comment 10 commit-hook freebsd_committer freebsd_triage 2024-08-18 13:06:59 UTC
A commit in branch main references this bug:

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

commit 33c9e0588d0f7c779f8d9575c49d3bbb69a373d3
Author:     Jonathan Schleifer <js@nil.im>
AuthorDate: 2024-08-18 13:02:38 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-18 13:02:38 +0000

    devel/objfw: Update 1.1.2 → 1.1.6

    ObjFW 1.1.5 -> ObjFW 1.1.6, 2024-08-11
     * Fixes ObjC++ with GCC.
     * Adds handling of EINTR in OFKernelEventObserver.
     * Fixes overriding / reusing stack arguments in super calls on x86.
     * Makes headers compatible with -Wunused-parameter.

    ObjFW 1.1.4 -> ObjFW 1.1.5, 2024-07-06
     * Fixes MIPS32.
     * Properly hides private symbols in the runtime so they can't be used
       accidentally anymore.

    ObjFW 1.1.3 -> ObjFW 1.1.4, 2024-05-22
     * Fixes ofarc failing to extract from stdin on macOS.
     * Fixes the workaround for missing blx on ARM.
     * Avoids Clang's integrated assembler on MIPS64 for .S files (as it cannot
       calcualte the offset between two labels).
     * Fixes X32 being mistaken for AMD64.

    ObjFW 1.1.2 -> ObjFW 1.1.3, 2024-05-12
     * Fixes +[OFSystemInfo networkInterfaces] on NetBSD.
     * Properly hides private symbols so they can't be used accidentally anymore.
     * Adds missing documentation for various functions and macros.
     * Uses RtlGenRandom to get proper randomness on Windows now.
     * No longer uses _wutime64, which is buggy in some MinGW distributions.
     * Only uses blx on ARM if it is available now.
     * Adds a workaround for OFSubprocess tests on Windows 9x.
     * Skips symlink tests if symlinks are unavailable.

    PR:     280876
    MFH:    2024Q3

 devel/objfw/Makefile  |  2 +-
 devel/objfw/distinfo  |  6 +++---
 devel/objfw/pkg-plist | 13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)
Comment 11 commit-hook freebsd_committer freebsd_triage 2024-08-18 13:10:00 UTC
A commit in branch 2024Q3 references this bug:

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

commit 2a49f109146b12b8b481c8e46f92a1433338f633
Author:     Jonathan Schleifer <js@nil.im>
AuthorDate: 2024-08-18 13:02:38 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-18 13:08:42 +0000

    devel/objfw: Update 1.1.2 → 1.1.6

    ObjFW 1.1.5 -> ObjFW 1.1.6, 2024-08-11
     * Fixes ObjC++ with GCC.
     * Adds handling of EINTR in OFKernelEventObserver.
     * Fixes overriding / reusing stack arguments in super calls on x86.
     * Makes headers compatible with -Wunused-parameter.

    ObjFW 1.1.4 -> ObjFW 1.1.5, 2024-07-06
     * Fixes MIPS32.
     * Properly hides private symbols in the runtime so they can't be used
       accidentally anymore.

    ObjFW 1.1.3 -> ObjFW 1.1.4, 2024-05-22
     * Fixes ofarc failing to extract from stdin on macOS.
     * Fixes the workaround for missing blx on ARM.
     * Avoids Clang's integrated assembler on MIPS64 for .S files (as it cannot
       calcualte the offset between two labels).
     * Fixes X32 being mistaken for AMD64.

    ObjFW 1.1.2 -> ObjFW 1.1.3, 2024-05-12
     * Fixes +[OFSystemInfo networkInterfaces] on NetBSD.
     * Properly hides private symbols so they can't be used accidentally anymore.
     * Adds missing documentation for various functions and macros.
     * Uses RtlGenRandom to get proper randomness on Windows now.
     * No longer uses _wutime64, which is buggy in some MinGW distributions.
     * Only uses blx on ARM if it is available now.
     * Adds a workaround for OFSubprocess tests on Windows 9x.
     * Skips symlink tests if symlinks are unavailable.

    PR:     280876
    MFH:    2024Q3
    (cherry picked from commit 33c9e0588d0f7c779f8d9575c49d3bbb69a373d3)

 devel/objfw/Makefile  |  2 +-
 devel/objfw/distinfo  |  6 +++---
 devel/objfw/pkg-plist | 13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)
Comment 12 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-18 13:31:18 UTC
Created attachment 252879 [details]
v1: sort options, rename SSL to TLS

Rename SSL to TLS: PLIST_SUB options have name TLS, installed so library hae name libobjfwtls.so.1 - name TLS is better, IMHO.
Comment 13 Jonathan Schleifer 2024-08-18 14:48:17 UTC
(In reply to Vladimir Druzenko from comment #12)

LGTM
Comment 14 commit-hook freebsd_committer freebsd_triage 2024-08-18 15:05:19 UTC
A commit in branch main references this bug:

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

commit a26eec01a598c88de2c1ec39ea7b2c011d78dc5f
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-08-18 14:55:43 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-18 14:55:43 +0000

    devel/objfw: Improve Makefile

    - Sort options to pet portclippy.
    - Rename option SSL to TLS: TLS used in PLIST_SUB and in name of the so
      library installed with this option - libobjfwtls.so.1.
    - Add strip libobjfwtls.so.1 to TLS option MBEDTLS too.

    PR:             280876
    Approved by:    Jonathan Schleifer <js@nil.im> (maintainer)

 devel/objfw/Makefile | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)
Comment 15 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-18 15:05:37 UTC
Thanks.