From 6201491233d80bfbc8277390b85cbfc05b411027 Mon Sep 17 00:00:00 2001
From: Ali Polatel <alip@exherbo.org>
Date: Tue, 6 Dec 2011 16:41:33 +0200
Subject: [PATCH] notmuch-deliver: Import from maildrop-2.5.5

maildrop-2.5.5 is GPL-3.
No change in functionality, just a precaution before relicensing.
---
 contrib/notmuch-deliver/maildrop/maildir/Makefile.am     | 1 -
 contrib/notmuch-deliver/maildrop/maildir/configure.in    | 2 +-
 contrib/notmuch-deliver/maildrop/maildir/maildircreate.c | 1 -
 contrib/notmuch-deliver/maildrop/maildir/maildircreate.h | 1 -
 contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h   | 1 -
 contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c  | 1 -
 contrib/notmuch-deliver/maildrop/maildir/maildiropen.c   | 1 -
 contrib/notmuch-deliver/maildrop/numlib/Makefile.am      | 1 -
 contrib/notmuch-deliver/maildrop/numlib/atotimet.c       | 1 -
 contrib/notmuch-deliver/maildrop/numlib/atouidt.c        | 1 -
 contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c   | 1 -
 contrib/notmuch-deliver/maildrop/numlib/configure.in     | 2 +-
 contrib/notmuch-deliver/maildrop/numlib/numlib.h         | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strdevt.c        | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strgidt.c        | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strhdevt.c       | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strhinot.c       | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strhpidt.c       | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strhtimet.c      | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strinot.c        | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strofft.c        | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strpidt.c        | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strsize.c        | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strsizet.c       | 1 -
 contrib/notmuch-deliver/maildrop/numlib/strtimet.c       | 1 -
 contrib/notmuch-deliver/maildrop/numlib/struidt.c        | 1 -
 26 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/contrib/notmuch-deliver/maildrop/maildir/Makefile.am b/contrib/notmuch-deliver/maildrop/maildir/Makefile.am
index 2495a83b..6fd0ae49 100644
--- a/contrib/notmuch-deliver/maildrop/maildir/Makefile.am
+++ b/contrib/notmuch-deliver/maildrop/maildir/Makefile.am
@@ -1,4 +1,3 @@
-#$Id: Makefile.am,v 1.59 2009/06/27 16:32:38 mrsam Exp $
 #
 # Copyright 1998 - 2005 Double Precision, Inc.  See COPYING for
 # distribution information.
diff --git a/contrib/notmuch-deliver/maildrop/maildir/configure.in b/contrib/notmuch-deliver/maildrop/maildir/configure.in
index 1e724443..dfdd22a3 100644
--- a/contrib/notmuch-deliver/maildrop/maildir/configure.in
+++ b/contrib/notmuch-deliver/maildrop/maildir/configure.in
@@ -1,4 +1,3 @@
-dnl $Id: configure.in,v 1.37 2008/11/27 21:51:16 mrsam Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl Copyright 1998 - 2001 Double Precision, Inc.  See COPYING for
@@ -67,6 +66,7 @@ AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 AC_STRUCT_TM
+AC_SYS_LARGEFILE
 
 dnl Checks for library functions.
 AC_CHECK_HEADER(fam.h, :, :)
diff --git a/contrib/notmuch-deliver/maildrop/maildir/maildircreate.c b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.c
index 74030f41..5efc0afb 100644
--- a/contrib/notmuch-deliver/maildrop/maildir/maildircreate.c
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.c
@@ -35,7 +35,6 @@
 #include	"numlib/numlib.h"
 
 
