CVS commit: pkgsrc/mail/opensmtpd-extras

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/opensmtpd-extras
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Sat, 2 Mar 2024 17:53:23 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Mar  2 17:53:23 UTC 2024

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

Log Message:
mail/opensmtpd-extras: update package to latest snapshot

The official OpenSMTPD-extras repository is in maintainance mode, but
receives occasional bug fixes. By bringing the package in sync with the
most recent upstream commit, we incorporate a series of fixes and
improvements, with particular regard to the LDAP table.

Hopefully, this is only a temporary solution until a further official
release comes to light.

# Changes (pkgsrc)

* Use PKG_SYSCONFSUBDIR to match mail/opensmtpd configuration.
* Improve the SUBST routine to fix more hard-coded paths, including those
  in man pages.
* Fix a small portability issue in configure script while attempting to
  link against OpenSSL.

# Changes (upstream)

* Inline the only use of tls_handshake_wrapper
* Add AC_USE_SYSTEM_EXTENSIONS
* Mark log.h' fatal and fatalx as noreturn
* Do not hard-code build architecture
* table-ldap:
        - add ldaps support
        - handle more than one result
        - request only required attributes
        - update ber and aldap
        - add example config file
        - fix reconnection logic
        - check if a filter is configured before try to query
        - add netaddr and mailaddrmap support
        - simplify getaddrinfo() usage


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/opensmtpd-extras/Makefile \
    pkgsrc/mail/opensmtpd-extras/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/opensmtpd-extras/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-extras/Makefile
diff -u pkgsrc/mail/opensmtpd-extras/Makefile:1.1 pkgsrc/mail/opensmtpd-extras/Makefile:1.2
--- pkgsrc/mail/opensmtpd-extras/Makefile:1.1   Thu Feb 29 20:57:37 2024
+++ pkgsrc/mail/opensmtpd-extras/Makefile       Sat Mar  2 17:53:23 2024
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2024/02/29 20:57:37 vins Exp $
+# $NetBSD: Makefile,v 1.2 2024/03/02 17:53:23 vins Exp $
 
-DISTNAME=      opensmtpd-extras-6.7.1
-CATEGORIES=    mail
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenSMTPD/}
-GITHUB_PROJECT=        OpenSMTPD-extras
-GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+DISTNAME=              opensmtpd-extras-6.7.1_20240228
+CATEGORIES=            mail
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=OpenSMTPD/}
+GITHUB_PROJECT=                OpenSMTPD-extras
+#GITHUB_RELEASE=       ${PKGVERSION_NOREV}
+GITHUB_TAG=            86f2f1927743257674d29d4fed250bdce5d1c0b5
 
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/OpenSMTPD/OpenSMTPD-extras/
@@ -18,34 +19,38 @@ CFLAGS.NetBSD+=     -D_OPENBSD_SOURCE   # st
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_TOOLS+=    awk mandoc pkg-config sh
+USE_TOOLS+=    awk mandoc pkg-config
 USE_TOOLS+=    automake aclocal autoheader autoconf
 
 DEPENDS+=      opensmtpd-[0-9]*:../../mail/opensmtpd
 
+PKG_SYSCONFSUBDIR=     smtpd
+
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_MESSAGE.paths=   Replacing hard-coded paths.
-SUBST_FILES.paths=     configure.ac
+SUBST_FILES.paths=     configure.ac extras/tables/table-mysql/table-mysql.5 \
+                       extras/tables/table-postgres/table-postgres.5 \
+                       extras/tables/table-sqlite/table-sqlite.5
 SUBST_SED.paths+=      -e "s:/usr/local/bin:${PREFIX}/bin:g"
 SUBST_SED.paths+=      -e "s:/usr/local/lib:${PREFIX}/lib:g"
 SUBST_SED.paths+=      -e "s:/usr/local/include:${PREFIX}/include:g"
-SUBST_SED.paths+=      -e "s:/usr/local/ssl:${SSLDIR}:g"
+SUBST_SED.paths+=      -e "s:/usr/local/ssl:${SSLBASE}:g"
+SUBST_SED.paths+=      -e "s:/etc/openssl:${SSLDIR}:g"
+SUBST_SED.paths+=      -e "s:/usr/local:${PREFIX}:g"
+SUBST_SED.paths+=      -e "s:/etc/mail:${PKG_SYSCONFDIR}:g"
+SUBST_SED.paths+=      -e "s:/var/vmail:${VARBASE}/vmail:g"
 
 CONFIGURE_ENV+=                TEST_MINUS_S_SH=${SH:Q}
 CONFIGURE_ARGS+=       --with-pie
 CONFIGURE_ARGS+=       --with-mantype=man
 CONFIGURE_ARGS+=       --libexecdir=${PREFIX}/libexec
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}/smtpd
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-user-smtpd=_smtpd
 CONFIGURE_ARGS+=       --with-path-empty=${VARBASE}/empty
 CONFIGURE_ARGS+=       --with-libssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=       --with-libevent=${BUILDLINK_PREFIX.libevent}
 
