Bug 289279 - archivers/urbackup-client: Update 2.5.25.0 => 2.5.26.0
Summary: archivers/urbackup-client: Update 2.5.25.0 => 2.5.26.0
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: https://www.urbackup.org/client_chang...
Keywords:
Depends on:
Blocks:
 
Reported: 2025-09-03 17:51 UTC by ek
Modified: 2025-09-03 22:22 UTC (History)
1 user (show)

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


Attachments
urbackup-client 2.5.26.0 patch (5.96 KB, patch)
2025-09-03 17:51 UTC, ek
no flags Details | Diff
CORRECT urbackup 2.5.26.0 patch (5.10 KB, patch)
2025-09-03 19:12 UTC, ek
ek: maintainer-approval+
Details | Diff
FIXED: urbackup-client 2.5.26.0 patch (5.05 KB, patch)
2025-09-03 21:05 UTC, ek
no flags Details | Diff
REINPLACE FIX: urbackup-client 2.5.26.0 patch (5.30 KB, patch)
2025-09-03 22:19 UTC, ek
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description ek 2025-09-03 17:51:52 UTC
Created attachment 263452 [details]
urbackup-client 2.5.26.0 patch

Update to version 2.5.26.0 with some more port cleanup.

Build logs can be found at: https://pkg.purplehat.org/data/fbsd_14-3_x64-HEAD/2025-09-02_21h06m44s/logs/urbackup-client-2.5.26.0.log
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-03 18:09:55 UTC
Wrong patch.
Comment 2 ek 2025-09-03 19:12:02 UTC
Created attachment 263455 [details]
CORRECT urbackup 2.5.26.0 patch

Oh, wow! Complete rookie mistake. I suppose it makes sense, since I'm a rookie. :)

Proper patch attached. Sorry about that and thanks for pointing it out so quickly!
Comment 3 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-03 19:28:58 UTC
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: etc/rc.d/urbackup_client
===> Error: Plist issues found.
*** Error code 1
Comment 4 ek 2025-09-03 21:05:33 UTC
Created attachment 263456 [details]
FIXED: urbackup-client 2.5.26.0 patch

Jeepers! I dunno how that crept back in there. But, fixed, re-patched, re-tested via Poudriere.

New build log can be found at https://pkg.purplehat.org/data/fbsd_14-3_x64-HEAD/2025-09-03_14h51m53s/logs/urbackup-client-2.5.26.0.log

*crosses fingers*
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-03 21:16:25 UTC
(In reply to ek from comment #4)
You didn't add the script etc/rc.d/urbackup_client to the port. Ok.
Comment 6 ek 2025-09-03 21:24:26 UTC
(In reply to Vladimir Druzenko from comment #5)

Yeah. I left the RC script as files/urbackup_client.in (which gets installed/removed as expected) but left it out of STAGE. I tested with manual ports, poudriere, and pkg install/delete and the file was created/removed for all.

I'm not sure if this is the best/proper way to handle the RC script. Should it be dumped into ${WRKDIR} for STAGE as well or does it not matter?
Comment 7 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-03 22:03:25 UTC
(In reply to ek from comment #6)
It handled by USE_RC_SUBR=urbackup_client variable.

Suggestion to run REINPLACE_CMD for *.cpp and *.h files only:
-        ${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} \
-                -e 's|auto_ptr|unique_ptr|g' {} +
+        ${FIND} ${WRKSRC} -type f \( -name '*.cpp' -o -name '*.h' \) \
+                -exec ${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|g' {} +
Comment 8 ek 2025-09-03 22:10:45 UTC
(In reply to Vladimir Druzenko from comment #7)

Perfect. Thank you for the work and the explanation/information. I greatly appreciate it!
Comment 9 commit-hook freebsd_committer freebsd_triage 2025-09-03 22:16:59 UTC
A commit in branch main references this bug:

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

commit d70c8a415dd3d89ac879a2bce2c37b914538ebee
Author:     ek <ek@purplehat.org>
AuthorDate: 2025-09-03 22:13:39 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-09-03 22:16:00 +0000

    archivers/urbackup-client: Update 2.5.25.0 => 2.5.26.0

    Changelog:
    https://www.urbackup.org/client_changelog.html

    PR:     289279
    MFH:    2025Q3

 archivers/urbackup-client/Makefile                        |  9 +++------
 archivers/urbackup-client/distinfo                        |  6 +++---
 archivers/urbackup-client/files/patch-Makefile.am         |  4 ++--
 .../files/patch-cryptoplugin_src_files.cpp (new)          | 11 +++++++++++
 .../files/patch-libfastcgi_fastcgi.hpp (new)              | 11 +++++++++++
 .../files/patch-urbackupclient_lin__tokens.cpp (gone)     | 11 -----------
 archivers/urbackup-client/pkg-plist                       | 15 ++++++++-------
 7 files changed, 38 insertions(+), 29 deletions(-)
Comment 10 commit-hook freebsd_committer freebsd_triage 2025-09-03 22:19:01 UTC
A commit in branch 2025Q3 references this bug:

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

commit ddbf2805b0d3fb5d139813d08617f8d4982bb38b
Author:     ek <ek@purplehat.org>
AuthorDate: 2025-09-03 22:13:39 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-09-03 22:18:18 +0000

    archivers/urbackup-client: Update 2.5.25.0 => 2.5.26.0

    Changelog:
    https://www.urbackup.org/client_changelog.html

    PR:     289279
    MFH:    2025Q3
    (cherry picked from commit d70c8a415dd3d89ac879a2bce2c37b914538ebee)

 archivers/urbackup-client/Makefile                        |  9 +++------
 archivers/urbackup-client/distinfo                        |  6 +++---
 archivers/urbackup-client/files/patch-Makefile.am         |  4 ++--
 .../files/patch-cryptoplugin_src_files.cpp (new)          | 11 +++++++++++
 .../files/patch-libfastcgi_fastcgi.hpp (new)              | 11 +++++++++++
 .../files/patch-urbackupclient_lin__tokens.cpp (gone)     | 11 -----------
 archivers/urbackup-client/pkg-plist                       | 15 ++++++++-------
 7 files changed, 38 insertions(+), 29 deletions(-)
Comment 11 ek 2025-09-03 22:19:34 UTC
Created attachment 263460 [details]
REINPLACE FIX: urbackup-client 2.5.26.0 patch

Uploaded patch for update REINPLACE in the Makefile. Thanks again!
Comment 12 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-03 22:20:50 UTC
Thanks.
Comment 13 ek 2025-09-03 22:22:31 UTC
Thank you very much, Vladimir!