Remove clean and smudge filters from the git repo that are used to

stamp sysconftool-processed configuration file.

Rename all sysconftool-processed configuration files to *.git, and use
a build rule to create a stamped sysconftool file.

Fix a couple of compilation warnings.

18 files changed, 89 insertions, 25 deletions

diff --git a/imap/.gitignore b/imap/.gitignore
index 2c8f7fa..b97dbfc 100644
--- a/imap/.gitignore
+++ b/imap/.gitignore
@@ -8,11 +8,13 @@
 /courierpop3d.html.in
 /imapd
 /imapd-ssl.dist
+/imapd-ssl.dist.in
 /imapd.8
 /imapd.8.in
 /imapd.cnf
 /imapd.cnf.openssl
 /imapd.dist
+/imapd.dist.in
 /imapd.html
 /imapd.html.in
 /imapd.pam
@@ -38,9 +40,11 @@
 /mkpop3dcert.html.in
 /pop3d
 /pop3d-ssl.dist
+/pop3d-ssl.dist.in
 /pop3d.cnf
 /pop3d.cnf.openssl
 /pop3d.dist
+/pop3d.dist.in
 /pop3d.pam
 /pop3login
 /testsuitefix.pl
diff --git a/imap/Makefile.am b/imap/Makefile.am
index bd68261..7a08790 100644
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -139,6 +139,15 @@ courierpop3d.8: courierpop3d.8.in
 	./config.status --file=courierpop3d.8
 
 if HAVE_SGML
+
+GITFILES=imapd.dist.in imapd-ssl.dist.in pop3d.dist.in pop3d-ssl.dist.in
+
+BUILT_SOURCES += $(GITFILES)
+
+$(GITFILES): %: %.git
+	perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp
+	mv -f $@.tmp $@
+
 imapd.html.in: imapd.sgml ../docbook/sgml2html
 	../docbook/sgml2html imapd.sgml imapd.html.in
 
diff --git a/imap/configure.ac b/imap/configure.ac
index df67887..972cd26 100644
--- a/imap/configure.ac
+++ b/imap/configure.ac
@@ -313,6 +313,17 @@ fi
 
 AM_CONDITIONAL(HAVE_SGML, test -d ${srcdir}/../docbook)
 
+# This gets built by the make rule, and is not in the git repo
+
+for f in imapd.dist.in imapd-ssl.dist.in pop3d.dist.in pop3d-ssl.dist.in
+do
+    if test ! -f "$srcdir/$f"
+    then
+	cp -p "$srcdir/$f.git" "$srcdir/$f"
+	touch "$srcdir/$f.git"
+    fi
+done
+
 AC_SUBST(target_cpu)
 AC_SUBST(target_vendor)
 AC_SUBST(target_os)
diff --git a/imap/imapd-ssl.dist.in b/imap/imapd-ssl.dist.in.git
index bd531d7..b0d68bc 100644
--- a/imap/imapd-ssl.dist.in
+++ b/imap/imapd-ssl.dist.in.git
@@ -54,7 +54,7 @@ SSLPIDFILE=@piddir@/imapd-ssl.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# courierlogger(1) options.
 #
 
 SSLLOGGEROPTS="-name=imapd-ssl"
@@ -131,7 +131,7 @@ COURIERTLS=@bindir@/couriertls
 # documentation.
 
 ##NAME: TLS_PROTOCOL:0
-# 
+#
 # TLS_PROTOCOL sets the protocol version.  The possible versions are:
 #
 # OpenSSL:
@@ -178,7 +178,7 @@ COURIERTLS=@bindir@/couriertls
 # documentation.
 
 ##NAME: TLS_STARTTLS_PROTOCOL:0
-# 
+#
 # TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS
 # extension, as opposed to IMAP over SSL on port 993.
 #
diff --git a/imap/imapd.dist.in b/imap/imapd.dist.in.git
index 08ecd69..08ecd69 100644
--- a/imap/imapd.dist.in
+++ b/imap/imapd.dist.in.git
diff --git a/imap/pop3d-ssl.dist.in b/imap/pop3d-ssl.dist.in.git
index 8fdf5a2..9e81ee8 100644
--- a/imap/pop3d-ssl.dist.in
+++ b/imap/pop3d-ssl.dist.in.git
@@ -52,7 +52,7 @@ SSLPIDFILE=@piddir@/pop3d-ssl.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# courierlogger(1) options.
 #
 
 SSLLOGGEROPTS="-name=pop3d-ssl"
