Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Joerg Bornkessel (hd_brummy)" <hd_brummy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-misc/vdradmin-am: vdradmin-am-3.6.8.ebuild ChangeLog vdradmin-am-3.6.9.ebuild
Date: Fri, 24 Feb 2012 20:55:13
Message-Id: 20120224205501.F0F952004B@flycatcher.gentoo.org
1 hd_brummy 12/02/24 20:55:01
2
3 Modified: vdradmin-am-3.6.8.ebuild ChangeLog
4 Added: vdradmin-am-3.6.9.ebuild
5 Log:
6 bump; #bug 405513, thx to T.Rheinhold for testing
7
8 (Portage version: 2.1.10.11/cvs/Linux i686)
9
10 Revision Changes Path
11 1.4 www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild?r1=1.3&r2=1.4
16
17 Index: vdradmin-am-3.6.8.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- vdradmin-am-3.6.8.ebuild 21 Dec 2011 09:01:25 -0000 1.3
24 +++ vdradmin-am-3.6.8.ebuild 24 Feb 2012 20:55:01 -0000 1.4
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2011 Gentoo Foundation
27 +# Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $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 $
30 +# $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 $
31
32 EAPI=4
33
34 @@ -51,12 +51,6 @@
35 pkg_setup() {
36 enewgroup ${VDRADMIN_GROUP}
37 enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
38 -
39 - if ! use vdr; then
40 - elog
41 - elog "You can run ${PN} outside a vdr install. For minimal"
42 - elog "functionality you need access to the epg.data file of your VDR."
43 - fi
44 }
45
46 src_prepare() {
47
48
49
50 1.25 www-misc/vdradmin-am/ChangeLog
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/vdradmin-am/ChangeLog?rev=1.25&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/vdradmin-am/ChangeLog?rev=1.25&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/vdradmin-am/ChangeLog?r1=1.24&r2=1.25
55
56 Index: ChangeLog
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v
59 retrieving revision 1.24
60 retrieving revision 1.25
61 diff -u -r1.24 -r1.25
62 --- ChangeLog 25 Jan 2012 20:18:37 -0000 1.24
63 +++ ChangeLog 24 Feb 2012 20:55:01 -0000 1.25
64 @@ -1,6 +1,12 @@
65 # ChangeLog for www-misc/vdradmin-am
66 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
67 -# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.24 2012/01/25 20:18:37 billie Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.25 2012/02/24 20:55:01 hd_brummy Exp $
69 +
70 +*vdradmin-am-3.6.9 (24 Feb 2012)
71 +
72 + 24 Feb 2012; Joerg Bornkessel <hd_brummy@g.o>
73 + vdradmin-am-3.6.8.ebuild, +vdradmin-am-3.6.9.ebuild:
74 + bump; #bug 405513, thx to T.Rheinhold for testing
75
76 25 Jan 2012; Daniel Pielmeier <billie@g.o>
77 -vdradmin-am-3.6.7-r1.ebuild:
78
79
80
81 1.1 www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
82
83 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild?rev=1.1&view=markup
84 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild?rev=1.1&content-type=text/plain
85
86 Index: vdradmin-am-3.6.9.ebuild
87 ===================================================================
88 # Copyright 1999-2012 Gentoo Foundation
89 # Distributed under the terms of the GNU General Public License v2
90 # $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 $
91
92 EAPI="4"
93
94 inherit eutils ssl-cert
95
96 DESCRIPTION="WWW Admin for the Video Disk Recorder"
97 HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
98 SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
99
100 LICENSE="LGPL-2.1"
101 SLOT="0"
102 KEYWORDS="~amd64 ~x86"
103 IUSE="ipv6 ssl +vdr"
104
105 DEPEND="dev-lang/perl
106 dev-perl/Template-Toolkit
107 dev-perl/libwww-perl
108 dev-perl/URI
109 dev-perl/Locale-gettext
110 virtual/perl-IO-Compress
111 ipv6? ( dev-perl/IO-Socket-INET6 )
112 ssl? ( dev-perl/IO-Socket-SSL )
113 vdr? ( media-video/vdr )
114 perl-core/libnet
115 dev-perl/Authen-SASL
116 dev-perl/Digest-HMAC"
117 RDEPEND="${DEPEND}"
118
119 ETC_DIR=/etc/vdradmin
120 CERTS_DIR=/etc/vdradmin/certs
121 LIB_DIR=/usr/share/vdradmin
122 CACHE_DIR=/var/cache/vdradmin
123 VDRADMIN_USER=vdradmin
124 VDRADMIN_GROUP=vdradmin
125
126 create_ssl_cert() {
127 # The ssl-cert eclass is not flexible enough so do some steps manually
128 SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
129 SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
130
131 gen_cnf || return 1
132
133 gen_key 1 || return 1
134 gen_csr 1 || return 1
135 gen_crt 1 || return 1
136 }
137
138 pkg_setup() {
139 enewgroup ${VDRADMIN_GROUP}
140 enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
141 }
142
143 src_prepare() {
144 sed -i vdradmind.pl \
145 -e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g" || die
146 }
147
148 src_install() {
149 newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
150 newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
151
152 insinto /etc/logrotate.d
153 newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
154
155 newbin vdradmind.pl vdradmind
156
157 insinto ${LIB_DIR}/template
158 doins -r "${S}"/template/*
159
160 insinto ${LIB_DIR}/lib/Template/Plugin
161 doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
162
163 insinto /usr/share/locale/
164 doins -r "${S}"/locale/*
165
166 newman vdradmind.pl.1 vdradmind.8
167
168 dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
169 docinto contrib
170 dodoc "${S}"/contrib/*
171
172 diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
173 keepdir ${ETC_DIR}
174 use ssl && keepdir ${CERTS_DIR}
175 }
176
177 pkg_preinst() {
178 install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
179 "${D}"${ETC_DIR}/vdradmind.conf || die
180
181 if [[ -f "${ROOT}"${ETC_DIR}/vdradmind.conf ]]; then
182 cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
183 "${D}"${ETC_DIR}/vdradmind.conf || die
184 else
185 elog
186 elog "Creating a new config-file."
187 echo
188
189 cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
190 VDRCONFDIR = "${ROOT%/}"/etc/vdr
191 VIDEODIR = "${ROOT%/}"/var/vdr/video
192 EPG_FILENAME = "${ROOT%/}"/var/vdr/video/epg.data
193 EPGIMAGES = "${ROOT%/}"/var/vdr/video/epgimages
194 PASSWORD = gentoo-vdr
195 USERNAME = gentoo-vdr
196 EOF
197 # Feed it with newlines
198 yes "" \
199 | "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \
200 |sed -e 's/: /: \n/g'
201
202 [[ ${PIPESTATUS[1]} == "0" ]] \
203 || die "Failed to create initial configuration."
204
205 elog
206 elog "Created default user/password: gentoo-vdr/gentoo-vdr"
207 elog
208 elog "You can run \"emerge --config ${PN}\" if the default-values"
209 elog "do not match your installation or change them in the Setup-Menu"
210 elog "of the Web-Interface."
211 fi
212 }
213
214 pkg_postinst() {
215 if use ipv6; then
216 elog
217 elog "To make use of the ipv6 protocol"
218 elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
219 fi
220
221 if use ssl; then
222 elog
223 elog "To use ssl connection to your vdr"
224 elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
225
226 if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \
227 ! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then
228 create_ssl_cert
229 local base=$(get_base 1)
230 install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
231 "${base}".key "${ROOT}"${CERTS_DIR}/server-key.pem || die
232 install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
233 "${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
234 fi
235 fi
236
237 elog
238 elog "To extend ${PN} you can emerge"
239 elog ">=media-plugins/vdr-epgsearch-0.9.25 to search the EPG,"
240 elog "media-plugins/vdr-streamdev for livetv streaming and/or"
241 elog "media-video/vdr with USE=\"liemikuutio\" to rename recordings"
242 elog "on the machine running the VDR you connect to with ${PN}."
243 }
244
245 pkg_config() {
246 "${ROOT}"/usr/bin/vdradmind -c
247 }
Report Message
Find on MARC Find on Google Groups