Use checkpath instead of mkdir. Fix paths in havp.config too.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 77 insertions, 26 deletions

diff --git a/net-proxy/havp/ChangeLog b/net-proxy/havp/ChangeLog
index 572df37d1171..c3b8e75a449f 100644
--- a/net-proxy/havp/ChangeLog
+++ b/net-proxy/havp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/havp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.36 2013/01/08 17:39:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.37 2013/01/09 14:03:37 jer Exp $
+
+  09 Jan 2013; Jeroen Roovers <jer@gentoo.org> havp-0.92a.ebuild,
+  +files/havp-0.92a-run.patch, files/havp.initd:
+  Use checkpath instead of mkdir. Fix paths in havp.config too.
 
   08 Jan 2013; Jeroen Roovers <jer@gentoo.org> -havp-0.91.ebuild:
   Old.
diff --git a/net-proxy/havp/Manifest b/net-proxy/havp/Manifest
index 4b442dfaf0ba..f63b62d7e51f 100644
--- a/net-proxy/havp/Manifest
+++ b/net-proxy/havp/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA256
 
 AUX havp-0.90-gcc44.patch 2798 SHA256 343e9ada00bac88bb477df8cfa025b9998da33b9ca41e8d542ddad23bb035710 SHA512 6f084b16f960f15eef231e0aa8159a29d62406e755721c8d1f89d3e33d7f9d45407330b94b89d2c8da537df6d578cb9abb97a1090201b7cee521d2d70e68274b WHIRLPOOL ce9247b0aab1ae5c51c2e33f0e8586031d07641623622c74b6f791b31febd8e281b14ae21ea70a6d600723bd61280c4b1f342b822d994661c0ed54bb93c11c48
-AUX havp.initd 1613 SHA256 f9bbfd4a5e35ebc57653b814dcd96d0103014694275c488848a968e0e9c91f06 SHA512 fa88b842cf3231ae83593673268ba781d85eea00cbc19f844576b7f9b08af48c3ad9a3f64f7ad3a57f54a8d6c317909405236cf924e3f012b993bc5ef803ba10 WHIRLPOOL 3f7cf07ecdafc0646b222a53a7a6e19f184136163b5be53d86697cb938fd8905cf870957ea059439dc70f95d2159bc6cb3cd0afd5b01dec8faf5312f77805b2c
+AUX havp-0.92a-run.patch 1084 SHA256 b5cfb56dd3324b5a931cb22b9b108c3b094120c7ebecd801fd16a0e0bf6ed490 SHA512 e8e213b635984ef67a81917fc33eb086d31400b009e657da0dc96bc4fc46659dd41ede9a4a809d7221a949564e38fbb613e649b45fb9555bc4989548eac993e6 WHIRLPOOL a1d6bcca6562f71fc4518fabf115accf37645f8450f66455dbaf4edd5abe885c88f009dfaef5bbaeb93f51ce2591b9afe8de6aeb04d5ef740a7c5764283b89ff
+AUX havp.initd 1522 SHA256 ba97f868fa44fe3e7c9873906e6fb249797cc873e8a5a0d6fbbdabd8ff532ccc SHA512 38fc2c208880ffe481b9ca2d14a74294de77bbec37049645e2cf4542c6275773dabe4367a4f24c3786aa9c42ad4c693458cd5ed47ede3cc2d2a5966b3b0df954 WHIRLPOOL eaa4e960a44becfc37dffb49e743e1e8ac4afd8e79a1e7a1f04dd5ef503ebdfa9565a60375e824777c4c7b9445e44090cae33ecf01027c4d25ff59ec29fdfa82
 DIST havp-0.90.tar.gz 118013 SHA256 01dee1f017bb93378e3fa7b4eab9deec031b8baa5e75442a147a58ee29460d65
 DIST havp-0.92a.tar.gz 121987 SHA256 0dec86390b5738184aa7155af0c66dd00a97476fcd7377bcec8f1f0bf50f0e9a SHA512 3eb742519795a7d10520bdc1c78af0d3bf580a56e14f90bff9f519607a4e82cbf704372bd6da2fc05fcd436d580f4c226874d8df7770d22e2160b5d01afb9c62 WHIRLPOOL 9459d3bab10ed5a6b9053b72795f1e3729765665804fd01f5bae64170510a4427212357ff987cfbb4e93c9770702bb23d18d37dbfdfbc37958f16ff6890178f2
 EBUILD havp-0.90-r1.ebuild 1803 SHA256 6ce5354d74f6bc8a07c5d2fcf3c8d44a4dc8061efd3b72e1907c646955edc63e SHA512 22d6eb9fb3ae7dbaee2356ebd166da7ee5cba155ebf7ed1eb846db900593bcdbc4980b50915f8a46c596957c2e523ab7a4ab08ba152a2f1fc78f9b72c9c4485f WHIRLPOOL e7b5aeb2c00d22bf7fc9d42c9576b45cbc844682d8f4bc54d478ed34c376fbc493cc6d2fcbe0831c8c44840e9b448a7e2c3e7f2a3f7734aaf4a706b804414098
