Fix configuration file permissions.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 25 insertions, 17 deletions

diff --git a/www-misc/vdradmin-am/ChangeLog b/www-misc/vdradmin-am/ChangeLog
index cd098d3bbae5..a3a8b7c7a239 100644
--- a/www-misc/vdradmin-am/ChangeLog
+++ b/www-misc/vdradmin-am/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/vdradmin-am
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.16 2010/10/26 21:54:14 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.17 2010/11/07 21:43:12 billie Exp $
+
+  07 Nov 2010; Daniel Pielmeier <billie@gentoo.org>
+  vdradmin-am-3.6.7-r1.ebuild, files/vdradmin-3.6.7.init:
+  Fix configuration file permissions.
 
   26 Oct 2010; Daniel Pielmeier <billie@gentoo.org>
   vdradmin-am-3.6.7.ebuild:
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 5344aeaad7ea..4519e963d22a 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -1,9 +1,9 @@
 AUX vdradmin-3.6.6.conf 512 RMD160 a293a685c79a3f0fd7eb8c82662d789a3089d2bf SHA1 38ad0d0a7c7c5eefb1b063d2f881720df4462bb8 SHA256 7621749f8bc17b44c036a8f7b592be8fef18e21ce44c4ca2719cf7fb28258df4
 AUX vdradmin-3.6.6.init 1959 RMD160 2a4266e43687d785789494dda40503d3744693d3 SHA1 f6e045cf76484c1385dc2bf71999506780f16a60 SHA256 ff747908e4bbd93502b17c5547d5436363d9d799c48eb7257de7897a5e7e9688
 AUX vdradmin-3.6.6.logrotate 116 RMD160 bf4e29e03b515306521a9e5c8e20445622ff4ea0 SHA1 99d26a22124c7d3821b4871fc3aa5914b90b97c0 SHA256 2eb705ff7ab186d2a0287d3e91afe7d59be39f896fd9a62d875d8f13db1312af
-AUX vdradmin-3.6.7.init 1754 RMD160 3c8dcda67cc5a4c6168636616f2a422b478fd6b2 SHA1 5b7d253980ef0a256d39b2c9a57d72927d9d03aa SHA256 767c0f5c4b0c529d1856f4138bc1be68f5a07f1301cd14fdea87cd23b3da1f3a
+AUX vdradmin-3.6.7.init 1988 RMD160 d85dc39535f09b92962c7355e5b5a9e38be17db7 SHA1 b7abe4fe58888de341230a2c126482850db78608 SHA256 d903fb0ee336a9bd8c27054c89c5493465d38fd7f9089eb4759ef8b7fd862bc5
 DIST vdradmin-am-3.6.7.tar.bz2 545850 RMD160 d48dea7caf30716d2dac4132612160d1c35fa596 SHA1 68c380ed038a36968c72fb5462eaebb2f97eb61d SHA256 48fb4edb16f65e7f340bd57b4d205c1718e37f40d22bf3a76515812f3f45b39b
-EBUILD vdradmin-am-3.6.7-r1.ebuild 4742 RMD160 abe786b3ad137a65e965ed7776f42e297d0d73ee SHA1 14f863ad173898e1c23cfc3d134b54464dd2eaed SHA256 75836edbd1d7061e7c05d66a0360f75f6f47977b8f45df94c0977f184b320a55
+EBUILD vdradmin-am-3.6.7-r1.ebuild 4671 RMD160 43fa1fe0d4cf39865040f70d7df8a9e201cf0b4a SHA1 fffc9e0dc64ed6d7444d7133118f1e23636b67eb SHA256 bb781507d150f73cf81f58b2f72b6db7cb87789727f3bb49ecf2a472adf0331d
 EBUILD vdradmin-am-3.6.7.ebuild 4449 RMD160 3b74b7578ba56bbd4bf030c840c70741052db9d1 SHA1 d3c019f5925c2feb2c8a10b18ac5b5bae49bf72f SHA256 f218f1969f32d9b3c3c6f7cebe8e767798167bdf03f52bd7202ba8b9b4f427dd
