version bump - see bug# 186393

Package-Manager: portage-2.1.4.4

5 files changed, 155 insertions, 8 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 0c13c9b9d839..7104ad7d25e7 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-mta/nullmailer
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.27 2007/10/28 14:05:21 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.28 2008/02/28 07:50:09 bangert Exp $
+
+*nullmailer-1.04 (28 Feb 2008)
+
+  28 Feb 2008; Thilo Bangert <bangert@gentoo.org>
+  +files/remotes.sample-1.04, +nullmailer-1.04.ebuild, metadata.xml:
+  version bump - see also bug #186393
+  remove mailwrapper support
+  turn on ipv6 patch unconditionally
+  fix sample config file to reflect 1.01 syntax changes
+  dont dep on daemontools -add myself as maintainer
 
   28 Oct 2007; Christian Heim <phreak@gentoo.org> nullmailer-1.00.ebuild,
   nullmailer-1.00-r2.ebuild, nullmailer-1.02.ebuild,
@@ -19,7 +29,7 @@
   nullmailer-1.02-r1.ebuild, nullmailer-1.02-r2.ebuild:
   Replacing einfo with elog
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
@@ -49,16 +59,16 @@
   Bug #112163 - Version bump. Bug #118043 - init.d script. Bug #118826 -
   ~amd64 keyword.
 
-  31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   nullmailer-1.00_rc7.ebuild, nullmailer-1.00_rc7-r1.ebuild,
   nullmailer-1.00_rc7-r2.ebuild, nullmailer-1.00_rc7-r4.ebuild,
   nullmailer-1.00_rc7-r5.ebuild, nullmailer-1.00.ebuild:
   Use -1 instead of /bin/false as default shell.
 
-  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> nullmailer-1.00.ebuild:
+  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> nullmailer-1.00.ebuild:
   Actually change last version, not the one before.
 
-  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   nullmailer-1.00_rc7-r5.ebuild:
   Use bindnow-flags function instead of -Wl,-z,now.
 
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 97e718523fe9..618a5d449781 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -4,13 +4,17 @@ AUX nullmailer-1.00-gcc34-fix.patch 618 RMD160 e294a7728b968b70e88f3882994c766ea
 AUX nullmailer-1.00-smtp-auth.patch 3990 RMD160 a773a74362e49fe4ee72234cd0f1c8ecf845a642 SHA1 07da7435ca1230314a923490755d9a0d69f07692 SHA256 dac4fed444ebbdd6c372e918c86ab2d5046fdb66faf55c9efe485f4b768cdf1a
 AUX nullmailer-1.00-syslog.patch 10047 RMD160 c27eecec6a1f0e1017217d4baaa9dfe6a5d05206 SHA1 7f964b9ea2a85f90c2e1ec5ae4b8f54381771f19 SHA256 c158e90fa9e16bf4d9f71cb0d92eb1f8223ad899862dcd939e67f6867f7abfb9
 AUX remotes.sample 444 RMD160 00d2f8ccade03f6ba9cca2f3f0a157f42e3b8b98 SHA1 1cc94a1191f4bf20e1bd437fda70b5d40c127f8e SHA256 c3c6b0efc100142ecbe65b9af3e20900f9b21449619f35ef3ba2334dd0888b1f
+AUX remotes.sample-1.04 540 RMD160 41a6f50c7d0cd0423be8d2e485e07148504316f7 SHA1 8aecf00f27f705a28e9c45c2e9807a3a4f4f309a SHA256 d9f756d9a2b21e7f7166c1b29a34c4dda1eb1ab0c57168ded3d0ed225cf692ee
 DIST nullmailer-1.00.tar.gz 170605 RMD160 cd45934be7a8a9391f31452fe56b6166cb730306 SHA1 e17b524b857b0a2eaf97df78e040f6e804764f4d SHA256 1ebb63f010a46dce9559b1025f76e74741429071cd2d4f380a63a5ced3ce8340
 DIST nullmailer-1.02.tar.gz 171591 RMD160 5be509670c0524bec7d7e664901f88f0872536bf SHA1 eeb94fb0fdcf0944c8a1590d12f0572ae95d0dda SHA256 a35298470ba5e0f7f14d17f4a2e76039413b214c7b80921fa9a00598ecf6243d
