Attachment #426400 for bug #562912

View | Details | Raw Unified | Return to bug 562912
Collapse All | Expand All





pkg_setup() {
	enewgroup nullmail 88
	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
}

src_prepare() {

		-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
	sed -e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" -i doc/nullmailer-send.8
	mv configure.in configure.ac
	eautoreconf
}

src_configure() {
	# Note that we pass a different directory below due to bugs in the makefile!
	econf \
		--localstatedir=/var/spool \
		$(use_enable ssl tls)
}

src_install () {
	emake DESTDIR="${D}" install

	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO


	fowners root:nullmail /etc/nullmailer/remotes

	# daemontools stuff
	dodir /var/spool/nullmailer/service{,/log}

	insinto /var/spool/nullmailer/service
	newins scripts/nullmailer.run run
	fperms 700 /var/spool/nullmailer/service/run

	insinto /var/spool/nullmailer/service/log
	newins scripts/nullmailer-log.run run
	fperms 700 /var/spool/nullmailer/service/log/run

	# usability
	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail

	# permissions stuff
	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
	fperms 770 /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq


}

pkg_postinst() {
	if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then
		mkfifo "${ROOT}"/var/spool/nullmailer/trigger
	fi
	chown nullmail:nullmail \
		"${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} || die
	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue} || die
	chmod 660 "${ROOT}"/var/spool/nullmailer/trigger || die

	# This contains passwords, so should be secure
	chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die

	#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/spool/nullmailer/service /service/nullmailer"
	#echo
}

pkg_postrm() {
	if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then
		rm "${ROOT}"/var/spool/nullmailer/trigger || die
	fi
}


Lines 5-13 Link Here

(-)/usr/portage/mail-mta/nullmailer/files/init.d-nullmailer-r4 (-2 / +2 lines)
5		5
6	command="/usr/sbin/nullmailer-send"	6	command="/usr/sbin/nullmailer-send"
7		7
8	start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail"	8	start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail"
9		9
10	required_dirs="/var/nullmailer"	10	required_dirs="/var/spool/nullmailer"
11	pidfile="/run/nullmailer.pid"	11	pidfile="/run/nullmailer.pid"
12	command_background="true"	12	command_background="true"
13	command_args="-s"	13	command_args="-s"




Description=Nullmailer relay-only MTA
Requires=network.target
After=local-fs.target syslog.target
ConditionPathExists=/var/spool/nullmailer/queue
ConditionPathExists=/etc/nullmailer/defaultdomain
ConditionPathExists=/etc/nullmailer/me

[Service]
WorkingDirectory=/var/spool/nullmailer
ExecStart=/usr/sbin/nullmailer-send -s
User=nullmail
Group=nullmail

Return to bug 562912

Lines 49-55 Link Here

