gentoo Easter resync : 12.04.2020

3 files changed, 199 insertions, 0 deletions

diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index a5cc55e3cbdf..69162daa2eba 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -1,3 +1,4 @@
+AUX vdradmin-3.6.10.conf 387 BLAKE2B ababdd27b66bcbcb47ea5e69774b659c2319d3c9d8756bbbfde64c738b75d0a497778a1a6b3529f118f54519ad3895bd4ec51a613d74273a11b64f8f1e8739a2 SHA512 9308c97fd5354c16ffeb8ddaf983710d4e72a443e30ade596d1f0cd3133e28173062ac30efc18e8ec8fdd0ee9747083f697bd52865624dc3e8c8d64b0d3c8cfc
 AUX vdradmin-3.6.6.conf 557 BLAKE2B d5a9991ec16a87986bb9674d1c9b2450f8b34832e45984c731b49f4bb4c55f767e353066b38aa679d78b316431d1ad5d135dedacd9050929fe570da0d9e58455 SHA512 253ad76deb8c4b5d8ca69464381a7322efa6c638bb78049db8dce3dfc44aaa9a36e37ac62d0ac945418dd4afbde573b0b11ecab3ace149c06a8ded2c4832afe6
 AUX vdradmin-3.6.6.logrotate 116 BLAKE2B 5db1b231a4a821689c8f6198e02f56e8c8dfb89c56abf6fc4630f59081d34b222f7437186b6cdb169e2a7929c26c8bf86e3f1ae037a57bffdcdb1becca4af8b6 SHA512 27d730b67210adf314c53e87fb4ba7e6ab0a1461db0f8ddb517878341badcb27531eaedc8034ba2e72572bbaa8db07c61781be6063aaee7ef63043d4d5979b98
 AUX vdradmin-3.6.7.init 1860 BLAKE2B e8e93378a56a2a2118a5a3ac0cd879690a09c5508a54d6eb0cf7e827c915df2bcbd894fc53f4eee75eaebba0826e6712fbf3a0c1975101799a0d4575b6679fbb SHA512 73a175c7ae8f233442dedc5d2d94a81a4a63d3973c4548d508496f2d99e06eeb0683f51b8621ee8cefd5111ad2240c90d7225b96fef96b15e618b21418136731
@@ -5,6 +6,7 @@ AUX vdradmind.conf 92 BLAKE2B 14d1abac4f0718dcf0679ffaab81f2d1867cdca3f3cf8534dd
 AUX vdradmind.service 278 BLAKE2B 58b7aca123f3dc6ac00eeed25a241cd4315b93abff33ef66a0a227623a5bfd6fb5c234166a55d66f0d4a7762ab0c9c720f8e2031bf52789a52edc3d07d61bfa2 SHA512 e862d5a54e0f9b1b8c3604933ccea840e1256fac49f1b93cd7c6446f9aa4f6b8371fbd8d8b767574efe2420c7141e7af0cd5578733311a94377db8797de32b28
 DIST vdradmin-am-3.6.10.tar.bz2 606665 BLAKE2B c475b36c840548b6e0d50b2095ce3278b0b526af856c891a25d28bb2f0cb9f950aa9979533a6b6425a2a36a594dc5d6a075fca7713eb1f59071fec854582cf5b SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597
 DIST vdradmin-am-3.6.9.tar.bz2 562006 BLAKE2B d04d7c0c3254942a388fe0f7b9832fb83f5b6c36af8e9021da8b1e5480d0a507c14da3b55590ea3ba4f58e58c7de9f36cc2a3c5f94168be605477244f62da987 SHA512 1c84ce56da238db6ab2a2fc3d59582945440436e174b3998c21b6bcb5b99c914a195728aa24fef7de8841c3be09b6e9976497acd873e768aab5fdaacddd473d5
+EBUILD vdradmin-am-3.6.10-r1.ebuild 4745 BLAKE2B ae6dcfccc5c4ee3bb42f860cb576dc952086c45cb8418bcedae3e3bcdeb99b630754a8cf1f5bbc380d386fa3df7349839fdc04a30d265934a69ecce0a37f77d2 SHA512 4af9d07e394a6e243c88718f73747282d69e60b6d40045d5364d9fda02d860709572ab252b3954f285dc0f0c4d9df417dbaefd9d8290d81e28239e8c02564374
 EBUILD vdradmin-am-3.6.10.ebuild 4768 BLAKE2B cbddb51256653c55a36ffbfab055bf6deb93eba83b1ccafa01c98bd4d8e0237a6b0cf441894281e90d05839098384193666ee9b5a650b87d928cbf420d1f0308 SHA512 cbfe87316898d2cafd01dfb8f3bd681310a80383061c9966d0fc0a246a19cbd1894f7904a2ff94280e17dc148ec1b48c74e71a5475aaa758dacc46f00330b828
 EBUILD vdradmin-am-3.6.9-r3.ebuild 4730 BLAKE2B bdc97dd0b5be9bbf0977c9fd687c9260c14831278e43dbb2ea26a00cb4f494b48ba5571a03b3e049340d381df6beb2891b5c62c9752e0e6dacdda5cf5df72e0a SHA512 69a1ce6c895f45b2b738375bcf14501fb1771f72fbf794b99019398599ed9d553402abb17e7488822cf847440939afa644ab7ce81fdd9d21a2971a91c01d849a
 EBUILD vdradmin-am-3.6.9.ebuild 4315 BLAKE2B b69fc3e119c2ed3eaf70898515b9612012ab3fbd68395eb9c50b59dc8904293f3fd83988db6f0f6d97f47641f0b85787a01547d566dd26ad9b60f7024481c407 SHA512 1ab55053c9eefd90ca28a5cd7659e6da9cb56c1178a1fffff7e7b9a111ec8b1b0ad3631d29c0206c6ddf1996b2ccd7265b62ef5621269056d566930f063499c3