+DIST nullmailer-1.04.tar.gz 176867 RMD160 13deaf37a392dfd7b57ac61b50d496dfdb9c362f SHA1 f3815fec726a776be050a6be59b91e696779f5a9 SHA256 364b7888720469d1494c6084a8de7cd39cfc8f841f3be02dfc417e111572fe8b
 DIST nullmailer_1.02-1.diff.gz 21242 RMD160 152b8336e7f041cf0ad3f7058e1e81b8a99dcb1e SHA1 c9d71aa155204b2184181a8e10792698b24a2aaa SHA256 a19b36e872880757626c7151d6e0d942ccd2d462929fe873f2d9be5eed18a07a
+DIST nullmailer_1.04-1.diff.gz 47284 RMD160 0f6ba5985d6b47678f35b090a635630646dbbd14 SHA1 61525c2b5d9297c2a976c7107e1d16dab43d2259 SHA256 daa2a9388e8fa2a93401b9ee060a7f56f2f8e820af57aeba82a8abde838fcd75
 EBUILD nullmailer-1.00-r2.ebuild 3979 RMD160 99644d8e3cd3685ad7e66112601f3a83d9068913 SHA1 0dd815a251d911d02562a20ece6110a49ba41882 SHA256 6fa400931206dab3ad842f3df7e72ea5e795a8b8f2e6571acd552a91229643f8
 EBUILD nullmailer-1.00.ebuild 4027 RMD160 cf8c4fa7e574a4d549bf0b09e0b9368e096b74d3 SHA1 81c8197502ce4dc75d80279b23e00b34f733118d SHA256 df574a30e49e4c228d55670d0ee03089035b97f667cf97f2a8f3375d08309216
 EBUILD nullmailer-1.02-r1.ebuild 4565 RMD160 364eb57304c93892ba5001a6ef63ca4a47ce250b SHA1 77b9cec60649fa67dbcf8785bf28e2c03f1d1be1 SHA256 ed1cbfc64a023516a3f4e4d186b38136723657db40180b09dfd430ad25bb0dc4
 EBUILD nullmailer-1.02-r2.ebuild 4496 RMD160 909b674354de0250c4833e26c2c960d4dc670593 SHA1 9ced9f8e334c8c9232866a090ef92ad7bdcfeb00 SHA256 94bdea1429e87c12f7fa4d1597956d7ffb0bb6e820240bb5bc69965ee31ccd37
 EBUILD nullmailer-1.02.ebuild 4622 RMD160 2d59e43dcc80efabf2ccdf0287c573ab338e8241 SHA1 4a7631038df3eaea997d2587cd8247031b770d2e SHA256 bd87174b5b0a2f3f0f6b80b1810f4687d9c4c81c35fde24d1bbac0cdec4e15c0
