Passing /dev/null as a pidfile path makes s-s-d rm your /dev/null device!

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 97 insertions, 10 deletions

diff --git a/mail-mta/qpsmtpd/ChangeLog b/mail-mta/qpsmtpd/ChangeLog
index 24671a1d932d..91450b512130 100644
--- a/mail-mta/qpsmtpd/ChangeLog
+++ b/mail-mta/qpsmtpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/qpsmtpd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.8 2009/09/16 01:24:33 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.9 2010/03/25 06:07:12 robbat2 Exp $
+
+*qpsmtpd-0.83-r1 (25 Mar 2010)
+
+  25 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +qpsmtpd-0.83-r1.ebuild, files/qpsmtpd.initd:
+  Passing /dev/null as a pidfile path makes s-s-d rm your /dev/null device!
 
 *qpsmtpd-9999 (16 Sep 2009)
 
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index 41a84fb86708..a3ce2da6f857 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -6,7 +6,7 @@ AUX qpsmtpd-0.43-peer_hooks.patch 1698 RMD160 c9b270b43978fcdd570a288accd548c121
 AUX qpsmtpd-0.83-clamd_conf.patch 706 RMD160 fe1a169917c435df4b73097e26b0f627ba421278 SHA1 b4c7c5c169eba9bf700c8b383c78106c8d6f19b8 SHA256 ead4226d7037bbeac5ca66b162a8858da520ef6be73604cfe0e86c9aa51aa6f3
 AUX qpsmtpd.confd 617 RMD160 3b95ace716df3f61f9280ca783dbef43e6ee23ac SHA1 b409a52c77fad35b1a6f3c4e7eb65a7fb78cea89 SHA256 7748b525d9c3a3e8cbeec66b8b5df48510a44a1d624168278ce71720e7de8bc0
 AUX qpsmtpd.envd 74 RMD160 963ae15c132be3f99226bf5efed7da5b8f3c2570 SHA1 3a9975274ee6b8cbf2158b5643bd692291625fe8 SHA256 bbf8f40198e8a87ff6103b5dc98cae561f0dc9738a6cda3492b00468fbfdfd8e
-AUX qpsmtpd.initd 2068 RMD160 5a809569722c8930bd4cc4d6b8bfd458fca2056d SHA1 2ebdb7ef090fcf56a6eb69540bef88600edf15b6 SHA256 13473280234660bb314289d79c79c57a5e25a2be913469cdb4ab66fefcfc14ce
+AUX qpsmtpd.initd 2057 RMD160 fe8a31e6b364ddf6c27ff23a25fbba1faaa96b36 SHA1 7b16474a67cd98d60c8c31c1562697b519214a54 SHA256 035db169b79760e2259e0562acca23f16b6cf108edd965c687c47ddd2d6916c1
 AUX qpsmtpd.xinetd 526 RMD160 040c159e3c637dc00f1816088852207766c286fa SHA1 81deb67094386ab4ae341572270c47c140f16e89 SHA256 45729911251be13007d95bb9e25b6c9c951a6419b8badae4e4097dfc603edcdd
 DIST qpsmtpd-0.81.tar.gz 175691 RMD160 945029280222e6221445a89c61e124f266ba4bed SHA1 8bfe4142565f9aaf407bcdc94da62cf09e00190e SHA256 302f16be06c62aac3135a5ab8fe29612e7831769e11861e5a98190987b58517d
 DIST qpsmtpd-0.82.tar.gz 176806 RMD160 8d7642f1887278ce45b3355de7da7f6b2c98a7d4 SHA1 540155086c0b5e553f951ef4f8967886384dca24 SHA256 794af76a1be3cc766ce034311a351ff76b0323c2decc49af96d626e3f3de4df9