-static const char rcsid[]="$Id: maildircreate.c,v 1.6 2003/01/26 04:07:03 mrsam Exp $";
 
 FILE *maildir_tmpcreate_fp(struct maildir_tmpcreate_info *info)
 {
diff --git a/contrib/notmuch-deliver/maildrop/maildir/maildircreate.h b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.h
index ea1c71ac..85391454 100644
--- a/contrib/notmuch-deliver/maildrop/maildir/maildircreate.h
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildircreate.h
@@ -16,7 +16,6 @@
 extern "C" {
 #endif
 
-static const char maildircreate_h_rcsid[]="$Id: maildircreate.h,v 1.10 2006/10/29 00:03:53 mrsam Exp $";
 
 	/* Create messages in maildirs */
 
diff --git a/contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h b/contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h
index 545d11e1..e1e7c19a 100644
--- a/contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildirmisc.h
@@ -18,7 +18,6 @@
 extern "C" {
 #endif
 
-static const char maildirmisc_h_rcsid[]="$Id: maildirmisc.h,v 1.18 2006/07/22 02:48:15 mrsam Exp $";
 
 /*
 **
diff --git a/contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c b/contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c
index 754b2c70..28a3ac21 100644
--- a/contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildirmkdir.c
@@ -18,7 +18,6 @@
 
 #include	"maildirmisc.h"
 
-static const char rcsid[]="$Id: maildirmkdir.c,v 1.2 2002/03/15 03:09:21 mrsam Exp $";
 
 int maildir_mkdir(const char *dir)
 {
diff --git a/contrib/notmuch-deliver/maildrop/maildir/maildiropen.c b/contrib/notmuch-deliver/maildrop/maildir/maildiropen.c
index 5071df76..25428737 100644
--- a/contrib/notmuch-deliver/maildrop/maildir/maildiropen.c
+++ b/contrib/notmuch-deliver/maildrop/maildir/maildiropen.c
@@ -22,7 +22,6 @@
 
 #include	"maildirmisc.h"
 
-static const char rcsid[]="$Id: maildiropen.c,v 1.8 2003/01/19 16:39:52 mrsam Exp $";
 
 char *maildir_getlink(const char *filename)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/Makefile.am b/contrib/notmuch-deliver/maildrop/numlib/Makefile.am
index c0f129fa..0a5f103d 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/Makefile.am
+++ b/contrib/notmuch-deliver/maildrop/numlib/Makefile.am
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.12 2007/06/30 15:40:53 mrsam Exp $
 #
 # Copyright 1998 - 2004 Double Precision, Inc.  See COPYING for
 # distribution information.
diff --git a/contrib/notmuch-deliver/maildrop/numlib/atotimet.c b/contrib/notmuch-deliver/maildrop/numlib/atotimet.c
index d494fd22..0360b5b2 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/atotimet.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/atotimet.c
@@ -9,6 +9,5 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: atotimet.c,v 1.1 2003/08/03 03:09:19 mrsam Exp $";
 
 LIBMAIL_STRIMPL(time_t, libmail_strtotime_t, libmail_atotime_t)
diff --git a/contrib/notmuch-deliver/maildrop/numlib/atouidt.c b/contrib/notmuch-deliver/maildrop/numlib/atouidt.c
index 3c01ecf5..6f869d54 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/atouidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/atouidt.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: atouidt.c,v 1.1 2004/01/11 02:47:33 mrsam Exp $";
 
 LIBMAIL_STRIMPL(uid_t, libmail_strtouid_t, libmail_atouid_t)
 LIBMAIL_STRIMPL(gid_t, libmail_strtogid_t, libmail_atogid_t)
diff --git a/contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c b/contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c
index 56793927..adaee406 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/changeuidgid.c
@@ -19,7 +19,6 @@
 
 #include	"numlib.h"
 
-static const char rcsid[]="$Id: changeuidgid.c,v 1.2 2003/01/05 04:01:17 mrsam Exp $";
 
 void libmail_changegroup(gid_t gid)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/configure.in b/contrib/notmuch-deliver/maildrop/numlib/configure.in
index fc977aa9..7479725b 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/configure.in
+++ b/contrib/notmuch-deliver/maildrop/numlib/configure.in
@@ -1,5 +1,4 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.7 2010/03/19 01:09:26 mrsam Exp $
 dnl
 dnl Copyright 1998 - 2010 Double Precision, Inc.  See COPYING for
 dnl distribution information.
@@ -39,6 +38,7 @@ AC_CHECK_TYPE(int64_t, [ : ],
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_UID_T
 AC_TYPE_PID_T
+AC_SYS_LARGEFILE
 
 dnl Checks for library functions.
 
diff --git a/contrib/notmuch-deliver/maildrop/numlib/numlib.h b/contrib/notmuch-deliver/maildrop/numlib/numlib.h
index 7928aa7e..c31d9b1a 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/numlib.h
+++ b/contrib/notmuch-deliver/maildrop/numlib/numlib.h
@@ -10,7 +10,6 @@
 extern "C" {
 #endif
 
-static const char numlib_h_rcsid[]="$Id: numlib.h,v 1.11 2010/03/19 01:09:26 mrsam Exp $";
 
 #if	HAVE_CONFIG_H
 #include	"../numlib/config.h" /* VPATH build */
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strdevt.c b/contrib/notmuch-deliver/maildrop/numlib/strdevt.c
index 2e542d54..aa8b0282 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strdevt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strdevt.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strdevt.c,v 1.1 2003/01/26 03:22:40 mrsam Exp $";
 
 char *libmail_str_dev_t(dev_t t, char *arg)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strgidt.c b/contrib/notmuch-deliver/maildrop/numlib/strgidt.c
index 89472e3b..828a4550 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strgidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strgidt.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strgidt.c,v 1.4 2003/01/05 04:01:17 mrsam Exp $";
 
 char *libmail_str_gid_t(gid_t t, char *arg)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strhdevt.c b/contrib/notmuch-deliver/maildrop/numlib/strhdevt.c
index 98e25e53..9ff45f28 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strhdevt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strhdevt.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strhdevt.c,v 1.2 2003/03/12 02:45:56 mrsam Exp $";
 
 static const char xdigit[]="0123456789ABCDEF";
 
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strhinot.c b/contrib/notmuch-deliver/maildrop/numlib/strhinot.c
index fa640915..c3cdc10e 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strhinot.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strhinot.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strhinot.c,v 1.5 2003/03/12 02:45:56 mrsam Exp $";
 
 static const char xdigit[]="0123456789ABCDEF";
 
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strhpidt.c b/contrib/notmuch-deliver/maildrop/numlib/strhpidt.c
index 2723af0b..5a440f5d 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strhpidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strhpidt.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strhpidt.c,v 1.5 2003/03/12 02:45:56 mrsam Exp $";
 
 static const char xdigit[]="0123456789ABCDEF";
 
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strhtimet.c b/contrib/notmuch-deliver/maildrop/numlib/strhtimet.c
index b86b05a2..cb9e6a9f 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strhtimet.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strhtimet.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strhtimet.c,v 1.5 2003/03/12 02:45:56 mrsam Exp $";
 
 static const char xdigit[]="0123456789ABCDEF";
 
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strinot.c b/contrib/notmuch-deliver/maildrop/numlib/strinot.c
index eb544c3c..314b2f38 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strinot.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strinot.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strinot.c,v 1.4 2003/01/05 04:01:17 mrsam Exp $";
 
 char *libmail_str_ino_t(ino_t t, char *arg)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strofft.c b/contrib/notmuch-deliver/maildrop/numlib/strofft.c
index 3435148e..567f912b 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strofft.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strofft.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strofft.c,v 1.6 2010/03/19 01:09:26 mrsam Exp $";
 
 char *libmail_str_off_t(off_t t, char *arg)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strpidt.c b/contrib/notmuch-deliver/maildrop/numlib/strpidt.c
index 12ee9ce1..0c29b07e 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strpidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strpidt.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strpidt.c,v 1.4 2003/01/05 04:01:17 mrsam Exp $";
 
 char *libmail_str_pid_t(pid_t t, char *arg)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strsize.c b/contrib/notmuch-deliver/maildrop/numlib/strsize.c
index 0a7dcaa8..1c903122 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strsize.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strsize.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strsize.c,v 1.2 2003/01/05 04:01:17 mrsam Exp $";
 
 static void cat_n(char *buf, unsigned long n)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strsizet.c b/contrib/notmuch-deliver/maildrop/numlib/strsizet.c
index d4ec92d3..fd9d1d1a 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strsizet.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strsizet.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strsizet.c,v 1.4 2003/01/05 04:01:18 mrsam Exp $";
 
 char *libmail_str_size_t(size_t t, char *arg)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/strtimet.c b/contrib/notmuch-deliver/maildrop/numlib/strtimet.c
index be7e051b..63307f22 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/strtimet.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strtimet.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: strtimet.c,v 1.4 2003/01/05 04:01:18 mrsam Exp $";
 
 char *libmail_str_time_t(time_t t, char *arg)
 {
diff --git a/contrib/notmuch-deliver/maildrop/numlib/struidt.c b/contrib/notmuch-deliver/maildrop/numlib/struidt.c
index 50f3f742..5843ed24 100644
--- a/contrib/notmuch-deliver/maildrop/numlib/struidt.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/struidt.c
@@ -9,7 +9,6 @@
 #include	"numlib.h"
 #include	<string.h>
 
-static const char rcsid[]="$Id: struidt.c,v 1.4 2003/01/05 04:01:18 mrsam Exp $";
 
 char *libmail_str_uid_t(uid_t t, char *arg)
 {