CVS commit: pkgsrc/mail/maildrop

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Apr 16 12:49:35 UTC 2020

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

Log Message:
Build fix for auth_mkhomedir() that is missing from courrier-authlib


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/maildrop/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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/distinfo
diff -u pkgsrc/mail/maildrop/distinfo:1.21 pkgsrc/mail/maildrop/distinfo:1.22
--- pkgsrc/mail/maildrop/distinfo:1.21  Fri May 24 14:17:16 2019
+++ pkgsrc/mail/maildrop/distinfo       Thu Apr 16 12:49:34 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2019/05/24 14:17:16 hauke Exp $
+$NetBSD: distinfo,v 1.22 2020/04/16 12:49:34 manu Exp $
 
 SHA1 (maildrop-3.0.0.tar.bz2) = d982d4d9d4ee2fa8637102049126c5202eb82c73
 RMD160 (maildrop-3.0.0.tar.bz2) = 9be87d2615f49bb02702c88ade8ebc3260c03e51
@@ -7,4 +7,4 @@ Size (maildrop-3.0.0.tar.bz2) = 2091018 
 SHA1 (patch-Makefile.in) = 6629f46889d6f3c73cac08d5ab10308a84c41ec2
 SHA1 (patch-libs_maildrop_configure) = 76b12b194463095a65cde90d992ac6b023b694e2
 SHA1 (patch-libs_maildrop_filelock.C) = d278b66bf77fe46f5ad51f860b6e5efdd7d7f29b
-SHA1 (patch-libs_maildrop_main.C) = e8d4229e6ae742876bef0134af41134fd53f5850
+SHA1 (patch-libs_maildrop_main.C) = fe53391fa0823f471a19b924aedd558d3da63aca

Index: pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C
diff -u pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C:1.1 pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C:1.2
--- pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C:1.1 Fri May 24 13:17:58 2019
+++ pkgsrc/mail/maildrop/patches/patch-libs_maildrop_main.C     Thu Apr 16 12:49:35 2020
@@ -1,10 +1,27 @@
-$NetBSD: patch-libs_maildrop_main.C,v 1.1 2019/05/24 13:17:58 hauke Exp $
+$NetBSD: patch-libs_maildrop_main.C,v 1.2 2020/04/16 12:49:35 manu Exp $
 
 Make this maildrop install usable by both Courier and other MTAs.
 
---- libs/maildrop/main.C.orig  2018-09-13 23:22:17.000000000 +0000
-+++ libs/maildrop/main.C
-@@ -754,7 +754,7 @@ uid_t      my_u=getuid();
+--- 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)
+ {
+       Maildrop &maildrop=*(Maildrop *)void_arg;
+ 
++#if 0 /* auth_mkhomedir does not exist in courrier-authlib */
+       if (auth_mkhomedir(auth))
+       {
+               perror(auth->homedir);
+               exit(1);
+       }
++#endif
+ 
+       if (VerboseLevel() > 1)
+       {
+               Buffer b;
+@@ -753,9 +755,9 @@
+ 
        if (!found)
        {
  #if HAVE_COURIER
@@ -13,7 +30,9 @@ Make this maildrop install usable by bot
  #endif
                {
                        my_pw=getpwuid(my_u);
-@@ -814,6 +814,14 @@ Buffer    value;
+                       if (!my_pw)
+@@ -813,8 +815,16 @@
+       if (deliverymode && orig_uid == getuid())
        {
        const char *p;
  
@@ -28,7 +47,9 @@ Make this maildrop install usable by bot
                if ((p=getenv("HOME")) && *p)
                        maildrop.init_home=p;
  
-@@ -838,6 +846,8 @@ Buffer     value;
+               if ((p=getenv("LOGNAME")) && *p)
+@@ -837,8 +847,10 @@
+               maildrop.init_default=p;
  
                if ((p=getenv("MAILDIRQUOTA")) && *p)
                        maildrop.init_quota=p;
@@ -37,3 +58,4 @@ Make this maildrop install usable by bot
        }
  #endif
  
+       if (deliverymode)