@@ -14,7 +14,8 @@ DIST qpsmtpd-0.83.tar.gz 177298 RMD160 b65f81b88635bc00465fe1493ee1d5f073b36255
 EBUILD qpsmtpd-0.43_rc2_pre955.ebuild 2496 RMD160 057e325094aa85dc264a570b4f13dfad2b88094c SHA1 60a5fb8e09c1660c7dd7a0077b5329d4d936af1a SHA256 3b19c2fb0516a78a6403d2faded4f388ba10ca0d1f0ef73208447e3d94daae11
 EBUILD qpsmtpd-0.81.ebuild 2334 RMD160 26d7f5faaea8ab0acaae8d08c12acb0bfd0080ed SHA1 1ac279d8a1f7908143ea16ada54b218bff3f8b22 SHA256 ffb06381ad72b21ce16a75fc2a6a39a41de440011832e573f6816ff0024cbb9c
 EBUILD qpsmtpd-0.82.ebuild 2173 RMD160 da339be1d8e7ea2a6d537649d16d6d9e9efcfe1a SHA1 543f8ecdd9a0098588d39f1cf4bd8a5d4ab704f7 SHA256 0b6007749b592edeafcff31c285d2a87f3db9b5ba032c9d6b8bed0ec8fa2329c
+EBUILD qpsmtpd-0.83-r1.ebuild 2118 RMD160 fc2fee22906f4e8a4d81327293442ff4965c160a SHA1 5734dfd0e6199d0b56b207dabd8060adbbd8a181 SHA256 fb0d47be3b3da2a30598fa1f63b0ad91a36921b6db6403fbbeccd350efdff554
 EBUILD qpsmtpd-0.83.ebuild 2115 RMD160 a6b72c34e9812ac93a2fb1637d81db0e72bedcf7 SHA1 00e4ec6e015dc674f5c15a4b18e8a90116d2c2f2 SHA256 feee2ed9c6eb4479a163f4aa875dc427b744d44597ed67b7735e2869954a884a
 EBUILD qpsmtpd-9999.ebuild 2105 RMD160 436045fb5eb1c03a48042ffd5afd39b58d3eaa2b SHA1 a40957386cd49edeffe0869ced0988ae0ebf7895 SHA256 44f99376fcdf1f2864091d85a167d9ac3d5b76f9a47eb8ac5173ccdebd54c44b
-MISC ChangeLog 2125 RMD160 099813c2d68e6728cf59c762017c7a912d883fa4 SHA1 fa99bbdd81e0b576224f7f85906f4b285d92e516 SHA256 ed427058a29f3630616e9b594432bb11df173c430b477672aa6318927436ebd8
+MISC ChangeLog 2335 RMD160 031547ce994a60d1f42e1464ca701a8b5074887d SHA1 b46425e058a7c09d77350a6bdf9bc7415aa436a0 SHA256 a8733b3ae7bffa4e73950262c589400c620bdce00452f13487ca2b5d4a65f067
 MISC metadata.xml 485 RMD160 0362a983d522720988a075feb3fe643ef09d7e36 SHA1 2fa98543a44b5b9a73f248f4fd605c1de32f56d1 SHA256 5f825ec7910cf1e3486d9d490f2bdbbacb68a2532a7a691500150c1b10c09e06
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd.initd b/mail-mta/qpsmtpd/files/qpsmtpd.initd
index 4624304884f4..b9500b6713ca 100644
--- a/mail-mta/qpsmtpd/files/qpsmtpd.initd
+++ b/mail-mta/qpsmtpd/files/qpsmtpd.initd
@@ -1,5 +1,7 @@
 #!/sbin/runscript
 
