Version bump, bug #321401.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux i686

3 files changed, 132 insertions, 12 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 35a7899e67bd..b4b1e7c92077 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.39 2011/07/20 17:18:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.40 2011/07/20 18:44:55 robbat2 Exp $
+
+*nullmailer-1.05 (20 Jul 2011)
+
+  20 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> +nullmailer-1.05.ebuild,
+  +nullmailer-1.05.ebuild~:
+  Version bump, bug #321401.
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #118937
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index a045271c3c8e..3817961877d8 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX init.d-nullmailer 1221 RMD160 9e793a57acc9f2123c75e5a27f4b6123ce1d171a SHA1 154b3c92512151d6d4f9dc63125536c44e207f1e SHA256 279dd0519b62b57b4f5f6a7bcbfcd8337dd3d5e6e785de1d443f2005def64d72
 AUX remotes.sample-1.04 540 RMD160 41a6f50c7d0cd0423be8d2e485e07148504316f7 SHA1 8aecf00f27f705a28e9c45c2e9807a3a4f4f309a SHA256 d9f756d9a2b21e7f7166c1b29a34c4dda1eb1ab0c57168ded3d0ed225cf692ee
 DIST nullmailer-1.04.tar.gz 176867 RMD160 13deaf37a392dfd7b57ac61b50d496dfdb9c362f SHA1 f3815fec726a776be050a6be59b91e696779f5a9 SHA256 364b7888720469d1494c6084a8de7cd39cfc8f841f3be02dfc417e111572fe8b
+DIST nullmailer-1.05.tar.gz 176800 RMD160 20bd31670be76297a9798282db6186156d4f5124 SHA1 93cc8924cd96bf8a79285ff32bf5b0894de0a9e5 SHA256 90356ed2bd95eef09ed04713fdef1f81c1ab95e02eee333a96a8e3eb230cac2f
 DIST nullmailer_1.04-1.diff.gz 47284 RMD160 0f6ba5985d6b47678f35b090a635630646dbbd14 SHA1 61525c2b5d9297c2a976c7107e1d16dab43d2259 SHA256 daa2a9388e8fa2a93401b9ee060a7f56f2f8e820af57aeba82a8abde838fcd75
 EBUILD nullmailer-1.04.ebuild 3912 RMD160 585ce921941209bfab3ca932921f7292ad9d505a SHA1 8fdd8b0aac88d8a159f7654d40b6e698bd96c23a SHA256 7bfe94f53eada504a6e9c6ddf62d50cf54242073e4442b0fab3451ca26ea3434
-MISC ChangeLog 8707 RMD160 b926615cf0eb09e5265234d7747c034c1f0cee89 SHA1 ccae6e28738b36af083b93745d3cea3cff4f64af SHA256 691362c72fa200a0ddd41dc14f9a94949c38c95dc72e71026635dbcaca2cc363
+EBUILD nullmailer-1.05.ebuild 3992 RMD160 92b15e9493ea536e553664301a4f231b2d6cfe19 SHA1 b03af6ffeea64f5d61396f5eff40ef4f502e3a96 SHA256 3d41661f04647b622ac5e74f25399e90411d2c055b7658e74f3a0b9f61514f62
+MISC ChangeLog 8877 RMD160 1e37469c8106c2adb0b3783663da50a23a32f333 SHA1 fda7c652c923a204da075325000ff8f64dd4b924 SHA256 f30f5dcad2a935c12cb718423fe0b8289d16b5b1e9c29b7fa29f12458790d3cb
 MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4nDfkACgkQCaWpQKGI+9SvLwCfUKyPyxmMkQeQFyy8JRUqOa3Q
-QgcAnRVg3jr/NYuFTsKzeeBAmckByCvI
-=aA4Y
------END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/nullmailer-1.05.ebuild b/mail-mta/nullmailer/nullmailer-1.05.ebuild
new file mode 100644
index 000000000000..61e08b50ab7f
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.05.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.05.ebuild,v 1.1 2011/07/20 18:44:55 robbat2 Exp $
+
+inherit eutils flag-o-matic autotools
+
+MY_P="${P/_rc/RC}"
+S=${WORKDIR}/${MY_P}
+DEBIAN_PV=1.04
+DEBIAN_PR="1"
+DEBIAN_P="${PN}-${DEBIAN_PV}"
+DEBIAN_PF="${DEBIAN_P/-/_}-${DEBIAN_PR}"
+DEBIAN_SRC="${DEBIAN_PF}.diff.gz"
+DESCRIPTION="Simple relay-only local mail transport agent"
+SRC_URI="http://untroubled.org/${PN}/archive/${MY_P}.tar.gz
+		mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}"
+HOMEPAGE="http://untroubled.org/nullmailer/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+DEPEND="sys-apps/groff"
+RDEPEND="sys-apps/shadow
+	virtual/logger
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp"
+
+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"
+
+	cd "${S}"
+	eautoreconf
+}
+
+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
+}