CVS commit: pkgsrc/mail/opensmtpd

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Sep 13 16:26:01 UTC 2025

Modified Files:
        pkgsrc/mail/opensmtpd: Makefile distinfo
Added Files:
        pkgsrc/mail/opensmtpd/patches: patch-configure.ac

Log Message:
mail/opensmtpd: make sure it links against out libasr

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mail/opensmtpd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/opensmtpd/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/mail/opensmtpd/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/opensmtpd/Makefile
diff -u pkgsrc/mail/opensmtpd/Makefile:1.34 pkgsrc/mail/opensmtpd/Makefile:1.35
--- pkgsrc/mail/opensmtpd/Makefile:1.34 Wed Sep 10 10:39:33 2025
+++ pkgsrc/mail/opensmtpd/Makefile      Sat Sep 13 16:26:01 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2025/09/10 10:39:33 vins Exp $
+# $NetBSD: Makefile,v 1.35 2025/09/13 16:26:01 vins Exp $
 
 VERSION=       7.7.0p0
 DISTNAME=      opensmtpd-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail net
 MASTER_SITES=  https://www.opensmtpd.org/archives/
 
@@ -19,7 +19,7 @@ GNU_CONFIGURE=        yes
 USE_DB185=     yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    awk pkg-config yacc
-USE_TOOLS+=    automake aclocal autoheader autoconf
+USE_TOOLS+=    automake aclocal autoheader autoconf pkg-config
 
 CHECK_BUILTIN.openssl:= yes
 .include "../../security/openssl/buildlink3.mk"
@@ -56,6 +56,7 @@ CONFIGURE_ARGS+=      --with-path-mbox=${VARB
 CONFIGURE_ARGS+=       --with-path-mbox=${VARBASE}/mail
 .endif
 CONFIGURE_ARGS+=       --with-libevent=${BUILDLINK_PREFIX.libevent}
+CONFIGURE_ARGS+=       --with-libasr=${BUILDLINK_PREFIX.libasr}
 CONFIGURE_ARGS+=       --with-table-db
 CONFIGURE_ARGS+=       --with-pie
 

Index: pkgsrc/mail/opensmtpd/distinfo
diff -u pkgsrc/mail/opensmtpd/distinfo:1.13 pkgsrc/mail/opensmtpd/distinfo:1.14
--- pkgsrc/mail/opensmtpd/distinfo:1.13 Fri May 23 18:40:47 2025
+++ pkgsrc/mail/opensmtpd/distinfo      Sat Sep 13 16:26:01 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2025/05/23 18:40:47 vins Exp $
+$NetBSD: distinfo,v 1.14 2025/09/13 16:26:01 vins Exp $
 
 BLAKE2s (opensmtpd-7.7.0p0.tar.gz) = a51ecac58934e880c4d006d536ae4adb011b1121cbd55f53420362fac61740a7
 SHA512 (opensmtpd-7.7.0p0.tar.gz) = 6a46a93bc0689603250376e414fc481fd5997c2bc7fc4e12d1522a9f4a2cad610f1c9452e9501b077e3ba2219a253e693160540fcfba595da8f68349bf795b92
 Size (opensmtpd-7.7.0p0.tar.gz) = 978481 bytes
+SHA1 (patch-configure.ac) = ff6534e28ecba1de479660a00340600feefd5d7e
 SHA1 (patch-contrib_libexec_mail.local_mail.local.c) = bec19540fa52c7c6596ab5923f3a67b334ddf168
 SHA1 (patch-mk_smtpd_Makefile.am) = cc3f82922e3e56bc0205085f7e311f2beeda7fc4
 SHA1 (patch-openbsd-compat_getpeereid.c) = 8d60140bffcabb6accf9b7bbe0f419c2c25d352d

Added files:

Index: pkgsrc/mail/opensmtpd/patches/patch-configure.ac
diff -u /dev/null pkgsrc/mail/opensmtpd/patches/patch-configure.ac:1.5
--- /dev/null   Sat Sep 13 16:26:01 2025
+++ pkgsrc/mail/opensmtpd/patches/patch-configure.ac    Sat Sep 13 16:26:01 2025
@@ -0,0 +1,72 @@
+$NetBSD: patch-configure.ac,v 1.5 2025/09/13 16:26:01 vins Exp $
+
+Standalone libasr support.
+
+--- configure.ac.orig  2025-05-11 12:40:26.000000000 +0000
++++ configure.ac
+@@ -54,7 +54,7 @@ AS_IF([test "x$with_libbsd" != xno], [
+ ])
+ 
+ need_dash_r=
+-need_libasr=yes
++need_libasr=
+ pkglibexecdir="$libexecdir/opensmtpd"
+ AS_CASE(["$host"],
+       [*-*-darwin*], [
+@@ -181,9 +181,16 @@ AC_CHECK_HEADERS([ \
+       vis.h \
+ ])
+ 
+-AS_IF([test "x$need_libasr" = xyes], [
+-      AM_CFLAGS="$AM_CFLAGS -I\${top_srcdir}/openbsd-compat/libasr"
++AC_CHECK_HEADER([asr.h],
++      [AC_DEFINE([HAVE_ASR_H], 1, [1 if have asr.h])],
++      [need_libasr=yes
++      AM_CFLAGS="$AM_CFLAGS -I\${top_srcdir}/openbsd-compat/libasr"],
++      [
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netdb.h>
+ ])
++
+ AM_CONDITIONAL([NEED_LIBASR], [test "x$need_libasr" = xyes])
+ 
+ AS_IF([test "x$ac_cv_func_errc" = xno], [
+@@ -1451,6 +1458,37 @@ LIBS="$save_LIBS"
+ AM_CONDITIONAL([HAVE_DB_API], [test "x$use_db_api" = "x1"])
+ AM_COND_IF([HAVE_DB_API], [AC_DEFINE([HAVE_DB_API], [1], [Define to 1 if HAVE_DB_API])])
+ 
++# Search for libasr
++AS_IF([test "x$HAVE_ASR_H" != xyes], [
++    AC_ARG_WITH([libasr],
++      [  --with-libasr=PATH           Specify path to libasr installation],
++      [ if test "x$withval" != "xno"; then
++              if test -d "$withval/lib"; then
++                      if test -n "${need_dash_r}"; then
++                              LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
++                      else
++                              LDFLAGS="-L${withval}/lib ${LDFLAGS}"
++                      fi
++              else
++                      if test -n "${need_dash_r}"; then
++                              LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
++                      else
++                              LDFLAGS="-L${withval} ${LDFLAGS}"
++                      fi
++              fi
++              if test -d "$withval/include"; then
++                      CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
++              else
++                      CPPFLAGS="-I${withval} ${CPPFLAGS}"
++              fi
++      LIBS="$LIBS -lasr"
++      fi
++      ])
++    ], [AC_SEARCH_LIBS([asr_run], [asr], [:], [
++              AC_MSG_ERROR([can't find libasr])
++              ], [-levent])
++])
++
+ LIBS="$LIBS ${SMTPDLIBS}"
+ 
+ dnl Adding -Werror to CFLAGS early prevents configure tests from running.