@@ -116,7 +116,7 @@ COURIERTLS=@bindir@/couriertls
 # documentation.
 
 ##NAME: TLS_PROTOCOL:0
-# 
+#
 # TLS_PROTOCOL sets the protocol version.  The possible versions are:
 #
 # OpenSSL:
diff --git a/imap/pop3d.dist.in b/imap/pop3d.dist.in.git
index b3ab118..b3ab118 100644
--- a/imap/pop3d.dist.in
+++ b/imap/pop3d.dist.in.git
diff --git a/ldapaddressbook/.gitignore b/ldapaddressbook/.gitignore
index 66ba562..7d0bda8 100644
--- a/ldapaddressbook/.gitignore
+++ b/ldapaddressbook/.gitignore
@@ -1 +1,2 @@
+/ldapaddressbook.dist
 /ldapsearch
diff --git a/ldapaddressbook/Makefile.am b/ldapaddressbook/Makefile.am
index 450375a..c8e99b6 100644
--- a/ldapaddressbook/Makefile.am
+++ b/ldapaddressbook/Makefile.am
@@ -10,6 +10,17 @@ noinst_PROGRAMS=ldapsearch
 libaddressbook_la_SOURCES=abookadd.c abookdel.c abookfind.c abookread.c \
 	abooksearch.c ldapaddressbook.h
 
+if HAVE_SGML
+
+GITFILES=ldapaddressbook.dist
+
+BUILT_SOURCES = $(GITFILES)
+
+$(GITFILES): %: %.git
+	perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp
+	mv -f $@.tmp $@
+endif
+
 if HAVE_OPENLDAP
 ldapsearch_SOURCES=ldapsearch.c
 ldapsearch_LDADD=libldapsearch.la
diff --git a/ldapaddressbook/configure.ac b/ldapaddressbook/configure.ac
index 3741b89..d3f5f46 100644
--- a/ldapaddressbook/configure.ac
+++ b/ldapaddressbook/configure.ac
@@ -82,6 +82,8 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_SYS_LARGEFILE
 
+AM_CONDITIONAL(HAVE_SGML, test -d ${srcdir}/../docbook)
+
 dnl Checks for library functions.
 
 AC_OUTPUT(Makefile)
diff --git a/ldapaddressbook/ldapaddressbook.dist b/ldapaddressbook/ldapaddressbook.dist
deleted file mode 100644
index 7d176a0..0000000
--- a/ldapaddressbook/ldapaddressbook.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-##VERSION: $Id:$
-#
-# ldapaddressbook created from ldapaddressbook.dist by sysconftool
-#
-# Do not alter lines that begin with ##, they are used when upgrading
-# this configuration.
-#
-#  This is a list of some public LDAP address books.  This is a global
-#  list -- all clients will have this list by default.
-#
-##NAME: ldapaddressbook:0
-
-Bigfoot	ldap.bigfoot.com	389	c=US		
-Infospace	ldap.infospace.com	389	c=US		
-Netscape Netcenter	memberdir.netscape.com	389	ou=member_directory,o=netcenter.com	ou=people,o=netcenter.com	
-WhoWhere	ldap.whowhere.com	389	c=US		
diff --git a/ldapaddressbook/ldapaddressbook.dist.git b/ldapaddressbook/ldapaddressbook.dist.git
new file mode 100644
index 0000000..a9bb851
--- /dev/null
+++ b/ldapaddressbook/ldapaddressbook.dist.git
@@ -0,0 +1,15 @@
+##VERSION: $Id:$
+#
+# ldapaddressbook created from ldapaddressbook.dist by sysconftool
+#
+# Do not alter lines that begin with ##, they are used when upgrading
+# this configuration.
+#
+# This is a list of some public LDAP address books.  This is a global
+# list -- all clients will have this list by default.
+#
+# Example:
+#
+# YourOrganizationName<tab>ldap.example.com<tab>ou=member_directory,o=example.com<tab>ou=people,o=example.com
+#
+##NAME: ldapaddressbook:0
diff --git a/maildrop/mailbot.c b/maildrop/mailbot.c
index f87d867..f49bbd9 100644
--- a/maildrop/mailbot.c
+++ b/maildrop/mailbot.c
@@ -576,6 +576,8 @@ FILE *find_draft(const char *maildirfolder)
 	static const char * const newcur[2]={"new", "cur"};
 	int i;
 