+pidfile=/var/run/qpsmtpd/qpsmtpd.pid
+
 depend() {
 	use logger dns ypbind amavisd mysql postgresql antivirus postfix_greylist net saslauthd
 	provide mta
@@ -30,20 +32,20 @@ start() {
 			QPSMTPD_OPTIONS="$(echo "${QPSMTPD_OPTIONS}" | sed "s:\-\-pid\-file[\t ]\{1,99\}[^ ]*::gI")"
 			# Option --pid-file is mentioned in the help of the prefork server
 			# but does not work when specified.
-			# QPSMTPD_OPTIONS="${QPSMTPD_OPTIONS} --pid-file /var/run/qpsmtpd.pid"
-			myopts="${myopts} --make-pidfile --pidfile /var/run/qpsmtpd.pid"
+			# QPSMTPD_OPTIONS="${QPSMTPD_OPTIONS} --pid-file ${pidfile}"
+			myopts="${myopts} --make-pidfile --pidfile ${pidfile}"
 			;;
 		async)
 			QPSMTPD_SERVER_BIN="/usr/sbin/qpsmtpd-async"
-			myopts="${myopts} --background --make-pidfile --pidfile /var/run/qpsmtpd.pid"
+			myopts="${myopts} --background --make-pidfile --pidfile ${pidfile}"
 			;;
 		forkserver|*)
 			QPSMTPD_SERVER_BIN="/usr/bin/qpsmtpd-forkserver"
 			QPSMTPD_OPTIONS="$(echo "${QPSMTPD_OPTIONS}" | sed "s:\-\-pid\-file[\t ]\{1,99\}[^ ]*::gI")"
 			QPSMTPD_OPTIONS="$(echo "${QPSMTPD_OPTIONS}" | sed "s:[\t ]\{0,99\}\-d[\t ]\{1,99\}|[\t ]\{1,99\}\-d[\t ]\{0,99\}::gI")"
 			QPSMTPD_OPTIONS="$(echo "${QPSMTPD_OPTIONS}" | sed "s:[\t ]\{0,99\}\-\detach[\t ]\{1,99\}|[\t ]\{1,99\}\-\-detach[\t ]\{0,99\}::gI")"
-			QPSMTPD_OPTIONS="${QPSMTPD_OPTIONS} --pid-file /var/run/qpsmtpd.pid --detach"
-			myopts="${myopts} --pidfile /dev/null"
+			QPSMTPD_OPTIONS="${QPSMTPD_OPTIONS} --pid-file ${pidfile} --detach"
+			myopts="${myopts} --pidfile ${pidfile}"
 			;;
 	esac
 	start-stop-daemon --start --nicelevel ${QPSMTPD_NICELEVEL:-0} \
@@ -55,6 +57,6 @@ start() {
 
 stop() {
 	ebegin "Stopping qpsmtpd [${QPSMTPD_SERVER_TYPE}] server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/qpsmtpd.pid
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
 	eend $?
 }
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild
new file mode 100644
index 000000000000..c3eecb79ebc5
--- /dev/null
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.83-r1.ebuild,v 1.1 2010/03/25 06:07:12 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils perl-app
+
+DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
+HOMEPAGE="http://smtpd.develooper.com"
+SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="postfix ipv6 syslog"
+
+RDEPEND=">=dev-lang/perl-5.8.0
+	dev-perl/Net-DNS
+	virtual/perl-MIME-Base64
+	dev-perl/MailTools
+	dev-perl/IPC-Shareable
+	dev-perl/Socket6
+	dev-perl/Danga-Socket
+	dev-perl/ParaDNS
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	syslog? ( virtual/perl-Sys-Syslog )
+	virtual/inetd"
+
+pkg_setup() {
+	enewgroup smtpd
+	local additional_groups
+	if use postfix; then
+		additional_groups="${additional_groups},postdrop"
+	fi
+	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
+	epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
+}
+
+src_install() {
+	perl-module_src_install
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
+
+	dodir /usr/share/qpsmtpd
+	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+
+	diropts -m 0755 -o smtpd -g smtpd
+	dodir /var/spool/qpsmtpd
+	keepdir /var/spool/qpsmtpd
+
+	dodir /etc/qpsmtpd
+	insinto /etc/qpsmtpd
+	doins config.sample/*
+
+	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
+	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+	if use syslog; then
+		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+	else
+		diropts -m 0755 -o smtpd -g smtpd
+		dodir /var/log/qpsmtpd
+		keepdir /var/log/qpsmtpd
+		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+	fi
+
+	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
+
+	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd || die "Installing conf.d file"
+	newinitd "${FILESDIR}"/qpsmtpd.initd qpsmtpd || die "Installing init.d file"
+
+	dodoc CREDITS Changes README README.plugins STATUS
+}