Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0B87084E55 for ; Thu, 21 Sep 2023 10:57:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id E7c32fh0FgIl for ; Thu, 21 Sep 2023 10:57:40 +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 5667984CF4 for ; Thu, 21 Sep 2023 10:57:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4A659FBDB; Thu, 21 Sep 2023 10:57:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1695293860118770" MIME-Version: 1.0 Date: Thu, 21 Sep 2023 10:57:40 +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: <20230921105740.4A659FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1695293860118770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: vins Date: Thu Sep 21 10:57:40 UTC 2023 Modified Files: pkgsrc/devel/libopensmtpd: Makefile buildlink3.mk distinfo Added Files: pkgsrc/devel/libopensmtpd/patches: patch-opensmtpd.c Log Message: devel/libopensmtpd: fix build on SunOS and bump revision. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libopensmtpd/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libopensmtpd/buildlink3.mk \ pkgsrc/devel/libopensmtpd/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libopensmtpd/patches/patch-opensmtpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1695293860118770 Content-Disposition: inline Content-Length: 3862 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libopensmtpd/Makefile diff -u pkgsrc/devel/libopensmtpd/Makefile:1.3 pkgsrc/devel/libopensmtpd/Makefile:1.4 --- pkgsrc/devel/libopensmtpd/Makefile:1.3 Tue Sep 5 13:22:43 2023 +++ pkgsrc/devel/libopensmtpd/Makefile Thu Sep 21 10:57:39 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2023/09/05 13:22:43 vins Exp $ +# $NetBSD: Makefile,v 1.4 2023/09/21 10:57:39 vins Exp $ DISTNAME= libopensmtpd-0.7 +PKGREVISION= 1 CATEGORIES= devel mail MASTER_SITES= https://distfiles.sigtrap.nl/ @@ -18,6 +19,8 @@ MAKE_ENV+= LOCALBASE=${PREFIX:Q} MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man3 MAKE_ENV+= MANFORMAT=man +BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=Symbols.map + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Linux" Index: pkgsrc/devel/libopensmtpd/buildlink3.mk diff -u pkgsrc/devel/libopensmtpd/buildlink3.mk:1.1 pkgsrc/devel/libopensmtpd/buildlink3.mk:1.2 --- pkgsrc/devel/libopensmtpd/buildlink3.mk:1.1 Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/buildlink3.mk Thu Sep 21 10:57:39 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2023/09/02 21:32:11 vins Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2023/09/21 10:57:39 vins Exp $ BUILDLINK_TREE+= libopensmtpd @@ -6,6 +6,7 @@ BUILDLINK_TREE+= libopensmtpd LIBOPENSMTPD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libopensmtpd+= libopensmtpd>=0.7 +BUILDLINK_ABI_DEPENDS.libopensmtpd+= libopensmtpd>=0.7nb1 BUILDLINK_PKGSRCDIR.libopensmtpd?= ../../devel/libopensmtpd .endif # LIBOPENSMTPD_BUILDLINK3_MK Index: pkgsrc/devel/libopensmtpd/distinfo diff -u pkgsrc/devel/libopensmtpd/distinfo:1.1 pkgsrc/devel/libopensmtpd/distinfo:1.2 --- pkgsrc/devel/libopensmtpd/distinfo:1.1 Sat Sep 2 21:32:11 2023 +++ pkgsrc/devel/libopensmtpd/distinfo Thu Sep 21 10:57:39 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2023/09/02 21:32:11 vins Exp $ +$NetBSD: distinfo,v 1.2 2023/09/21 10:57:39 vins Exp $ BLAKE2s (libopensmtpd-0.7.tar.gz) = e2bb3ad31fe2e99aa45cb97aeaad8eef39974a3f40cb4db942017a462ffc9ad3 SHA512 (libopensmtpd-0.7.tar.gz) = 53153eea5ed85309434316fa9bbba032aba9cac30744a6c228892b5fdf67f9df7e05c25832f16845c603892a255dfcf67d432e2a43ec6228f3103cf92ba2394f @@ -6,3 +6,4 @@ Size (libopensmtpd-0.7.tar.gz) = 34942 b SHA1 (patch-Makefile.gnu) = 409a47e7bfa4de69e82ab21fead576a47c981a8d SHA1 (patch-ioev.h) = bad26669e2968098a69f99bc24027204d96c9fee SHA1 (patch-openbsd-compat_explicit__bzero.c) = 77f4725a1bf4b8fc7f4040755e9f0b61db6b19e6 +SHA1 (patch-opensmtpd.c) = bfe061cd50e0ccc3fd8d1f1eea3c7009c96ea817 Added files: Index: pkgsrc/devel/libopensmtpd/patches/patch-opensmtpd.c diff -u /dev/null pkgsrc/devel/libopensmtpd/patches/patch-opensmtpd.c:1.1 --- /dev/null Thu Sep 21 10:57:40 2023 +++ pkgsrc/devel/libopensmtpd/patches/patch-opensmtpd.c Thu Sep 21 10:57:40 2023 @@ -0,0 +1,30 @@ +$NetBSD: patch-opensmtpd.c,v 1.1 2023/09/21 10:57:40 vins Exp $ + +Rename local variables to avoid name clash on SmartOS. + +--- opensmtpd.c.orig 2021-06-01 11:31:56.000000000 +0000 ++++ opensmtpd.c +@@ -2001,7 +2001,7 @@ osmtpd_addrtoss(char *addr, struct socka + const char *errstr = NULL; + struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; +- struct sockaddr_un *sun; ++ struct sockaddr_un *lsun; + size_t n; + + if (addr[0] == '[') { +@@ -2048,10 +2048,10 @@ osmtpd_addrtoss(char *addr, struct socka + linedup); + } + } else if (strncasecmp(addr, "unix:", 5) == 0) { +- sun = (struct sockaddr_un *)ss; +- sun->sun_family = AF_UNIX; +- if (strlcpy(sun->sun_path, addr, +- sizeof(sun->sun_path)) >= sizeof(sun->sun_path)) { ++ lsun = (struct sockaddr_un *)ss; ++ lsun->sun_family = AF_UNIX; ++ if (strlcpy(lsun->sun_path, addr, ++ sizeof(lsun->sun_path)) >= sizeof(lsun->sun_path)) { + osmtpd_errx(1, "Invalid line received: address too " + "long (%s): %s", addr, linedup); + } --_----------=_1695293860118770--