diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest deleted file mode 100644 index 8201ca74a..000000000 --- a/app-backup/backuppc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST BackupPC-3.3.1.tar.gz 556461 SHA256 c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6 WHIRLPOOL 1d895f530932fc1287cde9db584befc6ca0850b5841cc4e60927442d0db662ec092bda4efa4953650d3bfa13deb6e9fafa25c10f82e19b39c67969bb4e143bac diff --git a/app-backup/backuppc/backuppc-3.3.1-r2.ebuild b/app-backup/backuppc/backuppc-3.3.1-r2.ebuild deleted file mode 100644 index fbcbb3224..000000000 --- a/app-backup/backuppc/backuppc-3.3.1-r2.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit depend.apache eutils user systemd - -MY_P="BackupPC-${PV}" - -DESCRIPTION="High-performance backups 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" - -# 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 - -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 - dev-perl/Archive-Zip - 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 - 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 - rss? ( dev-perl/XML-RSS ) - samba? ( net-fs/samba )" - -need_apache2_4 - -SLOT="0" - -S="${WORKDIR}/${MY_P}" - -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 -} - -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" - - # Sabayon mod. - # https://bugs.gentoo.org/show_bug.cgi?id=580254 - epatch "${FILESDIR}/defined.patch" - - # 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" -} - -src_install() { - local myconf - myconf="" - if use samba ; then - myconf="--bin-path smbclient=$(type -p smbclient)" - myconf="${myconf} --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 "${D}/usr/doc/BackupPC.html" - dodoc "${D}/usr/doc/BackupPC.pod" - rm -rf "${D}/usr/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}"/init.d/gentoo-backuppc backuppc - newconfd "${S}"/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 -} - -pkg_postinst() { - elog "Installation finished, you 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 by running:" - elog - elog " # /etc/init.d/backuppc start" - elog - 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 " 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/files/3.2.0/01-fix-configure.pl.patch b/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch deleted file mode 100644 index 060cf953e..000000000 --- a/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- configure.pl.orig 2010-07-31 20:52:58.000000000 +0300 -+++ configure.pl 2010-09-03 22:09:46.437788435 +0300 -@@ -158,7 +158,7 @@ - # config file to get all the defaults. - # - my $ConfigPath = ""; --my $ConfigFileOK = 1; -+my $ConfigFileOK = 0; - while ( 1 ) { - if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) { - $ConfigPath = "/etc/BackupPC/config.pl"; -@@ -213,7 +213,8 @@ - $bpc->{LogDir} = $Conf{LogDir} = "$Conf{TopDir}/log" - if ( $Conf{LogDir} eq '' ); - } -- $bpc->{ConfDir} = $Conf{ConfDir} = $confDir; -+ # Disable this as it's not really neccessary for this ebuild -+ # $bpc->{ConfDir} = $Conf{ConfDir} = $confDir; - my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1); - if ( $err eq "" ) { - print < administrative users are only craig and celia'. - # - $Conf{CgiAdminUserGroup} = ''; --$Conf{CgiAdminUsers} = ''; -+$Conf{CgiAdminUsers} = 'backuppc'; - - # - # URL of the BackupPC_Admin CGI script. Used for email messages. -@@ -2062,7 +2066,7 @@ - # dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero - # for international dates (DD/MM). - # --$Conf{CgiDateFormatMMDD} = 1; -+$Conf{CgiDateFormatMMDD} = 2; - - # - # If set, the complete list of hosts appears in the left navigation -@@ -2248,7 +2252,7 @@ - ClientTimeout => 1, - MaxOldPerPCLogFiles => 1, - CompressLevel => 1, -- ClientNameAlias => 1, -+ ClientNameAlias => 0, - DumpPreUserCmd => 0, - DumpPostUserCmd => 0, - RestorePreUserCmd => 0, 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 deleted file mode 100644 index 0355aedf0..000000000 --- a/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -@@ -86,7 +86,7 @@ - $file = $bpc->ConfDir() . "/hosts"; - $linkHosts = 1; - } elsif ( $type eq "docs" ) { -- $file = $bpc->InstallDir() . "/doc/BackupPC.html"; -+ $file = "__DOCDIR__/BackupPC.html"; - } elsif ( $host ne "" ) { - if ( !defined($In{num}) ) { - # get the latest LOG file diff --git a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch deleted file mode 100644 index 50938f60b..000000000 --- a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 -@@ -21,7 +21,7 @@ - start() { - checkconfig || return 1 - ebegin "Starting BackupPC" -- start-stop-daemon --start --chuid ${USER} --user ${USER} --pidfile ${PID_FILE} --exec ${EXEC} -- ${EXEC_OPTIONS} -+ start-stop-daemon --start --chuid ${USER} --user ${USER} --nicelevel ${NICELEVEL} --pidfile ${PID_FILE} --exec ${EXEC} -- ${EXEC_OPTIONS} - 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 -@@ -3,3 +3,4 @@ - PID_FILE=__LOGDIR__/BackupPC.pid - EXEC=__INSTALLDIR__/bin/BackupPC - EXEC_OPTIONS=-d -+NICELEVEL=0 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 deleted file mode 100644 index c943fdce6..000000000 --- a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- configure.pl.dist 2013-09-23 23:01:19.524743747 +0300 -+++ configure.pl 2013-09-23 23:01:37.344567459 +0300 -@@ -158,7 +158,7 @@ - # config file to get all the defaults. - # - my $ConfigPath = ""; --my $ConfigFileOK = 1; -+my $ConfigFileOK = 0; - while ( 1 ) { - if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) { - $ConfigPath = "/etc/BackupPC/config.pl"; -@@ -213,7 +213,8 @@ - $bpc->{LogDir} = $Conf{LogDir} = "$Conf{TopDir}/log" - if ( $Conf{LogDir} eq '' ); - } -- $bpc->{ConfDir} = $Conf{ConfDir} = $confDir; -+ # Disable this as it's not really neccessary for this ebuild -+ # $bpc->{ConfDir} = $Conf{ConfDir} = $confDir; - my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1); - if ( $err eq "" ) { - print <= 1. -@@ -458,7 +482,9 @@ - # $Conf{FullKeepCnt} = 4; - # $Conf{FullKeepCnt} = [4]; - # --$Conf{FullKeepCnt} = 1; -+$Conf{FullKeepCnt} = [ -+ 1 -+]; - - # - # Very old full backups are removed after $Conf{FullAgeMax} days. However, -@@ -470,7 +496,7 @@ - # full backups to exceed $Conf{FullAgeMax}. - # - $Conf{FullKeepCntMin} = 1; --$Conf{FullAgeMax} = 90; -+$Conf{FullAgeMax} = 90; - - # - # Number of incremental backups to keep. Must be >= 1. -@@ -487,7 +513,7 @@ - # matter how old they are. - # - $Conf{IncrKeepCntMin} = 1; --$Conf{IncrAgeMax} = 30; -+$Conf{IncrAgeMax} = 30; - - # - # Level of each incremental. "Level" follows the terminology -@@ -565,7 +591,9 @@ - # meaning each incremental backed up all the files that - # changed since the last full. - # --$Conf{IncrLevels} = [1]; -+$Conf{IncrLevels} = [ -+ 1 -+]; - - # - # Disable all full and incremental backups. These settings are -@@ -631,7 +659,7 @@ - # The default is off. You can turn this on or off at any - # time without affecting existing backups. - # --$Conf{IncrFill} = 0; -+$Conf{IncrFill} = '0'; - - # - # Number of restore logs to keep. BackupPC remembers information about -@@ -683,7 +711,7 @@ - # '*' => ['/myFiles', '/important'], # these are other shares - # }; - # --$Conf{BackupFilesOnly} = undef; -+$Conf{BackupFilesOnly} = {}; - - # - # List of directories or files to exclude from the backup. For Smb, -@@ -739,7 +767,7 @@ - # '*' => ['/junk', '/dont_back_this_up'], # these are for other shares - # }; - # --$Conf{BackupFilesExclude} = undef; -+$Conf{BackupFilesExclude} = {}; - - # - # PCs that are always or often on the network can be backed up after -@@ -770,7 +798,7 @@ - # to just set $Conf{WakeupSchedule} to a restricted schedule. - # - $Conf{BlackoutBadPingLimit} = 3; --$Conf{BlackoutGoodCnt} = 7; -+$Conf{BlackoutGoodCnt} = 7; - - # - # One or more blackout periods can be specified. If a client is -@@ -813,11 +841,17 @@ - # Saturday night. - # - $Conf{BlackoutPeriods} = [ -- { -- hourBegin => 7.0, -- hourEnd => 19.5, -- weekDays => [1, 2, 3, 4, 5], -- }, -+ { -+ 'hourEnd' => '19.5', -+ 'weekDays' => [ -+ 1, -+ 2, -+ 3, -+ 4, -+ 5 -+ ], -+ 'hourBegin' => 7 -+ } - ]; - - # -@@ -826,7 +860,7 @@ - # backed up. If you have shares that might be empty (and therefore an - # empty backup is valid) you should set this flag to 0. - # --$Conf{BackupZeroFilesIsFatal} = 1; -+$Conf{BackupZeroFilesIsFatal} = '1'; - - ########################################################################### - # How to backup a client -@@ -922,7 +956,9 @@ - # - # This setting only matters if $Conf{XferMethod} = 'smb'. - # --$Conf{SmbShareName} = 'C$'; -+$Conf{SmbShareName} = [ -+ 'C$' -+]; - - # - # Smbclient share user name. This is passed to smbclient's -U argument. -@@ -975,9 +1011,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. - # --$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName' -- . ' $I_option -U $userName -E -d 1' -- . ' -c tarmode\\ full -Tc$X_option - $fileList'; -+$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 1 -c tarmode\\ full -Tc$X_option - $fileList'; - - # - # Command to run smbclient for an incremental dump. -@@ -989,9 +1023,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. - # --$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName' -- . ' $I_option -U $userName -E -d 1' -- . ' -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList'; -+$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 1 -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList'; - - # - # Command to run smbclient for a restore. -@@ -1007,9 +1039,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. - # --$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName' -- . ' $I_option -U $userName -E -d 1' -- . ' -c tarmode\\ full -Tx -'; -+$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 1 -c tarmode\\ full -Tx -'; - - ########################################################################### - # Tar Configuration -@@ -1044,7 +1074,9 @@ - # - # This setting only matters if $Conf{XferMethod} = 'tar'. - # --$Conf{TarShareName} = '/'; -+$Conf{TarShareName} = [ -+ '/' -+]; - - # - # Command to run tar on the client. GNU tar is required. You will -@@ -1088,9 +1120,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. - # --$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host' -- . ' env LC_ALL=C $tarPath -c -v -f - -C $shareName+' -- . ' --totals'; -+$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host env LC_ALL=C $tarPath -c -v -f - -C $shareName+ --totals'; - - # - # Extra tar arguments for full backups. Several variables are substituted at -@@ -1149,9 +1179,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. - # --$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host' -- . ' env LC_ALL=C $tarPath -x -p --numeric-owner --same-owner' -- . ' -v -f - -C $shareName+'; -+$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host env LC_ALL=C $tarPath -x -p --numeric-owner --same-owner -v -f - -C $shareName+'; - - # - # Full path for tar on the client. Security caution: normal users should not -@@ -1223,7 +1251,9 @@ - # - # $Conf{RsyncShareName} = ['/', '/var', '/data', '/boot']; - # --$Conf{RsyncShareName} = '/'; -+$Conf{RsyncShareName} = [ -+ '/' -+]; - - # - # Rsync daemon port on the client, for $Conf{XferMethod} = "rsyncd". -@@ -1252,7 +1282,7 @@ - # connect to an rsyncd on the client that is not password protected. - # Turn off at your own risk. - # --$Conf{RsyncdAuthRequired} = 1; -+$Conf{RsyncdAuthRequired} = '1'; - - # - # When rsync checksum caching is enabled (by adding the -@@ -1275,35 +1305,23 @@ - # - # This setting has no effect unless checksum caching is turned on. - # --$Conf{RsyncCsumCacheVerifyProb} = 0.01; -+$Conf{RsyncCsumCacheVerifyProb} = '0.01'; - - # - # Arguments to rsync for backup. Do not edit the first set unless you - # have a thorough understanding of how File::RsyncP works. - # - $Conf{RsyncArgs} = [ -- # -- # Do not edit these! -- # -- '--numeric-ids', -- '--perms', -- '--owner', -- '--group', -- '-D', -- '--links', -- '--hard-links', -- '--times', -- '--block-size=2048', -- '--recursive', -- -- # -- # Rsync >= 2.6.3 supports the --checksum-seed option -- # which allows rsync checksum caching on the server. -- # Uncomment this to enable rsync checksum caching if -- # you have a recent client rsync version and you want -- # to enable checksum caching. -- # -- #'--checksum-seed=32761', -+ '--numeric-ids', -+ '--perms', -+ '--owner', -+ '--group', -+ '-D', -+ '--links', -+ '--hard-links', -+ '--times', -+ '--block-size=2048', -+ '--recursive', - ]; - - # -@@ -1358,34 +1376,18 @@ - # Note: $Conf{RsyncArgsExtra} doesn't apply to $Conf{RsyncRestoreArgs}. - # - $Conf{RsyncRestoreArgs} = [ -- # -- # Do not edit these! -- # -- '--numeric-ids', -- '--perms', -- '--owner', -- '--group', -- '-D', -- '--links', -- '--hard-links', -- '--times', -- '--block-size=2048', -- '--relative', -- '--ignore-times', -- '--recursive', -- -- # -- # Rsync >= 2.6.3 supports the --checksum-seed option -- # which allows rsync checksum caching on the server. -- # Uncomment this to enable rsync checksum caching if -- # you have a recent client rsync version and you want -- # to enable checksum caching. -- # -- #'--checksum-seed=32761', -- -- # -- # Add additional arguments here -- # -+ '--numeric-ids', -+ '--perms', -+ '--owner', -+ '--group', -+ '-D', -+ '--links', -+ '--hard-links', -+ '--times', -+ '--block-size=2048', -+ '--relative', -+ '--ignore-times', -+ '--recursive', - ]; - - ########################################################################### -@@ -1518,7 +1520,7 @@ - # - # Set to 0 to disable this feature. - # --$Conf{ArchivePar} = 0; -+$Conf{ArchivePar} = '0'; - - # - # Archive Size Split -@@ -1554,9 +1556,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. - # --$Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost' -- . ' $tarCreatePath $splitpath $parpath $host $backupnumber' -- . ' $compression $compext $splitsize $archiveloc $parfile *'; -+$Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost $tarCreatePath $splitpath $parpath $host $backupnumber $compression $compext $splitsize $archiveloc $parfile *'; - - # - # Full path for ssh. Security caution: normal users should not -@@ -1628,7 +1628,7 @@ - # setting this flag is a great way to verify that the machines have - # their netbios name set correctly before turning on DCHP. - # --$Conf{FixedIPNetBiosNameCheck} = 0; -+$Conf{FixedIPNetBiosNameCheck} = '0'; - - # - # Full path to the ping command. Security caution: normal users -@@ -1805,13 +1805,13 @@ - # 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. - # --$Conf{DumpPreUserCmd} = undef; --$Conf{DumpPostUserCmd} = undef; --$Conf{DumpPreShareCmd} = undef; --$Conf{DumpPostShareCmd} = undef; --$Conf{RestorePreUserCmd} = undef; -+$Conf{DumpPreUserCmd} = undef; -+$Conf{DumpPostUserCmd} = undef; -+$Conf{DumpPreShareCmd} = undef; -+$Conf{DumpPostShareCmd} = undef; -+$Conf{RestorePreUserCmd} = undef; - $Conf{RestorePostUserCmd} = undef; --$Conf{ArchivePreUserCmd} = undef; -+$Conf{ArchivePreUserCmd} = undef; - $Conf{ArchivePostUserCmd} = undef; - - # -@@ -1835,7 +1835,7 @@ - # that snapshots or dumps a database which fails because - # of some database error. - # --$Conf{UserCmdCheckStatus} = 0; -+$Conf{UserCmdCheckStatus} = '0'; - - # - # Override the client's host name. This allows multiple clients -@@ -1873,7 +1873,7 @@ - # rounded up (ie: 2.5 means a user will never receive email more - # than once every 3 days). - # --$Conf{EMailNotifyMinDays} = 2.5; -+$Conf{EMailNotifyMinDays} = '2.5'; - - # - # Name to use as the "from" name for email. Depending upon your mail -@@ -1928,7 +1928,7 @@ - # When there have been no backups in this number of days the user - # is sent an email. - # --$Conf{EMailNotifyOldBackupDays} = 7.0; -+$Conf{EMailNotifyOldBackupDays} = 7; - - # - # This subject and message is sent to a user if their PC has not recently -@@ -1955,7 +1955,7 @@ - # How old the most recent backup of Outlook files has to be before - # notifying user. - # --$Conf{EMailNotifyOldOutlookDays} = 5.0; -+$Conf{EMailNotifyOldOutlookDays} = 5; - - # - # This subject and message is sent to a user if their Outlook files have -@@ -1983,10 +1983,9 @@ - # Additional email headers. This sets to charset to - # utf8. - # --$Conf{EMailHeaders} = < "?action=view&type=docs", -- lname => "Documentation", # actually displays $Lang->{Documentation} -- }, -- { -- link => "http://backuppc.wiki.sourceforge.net", -- name => "Wiki", # displays literal "Wiki" -- }, -- { -- link => "http://backuppc.sourceforge.net", -- name => "SourceForge", # displays literal "SourceForge" -- }, -+ { -+ 'link' => '?action=view&type=docs', -+ 'lname' => 'Documentation', -+ 'name' => undef -+ }, -+ { -+ 'link' => 'http://backuppc.wiki.sourceforge.net', -+ 'lname' => undef, -+ 'name' => 'Wiki' -+ }, -+ { -+ 'link' => 'http://backuppc.sourceforge.net', -+ 'lname' => undef, -+ 'name' => 'SourceForge' -+ } - ]; - - # - # Hilight colors based on status that are used in the PC summary page. - # - $Conf{CgiStatusHilightColor} = { -- Reason_backup_failed => '#ffcccc', -- Reason_backup_done => '#ccffcc', -- Reason_no_ping => '#ffff99', -- Reason_backup_canceled_by_user => '#ff9900', -- Status_backup_in_progress => '#66cc99', -- Disabled_OnlyManualBackups => '#d1d1d1', -- Disabled_AllBackupsDisabled => '#d1d1d1', -+ 'Reason_backup_failed' => '#ffcccc', -+ 'Reason_backup_done' => '#ccffcc', -+ 'Reason_backup_canceled_by_user' => '#ff9900', -+ 'Reason_no_ping' => '#ffff99', -+ 'Disabled_OnlyManualBackups' => '#d1d1d1', -+ 'Status_backup_in_progress' => '#66cc99', -+ 'Disabled_AllBackupsDisabled' => '#d1d1d1' - }; - - # -@@ -2141,7 +2143,7 @@ - # 'pl' => 'text/plain', - # }; - # --$Conf{CgiExt2ContentType} = { }; -+$Conf{CgiExt2ContentType} = {}; - - # - # URL (without the leading http://host) for BackupPC's image directory. -@@ -2166,7 +2168,7 @@ - # - # Whether the user is allowed to edit their per-PC config. - # --$Conf{CgiUserConfigEditEnable} = 1; -+$Conf{CgiUserConfigEditEnable} = '1'; - - # - # Which per-host config variables a non-admin user is allowed -@@ -2180,96 +2182,96 @@ - # sorts of bad things. - # - $Conf{CgiUserConfigEdit} = { -- FullPeriod => 1, -- IncrPeriod => 1, -- FullKeepCnt => 1, -- FullKeepCntMin => 1, -- FullAgeMax => 1, -- IncrKeepCnt => 1, -- IncrKeepCntMin => 1, -- IncrAgeMax => 1, -- IncrLevels => 1, -- IncrFill => 1, -- PartialAgeMax => 1, -- RestoreInfoKeepCnt => 1, -- ArchiveInfoKeepCnt => 1, -- BackupFilesOnly => 1, -- BackupFilesExclude => 1, -- BackupsDisable => 1, -- BlackoutBadPingLimit => 1, -- BlackoutGoodCnt => 1, -- BlackoutPeriods => 1, -- BackupZeroFilesIsFatal => 1, -- ClientCharset => 1, -- ClientCharsetLegacy => 1, -- XferMethod => 1, -- XferLogLevel => 1, -- SmbShareName => 1, -- SmbShareUserName => 1, -- SmbSharePasswd => 1, -- SmbClientFullCmd => 0, -- SmbClientIncrCmd => 0, -- SmbClientRestoreCmd => 0, -- TarShareName => 1, -- TarFullArgs => 1, -- TarIncrArgs => 1, -- TarClientCmd => 0, -- TarClientRestoreCmd => 0, -- TarClientPath => 0, -- RsyncShareName => 1, -- RsyncdClientPort => 1, -- RsyncdPasswd => 1, -- RsyncdUserName => 1, -- RsyncdAuthRequired => 1, -- RsyncCsumCacheVerifyProb => 1, -- RsyncArgs => 1, -- RsyncArgsExtra => 1, -- RsyncRestoreArgs => 1, -- RsyncClientCmd => 0, -- RsyncClientRestoreCmd => 0, -- RsyncClientPath => 0, -- FtpShareName => 1, -- FtpUserName => 1, -- FtpPasswd => 1, -- FtpBlockSize => 1, -- FtpPort => 1, -- FtpTimeout => 1, -- FtpFollowSymlinks => 1, -- FtpRestoreEnabled => 1, -- ArchiveDest => 1, -- ArchiveComp => 1, -- ArchivePar => 1, -- ArchiveSplit => 1, -- ArchiveClientCmd => 0, -- FixedIPNetBiosNameCheck => 1, -- NmbLookupCmd => 0, -- NmbLookupFindHostCmd => 0, -- PingMaxMsec => 1, -- PingCmd => 0, -- ClientTimeout => 1, -- MaxOldPerPCLogFiles => 1, -- CompressLevel => 1, -- ClientNameAlias => 1, -- DumpPreUserCmd => 0, -- DumpPostUserCmd => 0, -- RestorePreUserCmd => 0, -- RestorePostUserCmd => 0, -- ArchivePreUserCmd => 0, -- ArchivePostUserCmd => 0, -- DumpPostShareCmd => 0, -- DumpPreShareCmd => 0, -- UserCmdCheckStatus => 0, -- EMailNotifyMinDays => 1, -- EMailFromUserName => 1, -- EMailAdminUserName => 1, -- EMailUserDestDomain => 1, -- EMailNoBackupEverSubj => 1, -- EMailNoBackupEverMesg => 1, -- EMailNotifyOldBackupDays => 1, -- EMailNoBackupRecentSubj => 1, -- EMailNoBackupRecentMesg => 1, -- EMailNotifyOldOutlookDays => 1, -- EMailOutlookBackupSubj => 1, -- EMailOutlookBackupMesg => 1, -- EMailHeaders => 1, -+ FullPeriod => 1, -+ IncrPeriod => 1, -+ FullKeepCnt => 1, -+ FullKeepCntMin => 1, -+ FullAgeMax => 1, -+ IncrKeepCnt => 1, -+ IncrKeepCntMin => 1, -+ IncrAgeMax => 1, -+ IncrLevels => 1, -+ IncrFill => 1, -+ PartialAgeMax => 1, -+ RestoreInfoKeepCnt => 1, -+ ArchiveInfoKeepCnt => 1, -+ BackupFilesOnly => 1, -+ BackupFilesExclude => 1, -+ BackupsDisable => 1, -+ BlackoutBadPingLimit => 1, -+ BlackoutGoodCnt => 1, -+ BlackoutPeriods => 1, -+ BackupZeroFilesIsFatal => 1, -+ ClientCharset => 1, -+ ClientCharsetLegacy => 1, -+ XferMethod => 1, -+ XferLogLevel => 1, -+ SmbShareName => 1, -+ SmbShareUserName => 1, -+ SmbSharePasswd => 1, -+ SmbClientFullCmd => 0, -+ SmbClientIncrCmd => 0, -+ SmbClientRestoreCmd => 0, -+ TarShareName => 1, -+ TarFullArgs => 1, -+ TarIncrArgs => 1, -+ TarClientCmd => 0, -+ TarClientRestoreCmd => 0, -+ TarClientPath => 0, -+ RsyncShareName => 1, -+ RsyncdClientPort => 1, -+ RsyncdPasswd => 1, -+ RsyncdUserName => 1, -+ RsyncdAuthRequired => 1, -+ RsyncCsumCacheVerifyProb => 1, -+ RsyncArgs => 1, -+ RsyncArgsExtra => 1, -+ RsyncRestoreArgs => 1, -+ RsyncClientCmd => 0, -+ RsyncClientRestoreCmd => 0, -+ RsyncClientPath => 0, -+ FtpShareName => 1, -+ FtpUserName => 1, -+ FtpPasswd => 1, -+ FtpBlockSize => 1, -+ FtpPort => 1, -+ FtpTimeout => 1, -+ FtpFollowSymlinks => 1, -+ FtpRestoreEnabled => 1, -+ ArchiveDest => 1, -+ ArchiveComp => 1, -+ ArchivePar => 1, -+ ArchiveSplit => 1, -+ ArchiveClientCmd => 0, -+ FixedIPNetBiosNameCheck => 1, -+ NmbLookupCmd => 0, -+ NmbLookupFindHostCmd => 0, -+ PingMaxMsec => 1, -+ PingCmd => 0, -+ ClientTimeout => 1, -+ MaxOldPerPCLogFiles => 1, -+ CompressLevel => 1, -+ ClientNameAlias => 1, -+ DumpPreUserCmd => 0, -+ DumpPostUserCmd => 0, -+ RestorePreUserCmd => 0, -+ RestorePostUserCmd => 0, -+ ArchivePreUserCmd => 0, -+ ArchivePostUserCmd => 0, -+ DumpPostShareCmd => 0, -+ DumpPreShareCmd => 0, -+ UserCmdCheckStatus => 0, -+ EMailNotifyMinDays => 1, -+ EMailFromUserName => 1, -+ EMailAdminUserName => 1, -+ EMailUserDestDomain => 1, -+ EMailNoBackupEverSubj => 1, -+ EMailNoBackupEverMesg => 1, -+ EMailNotifyOldBackupDays => 1, -+ EMailNoBackupRecentSubj => 1, -+ EMailNoBackupRecentMesg => 1, -+ EMailNotifyOldOutlookDays => 1, -+ EMailOutlookBackupSubj => 1, -+ EMailOutlookBackupMesg => 1, -+ EMailHeaders => 1, - }; 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 deleted file mode 100644 index 25d579c30..000000000 --- a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- conf/config.pl.formatted 2013-09-23 23:12:30.708129365 +0300 -+++ conf/config.pl 2013-09-23 23:12:39.448043656 +0300 -@@ -1322,6 +1322,8 @@ - '--times', - '--block-size=2048', - '--recursive', -+ '--specials', -+ '--checksum-seed=32761', - ]; - - # -@@ -1388,6 +1390,8 @@ - '--relative', - '--ignore-times', - '--recursive', -+ '--specials', -+ '--checksum-seed=32761', - ]; - - ########################################################################### -@@ -2018,7 +2022,7 @@ - # --> administrative users are only craig and celia'. - # - $Conf{CgiAdminUserGroup} = ''; --$Conf{CgiAdminUsers} = ''; -+$Conf{CgiAdminUsers} = 'backuppc'; - - # - # URL of the BackupPC_Admin CGI script. Used for email messages. -@@ -2065,7 +2069,7 @@ - # dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero - # for international dates (DD/MM). - # --$Conf{CgiDateFormatMMDD} = 1; -+$Conf{CgiDateFormatMMDD} = 2; - - # - # If set, the complete list of hosts appears in the left navigation -@@ -2251,7 +2255,7 @@ - ClientTimeout => 1, - MaxOldPerPCLogFiles => 1, - CompressLevel => 1, -- ClientNameAlias => 1, -+ ClientNameAlias => 0, - DumpPreUserCmd => 0, - DumpPostUserCmd => 0, - RestorePreUserCmd => 0, diff --git a/app-backup/backuppc/files/99_backuppc.conf b/app-backup/backuppc/files/99_backuppc.conf deleted file mode 100644 index eae766e4f..000000000 --- a/app-backup/backuppc/files/99_backuppc.conf +++ /dev/null @@ -1,32 +0,0 @@ - - - -Listen 8080 - - AssignUserId backuppc backuppc - DocumentRoot "/usr/lib/backuppc/htdocs/" - RedirectMatch ^/$ /BackupPC_Admin - - - AuthType Basic - AuthName "BackupPC Community Edition Administrative Interface" - AuthUserFile "/etc/BackupPC/users.htpasswd" - Options ExecCGI - Require valid-user - Require host 127.0.0.1 - - - - SetHandler perl-script - PerlResponseHandler ModPerl::Registry - PerlOptions +ParseHeaders - - - - Require all granted - Options -ExecCGI - - - - - diff --git a/app-backup/backuppc/files/backuppc.service b/app-backup/backuppc/files/backuppc.service deleted file mode 100644 index 7c4877a4e..000000000 --- a/app-backup/backuppc/files/backuppc.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description= BackupPC server -After=syslog.target local-fs.target remote-fs.target - -[Service] -Type=oneshot -User=backuppc -Group=backuppc -ExecStart=/usr/bin/BackupPC -d -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/app-backup/backuppc/files/defined.patch b/app-backup/backuppc/files/defined.patch deleted file mode 100644 index b080d39de..000000000 --- a/app-backup/backuppc/files/defined.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/BackupPC/CGI/Browse.pm b/lib/BackupPC/CGI/Browse.pm -index 7309955..fea400f 100644 ---- a/lib/BackupPC/CGI/Browse.pm -+++ b/lib/BackupPC/CGI/Browse.pm -@@ -65,7 +65,7 @@ sub action - # - # default to the newest backup - # -- if ( !defined($In{num}) && defined(@Backups) && @Backups > 0 ) { -+ if ( !defined($In{num}) && @Backups > 0 ) { - $i = @Backups - 1; - $num = $Backups[$i]{num}; - }