(-)/usr/portage/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild (-18 / +20 lines)
49		49
50	pkg_setup() {	50	pkg_setup() {
51	enewgroup nullmail 88	51	enewgroup nullmail 88
52	enewuser nullmail 88 -1 /var/nullmailer nullmail	52	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
53	}	53	}
54		54
55	src_prepare() {	55	src_prepare() {
Lines 78-95 Link Here
78	-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \	78	-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
79	-i configure.in \|\| die	79	-i configure.in \|\| die
80	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in \|\| die	80	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in \|\| die
		81	sed -e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" -i doc/nullmailer-send.8
		82	mv configure.in configure.ac
81	eautoreconf	83	eautoreconf
82	}	84	}
83		85
84	src_configure() {	86	src_configure() {
85	# Note that we pass a different directory below due to bugs in the makefile!	87	# Note that we pass a different directory below due to bugs in the makefile!
86	econf \	88	econf \
87	--localstatedir=/var \	89	--localstatedir=/var/spool \
88	$(use_enable ssl tls)	90	$(use_enable ssl tls)
89	}	91	}
90		92
91	src_install () {	93	src_install () {
92	emake DESTDIR="${D}" localstatedir=/var/nullmailer install	94	emake DESTDIR="${D}" install
93		95
94	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO	96	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO
95		97
Lines 102-123 Link Here
102	fowners root:nullmail /etc/nullmailer/remotes	104	fowners root:nullmail /etc/nullmailer/remotes
103		105
104	# daemontools stuff	106	# daemontools stuff
105	dodir /var/nullmailer/service{,/log}	107	dodir /var/spool/nullmailer/service{,/log}
106		108
107	insinto /var/nullmailer/service	109	insinto /var/spool/nullmailer/service
108	newins scripts/nullmailer.run run	110	newins scripts/nullmailer.run run
109	fperms 700 /var/nullmailer/service/run	111	fperms 700 /var/spool/nullmailer/service/run
110		112
111	insinto /var/nullmailer/service/log	113	insinto /var/spool/nullmailer/service/log
112	newins scripts/nullmailer-log.run run	114	newins scripts/nullmailer-log.run run
113	fperms 700 /var/nullmailer/service/log/run	115	fperms 700 /var/spool/nullmailer/service/log/run
114		116
115	# usability	117	# usability
116	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail	118	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
117		119
118	# permissions stuff	120	# permissions stuff
119	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}	121	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
120	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}	122	fperms 770 /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
121	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq	123	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
122	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq	124	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
123		125
Lines 126-138 Link Here
126	}	128	}
127		129
128	pkg_postinst() {	130	pkg_postinst() {
129	if [ ! -e "${ROOT}"/var/nullmailer/trigger ]; then	131	if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then
130	mkfifo "${ROOT}"/var/nullmailer/trigger	132	mkfifo "${ROOT}"/var/spool/nullmailer/trigger
131	fi	133	fi
132	chown nullmail:nullmail \	134	chown nullmail:nullmail \
133	"${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger} \|\| die	135	"${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} \|\| die
134	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue} \|\| die	136	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue} \|\| die
135	chmod 660 "${ROOT}"/var/nullmailer/trigger \|\| die	137	chmod 660 "${ROOT}"/var/spool/nullmailer/trigger \|\| die
136		138
137	# This contains passwords, so should be secure	139	# This contains passwords, so should be secure
138	chmod 0640 "${ROOT}"/etc/nullmailer/remotes \|\| die	140	chmod 0640 "${ROOT}"/etc/nullmailer/remotes \|\| die
Lines 146-158 Link Here
146	#elog "To start nullmailer at boot you may use either the nullmailer init.d"	148	#elog "To start nullmailer at boot you may use either the nullmailer init.d"
147	#elog "script, or emerge sys-process/supervise-scripts, enable the"	149	#elog "script, or emerge sys-process/supervise-scripts, enable the"
148	#elog "svscan init.d script and create the following link:"	150	#elog "svscan init.d script and create the following link:"
149	#elog "ln -fs /var/nullmailer/service /service/nullmailer"	151	#elog "ln -fs /var/spool/nullmailer/service /service/nullmailer"
150	#echo	152	#echo
151	}	153	}
152		154
153	pkg_postrm() {	155	pkg_postrm() {
154	if [[ -e "${ROOT}"/var/nullmailer/trigger ]]; then	156	if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then
155	rm "${ROOT}"/var/nullmailer/trigger \|\| die	157	rm "${ROOT}"/var/spool/nullmailer/trigger \|\| die
156	fi	158	fi
157	}	159	}
158		160

Lines 2-13 Link Here

(-)/usr/portage/mail-mta/nullmailer/files/nullmailer.service (-2 / +2 lines)
2	Description=Nullmailer relay-only MTA	2	Description=Nullmailer relay-only MTA
3	Requires=network.target	3	Requires=network.target
4	After=local-fs.target syslog.target	4	After=local-fs.target syslog.target
5	ConditionPathExists=/var/nullmailer/queue	5	ConditionPathExists=/var/spool/nullmailer/queue
6	ConditionPathExists=/etc/nullmailer/defaultdomain	6	ConditionPathExists=/etc/nullmailer/defaultdomain
7	ConditionPathExists=/etc/nullmailer/me	7	ConditionPathExists=/etc/nullmailer/me
8		8
9	[Service]	9	[Service]
10	WorkingDirectory=/var/nullmailer	10	WorkingDirectory=/var/spool/nullmailer
11	ExecStart=/usr/sbin/nullmailer-send -s	11	ExecStart=/usr/sbin/nullmailer-send -s
12	User=nullmail	12	User=nullmail
13	Group=nullmail	13	Group=nullmail