-EBUILD havp-0.92a.ebuild 1716 SHA256 6aedeb92b483bfa02067e7ee60fad1bb7fe9a93c094617375f93d65a97f82ddb SHA512 4d505bee095c22a408914beb6b77b0ad3af4d6004ac870d501e4de71a3cd9faf1ba7392e53757567e2898c91915fc822aa8a2fdc9efc923027a3682137627b27 WHIRLPOOL 19112543f6f7c5b1ed44340efaec7de95ec893629ccc5e8394db4185ca45a688ff883a0894d8d668df54e0f0bfe5536291656081be00b17e3fca74b385dbf82b
-MISC ChangeLog 5503 SHA256 5a2f8cf18028e118702e9cb75787e874dac18ddc5b48bb76d1402f8ae95a2dde SHA512 e8766995d59c7f38b2508903f9617f89338d2279ad151d3e0f60aa3f14510a85b8032df1b435a319a18aadd8766b3d57d99c203d66923c1433f66b8371b2da8c WHIRLPOOL 92bce0d7b8979b8ed4037b99b7cc6d6bdd1ae0438e720170ca054ae971fbbac4113532e7af8ac8d2e7a3723325edde7e23984900e555b1cd9279bf671b626162
+EBUILD havp-0.92a.ebuild 1719 SHA256 381d04e85a31e4387e91743abd3ed25e99a5f2ca4d89350aa10d028a896ada41 SHA512 2136bd4232ed758093811a8b17892ce5457391f62a324e97ae97d3cf640a29cb17b2302ed8e8c04d30263ada824fc942231b471052481d86d718b528f73955eb WHIRLPOOL e6dddb1fe6ee918af88692d90b27aa0bfe11a613a44ed8059cb2ac11aa6209ea148762e6637cf799ba0a0d06b63dd6dd205558d22404efd6d5a31cda7121a7eb
+MISC ChangeLog 5683 SHA256 2d8d1bee8db9fe9a67275d2236cbb2056e77c9e9d360bedabda56a6794c3edcf SHA512 fc9f06b6c9c288747784dabbe7b47a80ee0cc154736bb249e3ff071a01a68db6a9368611658abd315f86753e3b0701663d1134700f7f82d44d23f19edd6efd19 WHIRLPOOL 25ae24d13cba7c170b0dbe0a4cf2d06020f2bcf03747e05996b5035be365e7ccc614f0c61f642042ed09ab1f5c9d25b20ea8dc65b6b1698d2d6dbb5f80fb3339
 MISC metadata.xml 309 SHA256 26c5dece4fe203c9ae4847405314a340fb86058060c9536a92dd7471f4f03d0d SHA512 9e3b8d9d19b20e646025ff490179b60cae73364c5e1cb33c404d8d201f893c9969e4c9d10cf709c5d03b5ff8f916ddd16bebc41c9f58a13383c642c16c3c66c1 WHIRLPOOL 08358cbc5f3f0edfce777c71819e5631e4cf0162474f96da28883972c1c55ef41d8a737ca74b4b5b6574d8b33bf70fc43c3542a00cdd4a7a48c6fe19723428d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDsWcAACgkQVWmRsqeSphP+8QCbBit3uSUgOl1nRQ1ch0rb/f1B
