Bug 260232 - net/haproxy: Update to 2.5.0
Summary: net/haproxy: Update to 2.5.0
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: Dmitry Sivachenko
URL: http://www.haproxy.org/download/2.5/s...
Keywords:
Depends on:
Blocks:
 
Reported: 2021-12-05 10:56 UTC by Daniel Engberg
Modified: 2022-01-12 09:03 UTC (History)
1 user (show)

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


Attachments
Patch for haproxy (14.95 KB, patch)
2021-12-05 10:56 UTC, Daniel Engberg
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Engberg freebsd_committer 2021-12-05 10:56:34 UTC
Created attachment 229917 [details]
Patch for haproxy

Update haproxy to 2.5.0
Introduce options to use (lib)pcre2 instead of libpcre(1)
Default to using shared (lib)pcre2 as per recommendation in Porters Handbook

Compile tested on FreeBSD 13.0-STABLE #1 stable/13-n247667-dc9094140c9 (amd64) (make, make check-plist)
Poudriere testport OK 12.2-RELEASE (amd64)
Poudriere testport OK 13.0-RELEASE (i386)
Comment 1 Daniel Engberg freebsd_committer 2021-12-05 11:01:03 UTC
i386 builds also needs to be addressed in haproxy-devel
https://portsfallout.com/port?port=haproxy&maintainer=
Comment 2 Dmitry Sivachenko freebsd_committer 2021-12-09 13:21:07 UTC
Well, since net/haproxy is the main port for production use, I usually wait for .1 release before updating the port :)

BTW, why did you remove USE_REGPARM?
Comment 3 Daniel Engberg freebsd_committer 2021-12-10 01:56:46 UTC
Hi,

"2020/02/25 : 2.2-dev3
...
BUILD: remove obsolete support for -mregparm / USE_REGPARM"

I also can't find any reference to it in the current source code.

I'll leave it up to you for deciding when to move the main port to the 2.5 branch.

Best regards,
Daniel
Comment 4 Daniel Engberg freebsd_committer 2021-12-10 02:06:11 UTC
The other changes are to pet portlint. Out of curiosity, do we need to keep the option to compile pcre statically?
Comment 5 Dmitry Sivachenko freebsd_committer 2021-12-22 08:41:23 UTC
(In reply to Daniel Engberg from comment #4)

Well, it does not hurt.  Sometimes it is convenient to have a self-contained binary.
Comment 6 Daniel Engberg freebsd_committer 2021-12-22 11:07:49 UTC
For the sake of consistency I'd suggest that you decide on either using the same solution for powerpc or moving it pkubaj@'s variant
Comment 7 commit-hook freebsd_committer 2022-01-12 08:58:57 UTC
A commit in branch main references this bug:

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

commit 14b3a4d9d0fb701cac10215daa1475cdac31cee2
Author:     Dmitry Sivachenko <demon@FreeBSD.org>
AuthorDate: 2022-01-12 08:34:46 +0000
Commit:     Dmitry Sivachenko <demon@FreeBSD.org>
CommitDate: 2022-01-12 08:58:14 +0000

    net/haproxy: update to version 2.5.1.

    PR: 260232
    Submitted by: diizzy

 net/haproxy/Makefile                               |  44 +++---
 net/haproxy/distinfo                               |   6 +-
 ...UP-servers-do-not-include-openssl-compat (gone) |  78 ----------
 ...er-always-include-the-storage-for-SSL-se (gone) | 163 ---------------------
 net/haproxy/pkg-plist                              |  11 +-
 5 files changed, 30 insertions(+), 272 deletions(-)
Comment 8 Dmitry Sivachenko freebsd_committer 2022-01-12 09:03:20 UTC
Port updated, thanks!