From f853affe799496c6b2219966fee16538b72ac002 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 15 Dec 2014 07:51:09 +0000 Subject: [PATCH] mail-mta/nullmailer: Drop einstall in favour of plain emake, #521552; prepend chmod/chown calls in pkg_* with ROOT, #532588 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- mail-mta/nullmailer/ChangeLog | 8 +- mail-mta/nullmailer/Manifest | 33 ++-- mail-mta/nullmailer/nullmailer-1.13-r5.ebuild | 166 ++++++++++++++++++ 3 files changed, 190 insertions(+), 17 deletions(-) create mode 100644 mail-mta/nullmailer/nullmailer-1.13-r5.ebuild diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog index 42c6cdd69f85..5236fa4f4f43 100644 --- a/mail-mta/nullmailer/ChangeLog +++ b/mail-mta/nullmailer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-mta/nullmailer # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.86 2014/03/27 07:15:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.87 2014/12/15 07:51:09 jlec Exp $ + +*nullmailer-1.13-r5 (15 Dec 2014) + + 15 Dec 2014; Justin Lecher +nullmailer-1.13-r5.ebuild: + Drop einstall in favour of plain emake, #521552; prepend chmod/chown calls in + pkg_* with ROOT, #532588 27 Mar 2014; Justin Lecher -nullmailer-1.13-r2.ebuild, -files/init.d-nullmailer-r3: diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest index dfe3afb95827..abc3df29973f 100644 --- a/mail-mta/nullmailer/Manifest +++ b/mail-mta/nullmailer/Manifest @@ -7,24 +7,25 @@ AUX remotes.sample-1.13 970 SHA256 56b9adc7762cfac88769ee6a87fa5057a42599a3d50a3 DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c DIST nullmailer-patches-1.13.tar.xz 8384 SHA256 8685dfbf23e9dc15269b1a0d14f700c4ef990cf49d4e6e830c0217289e8f4733 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c WHIRLPOOL 84f523be7963ceb7fbafd3f5632571e7bc12085b1b4bce5bb5c63871fd6c7ed1367a49ddf5ed66acad7055e28856b23fb1dcb59e60158fed26447128edd0a4fa EBUILD nullmailer-1.13-r4.ebuild 4778 SHA256 cdef6108ec43cb8dbfe30ba3eaf3766ca14e64ea478fb6fb47b3283587f64888 SHA512 2ab984a2bb8c72390fe8ff61e75c8ddaf6ffdc88927353d5a7097f20b6503b9656656c59d8bcf0541e9ca4274f9603342aac8c665b50461eea71aec88671deaa WHIRLPOOL 6856ce373577475d062dc12d11a204824057f8176ba635cc7184826768f9dd031c187e2d8fad11137fbef09191a5f565befa2bb8a5ee33e1c6db3795b1306596 -MISC ChangeLog 15657 SHA256 3e6c5ae22be9de168391492f055f7c6813f48a536ce7af24f0eb02fde0b500c4 SHA512 4dff732bea93ab1bfddaaa049610082a4eab3b370a84f233e23f82f8dbf6f7fe55a9a871869f0510f9ce776d8dec7709a987e9d4ebb09acc1385ac70babd2e3b WHIRLPOOL 51462cfc23ecd65f1af2dc89628cc77d883534f4507baf1b8aef04fe7fbd3a34f97f6ab1671af77c6dcc6140c822abc6737a85071cf3db2cc6e7d8e38af46c5b +EBUILD nullmailer-1.13-r5.ebuild 4814 SHA256 f315d7bb44ef38340178ec82801a0fb0b366b56052d5bc951ceffc453c29b8b1 SHA512 5e2a3d1463adf0a43b148d86942367d4850e3f112bd6505c128ec558f5d1caf760760e60c8ba11653bec6345ae3a548b70cfb7462a37fe575f0e578d9726944b WHIRLPOOL 95e893ae8dc0ac886dbb8717ec989540d18f93812ab4958d3d284b55ef351ecbc87f7e7b39b1f22fdcf6d49b6c90a574b139193452a9a24c18606b2c10ba073e +MISC ChangeLog 15875 SHA256 87ec9011f97e0e380cd8405d2778c44975c1852061b88f83b9fbbf48c818fdb7 SHA512 2796163c684e540d0601a5418a8379b0b2ed37aa134f8dd07ae833d5ffec366d225327f2eb34a5fd22a5d185a378d7bc16fd06354e4618b7007d2d068db637c1 WHIRLPOOL 480aeb6ca8a3c309075fc47c360f4a65ddbcd60f584cb8b48c1f7a69a1746b80d76ac918884320d3499d5835f201f8d8bb7fb8254917e3297af4d31a0bdf0cad MISC metadata.xml 363 SHA256 838fae6a4f4cabb0217b0d1ebbd63acf840e802b3852e7360a4b9ae12a10459e SHA512 18675ce1eba12e093f0d73ac35ca6e456d2d7c0b1f3eee41d9b5bb466391778e3aed877d06028e7fa28c121dfff20fd6729451e5c5706a5ebc33a4f3c10c6f85 WHIRLPOOL d8911b227b42c2f4e47d68cb72f65c1e3349df2e34659aa4a597522138e9f8b055913829e504e11492db81081fbeb51e4b62512aeffde65d105e1120fbd572a4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJTM8/9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJUjpLrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirMisP/j+FkeDo5xwXJ1a54MF7ucOh -pREuKdZqWKv36rQlfxXaCkKBtsnSIvl5xtpyQvxakZvrTa4yNR5CfTqV3gfxS1gd -AFur60f76sBauLVD1qlD7sI11Tp8gCqlRYENtUh9xunDe5WvdPWm3yDSYbkvCqic -oBEwpDoCXQAedF+UdMVaZkdX3qbWf6geppNu+AysVr1+49ikCcbIxOua3PakmQUl -9NEfR8e/sNVJLZKKY1inaucIgacrkeBxSSAlnpV06sJe5qX1DT+IPHyGU+nuNIz3 -Fls0pDlVHyQxoWzOWqhHxXpEsn9ELXvpqpUvgIaTGSBveoVA6G9Cuj5oJPOM2Ppw -MD6s7v76ezZmzK99Tk2eVTBWJunGtO7KbTZ3D3YU0+c3+VWVmMXolDWJoIak8kqi -Zl8fPihJASwtdYms0ow/4Cb5HYpwXn2XcSML+0BIoZdoPavsl2VeLs3G0miHQmwT -clHlBt/eb+b5hdienOQv7hMnkDjMakxEshiKAjjLSkY5heAtEz3DU2O8iFjstR3h -BeBO6xs2nVMaJnCs5X55dMyHdtjfPYghcor8Xccxgqh132O2B3dbHC5AngXcSeXs -sTXLqlmByRkPhKILmgVJsijLi9BRBY5fm5t2Kbww3BpylmaP3eN6pkvNHvdjZ6iA -cDTnwQKD14v56p0Js2eq -=fizd +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirzWoP/RlIPAYcWI5UY74m2PEtecoX +sdWkzJ3h6V2UFyj752h6k5Pv4xoI5ahBurwW2m+055TIsuOnenGz/PWKVpKGhQdY +rYNrKPQZ93/sm+cRZTwRWdv4SsTt5wyEM1WUN7Upr6pF4LImpUnU2jhMv6Goq2K5 +DDyECkW7d7eGv3Ato+K2y95JYCr2f9oAZSUdGAk67YN2YxjJWldufI6Gyh/bs6wQ +353jIAAbR+zboDjjvJ6SRy5kuZHKhPn6LGFaZzSu2ZY6fZxMCoJjvP2HqvRAz2EW +tHTRIsfWOgEqC84otw9eMowQ1RAcOcw6Zsy1fHroceIz5HmqvU0MabGQjPy8GK/d +hzDn+aeIV9HogQ9qFbylQja847wTLCggq7JWbPwbpfKPwlS0LginOeNA00dKpp/1 +WaPGLPbJmcaM+LTGk+aNJ7L910IPsMrMOu/wrHMtA6uzxMdNoh4ZxQ91ePq8popa +nPVQAMOJ8wliPQxTTAw8PVmGp+sjhOYVL939pHzF7wUZAlyqFfj5ztNYijv8gP7R +jTRKaarxgwxcmPVUIrDkIUxnqpd7Z1OUICUNRcnR4F2TbWr/P91xuaL753F+YjhO +imeAqcov2Lc4z/RoCDe9rOMp836n3nVyUvrX595QLt90bbqPwt7CMS1BAHr3uTKi +GQS1s+aA1Qde18giHF1c +=Mad5 -----END PGP SIGNATURE----- diff --git a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild new file mode 100644 index 000000000000..8941838b60d5 --- /dev/null +++ b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild,v 1.1 2014/12/15 07:51:09 jlec Exp $ + +EAPI=5 + +inherit autotools eutils flag-o-matic multilib systemd user + +MY_P="${P/_rc/RC}" + +DEBIAN_PV=1.11 +DEBIAN_PR="2" +DEBIAN_P="${PN}-${DEBIAN_PV}" +DEBIAN_PF="${DEBIAN_P/-/_}-${DEBIAN_PR}" +DEBIAN_SRC="${DEBIAN_PF}.debian.tar.gz" + +DESCRIPTION="Simple relay-only local mail transport agent" +HOMEPAGE="http://untroubled.org/nullmailer/" +SRC_URI=" + http://untroubled.org/${PN}/archive/${MY_P}.tar.gz + http://dev.gentoo.org/~jlec/distfiles/${PN}-patches-${PV}.tar.xz" +# mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="ssl" + +DEPEND=" + sys-apps/groff + ssl? ( net-libs/gnutls )" +RDEPEND=" + virtual/logger + virtual/shadow + ssl? ( net-libs/gnutls ) + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/mini-qmail + !mail-mta/msmtp + !mail-mta/netqmail + !mail-mta/postfix + !mail-mta/qmail-ldap + !mail-mta/sendmail + !mail-mta/opensmtpd + !mail-mta/ssmtp" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + enewgroup nullmail 88 + enewuser nullmail 88 -1 /var/nullmailer nullmail +} + +src_prepare() { +# sed -i -e 's/nullmailer-1.10/nullmailer-1.11/g' \ +# "${WORKDIR}"/debian/patches/*.diff || die +# EPATCH_OPTS="-d ${S} -p1" \ +# epatch "${DISTDIR}"/${DEBIAN_SRC} + # why revert? Ask Robin when he is back! +# EPATCH_OPTS="-d ${WORKDIR} -p0 -R" \ +# epatch "${WORKDIR}"/debian/patches/02_ipv6.diff + # this fixes the debian daemon/syslog to actually compile + + # old debian patches from 1.11 + # DO NOT APPLY patch 0009... It breaks + epatch "${WORKDIR}"/patches/000{1..8}*patch + + sed -i.orig \ + -e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \ + "${S}"/src/Makefile.am || die "Sed failed" + sed -i.orig \ + -e '/\$(localstatedir)\/trigger/d' \ + "${S}"/Makefile.am || die "Sed failed" + sed \ + -e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \ + -i configure.in || die + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die + eautoreconf +} + +src_configure() { + # Note that we pass a different directory below due to bugs in the makefile! + econf \ + --localstatedir=/var \ + $(use_enable ssl tls) +} + +src_install () { + emake DESTDIR="${D}" localstatedir=/var/nullmailer install + + dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO + + # A small bit of sample config + insinto /etc/nullmailer + newins "${FILESDIR}"/remotes.sample-${PV} remotes + + # This contains passwords, so should be secure + fperms 0640 /etc/nullmailer/remotes + fowners root:nullmail /etc/nullmailer/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 + + # usability + dosym /usr/sbin/sendmail usr/$(get_libdir)/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 + + newinitd "${FILESDIR}"/init.d-nullmailer-r4 nullmailer + systemd_dounit "${FILESDIR}"/${PN}.service +} + +pkg_postinst() { + if [ ! -e "${ROOT}"/var/nullmailer/trigger ]; then + mkfifo "${ROOT}"/var/nullmailer/trigger + fi + chown nullmail:nullmail \ + "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger} || die + chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue} || die + chmod 660 "${ROOT}"/var/nullmailer/trigger || die + + # This contains passwords, so should be secure + chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die + chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "To create an initial setup, please do:" + elog "emerge --config =${CATEGORY}/${PF}" + fi + #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 +} + +pkg_postrm() { + if [[ -e "${ROOT}"/var/nullmailer/trigger ]]; then + rm "${ROOT}"/var/nullmailer/trigger || die + fi +} + +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 +} -- 2.26.2