-Wb8Ani8kYAhygFEzFQeC5o+d121rodTj
-=EIU3
+iEYEAREIAAYFAlDteLoACgkQVWmRsqeSphM4egCfR6fpIcE3hEooJDWfkP5rQZp5
+lhkAnRhLGr3gJdEoiDAwQSm9OtvoTOqi
+=pwMV
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/havp/files/havp-0.92a-run.patch b/net-proxy/havp/files/havp-0.92a-run.patch
new file mode 100644
index 000000000000..d13761bee86d
--- /dev/null
+++ b/net-proxy/havp/files/havp-0.92a-run.patch
@@ -0,0 +1,51 @@
+--- a/etc/havp/havp.config.in
++++ b/etc/havp/havp.config.in
+@@ -39,7 +39,7 @@
+ # /etc/init.d/havp script requires this to work.
+ #
+ # Default:
+-# PIDFILE @localstatedir@/run/havp/havp.pid
++# PIDFILE /run/havp/havp.pid
+ 
+ #
+ # For performance reasons several instances of HAVP have to run.
+@@ -539,7 +539,7 @@
+ # Path to aveserver socket
+ #
+ # Default:
+-# AVESOCKET /var/run/aveserver
++# AVESOCKET /run/aveserver
+ 
+ 
+ #####
+@@ -551,7 +551,7 @@
+ # Path to sophie socket
+ #
+ # Default:
+-# SOPHIESOCKET /var/run/sophie
++# SOPHIESOCKET /run/sophie
+ 
+ 
+ #####
+@@ -600,7 +600,7 @@
+ # Path to avastd socket
+ #
+ # Default:
+-# AVASTSOCKET /var/run/avast4/local.sock
++# AVASTSOCKET /run/avast4/local.sock
+ 
+ # ..OR if you use avastd TCP socket, uncomment to enable use
+ #
+@@ -619,10 +619,10 @@
+ 
+ # Path to arcavird socket
+ #
+-# For version 2008, default socket is /var/run/arcad.ctl
++# For version 2008, default socket is /run/arcad.ctl
+ #
+ # Default:
+-# ARCAVIRSOCKET /var/run/arcavird.socket
++# ARCAVIRSOCKET /run/arcavird.socket
+ 
+ # Used Arcavir version
+ #  2007 = Version 2007 and earlier
diff --git a/net-proxy/havp/files/havp.initd b/net-proxy/havp/files/havp.initd
index cfdec6eda99d..44b00fcd0fbe 100644
--- a/net-proxy/havp/files/havp.initd
+++ b/net-proxy/havp/files/havp.initd
@@ -14,15 +14,6 @@ get_havp_opt() {
 }
 
 checkconfig() {
-	if [ ! -d /var/run/havp ] && ! mkdir -p /var/run/havp; then
-		eeror "Failed to create /var/run/havp"
-		return 1
-	fi
-	if [ ! -d /var/tmp/havp ] && ! mkdir /var/tmp/havp; then
-		eeror "Failed to create /var/tmp/havp"
-		return 1
-	fi
-	
 	if [ ! -f /etc/havp/havp.config ] ; then
 		eerror "No /etc/havp/havp.config file exists!"
 		return 1
@@ -40,17 +31,20 @@ checkconfig() {
 		eerror "${HAVP_GROUP} group is missing!"
 		return 1
 	fi
-
-	chown -R "${HAVP_USER:-havp}:${HAVP_GROUP:-havp}" /var/run/havp /var/tmp/havp /var/log/havp && \
-		chmod -R 0755 /var/run/havp &&
-		chmod -R 0750 /var/tmp/havp
 }
 
 
 start() {
 	checkconfig || return 1
 	
-	ebegin "Starting HTTP AntiVirus proxy"
+	checkpath --directory \
+		--owner "${HAVP_USER:-havp}:${HAVP_GROUP:-havp}" --mode 0755 /run/havp
+	checkpath --directory \
+		--owner "${HAVP_USER:-havp}:${HAVP_GROUP:-havp}" --mode 0700 /var/log/havp
+	checkpath --directory \
+		--owner "${HAVP_USER:-havp}:${HAVP_GROUP:-havp}" --mode 0750 /var/tmp/havp
+	
+	ebegin "Starting HTTP AntiVirus Proxy"
 	start-stop-daemon --start --exec /usr/sbin/havp > /dev/null
 	eend $?
 }
@@ -59,7 +53,7 @@ stop() {
 	local HAVP_PIDFILE
 	get_havp_opt PIDFILE
 
-	ebegin "Stopping HTTP AntiVirus proxy"
+	ebegin "Stopping HTTP AntiVirus Proxy"
 	start-stop-daemon --stop --pidfile=${HAVD_PIDFILE:-/var/run/havp/havp.pid}
 	eend $?
 }
diff --git a/net-proxy/havp/havp-0.92a.ebuild b/net-proxy/havp/havp-0.92a.ebuild
index f246a27bf3a7..30e337e6cda2 100644
--- a/net-proxy/havp/havp-0.92a.ebuild
+++ b/net-proxy/havp/havp-0.92a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.92a.ebuild,v 1.2 2013/01/08 17:06:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.92a.ebuild,v 1.3 2013/01/09 14:03:37 jer Exp $
 
 EAPI=4
 inherit eutils user
@@ -22,6 +22,10 @@ pkg_setup() {
 	enewuser ${PN} -1 -1 /etc/${PN} ${PN}
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.92a-run.patch
+}
+
 src_configure() {
 	econf \
 		$(use_enable clamav) \
@@ -39,9 +43,6 @@ src_install() {
 	rm -r etc/${PN}/${PN}.config.in
 	doins -r etc/${PN}
 
-	diropts -m 0700 -o ${PN} -g ${PN}
-	keepdir /var/log/${PN}
-
 	dodoc ChangeLog
 }