Reorganize to better match git.

5 files changed, 141 insertions, 59 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85d1db9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,22 @@
+*.o
+.deps
+Makefile
+Makefile.in
+.project
+.cproject
+.settings
+
+/install-sh
+/configure
+/config.sub
+/config.status
+/config.log
+/config.h.in
+/depcomp
+/stamp-h1
+/src/proxsmtpd
+/missing
+/config.h
+/config.guess
+/autom4te.cache
+/aclocal.m4
diff --git a/ChangeLog b/ChangeLog
index 90ecd17..0bd7f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,66 +1,32 @@
-1.8 [2008-06-30]
- - Make the XFOWARD HELO available as a environment variable in scripts. [Glenn Matthys]
- - Send an RSET to the server after filter fails an email.
- - Fix an uninitialized pid variable.
+=== ChangeLog discontinued ===
 
-1.7 [2007-05-28]
- - Use my real name 'Stef Walter'
-   See: http://memberwebs.com/nielsen/
+ With the move to git, this project is switching from a ChangeLog
+ file to relying on commit messages to provide change history. Please
+ write commit messages in the following format:
 
-1.6 [2006-11-13]
-  - On FreeBSD fix problem where stderr wasn't processed when filter
-    didn't read stdin.
-  - Add strcasestr which is missing on Solaris.
-  - Add back 'Header' option which was accidentally removed in 1.5. Blush!
+=== begin example commit ===
 
-1.5 [2006-09-05]
-  - Added support for setting the REMOTE variable when an XFORWARD
-    command is seen.
+ Short explanation of the commit
 
-1.4 [2006-08-10]
-  - Fix crasher after connection closes unexpectedly.
-  - Fix problem with waiting for processes [Jeff Fisher]
-  - Better message for 'busy' [Akihiro Sagawa]
+ Longer explanation explaining exactly what's changed, whether any
+ external or private interfaces changed, what bugs were fixed (with bug
+ tracker reference if applicable) and so forth. Be concise but not too
+ brief.
 
-1.3 [2005-10-21]
-  - Handle condition of server refusing data transfers more gracefully.
-  - Less chatty when setting timeouts fail
-  - Drop privileges after binding to port. Allows listening on ports < 1024
-  - Ported to Solaris
-  - Fix problem with binding to certain 'long' addresses
-  - Support embedded NULLs in email data.
-  - Fix problems with empty addresses in logs.
-  - Don't let exchange send it's strange binary data through the proxy
-  - Don't reject emails when server is overloaded or errors.
-  - Don't reject emails when starting the filter command fails.
+=== end example commit ===
 
-1.2.1 [2005-04-15]
-  - Fixed bug (introduced in 1.2) when 'Header' option is not present.
+ - Always add a brief description of the commit to the _first_ line of
+ the commit and terminate by two newlines. This may be the title of
+ a fixed bug, copied from Bugzilla.
 
-1.2  [2005-03-24]
-  - Don't leak file descriptors when clamsmtpd can't connect to outgoing
-  	SMTP server [Chris Mason]
-  - 'Header' configuration option with special format arguments [Olivier Beyssac]
-  - Supress weird warnings when looking up names of local unix connections.
+ - First line (the brief description) must only be one sentence and
+ should start with a capital letter unless it starts with a
+ lowercase symbol or identifier. Don't use a trailing full stop,
+ and don't exceed 72 characters.
 
-1.1  [2005-01-27]
-  - Fixed crasher when outgoing connection couldn't be established
-  - Removed erroneous chown line from clamsmtpd.sh
-
-1.0  [2004-12-02]
-  - Added XCLIENT support.
-  - Drop XCLIENT commands coming in from clients for security.
-  - Added big scary warnings to the sample scripts about escaping variables.
-  - Documentation fixes [Olivier Beyssac]
-
-0.6  [2004-10-30]
-  - Added CLIENT and SERVER variables to VirusAction script environment.
-  - Even better logging for network errors and filter warnings.
-  - Print out proxsmtp version in debug logs
-  - Allow configuration of server keep alives (NOOPs). Default to none
-
-0.5  [2004-10-20]
-  - Added sample scripts.
-  - Initial fork from clamsmtp version 0.9.x
-  - Converted into filter based SMTP pass-through
+ - The main description (the body) is normal prose and should use
+ normal punctuation and capital letters where appropriate.
 
