Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 32062 Details for
Bug 52076
GLEP 32: Maildir location
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
maildir.diff
maildir.diff (text/plain), 24.45 KB, created by
Georgi Georgiev
on 2004-05-26 03:54:50 UTC
(
hide
)
Description:
maildir.diff
Filename:
MIME Type:
Creator:
Georgi Georgiev
Created:
2004-05-26 03:54:50 UTC
Size:
24.45 KB
patch
obsolete
>diff -ru /usr/portage/net-mail/bincimap/bincimap-1.2.7-r1.ebuild /usr/portage-maildir/net-mail/bincimap/bincimap-1.2.7-r1.ebuild >--- /usr/portage/net-mail/bincimap/bincimap-1.2.7-r1.ebuild 2004-05-01 22:09:49.000000000 +0900 >+++ /usr/portage-maildir/net-mail/bincimap/bincimap-1.2.7-r1.ebuild 2004-05-26 19:12:48.290821587 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.7-r1.ebuild,v 1.3 2004/05/01 12:35:05 nakano Exp $ > >-inherit eutils >+inherit eutils maildir > > DESCRIPTION="IMAP server for Maildir" > SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}final.tar.bz2" >@@ -26,7 +26,7 @@ > > src_compile() { > cd ${S} >- epatch ${FILESDIR}/${P}-gentoo.diff >+ maildir_epatch ${FILESDIR}/${P}-gentoo.diff > econf `use_enable ssl ssl` --sysconfdir=/etc/bincimap || die > emake localstatedir=/etc/bincimap || die > } >@@ -62,7 +62,7 @@ > einfo "" > fi > >- einfo "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it, " >+ einfo "NOTE: Default Maildir path is '~/${MAILDIR}'. If you want to modify it, " > einfo "edit /etc/bincimap/bincimap.conf" > einfo "" > } >diff -ru /usr/portage/net-mail/checkpw/checkpw-1.01.ebuild /usr/portage-maildir/net-mail/checkpw/checkpw-1.01.ebuild >--- /usr/portage/net-mail/checkpw/checkpw-1.01.ebuild 2004-03-12 00:33:14.000000000 +0900 >+++ /usr/portage-maildir/net-mail/checkpw/checkpw-1.01.ebuild 2004-05-26 18:16:29.000000000 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/checkpw/checkpw-1.01.ebuild,v 1.1 2004/03/11 15:33:14 matsuu Exp $ > >-inherit gcc >+inherit gcc maildir > > DESCRIPTION="an implementation of the checkpassword interface that checks a password" > HOMEPAGE="http://checkpw.sourceforge.net/checkpw/" >@@ -25,7 +25,7 @@ > use static && LDFLAGS="${LDFLAGS} -static" > echo "$(gcc-getCC) ${CFLAGS}" > conf-cc || die > echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld || die >- echo ".maildir" > conf-maildir || die >+ echo "${MAILDIR}" > conf-maildir || die > > if [ -z "$QMAIL_HOME" ]; then > QMAIL_HOME="/var/qmail" >@@ -56,8 +56,8 @@ > einfo > einfo "How to set password:" > einfo >- einfo " % echo 'YOURPASSWORD' > ~/.maildir/.password" >- einfo " % chmod 600 ~/.maildir/.password" >+ einfo " % echo 'YOURPASSWORD' > ~/${MAILDIR}/.password" >+ einfo " % chmod 600 ~/${MAILDIR}/.password" > einfo > einfo "Replace YOURPASSWORD with your plain password." > einfo >diff -ru /usr/portage/net-mail/courier/courier-0.45.5.ebuild /usr/portage-maildir/net-mail/courier/courier-0.45.5.ebuild >--- /usr/portage/net-mail/courier/courier-0.45.5.ebuild 2004-05-23 05:05:36.000000000 +0900 >+++ /usr/portage-maildir/net-mail/courier/courier-0.45.5.ebuild 2004-05-26 19:24:13.581714415 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild > >-inherit eutils >+inherit eutils maildir > > DESCRIPTION="An MTA designed specifically for maildirs" > #SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2" >@@ -43,9 +43,9 @@ > src_unpack() { > unpack ${A} > cd ${S} >- sed -i -e 's:\#define.*USER_DIR.*\"Maildir\":\#define\tUSER_DIR\t\".maildir\":' \ >+ sed -i -e 's:\#define.*USER_DIR.*\"Maildir\":\#define\tUSER_DIR\t\"'"${MAILDIR}"'\":' \ > webmail/sqwebmail.h || die "failed to change maildir" >- sed -i -e 's:maildir="Maildir";:maildir=".maildir";:' \ >+ sed -i -e 's:maildir="Maildir";:maildir="'"${MAILDIR}"'";:' \ > webmail/auth.c || die "failed to change maildir" > use norewrite && epatch ${FILESDIR}/norewrite.patch > } >@@ -149,7 +149,8 @@ > local files=$* > > origmaildir='Maildir' >- newmaildir='.maildir' >+ newmaildir="${MAILDIR}" >+ test "${origmaildir}" = "${newmaildir}" && return 0 > > local f > for f in ${files} >@@ -192,12 +193,12 @@ > einfo "Setting up maildirs by default in the account skeleton ..." > diropts -m 755 -o root -g root > keepdir /etc/skel >- ${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir >+ ${D}/usr/bin/maildirmake ${D}/etc/skel/${MAILDIR} > # we're going to try this out for a while -20031107 > #newins ${FILESDIR}/dot_courier .courier > #fperms 644 /etc/skel/.courier > keepdir /var/spool/mail >- ${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir >+ ${D}/usr/bin/maildirmake ${D}/var/spool/mail/${MAILDIR} > insinto /etc/courier > newins ${FILESDIR}/bofh bofh > newins ${FILESDIR}/locallowercase locallowercase >@@ -223,7 +224,7 @@ > # fixes bug #25028 courier doesn't symlink sendmail to /usr/sbin > dosym /usr/bin/sendmail /usr/sbin/sendmail > >- echo "MAILDIR=\$HOME/.maildir" >> ${D}/etc/courier/courierd >+ echo "MAILDIR=\$HOME/${MAILDIR}" >> ${D}/etc/courier/courierd > > # we change the names of the binaries, but webadmin is still looking > # for the old names >diff -ru /usr/portage/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild /usr/portage-maildir/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild >--- /usr/portage/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild 2004-05-19 18:04:10.000000000 +0900 >+++ /usr/portage-maildir/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild 2004-05-26 18:38:31.000000000 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.4-r1.ebuild,v 1.1 2004/05/19 09:04:10 robbat2 Exp $ > >-inherit eutils >+inherit eutils maildir > > DESCRIPTION="An IMAP daemon designed specifically for maildirs" > SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" >@@ -210,7 +210,7 @@ > for service in imapd pop3d > do > echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service} >- echo 'MAILDIR=.maildir' >> ${service} >+ echo "MAILDIR=${MAILDIR}" >> ${service} > echo -e '#Put any program for ${PRERUN} here' >> ${service} > echo 'PRERUN='>> ${service} > done >diff -ru /usr/portage/net-mail/dovecot/dovecot-0.99.10.4.ebuild /usr/portage-maildir/net-mail/dovecot/dovecot-0.99.10.4.ebuild >--- /usr/portage/net-mail/dovecot/dovecot-0.99.10.4.ebuild 2004-05-10 13:42:35.000000000 +0900 >+++ /usr/portage-maildir/net-mail/dovecot/dovecot-0.99.10.4.ebuild 2004-05-26 18:39:54.000000000 +0900 >@@ -2,6 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.4.ebuild,v 1.3 2004/05/10 04:17:24 weeve Exp $ > >+inherit maildir > IUSE="debug ipv6 ldap maildir pam postgres sasl ssl vpopmail nopop3d" > > DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" >@@ -77,7 +78,7 @@ > if [ ! -e /etc/dovecot.conf ]; then > cd ${D}/etc > if [ "`use maildir`" ]; then >- sed s/^#default_mail_env.*$/default_mail_env\ =\ maildir:%h\\/.maildir/ dovecot-example.conf > dovecot.conf >+ sed s/^#default_mail_env.*$/default_mail_env\ =\ maildir:%h\\/${MAILDIR}/ dovecot-example.conf > dovecot.conf > else > sed s/^#default_mail_env.*$/default_mail_env\ =\ mbox:\\/var\\/spool\\/mail\\/%u/ dovecot-example.conf > dovecot.conf > fi >diff -ru /usr/portage/net-mail/exim/exim-4.34.ebuild /usr/portage-maildir/net-mail/exim/exim-4.34.ebuild >--- /usr/portage/net-mail/exim/exim-4.34.ebuild 2004-05-14 07:37:06.000000000 +0900 >+++ /usr/portage-maildir/net-mail/exim/exim-4.34.ebuild 2004-05-26 19:17:18.297171530 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/exim/exim-4.34.ebuild,v 1.6 2004/05/13 22:17:23 lu_zero Exp $ > >-inherit eutils >+inherit eutils maildir > > IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X" > >@@ -43,7 +43,7 @@ > > if use maildir; then > einfo "Patching maildir support into exim.conf" >- epatch ${FILESDIR}/exim-4.20-maildir.patch >+ maildir_epatch ${FILESDIR}/exim-4.20-maildir.patch > fi > > sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default >diff -ru /usr/portage/net-mail/maildrop/maildrop-1.5.3-r1.ebuild /usr/portage-maildir/net-mail/maildrop/maildrop-1.5.3-r1.ebuild >--- /usr/portage/net-mail/maildrop/maildrop-1.5.3-r1.ebuild 2004-05-16 04:07:35.000000000 +0900 >+++ /usr/portage-maildir/net-mail/maildrop/maildrop-1.5.3-r1.ebuild 2004-05-26 19:17:43.286428009 +0900 >@@ -4,7 +4,7 @@ > > IUSE="mysql ldap gdbm" > >-inherit flag-o-matic >+inherit flag-o-matic maildir > filter-flags -funroll-loops > filter-flags -fomit-frame-pointer > >@@ -51,7 +51,7 @@ > --enable-use-dotlock=1 \ > --enable-restrict-trusted=1 \ > --enable-trusted-users='root mail daemon postmaster qmaild mmdf vmail' \ >- --with-default-maildrop=./.maildir/ \ >+ --with-default-maildrop=./${MAILDIR}/ \ > --enable-sendmail=/usr/sbin/sendmail \ > ${myconf} || die > >@@ -79,6 +79,7 @@ > > insinto /etc > doins ${FILESDIR}/maildroprc >+ maildir_sed ${D}/etc/maildroprc > > insinto /etc/maildrop > if [ -n "`use mysql`" ] >diff -ru /usr/portage/net-mail/mailfront/mailfront-0.88.ebuild /usr/portage-maildir/net-mail/mailfront/mailfront-0.88.ebuild >--- /usr/portage/net-mail/mailfront/mailfront-0.88.ebuild 2004-01-06 08:03:24.000000000 +0900 >+++ /usr/portage-maildir/net-mail/mailfront/mailfront-0.88.ebuild 2004-05-26 19:18:01.492429270 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/mailfront/mailfront-0.88.ebuild,v 1.1 2004/01/05 23:03:24 robbat2 Exp $ > >-inherit fixheadtails >+inherit fixheadtails maildir > > S=${WORKDIR}/${P} > DESCRIPTION="Mail server network protocol front-ends." >@@ -41,6 +41,7 @@ > newexe ${FILESDIR}/run-smtpfront run.mailfront > exeinto /var/qmail/supervise/qmail-pop3d > newexe ${FILESDIR}/run-pop3front run.mailfront >+ maildir_sed ${D}/var/qmail/supervise/qmail-pop3d/run.mailfront > > dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION > >diff -ru /usr/portage/net-mail/nail/nail-9.30.ebuild /usr/portage-maildir/net-mail/nail/nail-9.30.ebuild >--- /usr/portage/net-mail/nail/nail-9.30.ebuild 2004-02-23 01:36:41.000000000 +0900 >+++ /usr/portage-maildir/net-mail/nail/nail-9.30.ebuild 2004-05-26 18:50:37.000000000 +0900 >@@ -2,6 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/nail/nail-9.30.ebuild,v 1.11 2004/02/22 16:22:03 agriffis Exp $ > >+inherit maildir > S=${WORKDIR}/${P} > > DESCRIPTION="Nail is a mail user agent derived from Berkeley Mail 8.1 and contains builtin support for MIME messages." >@@ -16,7 +17,7 @@ > > src_compile() { > econf \ >- --with-mailspool=~/.maildir || die "configure failed" >+ --with-mailspool=~/${MAILDIR} || die "configure failed" > > emake || die "emake failed" > } >@@ -42,7 +43,7 @@ > echo -e "\nNOTE: The nail mailer does _not_ support maildir format.\n" \ > " It is best to use nail only for outgoing mail, and\n" \ > " really only use it for scripts that require it.\n\n" \ >- "NOTE: This build has ~/.maildir compiled in as the\n" \ >+ "NOTE: This build has ~/${MAILDIR} compiled in as the\n" \ > " mail spool directory (for incoming mail).\n" \ > " Nail will work for sending outgoing mail even if\n" \ > " the mail spool directory does not exist.\n\n" \ >diff -ru /usr/portage/net-mail/popa3d/popa3d-0.6.4.ebuild /usr/portage-maildir/net-mail/popa3d/popa3d-0.6.4.ebuild >--- /usr/portage/net-mail/popa3d/popa3d-0.6.4.ebuild 2004-04-28 06:17:13.000000000 +0900 >+++ /usr/portage-maildir/net-mail/popa3d/popa3d-0.6.4.ebuild 2004-05-26 19:18:36.426594183 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-0.6.4.ebuild,v 1.4 2004/04/27 21:01:55 agriffis Exp $ > >-inherit eutils >+inherit eutils maildir > > # > # Mailbox format is determined by the 'mbox' and 'maildir' >@@ -11,7 +11,7 @@ > # Mailbox path configuration denoted by the system USE > # flags. > # >-# USE flag 'maildir' denotes ~/.maildir >+# USE flag 'maildir' denotes ~/${MAILDIR} > # USE flag 'mbox' denotes /var/mail/username > # > # You can overwrite this by setting the POPA3D_HOME_MAILBOX >@@ -96,7 +96,7 @@ > einfo "Mailbox format is: MAILDIR." > epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff > if [ "${POPA3D_HOME_MAILBOX}" = "" ] ; then >- POPA3D_HOME_MAILBOX=".maildir" >+ POPA3D_HOME_MAILBOX="${MAILDIR}" > fi > else > einfo "Mailbox format is: MAILBOX." >diff -ru /usr/portage/net-mail/postfix/postfix-2.0.19-r2.ebuild /usr/portage-maildir/net-mail/postfix/postfix-2.0.19-r2.ebuild >--- /usr/portage/net-mail/postfix/postfix-2.0.19-r2.ebuild 2004-05-12 13:39:11.000000000 +0900 >+++ /usr/portage-maildir/net-mail/postfix/postfix-2.0.19-r2.ebuild 2004-05-26 16:00:49.000000000 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19-r2.ebuild,v 1.5 2004/05/12 04:22:33 randy Exp $ > >-inherit eutils ssl-cert >+inherit eutils ssl-cert maildir > > VDA_P="${PN}-2.0.18" > TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c" >@@ -148,7 +148,7 @@ > keepdir /etc/postfix > mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix" > if use maildir ; then >- mypostconf="home_mailbox=.maildir/" >+ mypostconf="home_mailbox=${MAILDIR}/" > elif use mbox ; then > mypostconf="mail_spool_directory=/var/spool/mail" > fi >diff -ru /usr/portage/net-mail/procmail/procmail-3.22-r6.ebuild /usr/portage-maildir/net-mail/procmail/procmail-3.22-r6.ebuild >--- /usr/portage/net-mail/procmail/procmail-3.22-r6.ebuild 2004-05-12 13:16:16.000000000 +0900 >+++ /usr/portage-maildir/net-mail/procmail/procmail-3.22-r6.ebuild 2004-05-26 19:27:23.085999096 +0900 >@@ -2,6 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r6.ebuild,v 1.9 2004/05/12 03:52:30 randy Exp $ > >+inherit maildir > S=${WORKDIR}/${P} > DESCRIPTION="Mail delivery agent/filter" > SRC_URI="http://www.procmail.org/${P}.tar.gz" >@@ -30,9 +31,9 @@ > if [ -z "`use mbox`" ]; > then > echo "# Use maildir-style mailbox in user's home directory" > ${S}/procmailrc >- echo 'DEFAULT=$HOME/.maildir/' >> ${S}/procmailrc >+ echo 'DEFAULT=$HOME/${MAILDIR}/' >> ${S}/procmailrc > cd ${S} >- patch -p1 <${FILESDIR}/gentoo-maildir2.diff >+ maildir_epatch ${FILESDIR}/gentoo-maildir2.diff > else > echo '# Use mbox-style mailbox in /var/spool/mail' > ${S}/procmail > echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> ${S}/procmailrc >diff -ru /usr/portage/net-mail/qmail/qmail-1.03-r15.ebuild /usr/portage-maildir/net-mail/qmail/qmail-1.03-r15.ebuild >--- /usr/portage/net-mail/qmail/qmail-1.03-r15.ebuild 2004-05-14 12:39:32.000000000 +0900 >+++ /usr/portage-maildir/net-mail/qmail/qmail-1.03-r15.ebuild 2004-05-26 19:20:21.459090758 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r15.ebuild,v 1.10 2004/05/14 03:25:50 robbat2 Exp $ > >-inherit gcc eutils fixheadtails >+inherit gcc eutils fixheadtails maildir > > IUSE="ssl noauthcram notlsbeforeauth" > DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization" >@@ -301,9 +301,9 @@ > > einfo "Setting up the default aliases ..." > diropts -m 700 -o alias -g qmail >- ${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir >+ ${MAILDIRMAKE} ${D}/var/qmail/alias/${MAILDIR} > # for good measure >- keepdir /var/qmail/alias/.maildir/{cur,new,tmp} >+ keepdir /var/qmail/alias/${MAILDIR}/{cur,new,tmp} > > for i in mailer-daemon postmaster root > do >@@ -317,10 +317,11 @@ > diropts -m 755 -o root -g root > insinto /etc/skel > newins ${FILESDIR}/dot_qmail .qmail.sample >+ maildir_sed ${D}/etc/skel/.qmail.sample > fperms 644 /etc/skel/.qmail.sample >- ${MAILDIRMAKE} ${D}/etc/skel/.maildir >+ ${MAILDIRMAKE} ${D}/etc/skel/${MAILDIR} > # for good measure >- keepdir /etc/skel/.maildir/{cur,new,tmp} >+ keepdir /etc/skel/${MAILDIR}/{cur,new,tmp} > > einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..." > insopts -o root -g root -m 755 >@@ -355,7 +356,9 @@ > insinto /var/qmail/control > insopts -o root -g root -m 644 > doins ${FILESDIR}/conf-* >+ maildir_sed ${D}/var/qmail/control/conf-pop3d > newins ${FILESDIR}/dot_qmail defaultdelivery >+ maildir_sed ${D}/var/qmail/control/defaultdelivery > use ssl && doins ${FILESDIR}/servercert.cnf > > einfo "Configuration sanity checker and launcher" >@@ -379,16 +382,16 @@ > > rootmailfixup() { > # so you can check mail as root easily >- local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" >- if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then >- einfo "Previously the qmail ebuilds created /root/.maildir/ but not" >+ local TMPCMD="ln -sf /var/qmail/alias/${MAILDIR}/ ${ROOT}/root/${MAILDIR}" >+ if [ -d "${ROOT}/root/${MAILDIR}" ] && [ ! -L "${ROOT}/root/${MAILDIR}" ] ; then >+ einfo "Previously the qmail ebuilds created /root/${MAILDIR}/ but not" > einfo "mail was every delivered there. If the directory does not" > einfo "contain any mail, please delete it and run:" > einfo "${TMPCMD}" > else > ${TMPCMD} > fi >- chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null >+ chown -R alias:qmail ${ROOT}/var/qmail/alias/${MAILDIR} 2>/dev/null > } > > buildtcprules() { >diff -ru /usr/portage/net-mail/qmail-ldap/qmail-ldap-1.03-r4.ebuild /usr/portage-maildir/net-mail/qmail-ldap/qmail-ldap-1.03-r4.ebuild >--- /usr/portage/net-mail/qmail-ldap/qmail-ldap-1.03-r4.ebuild 2004-04-07 11:42:18.000000000 +0900 >+++ /usr/portage-maildir/net-mail/qmail-ldap/qmail-ldap-1.03-r4.ebuild 2004-05-26 19:19:19.514864202 +0900 >@@ -4,7 +4,7 @@ > > IUSE="ssl" > >-inherit eutils fixheadtails >+inherit eutils fixheadtails maildir > > S=${WORKDIR}/qmail-${PV} > >@@ -161,9 +161,9 @@ > > einfo "Setting up the default aliases ..." > diropts -m 700 -o alias -g qmail >- ${D}/var/qmail/bin/maildirmake ${D}/var/qmail/alias/.maildir >+ ${D}/var/qmail/bin/maildirmake ${D}/var/qmail/alias/${MAILDIR} > # for good measure >- keepdir /var/qmail/alias/.maildir/{cur,new,tmp} >+ keepdir /var/qmail/alias/${MAILDIR}/{cur,new,tmp} > > for i in mailer-daemon postmaster root > do >@@ -177,10 +177,11 @@ > diropts -m 755 -o root -g root > insinto /etc/skel > newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail.sample >+ maildir_sed ${D}/etc/skel/.qmail.sample > fperms 644 /etc/skel/.qmail.sample >- ${D}/var/qmail/bin/maildirmake ${D}/etc/skel/.maildir >+ ${D}/var/qmail/bin/maildirmake ${D}/etc/skel/${MAILDIR} > # for good measure >- keepdir /etc/skel/.maildir/{cur,new,tmp} >+ keepdir /etc/skel/${MAILDIR}/{cur,new,tmp} > > einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..." > insopts -o root -g root -m 755 >@@ -253,6 +254,7 @@ > insinto /var/qmail/control > insopts -o root -g root -m 644 > doins ${FILESDIR}/${PV}-${PR}/conf-* >+ maildir_sed ${D}/var/qmail/control/conf-pop3d > newins ${FILESDIR}/${PV}-${PR}/dot_qmail defaultdelivery > use ssl && doins ${FILESDIR}/${PV}-${PR}/servercert.cnf > >@@ -273,16 +275,16 @@ > > rootmailfixup() { > # so you can check mail as root easily >- local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" >- if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then >- einfo "Previously the qmail ebuilds created /root/.maildir/ but not" >+ local TMPCMD="ln -sf /var/qmail/alias/${MAILDIR}/ ${ROOT}/root/${MAILDIR}" >+ if [ -d "${ROOT}/root/${MAILDIR}" ] && [ ! -L "${ROOT}/root/${MAILDIR}" ] ; then >+ einfo "Previously the qmail ebuilds created /root/${MAILDIR}/ but not" > einfo "mail was every delivered there. If the directory does not" > einfo "contain any mail, please delete it and run:" > einfo "${TMPCMD}" > else > ${TMPCMD} > fi >- chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null >+ chown -R alias:qmail ${ROOT}/var/qmail/alias/${MAILDIR} 2>/dev/null > } > > buildtcprules() { >diff -ru /usr/portage/net-mail/qmail-mysql/qmail-mysql-1.03-r13.ebuild /usr/portage-maildir/net-mail/qmail-mysql/qmail-mysql-1.03-r13.ebuild >--- /usr/portage/net-mail/qmail-mysql/qmail-mysql-1.03-r13.ebuild 2004-02-23 01:36:45.000000000 +0900 >+++ /usr/portage-maildir/net-mail/qmail-mysql/qmail-mysql-1.03-r13.ebuild 2004-05-26 19:19:54.518036196 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/qmail-mysql/qmail-mysql-1.03-r13.ebuild,v 1.3 2004/02/22 16:24:59 agriffis Exp $ > >-inherit eutils fixheadtails >+inherit eutils fixheadtails maildir > > IUSE="ssl" > DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization" >@@ -247,9 +247,9 @@ > > einfo "Setting up the default aliases ..." > diropts -m 700 -o alias -g qmail >- ${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir >+ ${MAILDIRMAKE} ${D}/var/qmail/alias/${MAILDIR} > # for good measure >- keepdir /var/qmail/alias/.maildir/{cur,new,tmp} >+ keepdir /var/qmail/alias/${MAILDIR}/{cur,new,tmp} > > for i in mailer-daemon postmaster root > do >@@ -263,10 +263,11 @@ > diropts -m 755 -o root -g root > insinto /etc/skel > newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail.sample >+ maildir_sed ${D}/etc/skel/.qmail.sample > fperms 644 /etc/skel/.qmail.sample >- ${MAILDIRMAKE} ${D}/etc/skel/.maildir >+ ${MAILDIRMAKE} ${D}/etc/skel/${MAILDIR} > # for good measure >- keepdir /etc/skel/.maildir/{cur,new,tmp} >+ keepdir /etc/skel/${MAILDIR}/{cur,new,tmp} > > einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..." > insopts -o root -g root -m 755 >@@ -305,6 +306,7 @@ > insinto /var/qmail/control > insopts -o root -g root -m 644 > doins ${FILESDIR}/${PV}-${PR}/conf-* >+ maildir_sed ${D}/var/qmail/control/conf-pop3d > newins ${FILESDIR}/${PV}-${PR}/dot_qmail defaultdelivery > use ssl && doins ${FILESDIR}/${PV}-${PR}/servercert.cnf > >@@ -325,16 +327,16 @@ > > rootmailfixup() { > # so you can check mail as root easily >- local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" >- if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then >- einfo "Previously the qmail ebuilds created /root/.maildir/ but not" >+ local TMPCMD="ln -sf /var/qmail/alias/${MAILDIR}/ ${ROOT}/root/${MAILDIR}" >+ if [ -d "${ROOT}/root/${MAILDIR}" ] && [ ! -L "${ROOT}/root/${MAILDIR}" ] ; then >+ einfo "Previously the qmail ebuilds created /root/${MAILDIR}/ but not" > einfo "mail was every delivered there. If the directory does not" > einfo "contain any mail, please delete it and run:" > einfo "${TMPCMD}" > else > ${TMPCMD} > fi >- chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null >+ chown -R alias:qmail ${ROOT}/var/qmail/alias/${MAILDIR} 2>/dev/null > } > > buildtcprules() { >diff -ru /usr/portage/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild /usr/portage-maildir/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild >--- /usr/portage/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild 2004-05-24 15:46:26.000000000 +0900 >+++ /usr/portage-maildir/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild 2004-05-26 19:20:39.427126349 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.1.ebuild,v 1.1 2004/05/24 06:46:26 robbat2 Exp $ > >-inherit gnuconfig >+inherit gnuconfig maildir > > DESCRIPTION="A web interface for managing a qmail system with virtual domains." > MY_PV="${PV/_rc/-rc}" >@@ -32,9 +32,7 @@ > unpack ${A} > cd ${S} > gnuconfig_update >- for i in alias.c auth.c autorespond.c command.c contrib/alias2forward.pl qmailadmin.c template.c user.c; do >- sed -e 's|/Maildir|/.maildir|g' -i ${i} >- done >+ maildir_sed alias.c auth.c autorespond.c command.c contrib/alias2forward.pl qmailadmin.c template.c user.c > } > > src_compile() { >diff -ru /usr/portage/net-mail/vpopmail/vpopmail-5.4.0.ebuild /usr/portage-maildir/net-mail/vpopmail/vpopmail-5.4.0.ebuild >--- /usr/portage/net-mail/vpopmail/vpopmail-5.4.0.ebuild 2004-04-26 02:33:22.000000000 +0900 >+++ /usr/portage-maildir/net-mail/vpopmail/vpopmail-5.4.0.ebuild 2004-05-26 19:23:12.240420191 +0900 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /home/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.0.ebuild,v 1.4 2004/04/25 17:00:45 kugelfang Exp $ > >-inherit eutils gnuconfig fixheadtails >+inherit eutils gnuconfig fixheadtails maildir > > # TODO: all ldap, sybase support > MY_PV=${PV/_/-} >@@ -58,12 +58,12 @@ > > epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch > >- sed -i \ >- 's|Maildir|.maildir|g' \ >+ maildir_sed \ > vchkpw.c vconvert.c vdelivermail.c \ > vpopbull.c vpopmail.c vqmaillocal.c \ > vuserinfo.c maildirquota.c \ >- || die "failed to change Maildir to .maildir" >+ || die "failed to change Maildir to ${MAILDIR}" >+ > sed -i \ > '/printf.*vpopmail/s:vpopmail (:(:' \ > vdelivermail.c vpopbull.c vqmaillocal.c \ >@@ -135,6 +135,7 @@ > > into /var/vpopmail > dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh >+ maildir_sed ${D}/var/vpopmail/vpopmail-Maildir-dotmaildir-fix.sh > into /usr > > # Install documentation.
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 52076
:
32060
|
32062
|
32063
|
43210
|
43211