Fixed fix for bug 105454, reworked the creation of conf-cc.

(Portage version: 2.0.51.22-r2)

1 files changed, 111 insertions, 0 deletions

diff --git a/mail-mta/qmail/files/1.03-r16/fix-manpages.patch b/mail-mta/qmail/files/1.03-r16/fix-manpages.patch
new file mode 100644
index 000000000000..8dcbb6e63e95
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/fix-manpages.patch
@@ -0,0 +1,111 @@
+diff -ur qmail-1.03.orig/FILES qmail-1.03/FILES
+--- qmail-1.03.orig/FILES	2005-09-12 23:40:59.000000000 +0200
++++ qmail-1.03/FILES	2005-09-12 23:41:21.000000000 +0200
+@@ -66,7 +66,7 @@
+ maildirmake.1
+ maildirwatch.1
+ mailsubj.1
+-mbox.5
++qmail-mbox.5
+ preline.1
+ qbiff.1
+ qmail-clean.8
+@@ -428,6 +428,5 @@
+ maildir.5
+ maildir.h
+ maildir.c
+-tcp-environ.5
+ constmap.h
+ constmap.c
+diff -ur qmail-1.03.orig/maildir.5 qmail-1.03/maildir.5
+--- qmail-1.03.orig/maildir.5	2005-09-12 23:40:59.000000000 +0200
++++ qmail-1.03/maildir.5	2005-09-12 23:41:07.000000000 +0200
+@@ -235,5 +235,5 @@
+ environment variable
+ as the name of the user's primary mail directory.
+ .SH "SEE ALSO"
+-mbox(5),
++qmail-mbox(5),
+ qmail-local(8)
+diff -ur qmail-1.03.orig/Makefile qmail-1.03/Makefile
+--- qmail-1.03.orig/Makefile	2005-09-12 23:40:59.000000000 +0200
++++ qmail-1.03/Makefile	2005-09-12 23:41:53.000000000 +0200
+@@ -984,12 +984,12 @@
+ preline.0 condredirect.0 bouncesaying.0 except.0 maildirmake.0 \
+ maildir2mbox.0 maildirwatch.0 qmail.0 qmail-limits.0 qmail-log.0 \
+ qmail-control.0 qmail-header.0 qmail-users.0 dot-qmail.0 \
+-qmail-command.0 tcp-environ.0 maildir.0 mbox.0 addresses.0 \
++qmail-command.0 maildir.0 qmail-mbox.0 addresses.0 \
+ envelopes.0 forgeries.0
+ 
+-mbox.0: \
+-mbox.5
+-	nroff -man mbox.5 > mbox.0
++qmail-mbox.0: \
++qmail-mbox.5
++	nroff -man qmail-mbox.5 > qmail-mbox.0
+ 
+ myctime.o: \
+ compile myctime.c datetime.h fmt.h myctime.h
+@@ -1852,7 +1852,7 @@
+ auto_patrn.h conf-users conf-groups auto_uids.h auto_usera.h extra.h \
+ addresses.5 except.1 bouncesaying.1 condredirect.1 dot-qmail.9 \
+ envelopes.5 forgeries.7 forward.1 maildir2mbox.1 maildirmake.1 \
+-maildirwatch.1 mailsubj.1 mbox.5 preline.1 qbiff.1 qmail-clean.8 \
++maildirwatch.1 mailsubj.1 qmail-mbox.5 preline.1 qbiff.1 qmail-clean.8 \
+ qmail-command.8 qmail-control.9 qmail-getpw.9 qmail-header.5 \
+ qmail-inject.8 qmail-limits.9 qmail-local.8 qmail-log.5 \
+ qmail-lspawn.8 qmail-newmrh.9 qmail-newu.9 qmail-pop3d.8 \
+@@ -1915,7 +1915,7 @@
+ ipalloc.h ipalloc.c select.h1 select.h2 trysysel.c ndelay.h ndelay.c \
+ ndelay_off.c direntry.3 direntry.h1 direntry.h2 trydrent.c prot.h \
+ prot.c chkshsgr.c warn-shsgr tryshsgr.c ipme.h ipme.c trysalen.c \
+-maildir.5 maildir.h maildir.c tcp-environ.5 constmap.h constmap.c \
++maildir.5 maildir.h maildir.c constmap.h constmap.c \
+ update_tmprsadh
+ 	shar -m `cat FILES` > shar
+ 	chmod 400 shar
+@@ -2171,10 +2171,6 @@
+ scan.h subgetopt.h ip.h dns.h byte.h remoteinfo.h exit.h case.h
+ 	./compile tcp-env.c
+ 
+-tcp-environ.0: \
+-tcp-environ.5
+-	nroff -man tcp-environ.5 > tcp-environ.0
+-
+ tcpto.o: \
+ compile tcpto.c tcpto.h open.h lock.h seek.h now.h datetime.h ip.h \
+ byte.h datetime.h readwrite.h
+diff -ur qmail-1.03.orig/preline.1 qmail-1.03/preline.1
+--- qmail-1.03.orig/preline.1	2005-09-12 23:40:59.000000000 +0200
++++ qmail-1.03/preline.1	2005-09-12 23:41:07.000000000 +0200
+@@ -53,5 +53,5 @@
+ .B Return-Path
+ line.
+ .SH "SEE ALSO"
+-mbox(5),
++qmail-mbox(5),
+ qmail-command(8)
+diff -ur qmail-1.03.orig/qmail-mbox.5 qmail-1.03/qmail-mbox.5
+--- qmail-1.03.orig/qmail-mbox.5	2005-09-12 23:40:59.000000000 +0200
++++ qmail-1.03/qmail-mbox.5	2005-09-12 23:41:07.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH mbox 5
++.TH qmail-mbox 5
+ .SH "NAME"
+ mbox \- file containing mail messages
+ .SH "INTRODUCTION"
+diff -ur qmail-1.03.orig/TARGETS qmail-1.03/TARGETS
+--- qmail-1.03.orig/TARGETS	2005-09-12 23:40:59.000000000 +0200
++++ qmail-1.03/TARGETS	2005-09-12 23:41:33.000000000 +0200
+@@ -395,9 +395,8 @@
+ dot-qmail.5
+ dot-qmail.0
+ qmail-command.0
+-tcp-environ.0
+ maildir.0
+-mbox.0
++qmail-mbox.0
+ addresses.0
+ envelopes.0
+ forgeries.0