-CONFIGURE_ARGS+=       --with-cflags=${CFLAGS:Q}       \
-                       --with-cppflags=${CPPFLAGS:Q}   \
-                       --with-ldflags=${LDFLAGS:Q}
-
 CONFIGURE_ARGS+=       --with-filter-stub      \
                        --with-filter-trace     \
                        --with-filter-void      \
@@ -71,7 +76,7 @@ pre-configure:
        cd ${WRKSRC} && ${TOOLS_CMD.autoheader}
        cd ${WRKSRC} && ${TOOLS_CMD.automake} --foreign --add-missing --copy
 
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/libretls/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/mail/opensmtpd-extras/distinfo
diff -u pkgsrc/mail/opensmtpd-extras/distinfo:1.1 pkgsrc/mail/opensmtpd-extras/distinfo:1.2
--- pkgsrc/mail/opensmtpd-extras/distinfo:1.1   Thu Feb 29 20:57:37 2024
+++ pkgsrc/mail/opensmtpd-extras/distinfo       Sat Mar  2 17:53:23 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2024/02/29 20:57:37 vins Exp $
+$NetBSD: distinfo,v 1.2 2024/03/02 17:53:23 vins Exp $
 
-BLAKE2s (opensmtpd-extras-6.7.1.tar.gz) = 8f083e788e92af2374701f283e46b010f62d21d16cce0399fd5382a008425c1a
-SHA512 (opensmtpd-extras-6.7.1.tar.gz) = 0969c53a5d13816862f13b3572c0d84d34e2d36d85f83a528d70ee3f4ad5e6b2cdda256529e95a43a177e64368e4e93540d5bb2f81039808d79049234b249d91
-Size (opensmtpd-extras-6.7.1.tar.gz) = 548792 bytes
+BLAKE2s (opensmtpd-extras-6.7.1_20240228-86f2f1927743257674d29d4fed250bdce5d1c0b5.tar.gz) = 8ab39a010dd16e74912a15aba9cef5d9dd6aac347f7aea574cbc55ff364cbcd4
+SHA512 (opensmtpd-extras-6.7.1_20240228-86f2f1927743257674d29d4fed250bdce5d1c0b5.tar.gz) = 
3a51bc561769d55e0e528fb4d9a02f355e66bfe9b14a94d5a88bbc446da4567e34e6438def040b5af1d749d7e601a953e84252ff52ede49cf991d288a4d7bfe7
+Size (opensmtpd-extras-6.7.1_20240228-86f2f1927743257674d29d4fed250bdce5d1c0b5.tar.gz) = 129403 bytes
 SHA1 (patch-api_filter__api.c) = 10386e0910025a5fb7e39e516ba89d37a9f4f2df
 SHA1 (patch-api_queue__api.c) = 95cb46aaaec8f61767abd66a6ae7122aa524d20e
 SHA1 (patch-api_scheduler__api.c) = 926efe385a7cfe5844af80041e01b1886a27fea6
 SHA1 (patch-api_table__api.c) = a0a96fb0e8f26d4595dc92ad8c3844270530c4d1
-SHA1 (patch-configure.ac) = f772a1659f12fc421203d911d6b710020c29f5b2
+SHA1 (patch-configure.ac) = b0057b9f04c128c0c91a0185defafa0717f506a9

Index: pkgsrc/mail/opensmtpd-extras/patches/patch-configure.ac
diff -u pkgsrc/mail/opensmtpd-extras/patches/patch-configure.ac:1.1 pkgsrc/mail/opensmtpd-extras/patches/patch-configure.ac:1.2
--- pkgsrc/mail/opensmtpd-extras/patches/patch-configure.ac:1.1 Thu Feb 29 20:57:37 2024
+++ pkgsrc/mail/opensmtpd-extras/patches/patch-configure.ac     Sat Mar  2 17:53:23 2024
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure.ac,v 1.1 2024/02/29 20:57:37 vins Exp $
+$NetBSD: patch-configure.ac,v 1.2 2024/03/02 17:53:23 vins Exp $
 
-Avoid conflicting types for snprintf()
+* Avoid conflicting types for snprintf()
+* Fix testing of OpenSSL linking
 
---- configure.ac.orig  2024-02-29 18:09:13.292053324 +0000
+--- configure.ac.orig  2024-02-28 09:25:16.000000000 +0000
 +++ configure.ac
-@@ -501,9 +501,9 @@ fi
+@@ -503,9 +503,9 @@ fi
  AC_MSG_CHECKING([whether snprintf can declare const char *fmt])
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  #include <stdio.h>
@@ -16,3 +17,12 @@ Avoid conflicting types for snprintf()
                ]])],
     [AC_MSG_RESULT([yes])
      AC_DEFINE([SNPRINTF_CONST], [const],
+@@ -607,7 +607,7 @@ AC_DEFINE_UNQUOTED([WITH_OPENSSL], [1], 
+ AC_MSG_CHECKING([if programs using OpenSSL functions will link])
+ AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM([[ #include <openssl/evp.h> ]],
+-      [[ SSLeay_add_all_algorithms(); ]])],
++      [[ OpenSSL_add_all_algorithms(); ]])],
+       [
+               AC_MSG_RESULT([yes])
+       ],

Prev by Date: CVS commit: pkgsrc/mail/opensmtpd
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/mail/opensmtpd
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index