gentoo resync : 28.04.2021

9 files changed, 67 insertions, 68 deletions

diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index c20220c71692..58db55b71a36 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -1,12 +1,12 @@
-AUX 3.2.0/04-add-docdir-marker.patch 470 BLAKE2B 29376a3f028411f3bb85f6f717de30c9dfe7efb6819ac7a513d1cf75dd0606f1a6fda3e1c262ee2dca1d9176428e4aa4a50732433cfe43c7babd43b09e9e4847 SHA512 82b3fbb9c86405f2d8ab12f0a8de21d4b793ec012bfb1cd0fb3a51b769c3d29cfda1adf1b701826fd3e36e0a8aaf10b84b75643620b6512bd2351bbe768fc636
-AUX 3.2.0/05-nicelevel.patch 756 BLAKE2B b689fd8ffd8ec7821f0922832f7ac06186d4d18a6bc55cbdb1bc6c339d0f962ac750b92aac3f93e96c454054c8e91129d14664cbdd332c3a3978f2540037d702 SHA512 b33fe04ba54c8d28c51a3c2d85b13e204db9a7f4f193d25888c168234f6fbe6f02a49403b7097f056d7ab8495cddaf457f1776d64bcc84188d2d67e8ea77c1f6
-AUX 3.3.0/01-fix-configure.pl.patch 1098 BLAKE2B 28ff909a8d2b002648912d97a02ba4a1d2b6fac58075c9c5f21f14e79a426d3f38a10a4c416f221d8aae20a4adc2bfdba0993f6064ac5eca67f1a6a4cfb0c579 SHA512 532b88689e50c0a399b42a3264975e1fc71a97b9edfd60faf5e94d0bfad972717c380b8925ca4d7df1e402b13f7104082a57bbecd3fbf74113c6f0e4d0990584
-AUX 3.3.0/02-fix-config.pl-formatting.patch 3900 BLAKE2B 7fdd0f12f9929bc7a54c04290f8f3bde73025a9108a2d0e1e887ceb1dd39502be4270e5a3a03b489211162f02b9bdd11e297e20afda53f1c9ea23254cdc02aa8 SHA512 e61e0bd445c57e1726411a5dec3a21f0d0f6ab6d394cc1882f0de467f9515d6299f3bf4955fbfaafd049097f0814665114e8453d750db19a063202af1378f394
-AUX 3.3.0/03-reasonable-config.pl-defaults.patch 1904 BLAKE2B 0a7ee19f20d4105a86ab612194f827a6da102512e5dcedd55ca1bf5d959ebd9797c281c8fe9b6d6cd6f4e8887d906a1d12024268bd3cb8070897a4961ed5e9ea SHA512 19033dfefa135cba82d7fef50e619916af710d40c46c214e508cd83cf9cbcf032b8fa54e960e5c685e428b3646777b1040c6d067e0d642d8ba9623ade0fb6d11
+AUX 3.2.0/04-add-docdir-marker.patch 474 BLAKE2B 9c0f6ff031a7121dcaab70c5526c633ab9697d7d3cd9c995de17f398bca4c36be5014fd058493bfd0c3aafc09fd909bbcfafcce61fdaf8a2701f446d980cbe26 SHA512 95a6c1e248e2187823576b46b76ef71a096b2dc3b164586b1fdfdf763b1f1451a36df3bab70b10cab6188886d404c6b3a17c76be0aaf67ce9866fdda59a3120a
+AUX 3.2.0/05-nicelevel.patch 764 BLAKE2B 2b5a98754ab1f35f5174273fa6374a917458c0f285cb8cddd6447f9b2c79d7c96ec5755595fe184b5e6e20599dfa2907ea76fc8b7e43b6e9a2f54c94351e6e68 SHA512 29263b313a29ec3d64f4af6fec7eb8400c1c89713c244c4507c9808b5e0c0ec09aa3097243a9a6cd22556a06cb3300052028db092de6631478e7efbe024047c4
+AUX 3.3.0/01-fix-configure.pl.patch 1102 BLAKE2B 681cc2e69464dc7bf11f4a6d2e2c8b87912c35aad2d598752aeb0df53c47e95245bd04ea866bb93c631730bdb4a9455f6cd33474798bef6f87c887e8550a109e SHA512 fc3150771986abccb18733a649f6c39f4ebbd19d342df5bc9f45939786af7b6b6c5e2caf9020ff91d8553a4e986749de6f167628ec0826ea69928bcba401267a
+AUX 3.3.0/02-fix-config.pl-formatting.patch 3904 BLAKE2B 27e5d220124bb5ca1a909d3d6a3c30e717e97ad97d121a9a00adbd31f9a729e00006b9cb1333138f2ab99ac7e3cc15ea3fdb9b785a317f2ffa95b896b65ad478 SHA512 d334d1327d08c834894a7fc8ace3bac232e36087b3c21c8d7c98acc5aa84d70e83c9293833262b7e77f7a06f901e0f7ac6e8bd02c9abbe4cdfc1e44d7e4e7f61
+AUX 3.3.0/03-reasonable-config.pl-defaults.patch 1908 BLAKE2B e26b4c9dcda7416f09516dc5b2e4ea7b6a690d00ef60f5a8bd34090d8178074e560a486b00435593a9da832db0d70bedf6d48f2f8c93928b55b96dd2041deebe SHA512 d9fe509d59b3c0f0fab265dd1eab2da7d499fd5e9838e04f413b56d4e116337f8781815e3ac9c2ab0dd8e103ce49fa78a398ebf7e1b2475d0b7c869d468ddf2e
 AUX 99_backuppc.conf 718 BLAKE2B 3075731b3bd580e9e9f864391d8a65716f43826d801bdf95082dc2168120419346b09322292eecf9de0bac6708dcba606347142238a65f11676ec553ca278b75 SHA512 cb68dfbb635564740428850ea3f026ebc0b8e22b2bca52640b2f367e5487fa205b00ec82e4e192b311e2886686b81f9ea52de54886994c6cce1cd154937fa0ee
