CVS commit: pkgsrc/mail/opensmtpd-filter-dnsbl

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Sep 13 16:19:20 UTC 2025

Modified Files:
        pkgsrc/mail/opensmtpd-filter-dnsbl: Makefile distinfo
        pkgsrc/mail/opensmtpd-filter-dnsbl/patches: patch-main.c

Log Message:
opensmtpd-filter-dnsbl: update patch to reflect net/libasr update

Remove event_asr_* compat code from main.c. Use libasr built-in
implementation.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/opensmtpd-filter-dnsbl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/opensmtpd-filter-dnsbl/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mail/opensmtpd-filter-dnsbl/patches/patch-main.c

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-filter-dnsbl/Makefile
diff -u pkgsrc/mail/opensmtpd-filter-dnsbl/Makefile:1.7 pkgsrc/mail/opensmtpd-filter-dnsbl/Makefile:1.8
--- pkgsrc/mail/opensmtpd-filter-dnsbl/Makefile:1.7     Wed Sep 10 10:37:57 2025
+++ pkgsrc/mail/opensmtpd-filter-dnsbl/Makefile Sat Sep 13 16:19:20 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2025/09/10 10:37:57 vins Exp $
+# $NetBSD: Makefile,v 1.8 2025/09/13 16:19:20 vins Exp $
 
 DISTNAME=      filter-dnsbl-0.4
 PKGNAME=       ${DISTNAME:S|^|opensmtpd-|}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  https://src.imperialat.at/releases/
 

Index: pkgsrc/mail/opensmtpd-filter-dnsbl/distinfo
diff -u pkgsrc/mail/opensmtpd-filter-dnsbl/distinfo:1.3 pkgsrc/mail/opensmtpd-filter-dnsbl/distinfo:1.4
--- pkgsrc/mail/opensmtpd-filter-dnsbl/distinfo:1.3     Mon Jul 14 17:50:07 2025
+++ pkgsrc/mail/opensmtpd-filter-dnsbl/distinfo Sat Sep 13 16:19:20 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2025/07/14 17:50:07 vins Exp $
+$NetBSD: distinfo,v 1.4 2025/09/13 16:19:20 vins Exp $
 
 BLAKE2s (filter-dnsbl-0.4.tar.gz) = 70b952a56b39e570f293645cce41a9478011460e56ed62d10044f412cefa2809
 SHA512 (filter-dnsbl-0.4.tar.gz) = bca350ea1102243e4c53b979a62ee81ec8197fd37a4c5de652c166150fbb7e11b82b0daa42af75e8db9bca62f7ab2f69988e15a510e615032d4ee28a28f0d0a9
 Size (filter-dnsbl-0.4.tar.gz) = 3458 bytes
 SHA1 (patch-Makefile) = 1a262a5860642f965cf6d62c4efddb7515fd121e
 SHA1 (patch-compat.h) = ba2d347c80efa0467e2655fb5c9e56f451f0199b
-SHA1 (patch-main.c) = 80061610d34ede5d25c6239ba58570fdaaf36af9
+SHA1 (patch-main.c) = 29d777cea177cdda37a113b5a53be20517de5268

Index: pkgsrc/mail/opensmtpd-filter-dnsbl/patches/patch-main.c
diff -u pkgsrc/mail/opensmtpd-filter-dnsbl/patches/patch-main.c:1.2 pkgsrc/mail/opensmtpd-filter-dnsbl/patches/patch-main.c:1.3
--- pkgsrc/mail/opensmtpd-filter-dnsbl/patches/patch-main.c:1.2 Fri Sep  8 21:05:37 2023
+++ pkgsrc/mail/opensmtpd-filter-dnsbl/patches/patch-main.c     Sat Sep 13 16:19:20 2025
@@ -1,10 +1,8 @@
-$NetBSD: patch-main.c,v 1.2 2023/09/08 21:05:37 vins Exp $
+$NetBSD: patch-main.c,v 1.3 2025/09/13 16:19:20 vins Exp $
 
 * Provide an implementation of recallocarray().
-* Provide compatibility functions for OpenBSD's libevent
-  (pulled from OpenSMTD/openbsd-compat).
 
---- main.c.orig        2021-10-27 09:33:56.000000000 +0000
+--- main.c.orig        2025-05-19 19:01:24.000000000 +0000
 +++ main.c
 @@ -1,5 +1,6 @@
  /*
@@ -13,7 +11,7 @@ $NetBSD: patch-main.c,v 1.2 2023/09/08 2
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
-@@ -30,6 +31,104 @@
+@@ -30,6 +31,42 @@
  #include <asr.h>
  
  #include "opensmtpd.h"
@@ -53,68 +51,6 @@ $NetBSD: patch-main.c,v 1.2 2023/09/08 2
 +
 +      return newptr;
 +}
-+
-+struct event_asr {
-+      struct event     ev;
-+      struct asr_query *async;
-+      void            (*cb)(struct asr_result *, void *);
-+      void            *arg;
-+};
-+
-+struct event_asr * event_asr_run(struct asr_query *,
-+    void (*)(struct asr_result *, void *), void *);
-+void event_asr_abort(struct event_asr *);
-+
-+static void
-+event_asr_dispatch(int fd __attribute__((__unused__)),
-+    short ev __attribute__((__unused__)), void *arg)
-+{
-+      struct event_asr        *eva = arg;
-+      struct asr_result        ar;
-+      struct timeval           tv;
-+
-+      event_del(&eva->ev);
-+
-+      if (asr_run(eva->async, &ar)) {
-+              eva->cb(&ar, eva->arg);
-+              free(eva);
-+      } else {
-+              event_set(&eva->ev, ar.ar_fd,
-+                  ar.ar_cond == ASR_WANT_READ ? EV_READ : EV_WRITE,
-+                  event_asr_dispatch, eva);
-+              tv.tv_sec = ar.ar_timeout / 1000;
-+              tv.tv_usec = (ar.ar_timeout % 1000) * 1000;
-+              event_add(&eva->ev, &tv);
-+      }
-+}
-+
-+struct event_asr *
-+event_asr_run(struct asr_query *async, void (*cb)(struct asr_result *, void *),
-+    void *arg)
-+{
-+      struct event_asr *eva;
-+      struct timeval tv;
-+
-+      eva = calloc(1, sizeof *eva);
-+      if (eva == NULL)
-+              return (NULL);
-+      eva->async = async;
-+      eva->cb = cb;
-+      eva->arg = arg;
-+      tv.tv_sec = 0;
-+      tv.tv_usec = 0;
-+      evtimer_set(&eva->ev, event_asr_dispatch, eva);
-+      evtimer_add(&eva->ev, &tv);
-+      return (eva);
-+}
-+
-+void
-+event_asr_abort(struct event_asr *eva)
-+{
-+      asr_abort(eva->async);
-+      event_del(&eva->ev);
-+      free(eva);
-+}
  
  struct dnsbl_session;