Gentoo Archives: gentoo-commits

From: Austin English <wizardedit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/
Date: Tue, 26 Apr 2016 00:01:15
Message-Id: 1461628859.8580aac640282aa848c37594f447333fab688062.wizardedit@gentoo
1 commit: 8580aac640282aa848c37594f447333fab688062
2 Author: Austin English <wizardedit <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 00:00:38 2016 +0000
4 Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 00:00:59 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8580aac6
7
8 app-backup/backuppc: remove backuppc-3.3.0-r1 / backuppc-3.3.1-r1
9
10 Package-Manager: portage-2.2.26
11
12 app-backup/backuppc/backuppc-3.3.0-r1.ebuild | 223 ---------------------------
13 app-backup/backuppc/backuppc-3.3.1-r1.ebuild | 195 -----------------------
14 2 files changed, 418 deletions(-)
15
16 diff --git a/app-backup/backuppc/backuppc-3.3.0-r1.ebuild b/app-backup/backuppc/backuppc-3.3.0-r1.ebuild
17 deleted file mode 100644
18 index 1183720..0000000
19 --- a/app-backup/backuppc/backuppc-3.3.0-r1.ebuild
20 +++ /dev/null
21 @@ -1,223 +0,0 @@
22 -# Copyright 1999-2014 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Id$
25 -
26 -EAPI="5"
27 -
28 -inherit eutils systemd webapp user
29 -
30 -MY_P="BackupPC-${PV}"
31 -
32 -DESCRIPTION="A high-performance system for backing up computers to a server's disk"
33 -HOMEPAGE="http://backuppc.sourceforge.net/"
34 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
35 -
36 -LICENSE="GPL-2"
37 -KEYWORDS="amd64 ~arm x86"
38 -
39 -IUSE="rss samba"
40 -
41 -DEPEND="dev-lang/perl
42 - app-admin/apache-tools
43 - app-admin/makepasswd"
44 -RDEPEND="${DEPEND}
45 - virtual/perl-IO-Compress
46 - dev-perl/Archive-Zip
47 - dev-perl/libwww-perl
48 - >=app-arch/tar-1.13.20
49 - app-arch/par2cmdline
50 - app-arch/gzip
51 - app-arch/bzip2
52 - virtual/mta
53 - www-apache/mod_perl
54 - www-servers/apache
55 - net-misc/rsync
56 - >=dev-perl/File-RsyncP-0.68
57 - rss? ( dev-perl/XML-RSS )
58 - samba? ( net-fs/samba )"
59 -
60 -WEBAPP_MANUAL_SLOT="yes"
61 -SLOT="0"
62 -
63 -S=${WORKDIR}/${MY_P}
64 -
65 -CONFDIR="/etc/BackupPC"
66 -DATADIR="/var/lib/backuppc"
67 -LOGDIR="/var/log/BackupPC"
68 -
69 -pkg_setup() {
70 - webapp_pkg_setup
71 - enewgroup backuppc
72 - enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
73 -}
74 -
75 -src_prepare() {
76 - epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
77 - epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
78 - epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
79 -
80 - # Fix the documentation location in the CGI interface
81 - epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
82 - sed -i "s+__DOCDIR__+/usr/share/doc/${PF}+" "lib/BackupPC/CGI/View.pm"
83 -
84 - epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
85 - sed -i -e 's/--chuid ${USER}//' "${S}"/init.d/src/gentoo-backuppc || die "Failed to fix the init script"
86 -}
87 -
88 -src_test() {
89 - true
90 -}
91 -
92 -src_install() {
93 - webapp_src_preinst
94 -
95 - local myconf
96 - myconf=""
97 - if use samba ; then
98 - myconf="--bin-path smbclient=$(type -p smbclient)"
99 - myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
100 - fi
101 -
102 - /usr/bin/env perl ./configure.pl \
103 - --batch \
104 - --bin-path perl=$(type -p perl) \
105 - --bin-path tar=$(type -p tar) \
106 - --bin-path rsync=$(type -p rsync) \
107 - --bin-path ping=$(type -p ping) \
108 - --bin-path df=$(type -p df) \
109 - --bin-path ssh=$(type -p ssh) \
110 - --bin-path sendmail=$(type -p sendmail) \
111 - --bin-path hostname=$(type -p hostname) \
112 - --bin-path gzip=$(type -p gzip) \
113 - --bin-path bzip2=$(type -p bzip2) \
114 - --config-dir ${CONFDIR} \
115 - --install-dir /usr \
116 - --data-dir ${DATADIR} \
117 - --hostname $(hostname) \
118 - --uid-ignore \
119 - --dest-dir "${D%/}" \
120 - --html-dir ${MY_HTDOCSDIR}/image \
121 - --html-dir-url /image \
122 - --cgi-dir ${MY_HTDOCSDIR} \
123 - --fhs \
124 - ${myconf} || die "failed the configure.pl script"
125 -
126 - ebegin "Installing documentation"
127 -
128 - pod2man \
129 - -errors=none \
130 - --section=8 \
131 - --center="BackupPC manual" \
132 - "${S}"/doc/BackupPC.pod backuppc.8 || die "failed to generate man page"
133 -
134 - doman backuppc.8
135 -
136 - # Place the documentation in the correct location
137 - dodoc "${D}/usr/doc/BackupPC.html"
138 - dodoc "${D}/usr/doc/BackupPC.pod"
139 - rm -rf "${D}/usr/doc"
140 -
141 - eend 0
142 -
143 - # Setup directories
144 - dodir ${CONFDIR}/pc
145 -
146 - keepdir ${CONFDIR}
147 - keepdir ${CONFDIR}/pc
148 - keepdir ${DATADIR}/{trash,pool,pc,cpool}
149 - keepdir ${LOGDIR}
150 -
151 - ebegin "Setting up init.d/conf.d/systemd scripts"
152 - newinitd "${S}"/init.d/gentoo-backuppc backuppc
153 - newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
154 - systemd_dounit "${FILESDIR}/${PN}.service"
155 - eend 0
156 -
157 - ebegin "Setting up an apache instance for backuppc"
158 -
159 - cp "${FILESDIR}/apache2-backuppc."{conf,init} "${WORKDIR}/"
160 - cp "${FILESDIR}/httpd.conf" "${WORKDIR}/httpd.conf"
161 - sed -i -e "s+HTDOCSDIR+${MY_HTDOCSDIR}+g" "${WORKDIR}/httpd.conf"
162 - sed -i -e "s+AUTHFILE+${CONFDIR}/users.htpasswd+g" "${WORKDIR}/httpd.conf"
163 -
164 - moduledir="/usr/lib/apache2/modules"
165 -
166 - # Check if the Apache ServerRoot is real.
167 - # This is sometimes broken on older amd64 systems.
168 - # In this case we just patch our config file appropriately.
169 - if [[ ! -d "/usr/lib/apache2" ]]; then
170 - if [[ -d "/usr/lib64/apache2" ]]; then
171 - sed -i -e "s+/usr/lib/apache2+/usr/lib64/apache2+g" "${WORKDIR}/httpd.conf"
172 - sed -i -e "s+/usr/lib/apache2+/usr/lib64/apache2+g" "${WORKDIR}/apache2-backuppc.conf"
173 - moduledir="/usr/lib64/apache2/modules"
174 - fi
175 - fi
176 -
177 - # Check if we're using mod_cgid instead of mod_cgi
178 - # This happens if you install apache with USE="threads"
179 - if [[ -f "${moduledir}/mod_cgid.so" ]]; then
180 - sed -i -e "s+mod_cgi+mod_cgid+g" "${WORKDIR}/httpd.conf"
181 - sed -i -e "s+cgi_module+cgid_module+g" "${WORKDIR}/httpd.conf"
182 - fi
183 -
184 - # Install conf.d/init.d files for apache2-backuppc
185 - if [ -e /etc/init.d/apache2 ]; then
186 - newconfd "${WORKDIR}/apache2-backuppc.conf" apache2-backuppc
187 - newinitd /etc/init.d/apache2 apache2-backuppc
188 - else
189 - newconfd "${WORKDIR}/apache2-backuppc.conf" apache2-backuppc
190 - newinitd "${WORKDIR}/apache2-backuppc.init" apache2-backuppc
191 - fi
192 -
193 - insopts -m 0644
194 - insinto ${CONFDIR}
195 - doins "${WORKDIR}/httpd.conf"
196 -
197 - eend $?
198 -
199 - webapp_src_install || die "webapp_src_install"
200 -
201 - # Make sure that the ownership is correct
202 - chown -R backuppc:backuppc "${D}${CONFDIR}"
203 - chown -R backuppc:backuppc "${D}${DATADIR}"
204 - chown -R backuppc:backuppc "${D}${LOGDIR}"
205 -}
206 -
207 -pkg_postinst() {
208 - # This is disabled since BackupPC doesn't need it
209 - # webapp_pkg_postinst
210 -
211 - elog "Installation finished, now may now start using BackupPC."
212 - elog ""
213 - elog "- Read the documentation in /usr/share/doc/${PF}/BackupPC.html"
214 - elog " Please pay special attention to the security section."
215 - elog ""
216 - elog "- You can launch backuppc and it's apache web interface by running:"
217 - elog " # /etc/init.d/backuppc start"
218 - elog " # /etc/init.d/apache2-backuppc start"
219 -
220 - if [[ ! -e /etc/runlevels/default/backuppc ]]; then
221 - elog ""
222 - elog "- You also might want to add these scripts to your default runlevel:"
223 - elog " # rc-update add backuppc default"
224 - elog " # rc-update add apache2-backuppc default"
225 - fi
226 -
227 - # Generate a new password if there's no auth file
228 - if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then
229 - adminuser="backuppc"
230 - adminpass=$( makepasswd --chars=12 )
231 - htpasswd -bc "${CONFDIR}/users.htpasswd" $adminuser $adminpass
232 -
233 - elog ""
234 - elog "- Created admin user $adminuser with password $adminpass"
235 - elog " To add new users, run: "
236 - elog " # htpasswd ${CONFDIR}/users.htpasswd newUser"
237 - fi
238 -
239 - if [[ -d "/etc/backuppc" ]]; then
240 - ewarn ""
241 - ewarn "Detected old config directory in /etc/backuppc"
242 - ewarn "Please migrate relevant config files to ${CONFDIR} before starting backuppc"
243 - fi
244 -}
245
246 diff --git a/app-backup/backuppc/backuppc-3.3.1-r1.ebuild b/app-backup/backuppc/backuppc-3.3.1-r1.ebuild
247 deleted file mode 100644
248 index a40e0ae..0000000
249 --- a/app-backup/backuppc/backuppc-3.3.1-r1.ebuild
250 +++ /dev/null
251 @@ -1,195 +0,0 @@
252 -# Copyright 1999-2016 Gentoo Foundation
253 -# Distributed under the terms of the GNU General Public License v2
254 -# $Id$
255 -
256 -EAPI=5
257 -
258 -inherit depend.apache eutils user systemd
259 -
260 -MY_P="BackupPC-${PV}"
261 -
262 -DESCRIPTION="High-performance backups to a server's disk"
263 -HOMEPAGE="http://backuppc.sourceforge.net/"
264 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
265 -
266 -LICENSE="GPL-2"
267 -KEYWORDS="~amd64 ~x86"
268 -
269 -IUSE="rss samba"
270 -
271 -# The CGI modules are handled in $RDEPEND.
272 -APACHE_MODULES="apache2_modules_alias," # RedirectMatch
273 -APACHE_MODULES+="apache2_modules_authn_core," # AuthType
274 -APACHE_MODULES+="apache2_modules_authz_core," # Require
275 -APACHE_MODULES+="apache2_modules_authz_host," # Require host
276 -APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
277 -
278 -DEPEND="dev-lang/perl
279 - app-admin/apache-tools
280 - app-admin/makepasswd"
281 -
282 -# Older versions of mod_perl think they're compatibile with apache-2.4,
283 -# so we require the new one explicitly.
284 -RDEPEND="${DEPEND}
285 - virtual/perl-IO-Compress
286 - dev-perl/Archive-Zip
287 - dev-perl/libwww-perl
288 - app-arch/tar
289 - app-arch/par2cmdline
290 - app-arch/gzip
291 - app-arch/bzip2
292 - virtual/mta
293 - >=www-apache/mod_perl-2.0.9
294 - www-apache/mpm_itk
295 - || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
296 - >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
297 - >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
298 - net-misc/rsync
299 - dev-perl/File-RsyncP
300 - rss? ( dev-perl/XML-RSS )
301 - samba? ( net-fs/samba )"
302 -
303 -need_apache2_4
304 -
305 -SLOT="0"
306 -
307 -S="${WORKDIR}/${MY_P}"
308 -
309 -CGIDIR="/usr/lib/backuppc/htdocs"
310 -CONFDIR="/etc/BackupPC"
311 -DATADIR="/var/lib/backuppc"
312 -DOCDIR="/usr/share/doc/${PF}"
313 -LOGDIR="/var/log/BackupPC"
314 -
315 -pkg_setup() {
316 - enewgroup backuppc
317 - enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
318 -}
319 -
320 -src_prepare() {
321 - epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
322 - epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
323 - epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
324 -
325 - epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
326 - epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
327 -
328 - # Fix docs location using the marker that we've patched in.
329 - sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
330 - || die "failed to sed the documentation location"
331 -}
332 -
333 -src_install() {
334 - local myconf
335 - myconf=""
336 - if use samba ; then
337 - myconf="--bin-path smbclient=$(type -p smbclient)"
338 - myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
339 - fi
340 -
341 - /usr/bin/env perl ./configure.pl \
342 - --batch \
343 - --bin-path perl=$(type -p perl) \
344 - --bin-path tar=$(type -p tar) \
345 - --bin-path rsync=$(type -p rsync) \
346 - --bin-path ping=$(type -p ping) \
347 - --bin-path df=$(type -p df) \
348 - --bin-path ssh=$(type -p ssh) \
349 - --bin-path sendmail=$(type -p sendmail) \
350 - --bin-path hostname=$(type -p hostname) \
351 - --bin-path gzip=$(type -p gzip) \
352 - --bin-path bzip2=$(type -p bzip2) \
353 - --config-dir "${CONFDIR}" \
354 - --install-dir /usr \
355 - --data-dir "${DATADIR}" \
356 - --hostname 127.0.0.1 \
357 - --uid-ignore \
358 - --dest-dir "${D%/}" \
359 - --html-dir "${CGIDIR}"/image \
360 - --html-dir-url /image \
361 - --cgi-dir "${CGIDIR}" \
362 - --fhs \
363 - ${myconf} || die "failed the configure.pl script"
364 -
365 - ebegin "Installing documentation"
366 -
367 - pod2man \
368 - -errors=none \
369 - --section=8 \
370 - --center="BackupPC manual" \
371 - "${S}"/doc/BackupPC.pod backuppc.8 \
372 - || die "failed to generate man page"
373 -
374 - doman backuppc.8
375 -
376 - # Place the documentation in the correct location
377 - dodoc "${D}/usr/doc/BackupPC.html"
378 - dodoc "${D}/usr/doc/BackupPC.pod"
379 - rm -rf "${D}/usr/doc" || die
380 -
381 - eend 0
382 -
383 - # Setup directories
384 - dodir "${CONFDIR}/pc"
385 -
386 - keepdir "${CONFDIR}"
387 - keepdir "${CONFDIR}/pc"
388 - keepdir "${DATADIR}"/{trash,pool,pc,cpool}
389 - keepdir "${LOGDIR}"
390 -
391 - ebegin "Setting up init.d/conf.d/systemd scripts"
392 - newinitd "${S}"/init.d/gentoo-backuppc backuppc
393 - newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
394 - systemd_dounit "${FILESDIR}/${PN}.service"
395 -
396 - insinto "${APACHE_MODULES_CONFDIR}"
397 - doins "${FILESDIR}"/99_backuppc.conf
398 -
399 - # Make sure that the ownership is correct
400 - chown -R backuppc:backuppc "${D}${CONFDIR}" || die
401 - chown -R backuppc:backuppc "${D}${DATADIR}" || die
402 - chown -R backuppc:backuppc "${D}${LOGDIR}" || die
403 -}
404 -
405 -pkg_postinst() {
406 - elog "Installation finished, you may now start using BackupPC."
407 - elog
408 - elog "- Read the documentation in /usr/share/doc/${PF}/BackupPC.html"
409 - elog " Please pay special attention to the security section."
410 - elog
411 - elog "- You can launch backuppc by running:"
412 - elog
413 - elog " # /etc/init.d/backuppc start"
414 - elog
415 - elog "- To enable the GUI, first edit ${ROOT}etc/conf.d/apache2 and add,"
416 - elog
417 - elog " \"-D BACKUPPC -D PERL -D MPM_ITK\""
418 - elog
419 - elog " to the APACHE2_OPTS line."
420 - elog
421 - elog " Then you must edit ${ROOT}etc/apache2/modules.d/00_mpm_itk.conf"
422 - elog " and adjust the values of LimitUIDRange/LimitGIDRange to include"
423 - elog " the UID and GID of the backuppc user."
424 - elog
425 - elog " Finally, start apache:"
426 - elog
427 - elog " # /etc/init.d/apache2 start"
428 - elog
429 - elog " The web interface should now be running on,"
430 - elog
431 - elog " http://127.0.0.1:8080/"
432 - elog
433 -
434 - # Generate a new password if there's no auth file
435 - if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then
436 - adminuser="backuppc"
437 - adminpass=$( makepasswd --chars=12 )
438 - htpasswd -bc "${CONFDIR}/users.htpasswd" $adminuser $adminpass
439 -
440 - elog ""
441 - elog "- Created admin user $adminuser with password $adminpass"
442 - elog " To add new users, run: "
443 - elog ""
444 - elog " # htpasswd ${CONFDIR}/users.htpasswd newUser"
445 - fi
446 -}