Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removing suexec dependency, since the functionality isn't actually used.

Thanks to Daniel Biro <danman@danman.hu> for reporting this!
  • Loading branch information...
commit 200c55fea88ea9cad54bba00617aedf4dd075a9a 1 parent 4378edc
@lnagel authored
View
9 app-backup/backuppc/ChangeLog
@@ -1,3 +1,12 @@
+# ChangeLog for app-backup/backuppc
+
+*backuppc-3.1.0-r3 (08 Apr 2010)
+
+ 08 Apr 2010; <lenno@gentoo.org> files/apache2-backuppc.conf,
+ +backuppc-3.1.0-r3.ebuild:
+ Removing suexec dependency, since the functionality isn't actually used.
+ Thanks to Daniel Biro <danman@danman.hu> for reporting this!
+
*backuppc-3.1.0-r2 (27 Feb 2010)
27 Feb 2010; <lenno@gentoo.org> -backuppc-3.1.0-r1.ebuild,
View
5 app-backup/backuppc/Manifest
@@ -3,10 +3,11 @@ AUX 02-fix-config.pl-formatting.patch 23106 RMD160 4ef821db3c34416badc8efedd1426
AUX 03-reasonable-config.pl-defaults.patch 1168 RMD160 46321a71c0b3f4c0a49c82fc923edbb82e48e218 SHA1 ef26ef0d3c7c5e91576a22f751747a5e31308496 SHA256 437e7606387e5142550d25aadd1358a2995ef7da1b6d19f66e423a8ad50d51f4
AUX 04-add-docdir-marker.patch 470 RMD160 c077c32a5de7600d0906742510be5bc4612a0d50 SHA1 1117a29c10c00f4456f658be131b4d5c9e31f617 SHA256 9236caf66f1d5cd607ced53173cd127d49bfacb08212e93e0beff37ad80cc4bb
AUX 05-nicelevel.patch 756 RMD160 a26c588c0936f2d3f129aed4c5bbfbada3fef075 SHA1 e1db6fc9c2f450df08162218cb3680da407f3d47 SHA256 a707a592754fadc92a769a488518b355468afa8d57a280e29adff4e8c4384566
-AUX apache2-backuppc.conf 3057 RMD160 c9ad1329302296cc1cbce8c0d48989719872da65 SHA1 36d95931bb6dff59712b7511bf34b6b18486fa11 SHA256 7d832145226cc64386338001709e7fa9da9073b0788d6bf31f25b7d1b4e95a4b
+AUX apache2-backuppc.conf 3047 RMD160 dadd7e4165c5cc25ed2e38b42fbff4ebe8adf35d SHA1 00208a39fd0237a29000517b1c4d64ba3924cc9e SHA256 68204bd1f4e0ce88b1e883f5ca3a46abaeb07ec84b9a92030ab40c8d4af817e8
AUX apache2-backuppc.init 3800 RMD160 9a4a4c55671738447ef131480ca41506baf947b8 SHA1 6ffef133a0b523e4e0d428b8a5282632303d61a2 SHA256 a8b29805a82315f47e0b8e8583c530ba0e4c0b0393001bed4cd2759c2a0c6bb9
AUX httpd.conf 11857 RMD160 f2eac3a1f88cc5ac7420d33dc4c6e61e7aa49357 SHA1 ce6c673ac2ce5ed11bc640fcc8b50cadbf6d78ca SHA256 20a5e1b7c9c0ccd0627a72c9bc8b4b6febcecf8912a990516373ea5899d33d9c
DIST BackupPC-3.1.0.tar.gz 474981 RMD160 22d4cb6dd76f846fde489a301852f50e8db1ae1d SHA1 3bd6d637f4f08f2fda44a12668b91d47c4abb0a7 SHA256 49a2744cb9aaf27b298ec3d2e83e46fdb86fb3596922beb3904cb6ae552c148a
EBUILD backuppc-3.1.0-r2.ebuild 6027 RMD160 59020073b4d7b192dfca2b550ec0f7a3f77df986 SHA1 0f60f08982fdc942360b36e2222f054abff94422 SHA256 8f67e700d80af0654e4e8b79c494cd03afa2ff3d47f7b4f7a07ae44ad92dce81
-MISC ChangeLog 228 RMD160 011727c5e4b5e3c01af5bbfbdaa47373da5ec0c8 SHA1 44be7cd2d4f0ed9f98c9fcb640f37e2067f5b6cf SHA256 7f50b18c97761a7b351b4dc360f87ecbde63952946c9304c91c7b817b8834f89
+EBUILD backuppc-3.1.0-r3.ebuild 6019 RMD160 f83765d40e4e228abcaf43f244be9ddf3ab2c435 SHA1 94aee0e7fa8afa175b2a223664b132c89b078c8a SHA256 7679f61467e4faa56c59155d65b8f7da8fafc5e64959d61cf271a0cf7a5607b2
+MISC ChangeLog 530 RMD160 82e7b4ab2a7853c1ab0952440c2bcb4453f37621 SHA1 88116b39860e9314bc20be2110871a51fcbbe22a SHA256 6c316b00ea710ee046a65e1ae454f323553b9dc696cfb512cae61f6a8218731b
MISC metadata.xml 505 RMD160 080f7450920b9079a7436a05fb03c1a626c938fc SHA1 d42059212c110b63ee0590a3cc50c86adea635f4 SHA256 2c461cd601ed00f142b5994f2998df2308a47f79c46c1016e83b4109fb9d044e
View
221 app-backup/backuppc/backuppc-3.1.0-r3.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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="samba"
+
+DEPEND="dev-lang/perl
+ app-admin/apache-tools
+ app-admin/makepasswd"
+RDEPEND="${DEPEND}
+ perl-core/IO-Compress
+ dev-perl/Archive-Zip
+ >=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 -1 /dev/null backuppc
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/01-fix-configure.pl.patch"
+ epatch "${FILESDIR}/02-fix-config.pl-formatting.patch"
+ epatch "${FILESDIR}/03-reasonable-config.pl-defaults.patch"
+
+ # Fix the documentation location in the CGI interface
+ epatch "${FILESDIR}/04-add-docdir-marker.patch"
+ sed -i "s+__DOCDIR__+/usr/share/doc/${PF}+" "lib/BackupPC/CGI/View.pm"
+
+ epatch "${FILESDIR}/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"
+ 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"
+
+ # 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
+}
View
2  app-backup/backuppc/files/apache2-backuppc.conf
@@ -32,7 +32,7 @@
# SSL_DEFAULT_VHOST Enables default vhost for SSL (you should enable this
# when you enable SSL)
#
-APACHE2_OPTS="-D LANGUAGE -D SUEXEC -D PERL -D BACKUPPC_VHOST"
+APACHE2_OPTS="-D LANGUAGE -D PERL -D BACKUPPC_VHOST"
# Extended options for advanced uses of Apache ONLY
# You don't need to edit these unless you are doing crazy Apache stuff
Please sign in to comment.
Something went wrong with that request. Please try again.