-AUX backuppc-3.3.1-perl522.patch 607 BLAKE2B 98c35bbcbe76cd5f7bbc04722f9d8f840c61a8a713cf147db84934702ca754dbd3e0b88e83fa12ecfd45a2aa4974600d21f5cc8bd87fb0fb802f97b2a0c36ae0 SHA512 4d33fff4df53ee885676d58f78984616bb413fcbfd16fdacff0656d70a7c70c012c25f2fd685b360d878ebd407e76fab23103617f2bde0007ad9fc6bf34128c0
-AUX backuppc-3.3.1-perl526.patch 969 BLAKE2B 0b56c1535d8993a71ed2d3330db2cc1d22c42c3c9ed92bc00294c7d2769fc7277546c74844d592086d0b782a4cc482945a20f9ce9cec3daca174e297d80368cc SHA512 da626131a3253bbc6fe46a06f74462a2d356a71ae369e8de88acca2d85376be0d6ad16c8c566f7c80b93e794808f8b1c09a75707d5031dc64b93ab0f698faced
+AUX backuppc-3.3.1-perl522.patch 611 BLAKE2B a363952b76c8514ceeb31ae71b134ad37004422eeb905bf243aa86dc85795782066d9ee3aca266b7bbe62308bf421f7e6c5c006f2cff2182f4d56dba8eb3c063 SHA512 c7425c9eec316049b02226be02bcaefc6204016a7d0da876cab2094a5f1572ba42195dc0395ad42755b7dfbe11e28bcef59c04e85821e3b8e7ce428966f418bd
+AUX backuppc-3.3.1-perl526.patch 973 BLAKE2B 5853a89c016406d7202bc9f3ab20b9af9466b0081f958126cec2890bd6bde60d8134629a61929fa7e16b8056bb590f0bd973a62a7862e2432ec2d73862e5687b SHA512 ce5a9fc93656c6759c3afb900f68f7482b11916860a16c8e05db9432585618e942a092274a1dcdfde4cee94d39fe72f614443107e233ce1fb702c8a2fc2d999e
 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-r5.ebuild 5526 BLAKE2B 121793c6d0209b99a3104042181c3e85adec507aef4a69587c77329aa3d6822c6994b601b8b0c6302b33d3c0f1a84e4dd08f109b3b2f9a31f400d9da3bfac919 SHA512 c1c16a3cbb91dbd990165719591fd48fc6bdddc54c86e6d977f6e7cc3302b3e5e49ce1992f79b70e5c8edbde0b85919fcf4e8dcb2811af7dd725a5a1ab0d0ff6
+EBUILD backuppc-3.3.1-r6.ebuild 5433 BLAKE2B 5dcb07f3f8b57f9b7db9992a21cffb61f4ef96ca176bbd8183c18b5c3082db17445962766fbba8adae1c7a2040d20e21d511ac1b72cef885b676a4c76c32c75d SHA512 62a43139f30493eccc164d63ff9304acca9539b314e9f100fac73ada0b4568d63c6d3d5de647ff09659cd5735fe0150110f94f79b025a7600d2a67621d84f1b8
 MISC metadata.xml 245 BLAKE2B 60b89e1b22df8b9bf236255a9563dea8017b658ba02811b0826ec33790245fbba9332bcfef37cfe1a0dfc5c15de494f7b6eab4b6fbc0f92c6b3c9bec34c2f5c3 SHA512 4129c00f4fd37b4c2e051df35c98105ee97b74bc2a8af78e97f2cbc4c97d14740456fc01ed2ab5c6df3bab10a17ce1728de9e4b83cfee393a8841e8933232877
diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
index 932f8a9640d5..97bacafc0e0d 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -1,20 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit depend.apache eutils user systemd
+EAPI=7
 
 MY_P="BackupPC-${PV}"
 
+inherit depend.apache systemd
+
 DESCRIPTION="High-performance backups to a server's disk"
 HOMEPAGE="http://backuppc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+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
@@ -22,63 +32,52 @@ APACHE_MODULES+="apache2_modules_authz_core," # Require
 APACHE_MODULES+="apache2_modules_authz_host," # Require host
 APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
 
-DEPEND="dev-lang/perl
-	app-admin/apache-tools
-	app-admin/makepasswd"
-
 # Older versions of mod_perl think they're compatibile with apache-2.4,
 # so we require the new one explicitly.
-RDEPEND="${DEPEND}
-	virtual/perl-IO-Compress
+RDEPEND="
+	${DEPEND}
+	app-arch/par2cmdline
 	dev-perl/Archive-Zip
 	dev-perl/CGI
+	dev-perl/File-RsyncP
 	dev-perl/libwww-perl
-	app-arch/tar
-	app-arch/par2cmdline
-	app-arch/gzip
-	app-arch/bzip2
 	virtual/mta
-	>=www-apache/mod_perl-2.0.9
+	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]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
-	net-misc/rsync
-	dev-perl/File-RsyncP
+	|| (
+		>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+		>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+		>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid]
+	)
 	rss? ( dev-perl/XML-RSS )
 	samba? ( net-fs/samba )"
 
-need_apache2_4
-
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+	"${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+	"${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+	"${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+	"${FILESDIR}/3.2.0/05-nicelevel.patch"
+	"${FILESDIR}"/${P}-perl522.patch #580254
+	"${FILESDIR}"/${P}-perl526.patch #594128
+)
 
 CGIDIR="/usr/lib/backuppc/htdocs"
 CONFDIR="/etc/BackupPC"
 DATADIR="/var/lib/backuppc"
 DOCDIR="/usr/share/doc/${PF}"
 LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-	enewgroup backuppc
