* [gentoo-commits] gentoo-x86 commit in app-backup/backuppc: ChangeLog backuppc-3.2.1.ebuild
@ 2011-08-29 10:41 Patrick Lauer (patrick)
0 siblings, 0 replies; 2+ messages in thread
From: Patrick Lauer (patrick) @ 2011-08-29 10:41 UTC (permalink / raw
To: gentoo-commits
patrick 11/08/29 10:41:07
Modified: ChangeLog
Added: backuppc-3.2.1.ebuild
Log:
Bump for #287133, ebuild from the portage-backup overlay. Thanks to Lenno Nagel.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.9 app-backup/backuppc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/backuppc/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 12 Oct 2009 17:17:02 -0000 1.8
+++ ChangeLog 29 Aug 2011 10:41:07 -0000 1.9
@@ -1,6 +1,18 @@
# ChangeLog for app-backup/backuppc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/ChangeLog,v 1.8 2009/10/12 17:17:02 halcy0n Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/ChangeLog,v 1.9 2011/08/29 10:41:07 patrick Exp $
+
+*backuppc-3.2.1 (29 Aug 2011)
+
+ 29 Aug 2011; Patrick Lauer <patrick@gentoo.org>
+ +files/3.2.0/01-fix-configure.pl.patch,
+ +files/3.2.0/02-fix-config.pl-formatting.patch,
+ +files/3.2.0/03-reasonable-config.pl-defaults.patch,
+ +files/3.2.0/04-add-docdir-marker.patch, +files/3.2.0/05-nicelevel.patch,
+ +files/apache2-backuppc.conf, +files/apache2-backuppc.init,
+ +backuppc-3.2.1.ebuild, +files/httpd.conf:
+ Bump for #287133, ebuild from the portage-backup overlay. Thanks to Lenno
+ Nagel.
12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> backuppc-2.1.2-r1.ebuild:
QA fixes; unquoted variables
1.1 app-backup/backuppc/backuppc-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild?rev=1.1&content-type=text/plain
Index: backuppc-3.2.1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild,v 1.1 2011/08/29 10:41:07 patrick Exp $
EAPI="2"
inherit eutils webapp
MY_P="BackupPC-${PV}"
DESCRIPTION="A high-performance system for backing up computers to a server's disk."
HOMEPAGE="http://backuppc.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
IUSE="rss samba"
DEPEND="dev-lang/perl
app-admin/apache-tools
app-admin/makepasswd"
RDEPEND="${DEPEND}
perl-core/IO-Compress
dev-perl/Archive-Zip
dev-perl/libwww-perl
>=app-arch/tar-1.13.20
app-arch/par2cmdline
app-arch/gzip
app-arch/bzip2
virtual/mta
www-apache/mod_perl
www-servers/apache
net-misc/rsync
>=dev-perl/File-RsyncP-0.68
rss? ( dev-perl/XML-RSS )
samba? ( net-fs/samba )"
WEBAPP_MANUAL_SLOT="yes"
SLOT="0"
S=${WORKDIR}/${MY_P}
CONFDIR="/etc/BackupPC"
DATADIR="/var/lib/backuppc"
LOGDIR="/var/log/BackupPC"
pkg_setup() {
webapp_pkg_setup
enewgroup backuppc
enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
}
src_unpack() {
unpack ${A}
cd "${S}"
}
src_prepare() {
epatch "${FILESDIR}/3.2.0/01-fix-configure.pl.patch"
epatch "${FILESDIR}/3.2.0/02-fix-config.pl-formatting.patch"
epatch "${FILESDIR}/3.2.0/03-reasonable-config.pl-defaults.patch"
# Fix the documentation location in the CGI interface
epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
sed -i "s+__DOCDIR__+/usr/share/doc/${PF}+" "lib/BackupPC/CGI/View.pm"
epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
}
src_test() {
true
}
src_install() {
webapp_src_preinst
local myconf
myconf=""
if use samba ; then
myconf="--bin-path smbclient=$(type -p smbclient)"
myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
fi
./configure.pl \
--batch \
--bin-path perl=$(type -p perl) \
--bin-path tar=$(type -p tar) \
--bin-path rsync=$(type -p rsync) \
--bin-path ping=$(type -p ping) \
--bin-path df=$(type -p df) \
--bin-path ssh=$(type -p ssh) \
--bin-path sendmail=$(type -p sendmail) \
--bin-path hostname=$(type -p hostname) \
--bin-path gzip=$(type -p gzip) \
--bin-path bzip2=$(type -p bzip2) \
--config-dir ${CONFDIR} \
--install-dir /usr \
--data-dir ${DATADIR} \
--hostname $(hostname) \
--uid-ignore \
--dest-dir "${D%/}" \
--html-dir ${MY_HTDOCSDIR}/image \
--html-dir-url /image \
--cgi-dir ${MY_HTDOCSDIR} \
--fhs \
${myconf} || die "failed the configure.pl script"
ebegin "Installing documentation"
pod2man \
--section=8 \
--center="BackupPC manual" \
"${S}"/doc/BackupPC.pod backuppc.8 || die "failed to generate man page"
doman backuppc.8
# Place the documentation in the correct location
dodoc "${D}/usr/doc/BackupPC.html"
dodoc "${D}/usr/doc/BackupPC.pod"
rm -rf "${D}/usr/doc"
eend 0
# Setup directories
dodir ${CONFDIR}/pc
keepdir ${CONFDIR}
keepdir ${CONFDIR}/pc
keepdir ${DATADIR}/{trash,pool,pc,cpool}
keepdir ${LOGDIR}
ebegin "Setting up init.d/conf.d scripts"
newinitd "${S}"/init.d/gentoo-backuppc backuppc
newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
eend 0
ebegin "Setting up an apache instance for backuppc"
cp "${FILESDIR}/apache2-backuppc."{conf,init} "${WORKDIR}/"
cp "${FILESDIR}/httpd.conf" "${WORKDIR}/httpd.conf"
sed -i -e "s+HTDOCSDIR+${MY_HTDOCSDIR}+g" "${WORKDIR}/httpd.conf"
sed -i -e "s+AUTHFILE+${CONFDIR}/users.htpasswd+g" "${WORKDIR}/httpd.conf"
moduledir="/usr/lib/apache2/modules"
# Check if the Apache ServerRoot is real.
# This is sometimes broken on older amd64 systems.
# In this case we just patch our config file appropriately.
if [[ ! -d "/usr/lib/apache2" ]]; then
if [[ -d "/usr/lib64/apache2" ]]; then
sed -i -e "s+/usr/lib/apache2+/usr/lib64/apache2+g" "${WORKDIR}/httpd.conf"
sed -i -e "s+/usr/lib/apache2+/usr/lib64/apache2+g" "${WORKDIR}/apache2-backuppc.conf"
moduledir="/usr/lib64/apache2/modules"
fi
fi
# Check if we're using mod_cgid instead of mod_cgi
# This happens if you install apache with USE="threads"
if [[ -f "${moduledir}/mod_cgid.so" ]]; then
sed -i -e "s+mod_cgi+mod_cgid+g" "${WORKDIR}/httpd.conf"
sed -i -e "s+cgi_module+cgid_module+g" "${WORKDIR}/httpd.conf"
fi
# Install conf.d/init.d files for apache2-backuppc
if [ -e /etc/init.d/apache2 ]; then
newconfd "${WORKDIR}/apache2-backuppc.conf" apache2-backuppc
newinitd /etc/init.d/apache2 apache2-backuppc
else
newconfd "${WORKDIR}/apache2-backuppc.conf" apache2-backuppc
newinitd "${WORKDIR}/apache2-backuppc.init" apache2-backuppc
fi
insopts -m 0644
insinto ${CONFDIR}
doins "${WORKDIR}/httpd.conf"
eend $?
webapp_src_install || die "webapp_src_install"
# Make sure that the ownership is correct
chown -R backuppc:backuppc "${D}${CONFDIR}"
chown -R backuppc:backuppc "${D}${DATADIR}"
chown -R backuppc:backuppc "${D}${LOGDIR}"
}
pkg_postinst() {
# This is disabled since BackupPC doesn't need it
# webapp_pkg_postinst
elog "Installation finished, now may now start using BackupPC."
elog ""
elog "- Read the documentation in /usr/share/doc/${PF}/BackupPC.html"
elog " Please pay special attention to the security section."
elog ""
elog "- You can launch backuppc and it's apache web interface by running:"
elog " # /etc/init.d/backuppc start"
elog " # /etc/init.d/apache2-backuppc start"
if [[ ! -e /etc/runlevels/default/backuppc ]]; then
elog ""
elog "- You also might want to add these scripts to your default runlevel:"
elog " # rc-update add backuppc default"
elog " # rc-update add apache2-backuppc default"
fi
# Generate a new password if there's no auth file
if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then
adminuser="backuppc"
adminpass=$( makepasswd --chars=12 )
htpasswd -bc "${CONFDIR}/users.htpasswd" $adminuser $adminpass
elog ""
elog "- Created admin user $adminuser with password $adminpass"
elog " To add new users, run: "
elog " # htpasswd ${CONFDIR}/users.htpasswd newUser"
fi
if [[ -d "/etc/backuppc" ]]; then
ewarn ""
ewarn "Detected old config directory in /etc/backuppc"
ewarn "Please migrate relevant config files to ${CONFDIR} before starting backuppc"
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-backup/backuppc: ChangeLog backuppc-3.2.1.ebuild
@ 2011-08-29 10:47 Patrick Lauer (patrick)
0 siblings, 0 replies; 2+ messages in thread
From: Patrick Lauer (patrick) @ 2011-08-29 10:47 UTC (permalink / raw
To: gentoo-commits
patrick 11/08/29 10:47:00
Modified: ChangeLog backuppc-3.2.1.ebuild
Log:
Moving large patch away
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.10 app-backup/backuppc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/backuppc/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 29 Aug 2011 10:41:07 -0000 1.9
+++ ChangeLog 29 Aug 2011 10:47:00 -0000 1.10
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/backuppc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/ChangeLog,v 1.9 2011/08/29 10:41:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/ChangeLog,v 1.10 2011/08/29 10:47:00 patrick Exp $
+
+ 29 Aug 2011; Patrick Lauer <patrick@gentoo.org>
+ -files/3.2.0/02-fix-config.pl-formatting.patch, backuppc-3.2.1.ebuild:
+ Moving large patch away
*backuppc-3.2.1 (29 Aug 2011)
1.2 app-backup/backuppc/backuppc-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild?r1=1.1&r2=1.2
Index: backuppc-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- backuppc-3.2.1.ebuild 29 Aug 2011 10:41:07 -0000 1.1
+++ backuppc-3.2.1.ebuild 29 Aug 2011 10:47:00 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild,v 1.1 2011/08/29 10:41:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/backuppc-3.2.1.ebuild,v 1.2 2011/08/29 10:47:00 patrick Exp $
EAPI="2"
@@ -10,7 +10,8 @@
DESCRIPTION="A high-performance system for backing up computers to a server's disk."
HOMEPAGE="http://backuppc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+ http://dev.gentooexperimental.org/~dreeevil/02-fix-config.pl-formatting.patch"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
@@ -58,7 +59,7 @@
src_prepare() {
epatch "${FILESDIR}/3.2.0/01-fix-configure.pl.patch"
- epatch "${FILESDIR}/3.2.0/02-fix-config.pl-formatting.patch"
+ epatch "${DISTDIR}/02-fix-config.pl-formatting.patch"
epatch "${FILESDIR}/3.2.0/03-reasonable-config.pl-defaults.patch"
# Fix the documentation location in the CGI interface
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-29 10:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-29 10:41 [gentoo-commits] gentoo-x86 commit in app-backup/backuppc: ChangeLog backuppc-3.2.1.ebuild Patrick Lauer (patrick)
-- strict thread matches above, loose matches on Subject: below --
2011-08-29 10:47 Patrick Lauer (patrick)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox