bump; #bug 405513, thx to T.Rheinhold for testing

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

4 files changed, 179 insertions, 16 deletions

diff --git a/www-misc/vdradmin-am/ChangeLog b/www-misc/vdradmin-am/ChangeLog
index 36a1f3a1ceff..455e22c1dbaf 100644
--- a/www-misc/vdradmin-am/ChangeLog
+++ b/www-misc/vdradmin-am/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/vdradmin-am
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.24 2012/01/25 20:18:37 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.25 2012/02/24 20:55:01 hd_brummy Exp $
+
+*vdradmin-am-3.6.9 (24 Feb 2012)
+
+  24 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdradmin-am-3.6.8.ebuild, +vdradmin-am-3.6.9.ebuild:
+  bump; #bug 405513, thx to T.Rheinhold for testing
 
   25 Jan 2012; Daniel Pielmeier <billie@gentoo.org>
   -vdradmin-am-3.6.7-r1.ebuild:
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index aa5f06e8efc1..ffbdd44c5d43 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX vdradmin-3.6.6.conf 512 RMD160 a293a685c79a3f0fd7eb8c82662d789a3089d2bf SHA1 38ad0d0a7c7c5eefb1b063d2f881720df4462bb8 SHA256 7621749f8bc17b44c036a8f7b592be8fef18e21ce44c4ca2719cf7fb28258df4
 AUX vdradmin-3.6.6.logrotate 116 RMD160 bf4e29e03b515306521a9e5c8e20445622ff4ea0 SHA1 99d26a22124c7d3821b4871fc3aa5914b90b97c0 SHA256 2eb705ff7ab186d2a0287d3e91afe7d59be39f896fd9a62d875d8f13db1312af
 AUX vdradmin-3.6.7.init 1988 RMD160 d85dc39535f09b92962c7355e5b5a9e38be17db7 SHA1 b7abe4fe58888de341230a2c126482850db78608 SHA256 d903fb0ee336a9bd8c27054c89c5493465d38fd7f9089eb4759ef8b7fd862bc5
 DIST vdradmin-am-3.6.8.tar.bz2 556528 RMD160 1bd3b49518f3d6b8127b4b1c678c632fc3ef4689 SHA1 ec050f8561854644e34f3e347ce43fa7a6debb6f SHA256 71f365019741c3e7192f3342d30e550e0f52c77fa687691b0c239ce5859b3aaf
-EBUILD vdradmin-am-3.6.8.ebuild 4540 RMD160 62458a890d999893b2606edd2ee0c85cdc74e2d9 SHA1 e033d966a581deb73242414c78393b6c135103aa SHA256 ec4270786dc32cc360e0477ee7048c1763ccbdb023ffea8ecd794c987c4a7d24
-MISC ChangeLog 10471 RMD160 ee6d60baf6cb4869148cabed41ecf10f4fdae9c0 SHA1 4220d8405655d8f6418a58be87d40b6f83f60e94 SHA256 65b5291c4324353458557a46c9c6ce9587fed978603b59e557fee63d6ee15dd7
+DIST vdradmin-am-3.6.9.tar.bz2 562006 RMD160 1d79b41cbd036b2e3fc6e4ef8b0b4a19aaa29a5e SHA1 c9ca7731ecc5e6c31eb59baf96b64813db49815b SHA256 5f0421ca0ea2b4c7669d5332d43b04af8b0c40d2964dd152a265c18f4d7f2715
+EBUILD vdradmin-am-3.6.8.ebuild 4372 RMD160 ce97644d02318e53d56788485790606d8a776daa SHA1 f10dc81bd13ebdf6d4a7a07c0b1eafaefce99433 SHA256 fa632b81b41a646e72eede07f9357847aef3b3a1b727ff542ee50891506d99ac
+EBUILD vdradmin-am-3.6.9.ebuild 4376 RMD160 b92b1ff6e64c487d2cad0f17dbaa1c49b78e70be SHA1 45b55b91aaed0b836919eb5878d68fa083aabca0 SHA256 6728cb44a1180b44363430fa0ae115297abaa9fa41b17fe6b03557b4664a786e
+MISC ChangeLog 10671 RMD160 b78ee963dabcff6f8e05c2f72c356c1545a5ae9a SHA1 39b2916a1342fe9bcc2c6644e84eebefb3139edd SHA256 9819c0f1412b2a1ca68adfc8c13e91195cfef71731dec31cf1c6ef0c91395a86
 MISC metadata.xml 652 RMD160 c1c8a6d8b9632d603faace3e12b8d8f44afe8b5e SHA1 9eaeaf7403a8221c85d71615e2457be10796e98f SHA256 40a987f0caed004be4922c4d2a5f96472db5dc68aede439e3541a35c6ee8d412
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEAREIAAYFAk8gY6MACgkQlcuUeyFa0U2ttgCgxWikkF3OJXfMpTE98vPvFF2U
-qKgAoLjqh89XI8r5Q0/QKMJfqXlpmUe0
-=TEEi
+iD8DBQFPR/kvdn07HTTCgIoRAkhSAJ9iPR6xooa4OOOYJSgmY3/PH3Yr8QCfUiy8
+35G1ZKvetqMr7sWFWF5UmSA=
+=lv3B
 -----END PGP SIGNATURE-----
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild
index 3434857f7f64..8e1a775f9f7f 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.8.ebuild,v 1.3 2011/12/21 09:01:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild,v 1.4 2012/02/24 20:55:01 hd_brummy Exp $
 
 EAPI=4
 