+ - When committing code on behalf of others use the --author option,
+ e.g. git commit -a --author "Joe Coder <joe@coder.org>" and
+ --signoff.
diff --git a/Makefile.am b/Makefile.am
index 33d8e51..0b6be3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,5 +3,16 @@ EXTRA_DIST = config.sub acsite.m4 config.guess scripts common
 SUBDIRS = src doc
 
 dist-hook:
-	rm -rf `find $(distdir)/ -name CVS`
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		  echo '# Generate automatically. Do not edit.'; echo; \
+		  $(top_srcdir)/missing --run git log --stat --date=short ) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+		     echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
+	fi
 
diff --git a/NEWS b/NEWS
index c7ab92a..548caa3 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1,65 @@
-See ChangeLog
\ No newline at end of file
+1.8 [2008-06-30]
+ - Make the XFOWARD HELO available as a environment variable in scripts. [Glenn Matthys]
+ - Send an RSET to the server after filter fails an email.
+ - Fix an uninitialized pid variable.
+
+1.7 [2007-05-28]
+ - Use my real name 'Stef Walter'
+   See: http://memberwebs.com/nielsen/
+
+1.6 [2006-11-13]
+  - On FreeBSD fix problem where stderr wasn't processed when filter
+    didn't read stdin.
+  - Add strcasestr which is missing on Solaris.
+  - Add back 'Header' option which was accidentally removed in 1.5. Blush!
+
+1.5 [2006-09-05]
+  - Added support for setting the REMOTE variable when an XFORWARD
+    command is seen.
+
+1.4 [2006-08-10]
+  - Fix crasher after connection closes unexpectedly.
+  - Fix problem with waiting for processes [Jeff Fisher]
+  - Better message for 'busy' [Akihiro Sagawa]
+
+1.3 [2005-10-21]
+  - Handle condition of server refusing data transfers more gracefully.
+  - Less chatty when setting timeouts fail
+  - Drop privileges after binding to port. Allows listening on ports < 1024
+  - Ported to Solaris
+  - Fix problem with binding to certain 'long' addresses
+  - Support embedded NULLs in email data.
+  - Fix problems with empty addresses in logs.
+  - Don't let exchange send it's strange binary data through the proxy
+  - Don't reject emails when server is overloaded or errors.
+  - Don't reject emails when starting the filter command fails.
+
+1.2.1 [2005-04-15]
+  - Fixed bug (introduced in 1.2) when 'Header' option is not present.
+
+1.2  [2005-03-24]
+  - Don't leak file descriptors when clamsmtpd can't connect to outgoing
+        SMTP server [Chris Mason]
+  - 'Header' configuration option with special format arguments [Olivier Beyssac]
+  - Supress weird warnings when looking up names of local unix connections.
+
+1.1  [2005-01-27]
+  - Fixed crasher when outgoing connection couldn't be established
+  - Removed erroneous chown line from clamsmtpd.sh
+
+1.0  [2004-12-02]
+  - Added XCLIENT support.
+  - Drop XCLIENT commands coming in from clients for security.
+  - Added big scary warnings to the sample scripts about escaping variables.
+  - Documentation fixes [Olivier Beyssac]
+
+0.6  [2004-10-30]
+  - Added CLIENT and SERVER variables to VirusAction script environment.
+  - Even better logging for network errors and filter warnings.
+  - Print out proxsmtp version in debug logs
+  - Allow configuration of server keep alives (NOOPs). Default to none
+
+0.5  [2004-10-20]
+  - Added sample scripts.
+  - Initial fork from clamsmtp version 0.9.x
+  - Converted into filter based SMTP pass-through
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..1d2c8d9
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+# Some boiler plate to get git setup as expected
+if test -d .git; then
+	if test -f .git/hooks/pre-commit.sample && \
+	   test ! -f .git/hooks/pre-commit; then
+		cp -pv .git/hooks/pre-commit.sample .git/hooks/pre-commit
+	fi
+fi
+
+set -x
+
+aclocal
+autoheader
+automake -a
+autoconf
+./configure "$@"