diff options
Diffstat (limited to 'mail-mta/nullmailer')
| -rw-r--r-- | mail-mta/nullmailer/ChangeLog | 11 | ||||
| -rw-r--r-- | mail-mta/nullmailer/Manifest | 17 | ||||
| -rw-r--r-- | mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r4 (renamed from mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r3) | 0 | ||||
| -rw-r--r-- | mail-mta/nullmailer/files/mailer.conf | 23 | ||||
| -rw-r--r-- | mail-mta/nullmailer/nullmailer-1.00_rc7-r4.ebuild (renamed from mail-mta/nullmailer/nullmailer-1.00_rc7-r3.ebuild) | 28 |
5 files changed, 60 insertions, 19 deletions
diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog index e7b0b36eb1e1..94f385514c39 100644 --- a/mail-mta/nullmailer/ChangeLog +++ b/mail-mta/nullmailer/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-mail/nullmailer # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.2 2004/05/31 00:21:57 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.3 2004/05/31 05:28:33 g2boojum Exp $ + +*nullmailer-1.00_rc7-r4 (31 May 2004) + + 31 May 2004; Grant Goodyear <g2boojum@gentoo.org> files/mailer.conf, + -nullmailer-1.00_rc7-r3.ebuild, +nullmailer-1.00_rc7-r4.ebuild: + Fixes to make mailwrapper an optional dep. + + Removed -r3 because the dodir for services/run was broken, and I + incorporated all other changes into -r4. *nullmailer-1.00_rc7-r3 (30 May 2004) diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest index 839e5e32fc27..cb8448f7d997 100644 --- a/mail-mta/nullmailer/Manifest +++ b/mail-mta/nullmailer/Manifest @@ -1,12 +1,17 @@ -MD5 57944a8f6edbcf87b5380f784ef932fe nullmailer-1.00_rc7-r2.ebuild 3530 -MD5 565be0dff22cde2ee55ff6f0d27ee6c0 nullmailer-1.00_rc7-r1.ebuild 3179 -MD5 92cdd186e92fc6de4d50b12258f5f79c nullmailer-1.00_rc7-r3.ebuild 3606 -MD5 4807995fb77ce1e36b672b6da612a269 ChangeLog 1930 +MD5 5e1c75a9ca099cd9ee4de9cdbecd25d3 nullmailer-1.00_rc7-r2.ebuild 3531 +MD5 6692d4192205516b1a29125613099c69 nullmailer-1.00_rc7-r4.ebuild 3840 +MD5 f7cae986b3dc6c6bdf507e77af409b52 .#Manifest.1.1 892 +MD5 b8c52cfd0ba391177827c0c84f54c0a3 nullmailer-1.00_rc7-r1.ebuild 3180 +MD5 fe10649db2cf7ea49fb0c0f3ee4429fe .nullmailer-1.00_rc7-r4.ebuild.swp 16384 +MD5 c271c94d9ca54a481116e9e97d7139a6 nullmailer-1.00_rc7-r3.ebuild 3607 +MD5 c5f5e29c78fb45fa3f4be43241270d83 ChangeLog 1931 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280 -MD5 cbf00f49a102495e53091d9d35c0c1bf nullmailer-1.00_rc7.ebuild 3228 +MD5 15ad5f3fcfe74810b16fbfab69b5e3cb nullmailer-1.00_rc7.ebuild 3229 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7 70 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r1 70 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r2 70 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r3 70 -MD5 7e9737a515de7ff628184102fed62067 files/mailer.conf 1033 +MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r4 70 +MD5 de73b4be2f86853a7ce0f31a29626c3a files/mailer.conf 1580 +MD5 6a9e38c0f9c08ae892e90f783cffde64 files/.#mailer.conf.1.1 1471 MD5 ccc26a349646e55860dc06066004ce63 files/remotes.sample 301 diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r3 b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r4 index d67f55c171d8..d67f55c171d8 100644 --- a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r3 +++ b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r4 diff --git a/mail-mta/nullmailer/files/mailer.conf b/mail-mta/nullmailer/files/mailer.conf index 346e41df4dee..0952c1699d2b 100644 --- a/mail-mta/nullmailer/files/mailer.conf +++ b/mail-mta/nullmailer/files/mailer.conf @@ -1,5 +1,6 @@ -# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $ -# +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/files/mailer.conf,v 1.3 2004/05/31 05:28:33 g2boojum Exp $ +# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $ + # Execute the "real" sendmail program from nullmailer # named /usr/sbin/sendmail.nullmailer sendmail /usr/sbin/sendmail.nullmailer @@ -8,7 +9,22 @@ mailq /usr/bin/mailq.nullmailer newaliases /usr/sbin/sendmail.nullmailer +# Execute the "real" sendmail program from exim, +# named /usr/sbin/exim # +#sendmail /usr/sbin/exim +#send-mail /usr/sbin/exim +#mailq /usr/sbin/exim +#newaliases /usr/sbin/exim +#rsmtp /usr/sbin/exim +#rmail /usr/sbin/exim +#mail /usr/sbin/exim + +# Execute the "real" sendmail program from nullmailer +# named /usr/sbin/sendmail.nullmailer +#sendmail /usr/sbin/sendmail.nullmailer +#mailq /usr/bin/mailq.nullmailer + # Execute the "real" sendmail program from postfix, # named /usr/sbin/sendmail.postfix # @@ -21,8 +37,10 @@ newaliases /usr/sbin/sendmail.nullmailer # named /usr/sbin/ssmtp # #sendmail /usr/sbin/ssmtp +#send-mail /usr/sbin/ssmtp #mailq /usr/sbin/ssmtp #newaliases /usr/sbin/ssmtp + # Execute the "real" sendmail program, named /usr/sbin/sendmail # #sendmail /usr/sbin/sendmail.sendmail @@ -31,3 +49,4 @@ newaliases /usr/sbin/sendmail.nullmailer #newaliases /usr/sbin/sendmail.sendmail #hoststat /usr/sbin/sendmail.sendmail #purgestat /usr/sbin/sendmail.sendmail + diff --git a/mail-mta/nullmailer/nullmailer-1.00_rc7-r3.ebuild b/mail-mta/nullmailer/nullmailer-1.00_rc7-r4.ebuild index 9a6578c11d97..29f84b86db52 100644 --- a/mail-mta/nullmailer/nullmailer-1.00_rc7-r3.ebuild +++ b/mail-mta/nullmailer/nullmailer-1.00_rc7-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.00_rc7-r3.ebuild,v 1.1 2004/05/31 00:21:57 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.00_rc7-r4.ebuild,v 1.1 2004/05/31 05:28:33 g2boojum Exp $ inherit eutils @@ -13,10 +13,12 @@ HOMEPAGE="http://untroubled.org/${PN}/" SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~ppc" +IUSE="mailwrapper" DEPEND="virtual/glibc sys-apps/groff" -RDEPEND="!virtual/mta +RDEPEND="!mailwrapper? ( !virtual/mta ) + mailwrapper? ( >=net-mail/mailwrapper-0.2 ) virtual/glibc >=sys-apps/supervise-scripts-3.2 >=sys-apps/daemontools-0.76-r1 @@ -48,8 +50,13 @@ src_compile() { src_install () { einstall localstatedir=${D}/var/nullmailer || die "einstall failed" - mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.nullmailer - mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.nullmailer + if use mailwrapper; then + mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.nullmailer + mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.nullmailer + dosym /usr/sbin/sendmail /usr/bin/mailq + insinto /etc/mail + doins ${FILESDIR}/mailer.conf + fi dodoc AUTHORS BUGS COPYING HOWTO INSTALL NEWS README YEAR2000 TODO ChangeLog # A small bit of sample config dodir /etc/nullmailer @@ -57,7 +64,7 @@ src_install () { newins ${FILESDIR}/remotes.sample remotes # daemontools stuff dodir /var/nullmailer/service{,/log} - insinto /var/nullmailer/service/run + insinto /var/nullmailer/service newins scripts/nullmailer.run run fperms 700 /var/nullmailer/service/run insinto /var/nullmailer/service/log @@ -73,15 +80,15 @@ src_install () { fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger} fperms 660 /var/nullmailer/trigger - ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf" - insinto /etc - doins ${FILESDIR}/mailer.conf + use mailwrapper && \ + ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf" } pkg_config() { [ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me [ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain - ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf" + use mailwrapper && \ + ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf" } pkg_postinst() { @@ -99,6 +106,7 @@ pkg_postinst() { einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" einfo "and create the following links :" einfo "ln -fs /var/nullmailer/service /service/nullmailer" - ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf" + use mailwrapper && \ + ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf" } |