CVS commit: pkgsrc/mail/maildrop

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri May 24 14:17:17 UTC 2019

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

Log Message:
Update patches from FreeBSD mail/maildrop port.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/mail/maildrop/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/maildrop/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/maildrop/patches/patch-Makefile.in
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/maildrop/patches/patch-libs_maildrop_filelock.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.66 pkgsrc/mail/maildrop/Makefile:1.67
--- pkgsrc/mail/maildrop/Makefile:1.66  Fri May 24 13:17:57 2019
+++ pkgsrc/mail/maildrop/Makefile       Fri May 24 14:17:16 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2019/05/24 13:17:57 hauke Exp $
+# $NetBSD: Makefile,v 1.67 2019/05/24 14:17:16 hauke Exp $
 
 DISTNAME=      maildrop-3.0.0
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/mail/maildrop/distinfo
diff -u pkgsrc/mail/maildrop/distinfo:1.20 pkgsrc/mail/maildrop/distinfo:1.21
--- pkgsrc/mail/maildrop/distinfo:1.20  Fri May 24 13:17:57 2019
+++ pkgsrc/mail/maildrop/distinfo       Fri May 24 14:17:16 2019
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.20 2019/05/24 13:17:57 hauke Exp $
+$NetBSD: distinfo,v 1.21 2019/05/24 14:17:16 hauke Exp $
 
 SHA1 (maildrop-3.0.0.tar.bz2) = d982d4d9d4ee2fa8637102049126c5202eb82c73
 RMD160 (maildrop-3.0.0.tar.bz2) = 9be87d2615f49bb02702c88ade8ebc3260c03e51
 SHA512 (maildrop-3.0.0.tar.bz2) = 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff
 Size (maildrop-3.0.0.tar.bz2) = 2091018 bytes
-SHA1 (patch-Makefile.in) = 82153fdba4f9ef69d694672d97a68bb55d84765a
+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

Index: pkgsrc/mail/maildrop/patches/patch-Makefile.in
diff -u pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.1 pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.2
--- pkgsrc/mail/maildrop/patches/patch-Makefile.in:1.1  Fri May 24 13:17:57 2019
+++ pkgsrc/mail/maildrop/patches/patch-Makefile.in      Fri May 24 14:17:17 2019
@@ -1,7 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.1 2019/05/24 13:17:57 hauke Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2019/05/24 14:17:17 hauke Exp $
 
 Do not install maildir related tools & doc - they presumably get
-installed by some other courier-* package if you want them.
+installed by some other courier-* package if you want them. (The
+FreeBSD mail/maildrop port just 'maildrop-' prefixes those binaries?)
 
 Install system binaries in {libexecdir} where applicable.
 

Added files:

Index: pkgsrc/mail/maildrop/patches/patch-libs_maildrop_filelock.C
diff -u /dev/null pkgsrc/mail/maildrop/patches/patch-libs_maildrop_filelock.C:1.1
--- /dev/null   Fri May 24 14:17:17 2019
+++ pkgsrc/mail/maildrop/patches/patch-libs_maildrop_filelock.C Fri May 24 14:17:17 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-libs_maildrop_filelock.C,v 1.1 2019/05/24 14:17:17 hauke Exp $
+
+We want to not fail a lock on a device file, make it so 
+(patch from FreeBSD mail/maildrop port)
+  
+--- libs/maildrop/filelock.C.orig      2013-08-25 18:54:20.000000000 +0000
++++ libs/maildrop/filelock.C
+@@ -63,7 +63,7 @@ int  flockrc;
+               // you're writing to a device file, you know what you're doing.
+ 
+               if (fstat(fd, &stat_buf) >= 0 && (
+-                      S_ISREG(stat_buf.st_mode) || S_ISDIR(stat_buf.st_mode)))
++                      S_ISCHR(stat_buf.st_mode) || S_ISBLK(stat_buf.st_mode)))
+               {
+                       return;
+               }