Re: UPDATE net/sslh

On Sun, Jan 21, 2018 at 09:47:44PM +0000, Stuart Henderson wrote:
> On 2018/01/21 12:25, Daniel Jakots wrote:
> >
> > sslh supports OpenVPN. Our OpenVPN README says
> > (tail -n1 /usr/ports/net/openvpn/pkg/README):
> > chroot /var/empty
> >
> > So it's possible that users may run two software both
> > chrooting /var/empty. Can't it be a security 'imperfectness'?
>
> And about 12 things in base. Not a problem afaik, it is
> definitely not supposed to be writable..
>
>
> On 2018/01/21 19:10, Klemens Nanni wrote:
> > Instead of removing all the conditionals from the Makefile and passing
> > default values through make's `-D', USE_GMAKE is all you need.
>
> Either way works for me there. It's nice to have less patching, but
> it's also nice to avoid using gmake.
>
> > Combined this reduces a lot of noise; and if we can live with "v1.19"
> > instead of "1.19" in sslh's output and manpage, even the now introduced
> > genver.sh patch can be dropped.
>
> I think it's preferable not to patch genver.sh, just leave it how upstream
> wrote it.
I agree.

Updated diff without patch-genver_sh, moving NO_TEST down according to
template and also using INSTALL_MAN not INSTALL_DATA for sshl.8.

diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 5196ad1f3f6..7415f79f097 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -2,14 +2,11 @@

COMMENT = SSL/SSH multiplexer

-GH_ACCOUNT = yrutschle
-GH_PROJECT = sslh
-V = 1.18
-GH_TAGNAME = v$V
+DISTNAME = sslh-v1.19
+PKGNAME = ${DISTNAME:S/-v/-/}
CATEGORIES = security net
-REVISION = 0

-HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml
+HOMEPAGE = https://www.rutschle.net/tech/sslh.shtml

MAINTAINER = Bjorn Ketelaars <bjorn.ketelaars@hydroxide.nl>

@@ -17,21 +14,24 @@ MAINTAINER = Bjorn Ketelaars <bjorn.ketelaars@hydroxide.nl>
PERMIT_PACKAGE_CDROM = Yes

WANTLIB = c config pcre
+
+MASTER_SITES = https://www.rutschle.net/tech/sslh/
+
LIB_DEPENDS = devel/libconfig \
devel/pcre

-MAKE_FLAGS = CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
- -DENABLE_REGEX -DLIBCONFIG -DLIBPCRE" \
- LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" VERSION=$V
-NO_TEST = Yes
+MAKE_FLAGS = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" \
+ MAN=sslh.8

-do-configure:
- printf '#ifndef _VERSION_H_\n#define _VERSION_H_\n#define VERSION "$V"\n