From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DC91138334 for ; Wed, 11 Dec 2019 20:22:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D0EEE0864; Wed, 11 Dec 2019 20:22:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2493E0864 for ; Wed, 11 Dec 2019 20:22:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78F3E34D94A for ; Wed, 11 Dec 2019 20:22:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 041AD8C6 for ; Wed, 11 Dec 2019 20:22:26 +0000 (UTC) From: "Joerg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joerg Bornkessel" Message-ID: <1576095734.4946702d8aa824594f8f9e40282b1a1364bb9aa6.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild X-VCS-Directories: www-misc/vdradmin-am/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Joerg Bornkessel X-VCS-Revision: 4946702d8aa824594f8f9e40282b1a1364bb9aa6 X-VCS-Branch: master Date: Wed, 11 Dec 2019 20:22:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b21fc88f-3ae7-41c1-8182-842a8211cf37 X-Archives-Hash: 3e95d1bc1698d93ecd2ffcc3236e35d3 commit: 4946702d8aa824594f8f9e40282b1a1364bb9aa6 Author: Joerg Bornkessel gentoo org> AuthorDate: Wed Dec 11 20:21:11 2019 +0000 Commit: Joerg Bornkessel gentoo org> CommitDate: Wed Dec 11 20:22:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4946702d www-misc/vdradmin-am: failed preinst phase fixed failed preinst phase fixed by resolving missing depend, reported by H.Auer & Mark Dominik Buerkle this commit will close wrt bug 593506 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Joerg Bornkessel gentoo.org> www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild | 47 +++++++++++++----------- www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild | 2 +- www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild | 2 +- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild index dd8b73c217f..17158acefd5 100644 --- a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild +++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils ssl-cert systemd user +inherit ssl-cert systemd user DESCRIPTION="WWW Admin for the Video Disk Recorder" HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html" @@ -18,6 +18,7 @@ DEPEND="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 ) @@ -35,7 +36,7 @@ VDRADMIN_USER=vdradmin VDRADMIN_GROUP=vdradmin create_ssl_cert() { - # The ssl-cert eclass is not flexible enough so do some steps manually + # 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`}" @@ -57,8 +58,10 @@ src_unpack() { } src_prepare() { + default + sed -i vdradmind.pl \ - -e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g" || die + -e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g" if use ipv6; then sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \ @@ -105,27 +108,27 @@ src_install() { pkg_preinst() { install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \ - "${D}"${ETC_DIR}/vdradmind.conf || die + "${ED}"${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 + 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 > "${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 + 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 "" \ - | "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \ + | "${ED}"/usr/bin/vdradmind --cfgdir "${ED}"${ETC_DIR} --config \ |sed -e 's/: /: \n/g' [[ ${PIPESTATUS[1]} == "0" ]] \ @@ -144,22 +147,22 @@ 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" + 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 ${ROOT%/}/etc/conf.d/vdradmin" + elog "you need to enable it in ${EROOT}/etc/conf.d/vdradmin" - if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \ - ! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then + 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 "${ROOT}"${CERTS_DIR}/server-key.pem || die + "${base}".key "${EROOT}"${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 + "${base}".crt "${EROOT}"${CERTS_DIR}/server-cert.pem || die fi fi @@ -173,5 +176,5 @@ pkg_postinst() { } pkg_config() { - "${ROOT}"/usr/bin/vdradmind -c + "${EROOT}"/usr/bin/vdradmind -c } diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild index dd8b73c217f..64aadf4d8c1 100644 --- a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild +++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild index bc4de53ee76..5809bec4db5 100644 --- a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild +++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5"