CVS commit: pkgsrc/mail/maildrop

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/maildrop
From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
Date: Wed, 25 Jan 2023 19:34:04 +0000

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Jan 25 19:34:04 UTC 2023

Modified Files:
        pkgsrc/mail/maildrop: Makefile distinfo
        pkgsrc/mail/maildrop/patches: patch-Makefile.in
            patch-libs_maildrop_main.C

Log Message:
maildrop: update to 3.1.0. Needs newest security/courier-authlib.

3.1.0

        * Switch to libidn2.
        * Debian/Ubuntu: update lintian overrides

3.0.9
        * Adjust deb packaging. Check /etc/lsb-release and include the
        distribution release in the deb package version, to faciliate
        updating to the same version of the package in an updated release.

        Fix build dependencies.

        * Update deliverquota man page.

3.0.8

        * gcc 12 and autotools update. OpenSSL 3.0 update.
        * Add scripts to create installable .deb packages, update
        documentation.

3.0.7

        * configure.ac: Fix configure check for pcre2

3.0.6

        * Fix linking failure on some Linux distributions.

3.0.5

        * Fix linking failure on some Linux distributions.

3.0.4

        * maildrop: update to pcre2
        * Minor code tweaks, make it compileable with -Wall -Werror.

3.0.3

        * Add maildirwatch helper tool.
        * Fully install the maildirwatch tool, its man page, as well as the
        maildirkw man page and tool, which should be packaged with maildrop
        too.

3.0.2

        * spec file: add BuildRequires: %{__make} (will be required in F34).

3.0.1

        * courier-authlib API update.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/mail/maildrop/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/maildrop/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/maildrop/patches/patch-Makefile.in \
    pkgsrc/mail/maildrop/patches/patch-libs_maildrop_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/maildrop/Makefile
diff -u pkgsrc/mail/maildrop/Makefile:1.75 pkgsrc/mail/maildrop/Makefile:1.76
--- pkgsrc/mail/maildrop/Makefile:1.75  Tue Jun 28 11:34:21 2022
+++ pkgsrc/mail/maildrop/Makefile       Wed Jan 25 19:34:04 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2022/06/28 11:34:21 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2023/01/25 19:34:04 bsiegert Exp $
 
-DISTNAME=      maildrop-3.0.0
-PKGREVISION=   7
-CATEGORIES=    security
+DISTNAME=      maildrop-3.1.0
+CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
 
@@ -60,5 +59,6 @@ post-install:
 #      ${INSTALL_DATA} ${WRKSRC}/libs/maildrop/makedat.html ${DESTDIR}${DOCDIR}
 
 .include "../../mail/courier-unicode/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/libidn2/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/maildrop/distinfo
diff -u pkgsrc/mail/maildrop/distinfo:1.24 pkgsrc/mail/maildrop/distinfo:1.25
--- pkgsrc/mail/maildrop/distinfo:1.24  Tue Oct 26 10:54:06 2021
+++ pkgsrc/mail/maildrop/distinfo       Wed Jan 25 19:34:04 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2021/10/26 10:54:06 nia Exp $
+$NetBSD: distinfo,v 1.25 2023/01/25 19:34:04 bsiegert Exp $
 
-BLAKE2s (maildrop-3.0.0.tar.bz2) = 26d1510f606100605b5ee9e4df6d100bede52810259a665325820ec5f2aaf35f
-SHA512 (maildrop-3.0.0.tar.bz2) = 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff
-Size (maildrop-3.0.0.tar.bz2) = 2091018 bytes
-SHA1 (patch-Makefile.in) = 6629f46889d6f3c73cac08d5ab10308a84c41ec2
+BLAKE2s (maildrop-3.1.0.tar.bz2) = b768a660b19ac811b135185a28a941854619b4f716333fa9247d666992828d83
+SHA512 (maildrop-3.1.0.tar.bz2) = 4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56
+Size (maildrop-3.1.0.tar.bz2) = 2154698 bytes
+SHA1 (patch-Makefile.in) = 0a23852205a86918530a9b79b5c0451d04a6d672
 SHA1 (patch-libs_maildrop_configure) = 76b12b194463095a65cde90d992ac6b023b694e2
 SHA1 (patch-libs_maildrop_filelock.C) = d278b66bf77fe46f5ad51f860b6e5efdd7d7f29b
-SHA1 (patch-libs_maildrop_main.C) = fe53391fa0823f471a19b924aedd558d3da63aca
+SHA1 (patch-libs_maildrop_main.C) = f476c38a0079c71b854772a6de5058436646cb62

Index: pkgsrc/mail/maildrop/patches/patch-Makefile.in
diff -u pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.2 pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.3
--- pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.2  Fri May 24 14:17:17 2019
+++ pkgsrc/mail/maildrop/patches/patch-Makefile.in      Wed Jan 25 19:34:04 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.2 2019/05/24 14:17:17 hauke Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2023/01/25 19:34:04 bsiegert Exp $
 
 Do not install maildir related tools & doc - they presumably get
 installed by some other courier-* package if you want them. (The
@@ -6,35 +6,33 @@ FreeBSD mail/maildrop port just 'maildro
 
 Install system binaries in {libexecdir} where applicable.
 
---- Makefile.in.orig   2018-09-13 23:21:07.000000000 +0000
+--- Makefile.in.orig   2022-12-02 14:42:36.000000000 +0000
 +++ Makefile.in
-@@ -429,17 +429,17 @@ EXTRA_DIST = README.html INSTALL.html UP
-       maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW)
- 
+@@ -443,16 +443,15 @@ EXTRA_DIST = README.html INSTALL.html UP
+       packaging/debian/maildrop-dev.soname.lintian-overrides \
+       packaging/debian/rules packaging/debian/source/format
  scriptdir = $(pkgdatadir)/scripts
 -DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
 -DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
 -DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
 -MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