-MISC ChangeLog 6781 RMD160 9f9c759f44b45e48a7cd0547c3b391e829d30308 SHA1 55b92dee59366400ea445dd1acee63d79945d5d1 SHA256 98660209e65ad5cdff120a869219627e42898b4db12bbb35de02bb58637c88be
-MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
+EBUILD nullmailer-1.04.ebuild 3740 RMD160 e61301164a934013c4b7b6816eae861ea5e40bc9 SHA1 109d059fefc247af55fa1c9bc7495c4f76463831 SHA256 1430e9b7bf1282c88453deaf6e17c983688eda498e5f58be89284486e735b0d4
+MISC ChangeLog 7154 RMD160 bd2bdc7759a6a20106155bc8f3ff967044016dfa SHA1 7db2e06208d9280ab7cbb6a42a826208b18c108f SHA256 7ccfc8aa17171734f343b8ebcbde62d51a21ed6673646bdeefb75fac1ca23e3e
+MISC metadata.xml 392 RMD160 2ab4e8534884a8d887e0e619b5a2685b7a8b1a06 SHA1 e53462014fe3598699f7a86ceef1f28ec1f1c104 SHA256 bd4f44a5482232a527b27507b0d18e88358193360752722a0bd1aedef85a4732
diff --git a/mail-mta/nullmailer/files/remotes.sample-1.04 b/mail-mta/nullmailer/files/remotes.sample-1.04
new file mode 100644
index 000000000000..3a6f449e466b
--- /dev/null
+++ b/mail-mta/nullmailer/files/remotes.sample-1.04
@@ -0,0 +1,20 @@
+# Format is: HOST PROTOCOL [OPTIONS]
+# HOST = IP or DNS
+# PROTOCOL = smtp | qmtp
+# OPTIONS = [--port=NUMBER] [--auth=user,pass]
+#
+# Examples:
+# A standard SMTP server:
+# somesendmailserver.domain.com smtp
+#
+# A qmail server with QMQP setup:
+# someqmailserver.domain.com qmqp
+#
+# A nonstandard SMTP server setup:
+# someotherserver.domain.com smtp --port=2525
+#
+# SMTP server supporting AUTH PLAIN
+# mailserver smtp --user=<user> --pass=<pass>
+#
+# SMTP server supporting AUTH LOGIN 
+# mailserver smtp --user=<user> --pass=<pass> --auth-login
diff --git a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml
index 89dcd746873c..ae3542e55191 100644
--- a/mail-mta/nullmailer/metadata.xml
+++ b/mail-mta/nullmailer/metadata.xml
@@ -6,4 +6,8 @@
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
+    <maintainer>
+        <email>bangert@gentoo.org</email>
+        <name>Thilo Bangert</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/mail-mta/nullmailer/nullmailer-1.04.ebuild b/mail-mta/nullmailer/nullmailer-1.04.ebuild
new file mode 100644
index 000000000000..abb33c44a9b8
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.04.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.04.ebuild,v 1.1 2008/02/28 07:50:09 bangert Exp $
+
+inherit eutils flag-o-matic mailer
+
+MY_P="${P/_rc/RC}"
+S=${WORKDIR}/${MY_P}
+DEBIAN_PV="1"
+DEBIAN_SRC="${MY_P/-/_}-${DEBIAN_PV}.diff.gz"
+DESCRIPTION="Simple relay-only local mail transport agent"
+SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz
+		mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}"
+HOMEPAGE="http://untroubled.org/nullmailer/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+IUSE=""
+
+DEPEND="virtual/libc
+		sys-apps/groff"
+RDEPEND="virtual/libc
+	sys-apps/shadow
+	virtual/logger
+	!virtual/mta"
+PROVIDE="virtual/mta"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	EPATCH_OPTS="-d ${S} -p1" \
+	epatch "${DISTDIR}"/${DEBIAN_SRC}
+	EPATCH_OPTS="-d ${S} -p1" \
+	epatch "${S}"/debian/patches/02_ipv6.diff || die "IPV6 patch failed"
+	EPATCH_OPTS="-d ${S} -p1" \
+	epatch "${S}"/debian/patches/03_syslog.diff || die "daemon/syslog patch failed"
+	# this fixes the debian daemon/syslog to actually compile
+	sed -i.orig \
+		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
+		"${S}"/src/Makefile.am || die "Sed failed"
+}
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/nullmailer nullmail
+}
+
+src_compile() {
+	# Note that we pass a different directory below due to bugs in the makefile!
+	econf --localstatedir=/var || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	einstall localstatedir="${D}"/var/nullmailer || die "einstall failed"
+	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README YEAR2000 TODO
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-1.04 remotes
+	# daemontools stuff
+	dodir /var/nullmailer/service{,/log}
+	insinto /var/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/nullmailer/service/run
+	insinto /var/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/nullmailer/service/log/run
+	# usablity
+	dodir /usr/lib
+	dosym /usr/sbin/sendmail usr/lib/sendmail
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	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
+	newinitd "${FILESDIR}"/init.d-nullmailer nullmailer
+}
+
+pkg_postinst() {
+	[ ! -e "${ROOT}"/var/nullmailer/trigger ] && mkfifo "${ROOT}"/var/nullmailer/trigger
+	chown nullmail:nullmail "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger}
+	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue}
+	chmod 660 "${ROOT}"/var/nullmailer/trigger
+
+	elog "To create an initial setup, please do:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	echo
+	elog "To start nullmailer at boot you may use either the nullmailer init.d"
+	elog "script, or emerge sys-process/supervise-scripts, enable the"
+	elog "svscan init.d script and create the following link:"
+	elog "ln -fs /var/nullmailer/service /service/nullmailer"
+	echo
+	ewarn "${PF} introduces a new configuration syntax for SMTP AUTH."
+	ewarn "Please adjust your configuration accordingly."
+}
+
+pkg_config() {
+	if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
+		einfo "Setting /etc/nullmailer/me"
+		/bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me
+	fi
+	if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		/bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain
+	fi
+}