On 2021/01/18 13:15, Aisha Tammy wrote: > Hi, > I've attached update for haproxy.
Probably best talk to maintainer, some people prefer to keep ports on LTS versions. > -DISTNAME = haproxy-2.0.19 > +DISTNAME = haproxy-2.3.4 > CATEGORIES = net www > HOMEPAGE = http://www.haproxy.org/ That has https now. > MAINTAINER = Daniel Jakots <[email protected]> > @@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes > > WANTLIB += c crypto pcre pcreposix pthread ssl z > > -MASTER_SITES = ${HOMEPAGE}/download/2.0/src/ > +MASTER_SITES = ${HOMEPAGE}/download/2.3/src/ > > HAPROXYCONF = ${SYSCONFDIR}/haproxy > HAPROXYSTATE = /var/haproxy > diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo > index d0558081adc..2cd2f40ecdb 100644 > --- a/net/haproxy/distinfo > +++ b/net/haproxy/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (haproxy-2.0.19.tar.gz) = 3MRErArKCRfiiWUxNDM/fCnQXYRObNYN0E4jtf+AyS0= > -SIZE (haproxy-2.0.19.tar.gz) = 2682426 > +SHA256 (haproxy-2.3.4.tar.gz) = YBSM3+3WsZxAHbzXXM12pTwgvHbEkDK6Mq+YoKXEle0= > +SIZE (haproxy-2.3.4.tar.gz) = 2909672 > diff --git a/net/haproxy/patches/patch-Makefile > b/net/haproxy/patches/patch-Makefile > deleted file mode 100644 > index 16af6ebfddf..00000000000 > --- a/net/haproxy/patches/patch-Makefile > +++ /dev/null > @@ -1,32 +0,0 @@ > -$OpenBSD: patch-Makefile,v 1.10 2020/12/14 23:26:59 danj Exp $ > - > -- BUILD: makefile: Update feature flags for OpenBSD (90c9d78) > -- BUILD: makefile: enable crypt(3) for OpenBSD (496374e) > - > -Index: Makefile > ---- Makefile.orig > -+++ Makefile > -@@ -362,10 +362,11 @@ ifeq ($(TARGET),osx) > - EXPORT_SYMBOL = -export_dynamic > - endif > - > --# OpenBSD 5.7 and above > -+# OpenBSD 6.3 and above > - ifeq ($(TARGET),openbsd) > - set_target_defaults = $(call default_opts, \ > -- USE_POLL USE_TPROXY USE_THREAD USE_KQUEUE USE_ACCEPT4) > -+ USE_POLL USE_TPROXY USE_LIBCRYPT USE_THREAD USE_KQUEUE USE_ACCEPT4 > \ > -+ USE_CLOSEFROM USE_GETADDRINFO) > - endif > - > - # NetBSD > -@@ -455,7 +456,9 @@ BUILD_FEATURES := $(foreach opt,$(patsubst USE_%,%,$(u > - OPTIONS_CFLAGS += $(foreach opt,$(use_opts),$(if $($(opt)),-D$(opt),)) > - > - ifneq ($(USE_LIBCRYPT),) > -+ifneq ($(TARGET),openbsd) > - OPTIONS_LDFLAGS += -lcrypt > -+endif > - endif > - > - ifneq ($(USE_SLZ),) > diff --git a/net/haproxy/patches/patch-src_log_c > b/net/haproxy/patches/patch-src_log_c > deleted file mode 100644 > index 8469acea3e2..00000000000 > --- a/net/haproxy/patches/patch-src_log_c > +++ /dev/null > @@ -1,21 +0,0 @@ > -$OpenBSD: patch-src_log_c,v 1.2 2020/12/14 23:26:59 danj Exp $ > - > -This fixes `haproxy: vfprintf %s NULL in "<<<<>%s %2d %02d:%02d:%02d > %.*s%*s"` > -in syslog. It was never committed upstream and commit 5464885 shuffled the > -code. > - > -It was discussed on the mailing list: > -https://www.mail-archive.com/[email protected]/msg35601.html > - > -Index: src/log.c > ---- src/log.c.orig > -+++ src/log.c > -@@ -1389,7 +1389,7 @@ static char *update_log_hdr(const time_t time) > - "<<<<>%s %2d %02d:%02d:%02d %.*s%*s", > - monthname[tm.tm_mon], > - tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, > -- (int)host.data, host.area, sep, ""); > -+ (int)host.data, host.area ? host.area : "", > sep, ""); > - /* WARNING: depending upon implementations, snprintf may return > - * either -1 or the number of bytes that would be needed to > store > - * the total message. In both cases, we must adjust it. >
