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

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 70 insertions, 20 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/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
 }