* [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/
@ 2020-12-17 12:44 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2020-12-17 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 9db3a67ba0f2c1b86b1f0825770f6fb3dd791a2e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 12:43:32 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 12:43:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db3a67b
www-misc/vdradmin-am: Stabilize 3.6.10-r1 amd64, #757522
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 8a225ac3f56..d3dd72da604 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="ipv6 ssl"
DEPEND="acct-group/vdradmin
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/
@ 2021-07-30 23:31 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-07-30 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 6faf7ae088245853aa3a1e2f8ea1f633acb47ea7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 30 23:15:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 30 23:30:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6faf7ae0
www-misc/vdradmin-am: [QA] call tmpfiles_process in pkg_postinst
This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
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
index 7ceb43a448d..d4dfe74d614 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -142,6 +142,8 @@ pkg_preinst() {
}
pkg_postinst() {
+ tmpfiles_process vdradmind.conf
+
if use ipv6; then
elog
elog "To make use of the ipv6 protocol"
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/
@ 2021-05-09 9:15 Agostino Sarubbo
0 siblings, 0 replies; 8+ messages in thread
From: Agostino Sarubbo @ 2021-05-09 9:15 UTC (permalink / raw
To: gentoo-commits
commit: a9cb1e4564e052804136993fb09c7e636cdc135f
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 9 09:15:48 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 9 09:15:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cb1e45
www-misc/vdradmin-am: amd64 stable wrt bug #788685
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
www-misc/vdradmin-am/vdradmin-am-3.6.10-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r2.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r2.ebuild
index 7171ff75f7e..57557430704 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r2.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="ipv6 ssl systemd"
DEPEND="
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/
@ 2021-03-07 11:58 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2021-03-07 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 9026e76af3f06ddc8c4999997a3a1f289e1b0eee
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sun Mar 7 11:57:58 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 11:57:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9026e76a
www-misc/vdradmin-am: migrate to tmpfiles.eclass
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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
index d3dd72da604..7ceb43a448d 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit ssl-cert systemd
+inherit ssl-cert systemd tmpfiles
DESCRIPTION="WWW Admin for the Video Disk Recorder"
HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
@@ -75,7 +75,7 @@ src_install() {
newconfd "${FILESDIR}"/vdradmin-3.6.10.conf vdradmin
systemd_dounit "${WORKDIR}"/vdradmind.service
- systemd_dotmpfilesd "${FILESDIR}"/vdradmind.conf
+ dotmpfiles "${FILESDIR}"/vdradmind.conf
insinto /etc/logrotate.d
newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/
@ 2020-12-17 14:50 Aaron Bauman
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Bauman @ 2020-12-17 14:50 UTC (permalink / raw
To: gentoo-commits
commit: ff99aa2dd844e6f478597752496a2f0dbdc7d891
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 14:42:43 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 14:50:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff99aa2d
www-misc/vdradmin-am: drop old
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
www-misc/vdradmin-am/Manifest | 1 -
www-misc/vdradmin-am/metadata.xml | 6 -
www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild | 180 -----------------------
www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild | 177 ----------------------
www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild | 160 --------------------
5 files changed, 524 deletions(-)
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 98aaf276839..3bdcee76687 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -1,2 +1 @@
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
diff --git a/www-misc/vdradmin-am/metadata.xml b/www-misc/vdradmin-am/metadata.xml
index 692eb1a3b64..984a01fab26 100644
--- a/www-misc/vdradmin-am/metadata.xml
+++ b/www-misc/vdradmin-am/metadata.xml
@@ -5,10 +5,4 @@
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
- <use>
- <flag name="vdr">
- Support for media-video/vdr.
- Disable this if the VDR you want to control runs at a remote machine.
- </flag>
- </use>
</pkgmetadata>
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
deleted file mode 100644
index 4bc211d3705..00000000000
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ssl-cert systemd user
-
-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"
-
-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 )
- 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
-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_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.6.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/*
-
- 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 \
- "${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-0.9.25 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
-}
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
deleted file mode 100644
index 64aadf4d8c1..00000000000
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils ssl-cert systemd user
-
-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"
-
-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 )
- 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
-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_unpack() {
- unpack ${A}
- cp "${FILESDIR}"/vdradmind.service "${WORKDIR}"/vdradmind.service
-}
-
-src_prepare() {
- 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
- fi
-
- if use ssl; then
- sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
- -i "${WORKDIR}"/vdradmind.service
- fi
-}
-
-src_install() {
- newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
- newconfd "${FILESDIR}"/vdradmin-3.6.6.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/*
-
- 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/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() {
- "${ROOT}"/usr/bin/vdradmind -c
-}
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
deleted file mode 100644
index 5809bec4db5..00000000000
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils ssl-cert user
-
-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 )
- 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
-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/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() {
- "${ROOT}"/usr/bin/vdradmind -c
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/
@ 2020-12-03 2:01 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2020-12-03 2:01 UTC (permalink / raw
To: gentoo-commits
commit: 38dbb6a52c4641a7be6501a5853ea94ab653138e
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 3 01:59:49 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 02:01:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38dbb6a5
www-misc/vdradmin-am: x86 stable (bug #757522)
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 0e82c2c7092..8a225ac3f56 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="ipv6 ssl"
DEPEND="acct-group/vdradmin
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/
@ 2020-01-12 18:38 Jörg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Jörg Bornkessel @ 2020-01-12 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 234faac867f2994c0a4e73019a58a98b76f616f7
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 18:03:23 2020 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 18:38:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234faac8
www-misc/vdradmin-am: missing die's added
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 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 17158acefd5..4bc211d3705 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -61,16 +61,16 @@ src_prepare() {
default
sed -i vdradmind.pl \
- -e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g"
+ -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
+ -i "${WORKDIR}"/vdradmind.service || die
fi
if use ssl; then
sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
- -i "${WORKDIR}"/vdradmind.service
+ -i "${WORKDIR}"/vdradmind.service || die
fi
}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/
@ 2019-12-11 20:22 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2019-12-11 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 4946702d8aa824594f8f9e40282b1a1364bb9aa6
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 20:21:11 2019 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> 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 <hd_brummy <AT> 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"
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-07-30 23:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-17 12:44 [gentoo-commits] repo/gentoo:master commit in: www-misc/vdradmin-am/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-07-30 23:31 Sam James
2021-05-09 9:15 Agostino Sarubbo
2021-03-07 11:58 David Seifert
2020-12-17 14:50 Aaron Bauman
2020-12-03 2:01 Thomas Deutschmann
2020-01-12 18:38 Jörg Bornkessel
2019-12-11 20:22 Joerg Bornkessel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox