Create run dir when necessary - bug #452230

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 161 insertions, 15 deletions

diff --git a/mail-filter/p3scan/ChangeLog b/mail-filter/p3scan/ChangeLog
index 775338790deb..a6ca3c6ab64b 100644
--- a/mail-filter/p3scan/ChangeLog
+++ b/mail-filter/p3scan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/p3scan
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/ChangeLog,v 1.17 2012/06/04 23:59:37 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/ChangeLog,v 1.18 2013/01/15 15:01:34 eras Exp $
+
+*p3scan-2.3.2-r2 (15 Jan 2013)
+
+  15 Jan 2013; Eray Aslan <eras@gentoo.org> +files/p3scan.init-r1,
+  +p3scan-2.3.2-r2.ebuild:
+  Create run dir when necessary - bug #452230
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org> p3scan-2.3.1.ebuild,
   p3scan-2.3.2-r1.ebuild:
@@ -84,4 +90,3 @@
   Initial import. Closes bug #86216, by Zhenzhi <zzzzzz at singnet.com.sg>.
   Ebuild and initscript provided by Christian Zoffoli <xmerlin at gentoo.org>,
   modified by me.
-
diff --git a/mail-filter/p3scan/Manifest b/mail-filter/p3scan/Manifest
index 62a3f577c884..e82239a494c9 100644
--- a/mail-filter/p3scan/Manifest
+++ b/mail-filter/p3scan/Manifest
@@ -1,18 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX p3scan-ocreat.patch 433 RMD160 f4545bf316afc41918436f69f7850679766d6fc7 SHA1 7e019ba262b0020cc8bf6c2dd4d11e9e5456b8be SHA256 06f2d8bea897990df6d6b09a5fcb564f4a1e4eae37027a9a11a5cd62145d6670
-AUX p3scan.init 612 RMD160 169ee83c5df7079aaae9359c10edc24c1d0c820c SHA1 1f7399362bf64fbc9db816d145c835cc1ece96df SHA256 8cd2a9029c045184667a098e136092505bf04b3223817b8013094a0440e43415
-DIST p3scan-2.3.1.tar.gz 315677 RMD160 bb3ece736f44f2c8a8b919163fcb9d9d90ff7ec8 SHA1 896120aca194a96b34dbcf8f0e062afb8fbd8f41 SHA256 2c51185caddde414de13f7de9b94986145a6519deac1de655f38538113122329
-DIST p3scan-2.3.2.tar.gz 321684 RMD160 ed5857d1e711d4f303eeddf03b8ab93fa6c2a3dd SHA1 bc2d01699d34183e78cef44ac6a229326473d5d4 SHA256 570bdf87132b23120339e247809dc2cf37c2735d504f4e1072528c04d940bb5f
-EBUILD p3scan-2.3.1.ebuild 2035 RMD160 4bcbf325aba95b9f598f2effad253e15ea2475fe SHA1 cf2b38159ef69defc0d080fd47666001393119a1 SHA256 d70ce3381ab12abf9fc3692bd617d60d128514db2849204d663ad112c68ed7dc
-EBUILD p3scan-2.3.2-r1.ebuild 2652 RMD160 b5c610b0744e46a12f49c2c94f216b35d1f0c754 SHA1 3c0475569fbc73fff76c97b9854292b83cd3d06a SHA256 30c1688f844223023073407009741a99e822c807665662787bf9ea9eeb84d29b
-MISC ChangeLog 2873 RMD160 143df1ba5e5a9f502f82af399d46afe1cc49034f SHA1 2d92e6d38860879236d513c3c24debf43419322c SHA256 cd62c5e59415684157798f4d05b71ff79799e7963c82998eeeafb717cdbd1fad
-MISC metadata.xml 409 RMD160 5addb80d549a6bded7171e895652c0336d7f7160 SHA1 6a75719b6d3f69678028cae53f4fe02e910d6c14 SHA256 8b53ab62bbcc46fedd73c744afccb5cfd4d99571d30e65d3021115ba8a0ed16b
+AUX p3scan-ocreat.patch 433 SHA256 06f2d8bea897990df6d6b09a5fcb564f4a1e4eae37027a9a11a5cd62145d6670 SHA512 b5b63058da540a8ea7f56191ead2c2b537f1b5dd4486aba35285a26cef8e0c9759063fcc523c5664890fab3e0c866dcf8e5f38d83288f6f5689e5b294131d139 WHIRLPOOL de4b935c27c4b4caba372e1a0ed334bb03f99b8d702065169027ef033ab741ae2ef4304eb23462bd039f4d3942b816844fe268ef4ad1e05b858813d7f0d74b83
+AUX p3scan.init 612 SHA256 8cd2a9029c045184667a098e136092505bf04b3223817b8013094a0440e43415 SHA512 049eceb6742b8151526ff45cc899a019b090e01ce1d3b9b53530e715a209f491fb3cc197265d43d774896aebbdc2a439189125790a719910ea6abda36410af2c WHIRLPOOL b4dea7d066d86ca559e2369e3352b07f0ec29a0f07fafd4acf7eda9bdba787b078c963d24dc502a0fa1ca14eac71699eac2ee6defa185705f2be78c75318cac1
+AUX p3scan.init-r1 757 SHA256 96a434df1c3928b6c5c86c1f89f985fd637dcbbad820acd28a0d711737b8d260 SHA512 2c3a3a830681a38a52b4fee4c03318522587bb323dc34debc6c95630ee65ed721a63a610c8713ef7bb4da4318b9ec5443faf30b4e5f847a2c9f4fe148a02159a WHIRLPOOL d1478da6fa5b7a21e87e4d8d88dc5b852cad1e7df29b459fa7e996b80815701a816eb74906927ff5845f1329cbe55ab16e51e1f0a8e876c18186cbcd3a43485a
+DIST p3scan-2.3.1.tar.gz 315677 SHA256 2c51185caddde414de13f7de9b94986145a6519deac1de655f38538113122329
+DIST p3scan-2.3.2.tar.gz 321684 SHA256 570bdf87132b23120339e247809dc2cf37c2735d504f4e1072528c04d940bb5f SHA512 7504e988ca21760ea73f3ae41d9ec79c560da29e88ac849b671e4452e426cb8ca5065fe8de5b839299bd5da81e16f51951748a134a1737502f924c89867b75b7 WHIRLPOOL 852cd76b92656bc89d9f8c8e8890c2ee58e7d9f9019537ddde74831bcfd675883571a15778d57b25f2c46fe7c40dfe429592d7943e975fb35185894a0b296dbe
+EBUILD p3scan-2.3.1.ebuild 2035 SHA256 d70ce3381ab12abf9fc3692bd617d60d128514db2849204d663ad112c68ed7dc SHA512 6e975837d45390001718e5f3a761bf9b811c3b93e238682ce00ccab42bdca08de458ce0d709fcf2cc61304b6bb65e6a7e8b5eee3e7644722f4e2e816abe2651b WHIRLPOOL 2b5c93c58c8a3c69dc0111f0fe5ec31d3e772da02b6be71c449b397ae8d88be9d4a34252a9785cf7c745dc69a0528fb4342ae176aa7b550bf06d3bc0e7be49c0
+EBUILD p3scan-2.3.2-r1.ebuild 2652 SHA256 30c1688f844223023073407009741a99e822c807665662787bf9ea9eeb84d29b SHA512 a83463cd2694a0fd1f53e78a35313b2c79c8b6c40279b48c61e15ba9640bbc53e62e8078e4a172cf031daf9858e04f46f1d062412d05d970cdb38a6b9e195b6a WHIRLPOOL e62572b9e1249a116f966add18502cf369e03344bf7b63a58c4210aea8493a15f0740ddc2f2524c77b1fabe76be5cc1de216ef8d4a73b44836379b3d05db17df
+EBUILD p3scan-2.3.2-r2.ebuild 2583 SHA256 23886aee202b3ebaa68ddee3ce64879b486abf299182a1789c70c35c4e9d3853 SHA512 8184c63690cee4a798df686f48903769264f618503cdba683e320fdb015f05c8c78c22b4d0b9dfc4477a4964d21f2b3f0535b9427d17617c522be5eff818cd41 WHIRLPOOL 7d3d68e6f8a27af8391ed646c5e46fbb1334e1d54b1b58c2b392942a9c53f222e72d854ac0db19edd84ed6cf1507e502a48c893847a744f7940d8350d0834faf
+MISC ChangeLog 3042 SHA256 8f137e9c0ed51d70f58e7001fbcfa7c581b4bfa60fe1853f7114de707f17c9d9 SHA512 60c90ff9eaa26a7009a9e0f88cac8da1ae9df6f49e46625931ca012f17b48398631217987085775a320239242a2e48f21f038ff768171a0a61c7bed36ae40cda WHIRLPOOL 8f40a0ac6211f874b9c4362220ce027bbe0d20404ffc3a888ca0b09bba25bf6c8d13527c3ed82fe0bfc942aa6cb4bcff9a138f7b3a94538662145913ca00fa25
+MISC metadata.xml 409 SHA256 8b53ab62bbcc46fedd73c744afccb5cfd4d99571d30e65d3021115ba8a0ed16b SHA512 51345f6ab4ca3411cd1c3a2f4d6e94dab08702c0d8cf8e5099a41fb79dd8138641649026806f5081a055a8d5a1d5da9e77c2b1dca77cfa30a65208bca2db50d1 WHIRLPOOL 65d8806295ce5b60e45c002aa7b603a5c75677e7f46a30c8ee3ff82a48a2ad9a7b269fb726498c3cf252244cdb68ee811c92a73f918bf77f919b5588c7f63081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/NS/AACgkQ/ejvha5XGaPoOQCgqUVTnBl7EeXfy9zhZT0NDcrK
-zvUAoKWZR31Gq+nDaVXq7u313xtQniDt
-=chz8
+iQIcBAEBCAAGBQJQ9W9aAAoJEHfx8XVYajsfbSwP+wdUq1+eL5QeGmbgHCln/7NI
+o5JiLd1knug8bNLMa0E1HatgTwct2V9U15VuBZ2I6mIyOIQJ/AxpOAhWgVFF9k3s
+coVpee2Kb6hqKFXWhj2msFsdLsDZ5fLCGyvT8rKLTJu5OZcBLZ2Nj6y+GUh90RN0
+pafInXIoxLgZ+bAWenqzE9t1OZlYi374F3r83sVNCllrbS0QPgpNQsNGv79D0Nky
+X2y2avma3x8tou9SS2p9hH+8rw5uMkdhhRQikMXo1qe99pVBh/xac4VylaGwzaz8
+mGQtwlDOYUd4xthmTIrI5dDfizYCTQWKR17TF6iL+dZeDX0piZn0eWEyxzmAqYXy
+wdp9e6nTCHPQoLBMiDQQP5djlgk1dZrD2pogw1IPlB/6AHE4oPf4c2CllY1eBfXr
+uEJXVA25XYLmEmy0agpzGTyRZddJgnRIlz/jdZ11BpSyZYzBllw496Bmcxvee/iT
+YPqNsqPWV6SsOglE2QhimpIqMDhkV5+XOsMKeLo+dxxQPMawt09syp/lhxJy004y
+9rqoIJLxTijWgFNq69YdtvJGHOrHxggGYLusNwe5wwQYbIl/vFLHM6H2A3zJrYrk
+5wQ9oqfXKOMkNHlQIP8IiLFerZ6NBL1icZrnyauLLaSZo30MWN0K/wTAat2RBKMu
+/ZrdsA32S4pRquGZ4r/B
+=4g2C
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/p3scan/files/p3scan.init-r1 b/mail-filter/p3scan/files/p3scan.init-r1
new file mode 100644
index 000000000000..7854c76aaafc
--- /dev/null
+++ b/mail-filter/p3scan/files/p3scan.init-r1
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/files/p3scan.init-r1,v 1.1 2013/01/15 15:01:34 eras Exp $
+
+depend() {
+	use net
+}
+
+checkconfig() {
+	if [[ ! -d /var/run/p3scan ]] ; then
+		checkpath -q -d -m 0700 -o mail:mail /var/run/p3scan || return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting p3scan"
+	start-stop-daemon --start --quiet --pidfile /var/run/p3scan/p3scan.pid --exec /usr/sbin/p3scan
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping p3scan"
+	start-stop-daemon --stop --quiet --pidfile /var/run/p3scan/p3scan.pid
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting p3scan"
+	svc_stop
+	sleep 1
+	svc_start
+	eend $?
+}
diff --git a/mail-filter/p3scan/p3scan-2.3.2-r2.ebuild b/mail-filter/p3scan/p3scan-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..ce5074a70d67
--- /dev/null
+++ b/mail-filter/p3scan/p3scan-2.3.2-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/p3scan-2.3.2-r2.ebuild,v 1.1 2013/01/15 15:01:34 eras Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="This is a full-transparent proxy-server for POP3-Clients."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://p3scan.sf.net/"
+
+# Older ripmime did not install a library
+DEPEND="dev-libs/libpcre
+	>=net-mail/ripmime-1.4.0.9
+	>=net-mail/mailbase-1
+	"
+RDEPEND="net-firewall/iptables
+	sys-apps/openrc"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}/p3scan-ocreat.patch"
+
+	# respect CC (bug #244144), and CFLAGS (bug #240786)
+	sed -i \
+		-e "s/gcc/$(tc-getCC)/" \
+		-e "s:^CFLAGS=-Wall -O2 :CFLAGS=${CFLAGS} :" \
+		-e '/^LDFLAGS=/d' \
+		-e '/^ripmime\/libripmime/,+7d' \
+		-e '/^\.c\.o:/,+3d' \
+		-e '$ap3scan: LDLIBS:=-lripmime -lpcre -lssl -lcrypto\np3scan: $(OBJECTS)' \
+		Makefile || die
+	# Be sure the system copy is used
+	rm -rf ripmime/
+}
+
+src_install () {
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+
+	dosbin ${PN}
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins ${PN}.conf ${PN}-*.mail
+	doins ${PN}-*.mail
+
+	keepdir /var/spool/${PN}
+	keepdir /var/spool/${PN}/children
+	keepdir /var/spool/${PN}/notify
+
+	fowners mail:mail /var/spool/${PN}
+	fperms 700 /var/spool/${PN}
+
+	fowners mail:mail /var/spool/${PN}/children
+	fperms 700 /var/spool/${PN}/children
+
+	fowners mail:mail /var/spool/${PN}/notify
+	fperms 700 /var/spool/${PN}/notify
+
+	doman p3scan.8.gz p3scan_readme.8.gz
+
+	dodoc AUTHORS CHANGELOG CONTRIBUTERS NEWS README \
+		README-rpm TODO.list p3scan.sh spamfaq.*
+}
+
+pkg_postinst() {
+	if [ ! -L /etc/${PN}/${PN}.mail ]; then
+		ln -sf /etc/${PN}/${PN}-en.mail /etc/${PN}/${PN}.mail || die
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "Default infected notification template language is set to english, change the"
+		elog "symbolic link /etc/${PN}/${PN}.mail if you want it in another language."
+		elog
+		elog "To start ${PN}, you can use /etc/init.d/${PN} start"
+		elog
+		elog "You need port-redirecting, a rule like:"
+		elog "  iptables -t nat -A PREROUTING -p tcp -i eth0 --dport pop3 -j REDIRECT --to 8110"
+		elog "to forward pop3 connections incoming from eth0 interface."
+		elog
+		elog "You will need to configure at least following in /etc/${PN}/${PN}.conf:"
+		elog "scannertype, scanner, virusregexp"
+		elog
+		elog "An example scanner script has been installed to:"
+		elog "/usr/share/doc/${PF}/"
+		echo
+	fi
+}