+	draft_stat.st_mtime=0;
+
 	for (i=0; i<2; ++i)
 	{
 		char *dirbuf=malloc(strlen(maildirfolder)+10);
@@ -713,7 +715,7 @@ int main(int argc, char **argv)
 				perror("malloc");
 				exit(1);
 			}
-			
+
 			f->n=argv[argn-1]+11;
 			f->v=argv[argn];
 
diff --git a/sqwebmail/.gitignore b/sqwebmail/.gitignore
index cb1bd00..292956a 100644
--- a/sqwebmail/.gitignore
+++ b/sqwebmail/.gitignore
@@ -13,6 +13,7 @@
 /sqwebmail.msg
 /sqwebmaild
 /sqwebmaild.dist
+/sqwebmaild.dist.in
 /sqwebpasswd
 /testhtml
 /webgpg
diff --git a/sqwebmail/Makefile.am b/sqwebmail/Makefile.am
index 8d7b527..20dc31b 100644
--- a/sqwebmail/Makefile.am
+++ b/sqwebmail/Makefile.am
@@ -56,6 +56,16 @@ showmsg2html_LDFLAGS=-static
 ISPELLSOURCES=sqispell.c ispell.c ispell.h
 
 BUILT_SOURCES=htmllibdir.h
+if HAVE_SGML
+
+GITFILES=sqwebmaild.dist.in
+
+BUILT_SOURCES += $(GITFILES)
+
+$(GITFILES): %: %.git
+	perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp
+	mv -f $@.tmp $@
+endif
 
 EXTRA_DIST=$(DOCS) sqwebmail.pamconf sqwebmail-system-auth.pamconf\
 	 sqwebmail-system-auth2.pamconf\
diff --git a/sqwebmail/configure.ac b/sqwebmail/configure.ac
index 676336a..fd40b78 100644
--- a/sqwebmail/configure.ac
+++ b/sqwebmail/configure.ac
@@ -350,7 +350,7 @@ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE,
 
 AC_ARG_ENABLE(bannerprog,
 	[  --enable-bannerprog=prog   Program which will generate a banner.],
-	[ 
+	[
 		AC_DEFINE_UNQUOTED(BANNERPROG, "$enableval",
 		[ External banner generating program ])
 		 ])
@@ -456,6 +456,20 @@ AC_SUBST(MINPASSLEN)
 AC_DEFINE_UNQUOTED(MINPASSLEN, $MINPASSLEN,
 			     [ Minimum length of a password ])
 
+
+AM_CONDITIONAL(HAVE_SGML, test -d ${srcdir}/../docbook)
+
+# This gets built by the make rule, and is not in the git repo
+
+for f in sqwebmaild.dist.in
+do
+    if test ! -f "$srcdir/$f"
+    then
+	cp -p "$srcdir/$f.git" "$srcdir/$f"
+	touch "$srcdir/$f.git"
+    fi
+done
+
 AC_OUTPUT(Makefile sendit.sh cleancache.pl sqwebmaild.dist)
 
 if test ! -d html/$lang
diff --git a/sqwebmail/sqwebmaild.dist.in b/sqwebmail/sqwebmaild.dist.in.git
index f681c08..3b810a0 100644
--- a/sqwebmail/sqwebmaild.dist.in
+++ b/sqwebmail/sqwebmaild.dist.in.git
@@ -61,4 +61,3 @@ LOGGEROPTS=""
 # Each occurence of @ is replaced by the search key
 #
 # You may provide your own settings below.
-
diff --git a/threadlib/pthread.c b/threadlib/pthread.c
index c0d414c..598d03b 100644
--- a/threadlib/pthread.c
+++ b/threadlib/pthread.c
@@ -118,6 +118,7 @@ cthreadinfo_t	*i= c->myinfo;
 		if (PTHREAD_CHK(pthread_cond_signal( &i->newtask_cond )))
 			perror("pthread_cond_signal");
 	}
+	return 0;
 }
 
 static int initcondmutex(pthread_cond_t *c, pthread_mutex_t *m)
@@ -258,7 +259,7 @@ cthreadinfo_t *cit;
 		--i;
 		if (PTHREAD_CHK(pthread_cancel(cit->threads[i].pt)))
 			perror("pthread_cancel");
-		
+
 		if (PTHREAD_CHK(pthread_join(cit->threads[i].pt, NULL)))
 			perror("pthread_join");