-	enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
+need_apache2_4
 
 src_prepare() {
-	epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-	epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-	epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-	epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-	epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
+	default
 
-	epatch "${FILESDIR}"/${P}-perl522.patch #580254
-	epatch "${FILESDIR}"/${P}-perl526.patch #594128
+	# Fix initscript
+	sed -e 's/runscript/openrc-run/g' -i init.d/src/gentoo-backuppc || die
 
 	# Fix docs location using the marker that we've patched in.
-	sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
-		|| die "failed to sed the documentation location"
+	sed "s+__DOCDIR__+${DOCDIR}+" -i "lib/BackupPC/CGI/View.pm" || die
 }
 
 src_install() {
@@ -106,7 +105,7 @@ src_install() {
 		--data-dir "${DATADIR}" \
 		--hostname 127.0.0.1 \
 		--uid-ignore \
-		--dest-dir "${D%/}" \
+		--dest-dir "${D}" \
 		--html-dir "${CGIDIR}"/image \
 		--html-dir-url /image \
 		--cgi-dir "${CGIDIR}" \
@@ -163,13 +162,13 @@ pkg_postinst() {
 	elog
 	elog "    # /etc/init.d/backuppc start"
 	elog
-	elog "- To enable the GUI, first edit ${ROOT}etc/conf.d/apache2 and add,"
+	elog "- To enable the GUI, first edit ${ROOT}/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 ${ROOT}etc/apache2/modules.d/00_mpm_itk.conf"
+	elog "  Then you must edit ${ROOT}/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
diff --git a/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch b/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch
index 0355aedf04b7..d6a5a1c42991 100644
--- a/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch
+++ b/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch
@@ -1,5 +1,5 @@
---- lib/BackupPC/CGI/View.pm.orig	2009-09-30 19:08:34.353577546 +0300
-+++ lib/BackupPC/CGI/View.pm	2009-09-30 19:16:01.982412712 +0300
+--- a/lib/BackupPC/CGI/View.pm.orig	2009-09-30 19:08:34.353577546 +0300
++++ b/lib/BackupPC/CGI/View.pm	2009-09-30 19:16:01.982412712 +0300
 @@ -86,7 +86,7 @@
          $file = $bpc->ConfDir() . "/hosts";
          $linkHosts = 1;
diff --git a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch
index 50938f60bcdc..f6ecce98a7a8 100644
--- a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch
+++ b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch
@@ -1,5 +1,5 @@
---- init.d/src/gentoo-backuppc.orig	2009-10-18 00:14:44.125346723 +0300
-+++ init.d/src/gentoo-backuppc	2009-10-18 00:15:37.101346981 +0300
+--- a/init.d/src/gentoo-backuppc.orig	2009-10-18 00:14:44.125346723 +0300
++++ b/init.d/src/gentoo-backuppc	2009-10-18 00:15:37.101346981 +0300
 @@ -21,7 +21,7 @@
  start() {
  	checkconfig || return 1
@@ -9,8 +9,8 @@
  	eend $?
  }
  
---- init.d/src/gentoo-backuppc.conf.orig	2009-10-18 00:14:52.513347638 +0300
-+++ init.d/src/gentoo-backuppc.conf	2009-10-18 00:16:03.457346630 +0300
+--- a/init.d/src/gentoo-backuppc.conf.orig	2009-10-18 00:14:52.513347638 +0300
++++ b/init.d/src/gentoo-backuppc.conf	2009-10-18 00:16:03.457346630 +0300
 @@ -3,3 +3,4 @@
  PID_FILE=__LOGDIR__/BackupPC.pid
  EXEC=__INSTALLDIR__/bin/BackupPC
diff --git a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
index c943fdce68b1..f27fccc154fe 100644
--- a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
+++ b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
@@ -1,5 +1,5 @@
---- configure.pl.dist	2013-09-23 23:01:19.524743747 +0300
-+++ configure.pl	2013-09-23 23:01:37.344567459 +0300
+--- a/configure.pl.dist	2013-09-23 23:01:19.524743747 +0300
++++ b/configure.pl	2013-09-23 23:01:37.344567459 +0300
 @@ -158,7 +158,7 @@
  # config file to get all the defaults.
  #
diff --git a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
index 79ad6547fa6f..14a9600536d7 100644
--- a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
+++ b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
@@ -1,5 +1,5 @@
---- conf/config.pl.dist	2013-09-23 23:05:50.332064754 +0300
-+++ conf/config.pl	2013-09-23 23:07:44.110943607 +0300
+--- a/conf/config.pl.dist	2013-09-23 23:05:50.332064754 +0300
++++ b/conf/config.pl	2013-09-23 23:07:44.110943607 +0300
 @@ -355,7 +355,7 @@
  # needs to be a full path and you can't include shell syntax like
  # redirection and pipes; put that in a script if you need it.
diff --git a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
index 8b54fc87b050..0dd85d3acad1 100644
--- a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
+++ b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
@@ -1,5 +1,5 @@
---- conf/config.pl.formatted	2013-09-23 23:12:30.708129365 +0300
-+++ conf/config.pl	2013-09-23 23:12:39.448043656 +0300
+--- a/conf/config.pl.formatted	2013-09-23 23:12:30.708129365 +0300
++++ b/conf/config.pl	2013-09-23 23:12:39.448043656 +0300
 @@ -1305,7 +1305,7 @@
              '--times',
              '--block-size=2048',
diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch
index fb7eeeef1e02..cb29e890d347 100644
--- a/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch
+++ b/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch
@@ -1,5 +1,5 @@
---- lib/BackupPC/CGI/Browse.pm	2016-11-22 20:52:03.622509160 +0100
-+++ lib/BackupPC/CGI/Browse.pm	2016-11-22 20:50:35.871018400 +0100
+--- a/lib/BackupPC/CGI/Browse.pm	2016-11-22 20:52:03.622509160 +0100
++++ b/lib/BackupPC/CGI/Browse.pm	2016-11-22 20:50:35.871018400 +0100
 @@ -62,13 +62,13 @@ fix bug https://bugzilla.redhat.com/attachment.cgi?id=1104083
      #
      my @Backups = $bpc->BackupInfoRead($host);
diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
index 3a04f94835c3..ec7b9a63d06f 100644
--- a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
+++ b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
@@ -1,6 +1,6 @@
 diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm
---- BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm	2015-01-12 01:19:53.000000000 +0100
-+++ BackupPC-3.3.1/lib/BackupPC/Lib.pm	2017-07-08 00:31:52.100003197 +0200
+--- a/BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm	2015-01-12 01:19:53.000000000 +0100
++++ b/BackupPC-3.3.1/lib/BackupPC/Lib.pm	2017-07-08 00:31:52.100003197 +0200
 @@ -1261,7 +1261,7 @@
          #
          # Replace scalar variables first