From: Peter Pentchev Date: Tue, 1 Sep 2009 10:32:41 +0000 (+0000) Subject: Convert the patch headers to the DEP 3 format. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=064dc8759b65781bba58524ecbb5b34599548192;p=people%2Fms%2Fdma.git Convert the patch headers to the DEP 3 format. --- diff --git a/changelog b/changelog index 161faa1..e540754 100644 --- 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 Tue, 01 Sep 2009 11:50:03 +0300 diff --git a/patches/01-debian-build.patch b/patches/01-debian-build.patch index 3c26232..a9cd2ca 100644 --- 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 +Last-Update: 2009-09-01 --- a/Makefile +++ b/Makefile diff --git a/patches/03-debian-locations.patch b/patches/03-debian-locations.patch index 95b6496..92d1be6 100644 --- 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 +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 ed7626b..d718247 100644 --- 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 +Last-Update: 2009-09-01 --- a/Makefile +++ b/Makefile diff --git a/patches/09-typos.patch b/patches/09-typos.patch index dc26c45..8ddb553 100644 --- 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 +Last-Update: 2009-09-01 --- a/crypto.c +++ b/crypto.c diff --git a/patches/10-liblockfile.patch b/patches/10-liblockfile.patch index 539e58f..25a8dc6 100644 --- 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 +Last-Update: 2009-09-01 --- a/Makefile +++ b/Makefile diff --git a/patches/11-double-bounce.patch b/patches/11-double-bounce.patch index f3ff7ed..2e2266c 100644 --- 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 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 +Last-Update: 2009-09-01 --- a/conf.c +++ b/conf.c diff --git a/patches/17-mailname.patch b/patches/17-mailname.patch index ff8f999..1dd8a62 100644 --- 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 +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 f6b2659..e3dec19 100644 --- 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 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 +Last-Update: 2009-09-01 --- a/dma.8 +++ b/dma.8 diff --git a/patches/22-openfiles.patch b/patches/22-openfiles.patch index c1aec9c..32a112a 100644 --- 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 +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 c8d4ebd..b4d6c7a 100644 --- 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 +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 d3d1b2a..d0128b5 100644 --- 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 +Last-Update: 2009-09-01 --- a/Makefile +++ b/Makefile