Convert the patch headers to the DEP 3 format.

diff --git a/changelog b/changelog
index 161faa13e4afd3564797ffedf92d0c4e2193d10b..e5407543e8eeaeab87cbfba12a7a6dc8b9069dd0 100644 (file)
--- a/changelog
+++ b/changelog
@@ -10,6 +10,7 @@ dma (0.0.2009.07.17-2) unstable; urgency=low
   * Switch the copyright file header from the Wiki to DEP 5.
   * Remove the manual page ".Dx" patch - the groff version in Squeeze
     knows about the .Dx mdoc macro.
+  * Convert the patch file headers to the DEP 3 format.
 
  -- Peter Pentchev <roam@ringlet.net>  Tue, 01 Sep 2009 11:50:03 +0300
 

diff --git a/patches/01-debian-build.patch b/patches/01-debian-build.patch
index 3c2623257afc216efcba4f16f6787267850bd1e4..a9cd2cad4538701ed3be5f41d1a4ce27fd226778 100644 (file)
--- a/patches/01-debian-build.patch
+++ b/patches/01-debian-build.patch
@@ -1,13 +1,13 @@
-Several fixes to make dma build on Debian:
-- build and install the files in the etc/ subdirectory;
-- generate aliases_parse.h and let the others depend on it;
-- define the __DECONST macro;
-- prototype open_locked() in dma.c, just in case;
-- use mtime instead of mtimespec.
-
-All of these are taken from the Ringlet Subversion repository:
-http://svn.ringlet.net/svn/ringlet/mail/dma/
-http://svn.ringlet.net/cgi-bin/viewvc/viewvc.cgi/ringlet/mail/dma/
+Description: Several fixes to make dma build on Debian.
+ - build and install the files in the etc/ subdirectory;
+ - generate aliases_parse.h and let the others depend on it;
+ - define the __DECONST macro;
+ - prototype open_locked() in dma.c, just in case;
+ - use mtime instead of mtimespec.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: not-needed
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/Makefile
 +++ b/Makefile

diff --git a/patches/03-debian-locations.patch b/patches/03-debian-locations.patch
index 95b64965f1a2c2cdef64440e5b4d95161709f00f..92d1be6f0459e8106f00a31faf07e45e235287d6 100644 (file)
--- a/patches/03-debian-locations.patch
+++ b/patches/03-debian-locations.patch
@@ -1,6 +1,11 @@
-On Debian, the aliases file lives in /etc, not /etc/mail.
-Define a smarthost by default, albeit an invalid one.
-Use deferred delivery - the package includes a cron job running the queue.
+Description: Customize the /etc/dma configuration files for Debian.
+ On Debian, the aliases file lives in /etc, not /etc/mail.
+ Define a smarthost by default, albeit an invalid one.
+ Use deferred delivery - the package includes a cron job running the queue.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: not-needed
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/dma.8
 +++ b/dma.8

diff --git a/patches/04-debian-setgid.patch b/patches/04-debian-setgid.patch
index ed7626bb2df7e15fca08befa623413ebe3a14dcf..d71824752be16c05cadc07919441ade6fa064e25 100644 (file)
--- a/patches/04-debian-setgid.patch
+++ b/patches/04-debian-setgid.patch
@@ -1,5 +1,10 @@
-As per the Debian Policy, change the /usr/sbin/dma permissions from 2555
-to 2755, since removing root write access gains us nothing.
+Description: Install the dma binary with the correct permissions.
+ As per the Debian Policy, change the /usr/sbin/dma permissions from 2555
+ to 2755, since removing root write access gains us nothing.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: not-needed
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/Makefile
 +++ b/Makefile

diff --git a/patches/09-typos.patch b/patches/09-typos.patch
index dc26c459f212a5a55371eb394a32fb0e511f70b5..8ddb5530afd7ab4e891198803fc7646e0fad9e83 100644 (file)
--- a/patches/09-typos.patch
+++ b/patches/09-typos.patch
@@ -1,4 +1,9 @@
-Fix a typo.
+Description: Fix a typo in an error message.
+ I'll forward this patch as soon as I catch up with the dma upstream.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/crypto.c
 +++ b/crypto.c

diff --git a/patches/10-liblockfile.patch b/patches/10-liblockfile.patch
index 539e58fa161812515d619ad995d0bca5ce472312..25a8dc658adb8e0f0b9a762a88250dd51623ca29 100644 (file)
--- a/patches/10-liblockfile.patch
+++ b/patches/10-liblockfile.patch
@@ -1,5 +1,8 @@
-Try to dot-lock the user's mailbox using the maillock(3) function from
-liblockfile, as mandated by Debian Policy.
+Description: Dot-lock the user's mailbox with maillock(3) from liblockfile.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: not-needed
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/Makefile
 +++ b/Makefile

diff --git a/patches/11-double-bounce.patch b/patches/11-double-bounce.patch
index f3ff7ed558a0a1a8d5aba63f14c6b6bf4fa64bee..2e2266c10141268f4ee1c721448b92c3411b2c54 100644 (file)
--- a/patches/11-double-bounce.patch
+++ b/patches/11-double-bounce.patch
@@ -1,7 +1,14 @@
-Implement double-bounce handling via an external program, controlled
-by the DBOUNCEPROG config parameter.
-Enable this handling by default, using the dbounce-simple-safecat
-helper installed by the package.
+Description: Implement double-bounce handling via an external program.
+ Implement double-bounce handling via an external program, controlled
+ by the DBOUNCEPROG config parameter.
+ Enable this handling by default, using the dbounce-simple-safecat
+ helper installed by the package.
+ Unfortunately, Simon Schubert <corecode@dragonflybsd.org> did not
+ accept this part of my changes to dma in issue 1321.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Bug: http://bugs.dragonflybsd.org/issue1321
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/conf.c
 +++ b/conf.c

diff --git a/patches/17-mailname.patch b/patches/17-mailname.patch
index ff8f99987212d279bd494d31b896b6f457c2a84d..1dd8a623d248fef3a247e88bf79fa18d93c0fdde 100644 (file)
--- a/patches/17-mailname.patch
+++ b/patches/17-mailname.patch
@@ -1,6 +1,12 @@
-Fix a file descriptor leak in the MAILNAMEFILE code.
-Fix a mistake in my patch submitted to DFBSD - "initialized" should be static!
-For Debian, use /etc/mailname for the MAILNAMEFILE.
+Description: Several fixes to the mail name file parsing.
+ Fix a file descriptor leak in the MAILNAMEFILE code.
+ Fix a mistake in my patch submitted to DFBSD - "initialized" should be static!
+ I'll forward these parts of the patch when I catch up with upstream.
+ For Debian, use /etc/mailname for the MAILNAMEFILE.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/dma.c
 +++ b/dma.c

diff --git a/patches/20-parse-recipient.patch b/patches/20-parse-recipient.patch
index f6b26595847610e4cce424e6a986531e6b90fc2a..e3dec190e5ea29b66407cf124c5eec8cabf0d25f 100644 (file)
--- a/patches/20-parse-recipient.patch
+++ b/patches/20-parse-recipient.patch
@@ -1,5 +1,10 @@
-Implement the sendmail -t command-line option: parse the message itself
-to obtain the recipient addresses.
+Description: Implement sendmail -t, parse the message for recipients.
+ Unfortunately, Simon Schubert <corecode@dragonflybsd.org> did not
+ accept this part of my changes in issue 1321.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Bug: http://bugs.dragonflybsd.org/issue1321
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/dma.8
 +++ b/dma.8

diff --git a/patches/22-openfiles.patch b/patches/22-openfiles.patch
index c1aec9c1ad0e641c2dda3ce4a92614f6ead47985..32a112acb08d76cde27dd8c0f4df307daaa82c6f 100644 (file)
--- a/patches/22-openfiles.patch
+++ b/patches/22-openfiles.patch
@@ -1,4 +1,9 @@
-Handle the "too many open files" error gracefully, retrying.
+Desciption: Handle the "too many open files" error gracefully, retrying.
+ I'll forward this patch when I catch up with the dma upstream.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/dma.c
 +++ b/dma.c

diff --git a/patches/23-dirent-d_type.patch b/patches/23-dirent-d_type.patch
index c8d4ebd8fa3b848742e6af2c523e2bc7448e465b..b4d6c7a2c7e4b000d44f8b0f316fc6b16901c40a 100644 (file)
--- a/patches/23-dirent-d_type.patch
+++ b/patches/23-dirent-d_type.patch
@@ -1,7 +1,12 @@
-Cater to XFS's weirdness - handle the case when a dirent's d_type
-field is not filled in by doing an extra stat().
-
-Debian:                #544357
+Description: Allow the spool to be on a filesystem that does not set d_type.
+ Some filesystems (notably XFS) do not set the d_type field in the dirent
+ structure.  This prevents dma from delivering any of the queued messages.
+ I'll forward this patch when I catch up with the dma upstream.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Bug-Debian: http://bugs.debian.org/544357
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/dma.c
 +++ b/dma.c

diff --git a/patches/24-random-message-id.patch b/patches/24-random-message-id.patch
index d3d1b2abf67040b3badd4c1d37de3a7e94c9ec0a..d0128b50f8c5d6517a53bcbb763e7b904744d7da 100644 (file)
--- a/patches/24-random-message-id.patch
+++ b/patches/24-random-message-id.patch
@@ -1,6 +1,10 @@
-Randomize the generated Message-Id field a bit more.
-
-Debian:                #544475
+Description: Randomize the generated Message-Id field a bit more.
+ I'll forward this patch when I catch up with the dma upstream.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Bug-Debian: http://bugs.debian.org/544475
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-09-01
 
 --- a/Makefile
 +++ b/Makefile