Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B750384CEE for ; Sat, 2 Sep 2023 21:32:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id W--9iejHsbff for ; Sat, 2 Sep 2023 21:32:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C1EF084C86 for ; Sat, 2 Sep 2023 21:32:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AB5EDFBDB; Sat, 2 Sep 2023 21:32:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169369033189850" MIME-Version: 1.0 Date: Sat, 2 Sep 2023 21:32:11 +0000 From: "Paolo Vincenzo Olivo" Subject: CVS commit: pkgsrc/devel/libopensmtpd To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: vins@netbsd.org X-Mailer: log_accum Message-Id: <20230902213211.AB5EDFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169369033189850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: vins Date: Sat Sep 2 21:32:11 UTC 2023 Added Files: pkgsrc/devel/libopensmtpd: DESCR Makefile PLIST buildlink3.mk distinfo pkgsrc/devel/libopensmtpd/patches: patch-Makefile.gnu patch-ioev.h patch-openbsd-compat_explicit__bzero.c Log Message: devel/libopensmtpd: import libopensmtpd-0.7 libopensmtpd is an libevent based library which allows for easy writing of opensmtpd filter applications in C. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libopensmtpd/DESCR \ pkgsrc/devel/libopensmtpd/Makefile pkgsrc/devel/libopensmtpd/PLIST \ pkgsrc/devel/libopensmtpd/buildlink3.mk \ pkgsrc/devel/libopensmtpd/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libopensmtpd/patches/patch-Makefile.gnu \ pkgsrc/devel/libopensmtpd/patches/patch-ioev.h \ pkgsrc/devel/libopensmtpd/patches/patch-openbsd-compat_explicit__bzero.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169369033189850 Content-Disposition: inline Content-Length: 6801 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/devel/libopensmtpd/DESCR diff -u /dev/null pkgsrc/devel/libopensmtpd/DESCR:1.1 --- /dev/null Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/DESCR Sat Sep 2 21:32:11 2023 @@ -0,0 +1,2 @@ +libopensmtpd is an libevent based library which allows for easy writing +of opensmtpd filter applications in C. Index: pkgsrc/devel/libopensmtpd/Makefile diff -u /dev/null pkgsrc/devel/libopensmtpd/Makefile:1.1 --- /dev/null Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/Makefile Sat Sep 2 21:32:11 2023 @@ -0,0 +1,42 @@ +# $NetBSD: Makefile,v 1.1 2023/09/02 21:32:11 vins Exp $ + +DISTNAME= libopensmtpd-0.7 +CATEGORIES= devel mail +MASTER_SITES= https://distfiles.sigtrap.nl/ + +MAINTAINER= vins@NetBSD.org +HOMEPAGE= https://distfiles.sigtrap.nl/ +COMMENT= Library for creating opensmtpd filters +LICENSE= isc + +USE_TOOLS+= gmake + +MAKE_FILE= Makefile.gnu +MAKE_ENV+= LOCALBASE=${PREFIX:Q} +MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man3 +MAKE_ENV+= MANFORMAT=man + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} != "OpenBSD" || ${OPSYS} != "SunOS" +MAKE_ENV+= NEED_RECALLOCARRAY=1 +.endif + +.if ${OPSYS} == "NetBSD" +CFLAGS+= -D_OPENBSD_SOURCE +MAKE_ENV+= NEED_EXPLICIT_BZERO=1 + +.elif ${OPSYS} == "Linux" +MAKE_ENV+= NEED_STRLCAT=1 +MAKE_ENV+= NEED_STRLCPY=1 +MAKE_ENV+= NEED_STRTONUM=1 + +.elif ${OPSYS} == "Darwin" +MAKE_ENV+= NEED_STRTONUM=1 +.endif + +INSTALL_ENV= INSTALL=${INSTALL:Q} LINK=${LN:Q} +INSTALLATION_DIRS+= include lib ${PKGMANDIR}/man3 + +.include "../../devel/libevent/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/libopensmtpd/PLIST diff -u /dev/null pkgsrc/devel/libopensmtpd/PLIST:1.1 --- /dev/null Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/PLIST Sat Sep 2 21:32:11 2023 @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.1 2023/09/02 21:32:11 vins Exp $ +include/opensmtpd.h +lib/libopensmtpd.so +lib/libopensmtpd.so.0 +lib/libopensmtpd.so.0.1.0 +man/man3/osmtpd_run.3 Index: pkgsrc/devel/libopensmtpd/buildlink3.mk diff -u /dev/null pkgsrc/devel/libopensmtpd/buildlink3.mk:1.1 --- /dev/null Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/buildlink3.mk Sat Sep 2 21:32:11 2023 @@ -0,0 +1,13 @@ +# $NetBSD: buildlink3.mk,v 1.1 2023/09/02 21:32:11 vins Exp $ + +BUILDLINK_TREE+= libopensmtpd + +.if !defined(LIBOPENSMTPD_BUILDLINK3_MK) +LIBOPENSMTPD_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.libopensmtpd+= libopensmtpd>=0.7 +BUILDLINK_PKGSRCDIR.libopensmtpd?= ../../devel/libopensmtpd + +.endif # LIBOPENSMTPD_BUILDLINK3_MK + +BUILDLINK_TREE+= -libopensmtpd Index: pkgsrc/devel/libopensmtpd/distinfo diff -u /dev/null pkgsrc/devel/libopensmtpd/distinfo:1.1 --- /dev/null Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/distinfo Sat Sep 2 21:32:11 2023 @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1 2023/09/02 21:32:11 vins Exp $ + +BLAKE2s (libopensmtpd-0.7.tar.gz) = e2bb3ad31fe2e99aa45cb97aeaad8eef39974a3f40cb4db942017a462ffc9ad3 +SHA512 (libopensmtpd-0.7.tar.gz) = 53153eea5ed85309434316fa9bbba032aba9cac30744a6c228892b5fdf67f9df7e05c25832f16845c603892a255dfcf67d432e2a43ec6228f3103cf92ba2394f +Size (libopensmtpd-0.7.tar.gz) = 34942 bytes +SHA1 (patch-Makefile.gnu) = 409a47e7bfa4de69e82ab21fead576a47c981a8d +SHA1 (patch-ioev.h) = bad26669e2968098a69f99bc24027204d96c9fee +SHA1 (patch-openbsd-compat_explicit__bzero.c) = 77f4725a1bf4b8fc7f4040755e9f0b61db6b19e6 Index: pkgsrc/devel/libopensmtpd/patches/patch-Makefile.gnu diff -u /dev/null pkgsrc/devel/libopensmtpd/patches/patch-Makefile.gnu:1.1 --- /dev/null Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/patches/patch-Makefile.gnu Sat Sep 2 21:32:11 2023 @@ -0,0 +1,47 @@ +$NetBSD: patch-Makefile.gnu,v 1.1 2023/09/02 21:32:11 vins Exp $ + +Fix install target for pkgsrc. + +--- Makefile.gnu.orig 2021-06-02 10:48:50.000000000 +0000 ++++ Makefile.gnu +@@ -27,8 +27,7 @@ SYMBOL_LIST= ${CURDIR}/Symbols.list + includes: + @cd ${CURDIR}; for i in ${HDRS}; do \ + j="cmp -s $$i ${DESTDIR}${LOCALBASE}/include/$$i || \ +- ${INSTALL} -D -o ${BINOWN} -g ${BINGRP} -m 444 $$i\ +- ${DESTDIR}${LOCALBASE}/include/$$i"; \ ++ ${BSD_INSTALL_DATA} $$i ${DESTDIR}${LOCALBASE}/include"; \ + echo $$j; \ + eval "$$j"; \ + done; +@@ -41,11 +40,11 @@ ${VERSION_SCRIPT}: ${SYMBOL_LIST} + # Defines for OpenBSD-specific interfaces + # Add a OS-specific defines here. + NEED_EXPLICIT_BZERO?= 0 +-NEED_RECALLOCARRAY?= 1 ++NEED_RECALLOCARRAY?= 0 + NEED_REALLOCARRAY?= 0 +-NEED_STRLCAT?= 1 +-NEED_STRLCPY?= 1 +-NEED_STRTONUM?= 1 ++NEED_STRLCAT?= 0 ++NEED_STRLCPY?= 0 ++NEED_STRTONUM?= 0 + + MANFORMAT?= mangz + +@@ -138,10 +137,10 @@ all: ${TARGET_LIB} ${TARGET_MAN} + + .PHONY: install + install: includes ${TARGET_LIB} ${TARGET_MAN} +- ${INSTALL} -D -o ${BINOWN} -g ${BINGRP} -m ${LIBPERM} ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${TARGET_LIB} +- ${LINK} -s ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${SONAME_LIB} +- ${LINK} -s ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${BASE_LIB} +- ${INSTALL} -D -o ${MANOWN} -g ${MANGRP} -m ${MANPERM} ${TARGET_MAN} ${DESTDIR}${MANDIR}/${TARGET_MAN} ++ ${BSD_INSTALL_LIB} ${TARGET_LIB} ${DESTDIR}${LIBDIR} ++ ${LINK} ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${SONAME_LIB} ++ ${LINK} ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${BASE_LIB} ++ ${BSD_INSTALL_MAN} ${TARGET_MAN} ${DESTDIR}${MANDIR} + + CLEANFILES+= *.o ${TARGET_LIB} + Index: pkgsrc/devel/libopensmtpd/patches/patch-ioev.h diff -u /dev/null pkgsrc/devel/libopensmtpd/patches/patch-ioev.h:1.1 --- /dev/null Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/patches/patch-ioev.h Sat Sep 2 21:32:11 2023 @@ -0,0 +1,18 @@ +$NetBSD: patch-ioev.h,v 1.1 2023/09/02 21:32:11 vins Exp $ + +Add missing includes for sockaddr_in structure. + +--- ioev.h.orig 2019-11-14 17:40:26.000000000 +0000 ++++ ioev.h +@@ -15,6 +15,11 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#ifndef _NETINET_IN_H_ ++#include ++#include ++#endif ++ + enum { + IO_CONNECTED = 0, /* connection successful */ + IO_TLSREADY, /* TLS started successfully */ Index: pkgsrc/devel/libopensmtpd/patches/patch-openbsd-compat_explicit__bzero.c diff -u /dev/null pkgsrc/devel/libopensmtpd/patches/patch-openbsd-compat_explicit__bzero.c:1.1 --- /dev/null Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/patches/patch-openbsd-compat_explicit__bzero.c Sat Sep 2 21:32:11 2023 @@ -0,0 +1,16 @@ +$NetBSD: patch-openbsd-compat_explicit__bzero.c,v 1.1 2023/09/02 21:32:11 vins Exp $ + +Use explicit_memset() on NetBSD. + +--- openbsd-compat/explicit_bzero.c.orig 2019-11-14 18:23:50.000000000 +0000 ++++ openbsd-compat/explicit_bzero.c +@@ -11,5 +11,9 @@ + void + explicit_bzero(void *buf, size_t len) + { ++#if defined(__NetBSD__) ++ explicit_memset(buf, 0, len); ++#else + memset(buf, 0, len); ++#endif + } --_----------=_169369033189850--