# HG changeset patch
# User Heiko Schlittermann (I24) <hs@schlittermann.de>
# Date 1298540592 -3600
# Node ID b4b1035669609d5d429258a1fae5bbfa9baf0240
# Parent  e566d12d3a48f00706b8068b5d7ec26df39c6f47
changes to OS/Makefile-Linux, not EDITME

diff -r e566d12d3a48 -r b4b103566960 series
--- a/series	Wed Feb 23 23:56:51 2011 +0100
+++ b/series	Thu Feb 24 10:43:12 2011 +0100
@@ -1,8 +1,8 @@
-doc.maildir_tag
+doc.maildir_tag #+4.74
 build.Makefile #+stable
-src.bail-out-on-BOM #+stable
-src.maildir_use_size_file #+stable
-src.fixed_ensure_maildirsize #+stable
-src.lock_maildirsize #+current
-dbg.maildirsize #-stable
-src.quota-ignore #-stable
+src.bail-out-on-BOM #+4.74
+src.maildir_use_size_file #+4.74
+src.fixed_ensure_maildirsize #+4.74
+src.lock_maildirsize #+4.74
+dbg.maildirsize #+test
+src.quota-ignore #+test
diff -r e566d12d3a48 -r b4b103566960 src.lock_maildirsize
--- a/src.lock_maildirsize	Wed Feb 23 23:56:51 2011 +0100
+++ b/src.lock_maildirsize	Thu Feb 24 10:43:12 2011 +0100
@@ -1,18 +1,46 @@
 # HG changeset patch
-# Parent d54ee7005f7f7b5970ce45caf7487a9fd929e55f
+# Parent 68c3fb9c52b0af6e32558b20d60b34d0cc9daef4
 
-diff -r d54ee7005f7f Local/Makefile
---- a/Local/Makefile	Mon Feb 21 22:52:42 2011 +0100
-+++ b/Local/Makefile	Wed Feb 23 00:53:43 2011 +0100
-@@ -1,4 +1,5 @@
- # $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $
-+EXTRALIBS_EXIM=-lrt
- 
- ##################################################
- #          The Exim mail transport agent         #
-diff -r d54ee7005f7f src/transports/appendfile.c
---- a/src/transports/appendfile.c	Mon Feb 21 22:52:42 2011 +0100
-+++ b/src/transports/appendfile.c	Wed Feb 23 00:53:43 2011 +0100
+diff -r 68c3fb9c52b0 OS/Makefile-Linux
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/OS/Makefile-Linux	Thu Feb 24 10:42:47 2011 +0100
+@@ -0,0 +1,33 @@
++# $Cambridge: exim/src/OS/Makefile-Linux,v 1.4 2008/08/11 15:30:02 fanf2 Exp $
++
++# Exim: OS-specific make file for Linux. This is for modern Linuxes,
++# which use libc6.
++
++HAVE_ICONV=yes
++
++BASENAME_COMMAND=look_for_it
++CHOWN_COMMAND=look_for_it
++CHGRP_COMMAND=look_for_it
++CHMOD_COMMAND=look_for_it
++
++CFLAGS=-O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS_DYNAMIC=-shared -rdynamic
++
++DBMLIB = -ldb
++USE_DB = yes
++
++LIBS = -lnsl -lcrypt -lm -lrt
++LIBRESOLV = -lresolv
++
++X11=/usr/X11R6
++XINCLUDE=-I$(X11)/include
++XLFLAGS=-L$(X11)/lib
++X11_LD_LIB=$(X11)/lib
++
++EXIWHAT_PS_ARG=ax
++EXIWHAT_EGREP_ARG='/exim( |$$)'
++EXIWHAT_MULTIKILL_CMD=killall
++EXIWHAT_MULTIKILL_ARG=exim
++EXIWHAT_KILL_SIGNAL=-USR1
++
++# End
+diff -r 68c3fb9c52b0 src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Thu Feb 24 10:39:43 2011 +0100
++++ b/src/transports/appendfile.c	Thu Feb 24 10:42:47 2011 +0100
 @@ -13,6 +13,7 @@
  
  #ifdef SUPPORT_MAILDIR
@@ -132,9 +160,9 @@
  
  #ifdef SUPPORT_MBX
  if (mbx_lockfd >= 0)
-diff -r d54ee7005f7f src/transports/appendfile.h
---- a/src/transports/appendfile.h	Mon Feb 21 22:52:42 2011 +0100
-+++ b/src/transports/appendfile.h	Wed Feb 23 00:53:43 2011 +0100
+diff -r 68c3fb9c52b0 src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Thu Feb 24 10:39:43 2011 +0100
++++ b/src/transports/appendfile.h	Thu Feb 24 10:42:47 2011 +0100
 @@ -95,5 +95,8 @@
  /* Function that is shared with tf_maildir.c */
  
@@ -144,9 +172,9 @@
 +
  
  /* End of transports/appendfile.h */
-diff -r d54ee7005f7f src/transports/tf_maildir.c
---- a/src/transports/tf_maildir.c	Mon Feb 21 22:52:42 2011 +0100
-+++ b/src/transports/tf_maildir.c	Wed Feb 23 00:53:43 2011 +0100
+diff -r 68c3fb9c52b0 src/transports/tf_maildir.c
+--- a/src/transports/tf_maildir.c	Thu Feb 24 10:39:43 2011 +0100
++++ b/src/transports/tf_maildir.c	Thu Feb 24 10:42:47 2011 +0100
 @@ -367,13 +367,16 @@
  
  Returns:           >=0  a file descriptor for an open maildirsize file
@@ -271,15 +299,29 @@
  DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT
    " filecount=%d\n", size, filecount);
  *returned_size = size;
-diff -r d54ee7005f7f src/transports/tf_maildir.h
---- a/src/transports/tf_maildir.h	Mon Feb 21 22:52:42 2011 +0100
-+++ b/src/transports/tf_maildir.h	Wed Feb 23 00:53:43 2011 +0100
-@@ -16,7 +16,7 @@
-                 uschar *);
- extern int    maildir_ensure_sizefile(uschar *,
-                 appendfile_transport_options_block *, const pcre *,
--                const pcre *, off_t *, int *);
+diff -r 68c3fb9c52b0 src/transports/tf_maildir.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/src/transports/tf_maildir.h	Thu Feb 24 10:42:47 2011 +0100
+@@ -0,0 +1,22 @@
++/* $Cambridge: exim/src/src/transports/tf_maildir.h,v 1.7 2009/11/16 19:56:54 nm4 Exp $ */
++
++/*************************************************
++*     Exim - an Internet mail transport agent    *
++*************************************************/
++
++/* Copyright (c) University of Cambridge 1995 - 2009 */
++/* See the file NOTICE for conditions of use and distribution. */
++
++/* Header file for the functions that are used to support the use of
++maildirsize files for quota handling in maildir directories. */
++
++extern off_t  maildir_compute_size(uschar *, int *, time_t *, const pcre *,
++                const pcre *, BOOL);
++extern BOOL   maildir_ensure_directories(uschar *, address_item *, BOOL, int,
++                uschar *);
++extern int    maildir_ensure_sizefile(uschar *,
++                appendfile_transport_options_block *, const pcre *,
 +                const pcre *, off_t *, int *, uschar **);
- extern void   maildir_record_length(int, int);
- 
- /* End of tf_maildir.h */
++extern void   maildir_record_length(int, int);
++
++/* End of tf_maildir.h */