From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: update socklog to 2.1.2 to unbreak with newer compilers
To: Christian Rueger <cr+openbsd@rueger-net.de>, ports <ports@openbsd.org>
Date: Mon, 8 Jun 2026 22:46:46 +0100

On 2026/06/08 21:22, Stuart Henderson wrote:
> this had the same issue as ipsvd from the same author which I've just
> updated (and simplified the port a bit). both are still developed
> upstream and the most recent releases build without patches on newer
> compilers.
> 
> ok?

actually...since it's broken anyway, I think I'll just commit this,
can make further changes on top if needed.


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/socklog/Makefile,v
> diff -u -p -r1.11 Makefile
> --- Makefile	27 Sep 2023 17:16:34 -0000	1.11
> +++ Makefile	8 Jun 2026 20:19:26 -0000
> @@ -1,28 +1,23 @@
> -COMMENT=		small and secure replacement for syslogd
> +COMMENT=	small and secure replacement for syslogd
>  
> -DISTNAME=		socklog-2.1.0
> -CATEGORIES=		sysutils
> +DISTNAME=	socklog-2.1.2
> +CATEGORIES=	sysutils
>  
> -HOMEPAGE=		http://www.smarden.org/socklog/
> +# https://github.com/g-pape/socklog/
> +HOMEPAGE=	https://smarden.org/socklog/
> +SITES=		https://smarden.org/socklog/
>  
> -MAINTAINER=		Christian Rueger <cr+openbsd@rueger-net.de>
> +MAINTAINER=	Christian Rueger <cr+openbsd@rueger-net.de>
>  
> +# BSD
>  PERMIT_PACKAGE=	Yes
> -WANTLIB=		c
>  
> -SITES=			${HOMEPAGE}
> -WRKDIST=		${WRKDIR}/admin/${DISTNAME}
> -WRKSRC=			${WRKDIST}/src
> -BINPROGRAMS=		tryto uncat
> -SBINPROGRAMS=		socklog socklog-check socklog-conf
> -BINMANPAGES=		tryto.1 uncat.1
> -SBINMANPAGES=		socklog-check.8 socklog-conf.8 socklog.8
> -DOCS1=			benefits.html network.html socklog.8.html \
> -			configuration.html notify.html tryto.1.html \
> -			examples.html uncat.1.html index.html \
> -			socklog-check.8.html upgrade.html install.html \
> -			socklog-conf.8.html
> -DOCS2=			CHANGES README COPYING
> +WANTLIB=	c
> +
> +WRKDIST=	${WRKDIR}/admin/${DISTNAME}
> +WRKSRC=		${WRKDIST}/src
> +BINPROGRAMS=	tryto uncat
> +SBINPROGRAMS=	socklog socklog-check socklog-conf
>  
>  pre-build:
>  	echo "${CC} ${CFLAGS} ${COPTS}" > ${WRKSRC}/conf-cc
> @@ -41,18 +36,10 @@ do-install:
>  .for pgm in ${SBINPROGRAMS}
>  	${INSTALL_PROGRAM} ${WRKDIST}/command/${pgm} ${PREFIX}/sbin/
>  .endfor
> -.for page in ${BINMANPAGES}
> -	${INSTALL_MAN} ${WRKDIST}/man/${page} ${PREFIX}/man/man1
> -.endfor
> -.for page in ${SBINMANPAGES}
> -	${INSTALL_MAN} ${WRKDIST}/man/${page} ${PREFIX}/man/man8
> -.endfor
> +	${INSTALL_MAN} ${WRKDIST}/man/*.1 ${PREFIX}/man/man1
> +	${INSTALL_MAN} ${WRKDIST}/man/*.8 ${PREFIX}/man/man8
>  	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/socklog
> -.for doc in ${DOCS1}
> -	${INSTALL_DATA} ${WRKDIST}/doc/${doc} ${PREFIX}/share/doc/socklog/
> -.endfor
> -.for doc in ${DOCS2}
> -	${INSTALL_DATA} ${WRKDIST}/package/${doc} ${PREFIX}/share/doc/socklog/
> -.endfor
> +	${INSTALL_DATA} ${WRKDIST}/doc/*.html ${PREFIX}/share/doc/socklog/
> +	${INSTALL_DATA} ${WRKDIST}/package/[A-Z]* ${PREFIX}/share/doc/socklog/
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/socklog/distinfo,v
> diff -u -p -r1.6 distinfo
> --- distinfo	18 Jan 2015 03:15:15 -0000	1.6
> +++ distinfo	8 Jun 2026 20:19:26 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (socklog-2.1.0.tar.gz) = qoaaeH7gBNpOVQm1oAMbzBekq0rGUMLOjU5IgSOstFU=
> -SIZE (socklog-2.1.0.tar.gz) = 56942
> +SHA256 (socklog-2.1.2.tar.gz) = e8ej+ejhWn55EoHAV0GkwM8N6G50hw/SxvTX55QrleY=
> +SIZE (socklog-2.1.2.tar.gz) = 60743
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/socklog/pkg/PLIST,v
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST	11 Mar 2022 19:58:02 -0000	1.2
> +++ pkg/PLIST	8 Jun 2026 20:19:26 -0000
> @@ -1,13 +1,13 @@
> -bin/tryto
> -bin/uncat
> +@bin bin/tryto
> +@bin bin/uncat
>  @man man/man1/tryto.1
>  @man man/man1/uncat.1
>  @man man/man8/socklog-check.8
>  @man man/man8/socklog-conf.8
>  @man man/man8/socklog.8
> -sbin/socklog
> -sbin/socklog-check
> -sbin/socklog-conf
> +@bin sbin/socklog
> +@bin sbin/socklog-check
> +@bin sbin/socklog-conf
>  share/doc/socklog/
>  share/doc/socklog/CHANGES
>  share/doc/socklog/COPYING
> @@ -19,9 +19,11 @@ share/doc/socklog/index.html
>  share/doc/socklog/install.html
>  share/doc/socklog/network.html
>  share/doc/socklog/notify.html
> +@comment share/doc/socklog/readme.solaris.html
>  share/doc/socklog/socklog-check.8.html
>  share/doc/socklog/socklog-conf.8.html
>  share/doc/socklog/socklog.8.html
>  share/doc/socklog/tryto.1.html
>  share/doc/socklog/uncat.1.html
>  share/doc/socklog/upgrade.html
> +@comment share/doc/socklog/usedietlibc.html
>