gentoo resync : 12.05.2022

4 files changed, 201 insertions, 5 deletions

diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index 4bf2e15c55b6..c18880ad09d8 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -8,5 +8,7 @@ AUX backuppc-3.3.1-perl522.patch 611 BLAKE2B a363952b76c8514ceeb31ae71b134ad3700
 AUX backuppc-3.3.1-perl526.patch 907 BLAKE2B 80da3a7d9710c8ef55fac9e11859604584d1d2909dbd36201a206e96624aceb4ff362292914fda7bd5d513a27bbf338f6476ee2a49914fd06a449077318a71f7 SHA512 b697d756659f80d665d7c57132a44aa97411617988220e93360e6f3cc9c3b03059ecc4326fb6fa4016e55b4641694299122b8ca224ab1048986e5f29156b849f
 AUX backuppc.service 231 BLAKE2B 948543a9fc9accff40868e930680c4eb9c0ff89c291254091c8f48b788b1eacf6ba6aba317fd39d2958e8af2efd7194cbe26d3674ee055e8401c591ac27e2fa5 SHA512 9a7cb7ac7da2851cfaf90fafe082800fbac34a5a40a9f6aed1ea817b6f9aeb5be60cb3cfb35c263997c2ac1d22f3384752a23f44158572a9efc8f2c48e99c969
 DIST BackupPC-3.3.1.tar.gz 556461 BLAKE2B 91477196506291fb542a266aca4182ad727758ccf8379c135dcd5147d42b5f1f58d094473430fee64f67e0fc75e077fdf92bfcdaf2313dd53480737666746160 SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
-EBUILD backuppc-3.3.1-r6.ebuild 5434 BLAKE2B ae7decc2ce0a09f964d0a449c78cb44adeb3081846c4533e7373a1748983bad6aabf68d6747a488337aedb10030539b35b8fbd63d969a4abd78ddb7958c55d0f SHA512 189a6d83cbb86201ba36f017a855ecfd86f1f2ee23b230a5ae8646de404f23bb1d584ca72ea0735c1d6ad8216120325056309288a39ac3eca12c88b2a9d3f4f2
-MISC metadata.xml 303 BLAKE2B a0c0dc8e5bf8e40b1cc0201177ad31f2747815af852d6e77e1b5b0c8c44352c301b87d9977a146a9dbf096b3691977dee48be7d7204eba75ddcef195cc03f6ed SHA512 64361343f2c501a57682c371b83df0c64a72ff0b6907233aee679d4b24bad34839f25738143ea28c75ba558ac4626fc44f62c11ff940c1d0953fbe840c831ade
+DIST BackupPC-4.4.0.tar.gz 657309 BLAKE2B db977b73b09e1b2a051e38ecc94567cb516e2b11eca79c23bb0c4eef508e78cbbc984aaee4c84dc4ecd0524d849195c14dfe395ff97f77b6c7cf8adff152d75e SHA512 0c88447ab000c4a452034d5d8a074cd56801c7b38b0886e686e446c73ecfd0a40f0aa08703f76d16c31b24aec85c10c4ed1815d0cb67be5a1d66e5caeb3de418
+EBUILD backuppc-3.3.1-r6.ebuild 5448 BLAKE2B 473a11c0a125b5d87badb514f25aff1e991d09a580e2953ba9073bba7c01a9817c7a698e06590ec227a01cb82bd791b2e0c5515ae988b343c9301ae980fc8dee SHA512 ed152a7f3a236b4326dd3c2da17e963c328c835617a6c259069c40fd8a3e15038d2f4898ad7ffa513cea381c2aef08704b5ea0d5aa8869c28237712086fde7f2
+EBUILD backuppc-4.4.0.ebuild 5055 BLAKE2B 12cc14704efb6f0f82487b896eb04e6b4a88a86363cb1161030b72aa86eaa569c7f259c6b9f37690e8e99db88584485cb056770c7123e5b51189d4aad6d4c3d0 SHA512 cd5e81dcae335a6028a4fe6cc5adf70d5f75b5f474421a464c7c337059185e879f663419bf46f88f62d4129dcb5731db0a82bdfa18d8c32b5f61f089361f8418
+MISC metadata.xml 539 BLAKE2B c702c033b6ffe694fc3297d786adc3078d89d882eb88a4524411f202eabd14bf95ad7b31ad122e7249a038cd96f511c288c07fa192bb4e56e5edef43e4131675 SHA512 8f96ed324e67f5548f9dbd0b9a56206a902fc8e0cc0feccaf6e7a29d76050c8568f97fbee5a394ecfb121e54e133fe93afd2c26d33af68a9766f4726a1696354
diff --git a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
index 5d45affdb88d..3268596ed982 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ MY_P="BackupPC-${PV}"
 inherit depend.apache systemd
 
 DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/"