--      maildirmake.html maildropex.html maildir.html \
-+DELIVERQUOTAHTMLSOURCE = 
-+DELIVERQUOTAHTML = 
-+DELIVERQUOTAMAN = 
-+MAILDROPHTML = lockmail.html \
-+      maildropex.html \
-       maildropfilter.html maildropgdbm.html maildrop.html \
-       mailbot.html makemime.html reformail.html reformime.html \
-       $(am__append_1)
+-      maildirwatch.html maildirmake.html maildropex.html \
+-      maildir.html maildropfilter.html maildropgdbm.html \
++DELIVERQUOTAHTMLSOURCE =
++DELIVERQUOTAHTML =
++DELIVERQUOTAMAN =
++MAILDROPHTML = lockmail.html maildropex.html \
++      maildropfilter.html maildropgdbm.html \
+       maildrop.html mailbot.html makemime.html reformail.html \
+       reformime.html $(am__append_1)
 -MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 \
--      maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \
--      makemime.1 reformail.1 reformime.1 $(am__append_2)
+-      maildropex.7 maildirkw.1 maildirwatch.1 maildir.5 \
 +MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 \
-+      maildropex.7 maildropfilter.7 maildropgdbm.7 \
-+      makemime.1 reformail.1 reformime.1
++      maildropex.7 \
+       maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 \
+       reformime.1 $(am__append_2)
  EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
- @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3
- sysincludedir = $(includedir)
-@@ -1282,12 +1282,8 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -1308,12 +1307,8 @@ uninstall-man: uninstall-man1 uninstall-
  #  Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
  
  install-deliverquota:
@@ -47,11 +45,13 @@ Install system binaries in {libexecdir} 
  
  install-data-local: install-man install-deliverquota install-maildrop
  
-@@ -1315,23 +1311,24 @@ install-maildrop:
+@@ -1341,25 +1336,24 @@ install-maildrop:
                $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
        done
        $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
 -      $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
+-      $(INSTALL_PROGRAM) libs/maildir/maildirkw $(DESTDIR)$(bindir)/maildirkw
+-      $(INSTALL_PROGRAM) libs/maildir/maildirwatch $(DESTDIR)$(bindir)/maildirwatch
        $(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
        $(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
        test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
@@ -66,8 +66,8 @@ Install system binaries in {libexecdir} 
        . libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
  
  uninstall-maildrop:
--      for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \
-+      for f in maildrop mailbot reformail lockmail makemime reformime; do \
+-      for f in maildrop mailbot maildirmake reformail lockmail makemime reformime maildirkw maildirwatch; do \
++      for f in maildrop mailbot reformail lockmail makemime reformime ; do \
                rm -f $(DESTDIR)$(bindir)/$$f ; \
        done
        test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
Index: pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C
diff -u pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C:1.2 pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C:1.3
--- pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C:1.2 Thu Apr 16 12:49:35 2020
+++ pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C     Wed Jan 25 19:34:04 2023
@@ -1,11 +1,10 @@
-$NetBSD: patch-libs_maildrop_main.C,v 1.2 2020/04/16 12:49:35 manu Exp $
+$NetBSD: patch-libs_maildrop_main.C,v 1.3 2023/01/25 19:34:04 bsiegert Exp $
 
 Make this maildrop install usable by both Courier and other MTAs.
 
---- libs/maildrop/main.C.orig  2018-09-14 01:22:17.000000000 +0200
-+++ libs/maildrop/main.C       2020-04-10 03:32:11.795122838 +0200
-@@ -278,13 +278,15 @@
-                           void *void_arg)
+--- libs/maildrop/main.C.orig  2021-05-22 09:00:07.000000000 +0000
++++ libs/maildrop/main.C
+@@ -279,11 +279,13 @@ static int callback_authlib(struct authi
  {
        Maildrop &maildrop=*(Maildrop *)void_arg;
  
@@ -19,9 +18,7 @@ Make this maildrop install usable by bot
  
        if (VerboseLevel() > 1)
        {
-               Buffer b;
-@@ -753,9 +755,9 @@
- 
+@@ -758,7 +760,7 @@ uid_t      my_u=getuid();
        if (!found)
        {
  #if HAVE_COURIER
@@ -30,9 +27,7 @@ Make this maildrop install usable by bot
  #endif
                {
                        my_pw=getpwuid(my_u);
-                       if (!my_pw)
-@@ -813,8 +815,16 @@
-       if (deliverymode && orig_uid == getuid())
+@@ -818,6 +820,14 @@ Buffer    value;
        {
        const char *p;
  
@@ -47,9 +42,7 @@ Make this maildrop install usable by bot
                if ((p=getenv("HOME")) && *p)
                        maildrop.init_home=p;
  
-               if ((p=getenv("LOGNAME")) && *p)
-@@ -837,8 +847,10 @@
-               maildrop.init_default=p;
+@@ -842,6 +852,8 @@ Buffer     value;
  
                if ((p=getenv("MAILDIRQUOTA")) && *p)
                        maildrop.init_quota=p;
@@ -58,4 +51,3 @@ Make this maildrop install usable by bot
        }
  #endif
  
-       if (deliverymode)

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

Home | Main Index | Thread Index | Old Index