-MISC ChangeLog 9461 RMD160 df2c715f49aa257796054d200ae6dd9be688b699 SHA1 9881f158a0c2c984223a47825c9875f82c177930 SHA256 714ecbe6ba76ae702118ebc8edba0753451d69b7b288d0cc5f65b56eeff421bb
+MISC ChangeLog 9610 RMD160 fecdf60323b11ad633a224aadb9d61c920fe6400 SHA1 58dba71ad17e59ed0e20233b07bacb44754d3a37 SHA256 048899bca7cfab7f0054ee39fc74737c7d6aa9c88191d6acb3dc34078fa5d481
 MISC metadata.xml 748 RMD160 ce0254901737f368bfeb829b70d30c271c25bf14 SHA1 0ba36d4140d383486008e64ac7b9c84ce4c73cc6 SHA256 eb1d48cf2b7dfb0b9810fb1ce3c76fdd25c00fd1e4a93dfdf4b89b04f8024470
diff --git a/www-misc/vdradmin-am/files/vdradmin-3.6.7.init b/www-misc/vdradmin-am/files/vdradmin-3.6.7.init
index b2ce999eb687..038255675017 100644
--- a/www-misc/vdradmin-am/files/vdradmin-3.6.7.init
+++ b/www-misc/vdradmin-am/files/vdradmin-3.6.7.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/files/vdradmin-3.6.7.init,v 1.1 2010/10/26 21:52:31 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/files/vdradmin-3.6.7.init,v 1.2 2010/11/07 21:43:12 billie Exp $
 
 depend() {
 	use vdr
@@ -16,8 +16,13 @@ start() {
 
 	# Prepare directories
 	for dir in cache log run; do
-		[ ! -d /var/${dir}/vdradmin ] && checkpath -d -m 0755 -o ${VDRADMIN_USER}:vdradmin "/var/${dir}/vdradmin"
+		checkpath -q -d -m 0755 -o ${VDRADMIN_USER}:vdradmin "/var/${dir}/vdradmin"
 	done
+	checkpath -q -d -m 0755 -o ${VDRADMIN_USER}:vdradmin "/etc/vdradmin" \
+		"/etc/vdradmin/certs"
+	checkpath -q -f -m 0644 -o ${VDRADMIN_USER}:vdradmin "/etc/vdradmin/vdradmind.conf" \
+		"/etc/vdradmin/certs/server-cert.pem" \
+		"/etc/vdradmin/certs/server-key.pem"
 
 	if [ "${SSL}" = "yes" ]; then vdradmin_opts="${vdradmin_opts} --ssl"; fi
 	if [ "${IPV6}" = "yes" ]; then vdradmin_opts="${vdradmin_opts} --ipv6"; fi
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild
index e2a1cab4456a..0815c2dbf18f 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild,v 1.1 2010/10/26 21:52:31 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild,v 1.2 2010/11/07 21:43:12 billie Exp $
 
 EAPI=2
 
@@ -102,8 +102,6 @@ pkg_preinst() {
 		elog "Creating a new config-file."
 		echo
 
-		install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null "${D}"${ETC_DIR}/vdradmind.conf || die
-
 		cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
 			VDRCONFDIR = "${ROOT%/}"/etc/vdr
 			VIDEODIR = "${ROOT%/}"/var/vdr/video
@@ -126,6 +124,9 @@ pkg_preinst() {
 		elog "do not match your installation or change them in the Setup-Menu"
 		elog "of the Web-Interface."
 	fi
+
+	chmod 0644 "${D}"${ETC_DIR}/vdradmind.conf || die
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${D}"${ETC_DIR}/vdradmind.conf || die
 }
 
 pkg_postinst() {
@@ -140,13 +141,10 @@ pkg_postinst() {
 		elog "To use ssl connection to your vdr"
 		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
 
-		if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \
-			! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then
-			create_ssl_cert
-			local base=$(get_base 1)
-			install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} "${base}".key "${ROOT}"${CERTS_DIR}/server-key.pem || die
-			install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} "${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
-		fi
+		create_ssl_cert
+		local base=$(get_base 1)
+		install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} "${base}".key "${ROOT}"${CERTS_DIR}/server-key.pem || die
+		install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} "${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
 	fi
 
 	elog
@@ -159,7 +157,8 @@ pkg_postinst() {
 
 pkg_postrm() {
 	rm -f "${ROOT}"${CERTS_DIR}/server-{cert,key}.pem
-	rmdir --ignore-fail-on-non-empty "${ROOT}"${CERTS_DIR}
+	rmdir --ignore-fail-on-non-empty "${ROOT}"${CERTS_DIR} \
+		"${ROOT}"${ETC_DIR}
 }
 
 pkg_config() {