diff --git a/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf b/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf
new file mode 100644
index 000000000000..1895b9c51dd8
--- /dev/null
+++ b/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf
@@ -0,0 +1,19 @@
+# Settings for vdradmin-am
+
+# Use ssl connection
+# Allowed values: yes no
+# SSL using will disable non SSL connections
+#SSL=no
+
+# Use the ipv6 protocol [EXPERIMENTAL]
+# Allowed values: yes no
+#IPV6=no
+
+# Enable Logging
+# Allowed values: syslog file no
+# Setting this value to file will log to /var/log/vdradmin/vdradmind.log
+#LOGGING=no
+
+# Set loglevel
+# Allowed values: 0-7
+#LOGLEVEL=4
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
new file mode 100644
index 000000000000..0e82c2c70929
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ssl-cert systemd
+
+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="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 ssl"
+
+DEPEND="acct-group/vdradmin
+	acct-user/vdradmin
+	dev-lang/perl
+	dev-perl/Template-Toolkit
+	dev-perl/libwww-perl
+	dev-perl/URI
+	dev-perl/CGI
+	dev-perl/Locale-gettext
+	virtual/perl-IO-Compress
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ssl? ( dev-perl/IO-Socket-SSL )
+	virtual/perl-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"
+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
+}
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}"/vdradmind.service "${WORKDIR}"/vdradmind.service
+}
+
+src_prepare() {
+	default
+
+	sed -i vdradmind.pl \
+		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g" || die
+
+	if use ipv6; then
+		sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
+			-i "${WORKDIR}"/vdradmind.service || die
+	fi
+
+	if use ssl; then
+		sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
+			-i "${WORKDIR}"/vdradmind.service || die
+	fi
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
+	newconfd "${FILESDIR}"/vdradmin-3.6.10.conf vdradmin
+
+	systemd_dounit "${WORKDIR}"/vdradmind.service
+	systemd_dotmpfilesd "${FILESDIR}"/vdradmind.conf
+
+	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/*
+
+	keepdir "${ETC_DIR}"
+	fowners "${VDRADMIN_USER}":"${VDRADMIN_GROUP}" "${ETC_DIR}"
+
+	use ssl && keepdir "${CERTS_DIR}" && \
+	fowners "${VDRADMIN_USER}":"${VDRADMIN_GROUP}" "${CERTS_DIR}"
+}
+
+pkg_preinst() {
+	install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
+		"${ED}"${ETC_DIR}/vdradmind.conf || die
+
+	if [[ -f "${EROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+		cp "${EROOT}"${ETC_DIR}/vdradmind.conf \
+			"${ED}"${ETC_DIR}/vdradmind.conf || die
+	else
+		elog
+		elog "Creating a new config-file."
+		echo
+
+		cat <<-EOF > "${ED}"${ETC_DIR}/vdradmind.conf
+			VDRCONFDIR = "${EROOT}"/etc/vdr
+			VIDEODIR = "${EROOT}"/var/vdr/video
+			EPG_FILENAME = "${EROOT}"/var/vdr/video/epg.data
+			EPGIMAGES = "${EROOT}"/var/vdr/video/epgimages
+			PASSWORD = gentoo-vdr
+			USERNAME = gentoo-vdr
+		EOF
+		# Feed it with newlines
+		yes "" \
+			| "${ED}"/usr/bin/vdradmind --cfgdir "${ED}"${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 ${EROOT}/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 ${EROOT}/etc/conf.d/vdradmin"
+
+		if [[ ! -f "${EROOT}"${CERTS_DIR}/server-cert.pem || \
+			! -f "${EROOT}"${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 "${EROOT}"${CERTS_DIR}/server-key.pem || die
+			install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+				"${base}".crt "${EROOT}"${CERTS_DIR}/server-cert.pem || die
+		fi
+	fi
+
+	elog
+	elog "To extend ${PN} you can emerge"
+	elog "media-plugins/vdr-epgsearch to search the EPG,"
+	elog "media-plugins/vdr-streamdev for livetv streaming and/or"
+	elog "media-video/vdr with USE=\"liemikuutio/vasarajanauloja/none\" "
+	elog "(depend on your vdr version) to rename recordings"
+	elog "on the machine running the VDR you connect to with ${PN}."
+}
+
+pkg_config() {
+	"${EROOT}"/usr/bin/vdradmind -c
+}