Re: eventlog vs. syslog-ng eventlog

Stuart Henderson [2021-04-29, 19:01:00]:
> +cc steven in case he's around;
>
> On 2021/04/29 11:29, Todd C. Miller wrote:
> > On Thu, 29 Apr 2021 08:21:24 +0100, Stuart Henderson wrote:
> >
> > > Yes retiring the separate port makes sense.
> >
> > Here's a diff that just changes sysyutils/syslog-ng to use the
> > bundled copy of libevtlog. After this is committed I will remove
> > sysyutils/eventlog.
> >
> > OK?
>
> couple of small things;
>
> > Index: sysutils/syslog-ng/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
> > retrieving revision 1.68
> > diff -u -p -u -r1.68 Makefile
> > --- sysutils/syslog-ng/Makefile 30 Dec 2019 22:45:11 -0000 1.68
> > +++ sysutils/syslog-ng/Makefile 29 Apr 2021 17:20:02 -0000
> > @@ -6,7 +6,7 @@ V = 3.12.1
> > REL = 3.12
> > DISTNAME = syslog-ng-$V
> > CATEGORIES = sysutils
> > -REVISION = 7
> > +REVISION = 8
> >
> > MAINTAINER = Steven Mestdagh <steven@openbsd.org>
> >
> > @@ -15,13 +15,15 @@ HOMEPAGE = https://syslog-ng.com/
> > # GPL v2
> > PERMIT_PACKAGE = Yes
> >
> > -WANTLIB += c crypto curl dbi evtlog glib-2.0 gmodule-2.0 gthread-2.0
> > +WANTLIB += c crypto curl dbi glib-2.0 gmodule-2.0 gthread-2.0
> > WANTLIB += iconv intl ivykis json-c m maxminddb nghttp2 pcre pthread
> > WANTLIB += ssl z
> >
> > MASTER_SITES = http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
> >
> > -SHARED_LIBS = syslog-ng 5.0 \
> > +SHARED_LIBS = evtlog 1.0 \
> > + evtlog-${REL} 1.0 \
>
> even though it seems likely that the ABI is compatible, I think it may
> be beneficial to bump the library version of this compared to what
> sysutils/eventlog has. I'd probably go with a major bump to make sure
> things are clean.
>
> > Index: sysutils/syslog-ng/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v
> > retrieving revision 1.24
> > diff -u -p -u -r1.24 PLIST
> > --- sysutils/syslog-ng/pkg/PLIST 9 Dec 2019 14:45:16 -0000 1.24
> > +++ sysutils/syslog-ng/pkg/PLIST 29 Apr 2021 17:22:01 -0000
> > @@ -225,9 +225,13 @@ include/syslog-ng/value-pairs/evttag.h
> > include/syslog-ng/value-pairs/transforms.h
> > include/syslog-ng/value-pairs/value-pairs.h
> > include/syslog-ng/versioning.h
> > +@lib lib/libevtlog-3.12.so.${LIBevtlog-3.12_VERSION}
> > +@static-lib lib/libevtlog.a
> > +lib/libevtlog.la
>
> At least the static library conflicts with sysutils/eventlog so it needs
> "@conflict eventlog-*". Also "@pkgpath sysutils/eventlog" so that pkg_add -u
> is able to update an existing installed syslog-ng otherwise it will just
> error out with a conflict.
>
> (Not related to the diff, it picks up libuuid from e2fsprogs if present
> at build time, though it seems likely that the newer version you're looking
> at doesn't do this so maybe ignore that!)

ok with the library version bump and conflict.