Bug 263274 - devel/subversion: build fails with option SVNSERVE_WRAPPER=on
Summary: devel/subversion: build fails with option SVNSERVE_WRAPPER=on
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Lev A. Serebryakov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-04-14 07:21 UTC by Martin Birgmeier
Modified: 2022-04-22 09:46 UTC (History)
2 users (show)

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

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Birgmeier 2022-04-14 07:21:33 UTC 
Scenario:
- FreeBSD 12.3 latest
- ports latest
- using portmaster to upgrade ports
- nonstandard build options to subversion:

[0]# cd /usr/ports/devel/subversion
[0]# diff =(PORT_DBDIR=/nonexistent make showconfig) =(make showconfig)
2c2
<      BDB=off: Berkeley DB support
---
>      BDB=on: Berkeley DB support
5c5
<      GPG_AGENT=on: Enable GPG agent password store
---
>      GPG_AGENT=off: Enable GPG agent password store
10c10
<      SVNSERVE_WRAPPER=off: Enable svnserve wrapper (umask setter)
---
>      SVNSERVE_WRAPPER=on: Enable svnserve wrapper (umask setter)
[1]# 

- Upgrading subversion

Result:
- Build fails during staging with "strip: open /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/devel/subversion/work/stage/usr/local/bin/svnserve failed: No such file or directory"

Expected result:
- Build should complete normally.

-- Martin
Comment 1 Martin Birgmeier 2022-04-14 07:30:12 UTC 
patch:

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 5af347c3cf2e..e4dc231d995c 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -87,7 +87,7 @@ MKREPOS_TARGET=       _mkrepos
 
 
 BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \
-               svnrdump svnserve svnsync svnversion
+               svnrdump svnserve.bin svnsync svnversion
 
 TOOLS_TO_STRIP=        fsfs-access-map svn-mergeinfo-normalizer \
                 svn-populate-node-origins-index svnauthz \

no version bump needed

-- Martin
Comment 2 commit-hook freebsd_committer freebsd_triage 2022-04-14 09:39:17 UTC 
A commit in branch main references this bug:

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

commit 32d20960fffb61219dd79dda52b2baee18d9e004
Author:     Lev A. Serebryakov <lev@FreeBSD.org>
AuthorDate: 2022-04-14 09:37:52 +0000
Commit:     Lev A. Serebryakov <lev@FreeBSD.org>
CommitDate: 2022-04-14 09:37:52 +0000

    devel/subversion: Fix build with SVNSERVE_WRAPPER=on

    PR:     263274

 devel/subversion/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Comment 3 commit-hook freebsd_committer freebsd_triage 2022-04-14 09:49:20 UTC 
A commit in branch main references this bug:

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

commit 43179a695c589c7fbd1e6650fc21099e79a59263
Author:     Lev A. Serebryakov <lev@FreeBSD.org>
AuthorDate: 2022-04-14 09:47:29 +0000
Commit:     Lev A. Serebryakov <lev@FreeBSD.org>
CommitDate: 2022-04-14 09:48:19 +0000

    devel/subversion-lts: Fix build with SVNSERVE_WRAPPER=on

    PR:     263274

 devel/subversion-lts/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Comment 4 Lev A. Serebryakov freebsd_committer freebsd_triage 2022-04-14 10:04:18 UTC 
Fixed. Thank you for report.
Comment 5 Martin Birgmeier 2022-04-14 10:11:06 UTC 
Thank you for the quick action.

-- Martin

There are good people everywhere.
Comment 6 commit-hook freebsd_committer freebsd_triage 2022-04-22 09:43:44 UTC 
A commit in branch 2022Q2 references this bug:

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

commit 0bf2fabac933d73aca22372f0cc30b8846a0a2b1
Author:     Lev A. Serebryakov <lev@FreeBSD.org>
AuthorDate: 2022-04-14 09:47:29 +0000
Commit:     Lev A. Serebryakov <lev@FreeBSD.org>
CommitDate: 2022-04-22 09:42:34 +0000

    devel/subversion-lts: Fix build with SVNSERVE_WRAPPER=on

    PR:     263274
    (cherry picked from commit 43179a695c589c7fbd1e6650fc21099e79a59263)

 devel/subversion-lts/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Comment 7 commit-hook freebsd_committer freebsd_triage 2022-04-22 09:46:48 UTC 
A commit in branch 2022Q2 references this bug:

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

commit fac83033ab02c251f5dd8ad6273fb090e2a1f6c4
Author:     Lev A. Serebryakov <lev@FreeBSD.org>
AuthorDate: 2022-04-14 09:37:52 +0000
Commit:     Lev A. Serebryakov <lev@FreeBSD.org>
CommitDate: 2022-04-22 09:46:05 +0000

    devel/subversion: Fix build with SVNSERVE_WRAPPER=on

    PR:     263274
    (cherry picked from commit 32d20960fffb61219dd79dda52b2baee18d9e004)

 devel/subversion/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)