+HOMEPAGE="https://backuppc.github.io/backuppc/index.html"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-backup/backuppc/backuppc-4.4.0.ebuild b/app-backup/backuppc/backuppc-4.4.0.ebuild
new file mode 100644
index 000000000000..9cdff04fee51
--- /dev/null
+++ b/app-backup/backuppc/backuppc-4.4.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="BackupPC-${PV}"
+
+inherit depend.apache systemd
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="https://backuppc.github.io/backuppc/index.html"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rss samba"
+
+DEPEND="
+	acct-group/backuppc
+	acct-user/backuppc
+	app-admin/apache-tools
+	app-admin/makepasswd
+	dev-lang/perl
+"
+
+# The CGI modules are handled in ${RDEPEND}.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+# Older versions of mod_perl think they're compatible with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="
+	${DEPEND}
+	app-arch/par2cmdline
+	dev-perl/Archive-Zip
+	dev-perl/CGI
+	dev-perl/File-RsyncP
+	dev-perl/libwww-perl
+	dev-perl/BackupPC-XS
+	net-misc/rsync-bpc
+	virtual/mta
+	virtual/perl-IO-Compress
+	www-apache/mod_perl
+	www-apache/mpm_itk
+	|| (
+		>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+		>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+	)
+	rss? ( dev-perl/XML-RSS )
+	samba? ( net-fs/samba )"
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="${EROOT}/etc/${EPREFIX}"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+need_apache2_4
+
+src_prepare() {
+	default
+
+	# Fix docs location using the marker that we've patched in.
+	sed "s+__DOCDIR__+${DOCDIR}+" -i lib/BackupPC/CGI/View.pm || die
+}
+
+src_install() {
+	local myconf
+	if use samba ; then
+		myconf=(
+			--bin-path smbclient=$(type -p smbclient)
+			--bin-path nmblookup=$(type -p nmblookup)
+		)
+	fi
+
+	/usr/bin/env perl ./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 127.0.0.1 \
+		--uid-ignore \
+		--dest-dir "${D}" \
+		--html-dir "${CGIDIR}"/image \
+		--html-dir-url /image \
+		--cgi-dir "${CGIDIR}" \
+		--fhs \
+		${myconf[@]} || die "failed the configure.pl script"
+
+	ebegin "Installing documentation"
+
+	pod2man \
+		-errors=none \
+		--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 "${ED}/usr/share/doc/BackupPC/BackupPC.html"
+	dodoc "${ED}/usr/share/doc/BackupPC/BackupPC.pod"
+	rm -rf "${ED}/usr/share/doc" || die
+
+	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/systemd scripts"
+	newinitd "${S}"/systemd/init.d/gentoo-backuppc backuppc
+	newconfd "${S}"/systemd/init.d/gentoo-backuppc.conf backuppc
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}"/99_backuppc.conf
+
+	# Make sure that the ownership is correct
+	chown -R backuppc:backuppc "${D}${CONFDIR}" || die
+	chown -R backuppc:backuppc "${D}${DATADIR}" || die
+	chown -R backuppc:backuppc "${D}${LOGDIR}"  || die
+
+	eend 0
+}
+
+pkg_postinst() {
+	elog "Installation finished, you may now start using BackupPC."
+	elog
+	elog "- Read the documentation in ${EROOT}/usr/share/doc/${PF}/BackupPC.html"
+	elog "  Please pay special attention to the security section."
+	elog
+	elog "- You can launch backuppc by running:"
+	elog
+	elog "    # /etc/init.d/backuppc start"
+	elog
+	elog "- To enable the GUI, first edit ${EROOT}/etc/conf.d/apache2 and add,"
+	elog
+	elog "    \"-D BACKUPPC -D PERL -D MPM_ITK\""
+	elog
+	elog "  to the APACHE2_OPTS line."
+	elog
+	elog "  Then you must edit ${EROOT}/etc/apache2/modules.d/00_mpm_itk.conf"
+	elog "  and adjust the values of LimitUIDRange/LimitGIDRange to include"
+	elog "  the UID and GID of the backuppc user."
+	elog
+	elog "  Finally, start apache:"
+	elog
+	elog "    # /etc/init.d/apache2 start"
+	elog
+	elog "  The web interface should now be running on,"
+	elog
+	elog "    http://127.0.0.1:8080/"
+	elog
+
+	# 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 ""
+		elog "  # htpasswd ${CONFDIR}/users.htpasswd newUser"
+	fi
+}
diff --git a/app-backup/backuppc/metadata.xml b/app-backup/backuppc/metadata.xml
index 63af74d14b21..4d83df8d74ca 100644
--- a/app-backup/backuppc/metadata.xml
+++ b/app-backup/backuppc/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>kernlpanic@dennis-eisele.de</email>
+		<name>Dennis Eisele</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">backuppc</remote-id>
 		<remote-id type="github">backuppc/backuppc</remote-id>