@@ -51,12 +51,6 @@ create_ssl_cert() {
 pkg_setup() {
 	enewgroup ${VDRADMIN_GROUP}
 	enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
-
-	if ! use vdr; then
-		elog
-		elog "You can run ${PN} outside a vdr install. For minimal"
-		elog "functionality you need access to the epg.data file of your VDR."
-	fi
 }
 
 src_prepare() {
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
new file mode 100644
index 000000000000..156bae426183
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 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.9.ebuild,v 1.1 2012/02/24 20:55:01 hd_brummy Exp $
+
+EAPI="4"
+
+inherit eutils ssl-cert
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
+SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 ssl +vdr"
+
+DEPEND="dev-lang/perl
+	dev-perl/Template-Toolkit
+	dev-perl/libwww-perl
+	dev-perl/URI
+	dev-perl/Locale-gettext
+	virtual/perl-IO-Compress
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ssl? ( dev-perl/IO-Socket-SSL )
+	vdr? ( media-video/vdr )
+	perl-core/libnet
+	dev-perl/Authen-SASL
+	dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+ETC_DIR=/etc/vdradmin
+CERTS_DIR=/etc/vdradmin/certs
+LIB_DIR=/usr/share/vdradmin
+CACHE_DIR=/var/cache/vdradmin
+VDRADMIN_USER=vdradmin
+VDRADMIN_GROUP=vdradmin
+
+create_ssl_cert() {
+	# The ssl-cert eclass is not flexible enough so do some steps manually
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
+	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+	gen_cnf || return 1
+
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+}
+
+pkg_setup() {
+	enewgroup ${VDRADMIN_GROUP}
+	enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
+}
+
+src_prepare() {
+	sed -i vdradmind.pl \
+		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g" || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
+	newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
+
+	newbin vdradmind.pl vdradmind
+
+	insinto ${LIB_DIR}/template
+	doins -r "${S}"/template/*
+
+	insinto ${LIB_DIR}/lib/Template/Plugin
+	doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
+
+	insinto /usr/share/locale/
+	doins -r "${S}"/locale/*
+
+	newman vdradmind.pl.1 vdradmind.8
+
+	dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
+	docinto contrib
+	dodoc "${S}"/contrib/*
+
+	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
+	keepdir ${ETC_DIR}
+	use ssl && keepdir ${CERTS_DIR}
+}
+
+pkg_preinst() {
+	install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
+		"${D}"${ETC_DIR}/vdradmind.conf || die
+
+	if [[ -f "${ROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+		cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
+			"${D}"${ETC_DIR}/vdradmind.conf || die
+	else
+		elog
+		elog "Creating a new config-file."
+		echo
+
+		cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
+			VDRCONFDIR = "${ROOT%/}"/etc/vdr
+			VIDEODIR = "${ROOT%/}"/var/vdr/video
+			EPG_FILENAME = "${ROOT%/}"/var/vdr/video/epg.data
+			EPGIMAGES = "${ROOT%/}"/var/vdr/video/epgimages
+			PASSWORD = gentoo-vdr
+			USERNAME = gentoo-vdr
+		EOF
+		# Feed it with newlines
+		yes "" \
+			| "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \
+			|sed -e 's/: /: \n/g'
+
+		[[ ${PIPESTATUS[1]} == "0" ]] \
+			|| die "Failed to create initial configuration."
+
+		elog
+		elog "Created default user/password: gentoo-vdr/gentoo-vdr"
+		elog
+		elog "You can run \"emerge --config ${PN}\" if the default-values"
+		elog "do not match your installation or change them in the Setup-Menu"
+		elog "of the Web-Interface."
+	fi
+}
+
+pkg_postinst() {
+	if use ipv6; then
+		elog
+		elog "To make use of the ipv6 protocol"
+		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+	fi
+
+	if use ssl; then
+		elog
+		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
+	fi
+
+	elog
+	elog "To extend ${PN} you can emerge"
+	elog ">=media-plugins/vdr-epgsearch-0.9.25 to search the EPG,"
+	elog "media-plugins/vdr-streamdev for livetv streaming and/or"
+	elog "media-video/vdr with USE=\"liemikuutio\" to rename recordings"
+	elog "on the machine running the VDR you connect to with ${PN}."
+}
+
+pkg_config() {
+	"${ROOT}"/usr/bin/vdradmind -c
+}