From fbea894e342e2030bff0a60f7e33b35b9a3d2c98 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Jun 05 2017 17:47:24 +0000 Subject: Update to latest upstream release. --- diff --git a/.gitignore b/.gitignore index a13555b..0fdf238 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-3.3.1.tar.gz /BackupPC-4.1.1.tar.gz /BackupPC-4.1.2.tar.gz +/BackupPC-4.1.3.tar.gz diff --git a/BackupPC-4.1.1-docfix.patch b/BackupPC-4.1.1-docfix.patch deleted file mode 100644 index dc8fcf2..0000000 --- a/BackupPC-4.1.1-docfix.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/configure.pl -+++ b/configure.pl -@@ -934,7 +934,7 @@ sub DoInstall - # - # Create install directories - # -- foreach my $dir ( qw(bin share/doc/BackupPC -+ foreach my $dir ( qw(bin doc - lib/BackupPC/CGI - lib/BackupPC/Config - lib/BackupPC/Lang -@@ -1064,13 +1064,13 @@ sub DoInstall - print("Making Apache configuration file for suid-perl\n"); - InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644); - -- print("Installing docs in $DestDir$Conf{InstallDir}/share/doc/BackupPC\n"); -+ print("Installing docs in $DestDir$Conf{InstallDir}/doc\n"); - foreach my $doc ( qw(BackupPC.pod BackupPC.html) ) { -- InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/share/doc/BackupPC/$doc", 0444); -+ InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/doc/$doc", 0444); - # - # clean up files from old directory - # -- unlink("$DestDir$Conf{InstallDir}/doc/$doc") if ( -f "$DestDir$Conf{InstallDir}/doc/$doc" ); -+ #unlink("$DestDir$Conf{InstallDir}/doc/$doc") if ( -f "$DestDir$Conf{InstallDir}/doc/$doc" ); - } - # - # clean up old directory (ok if it quietly fails if there are other files in that directory) ---- a/lib/BackupPC/CGI/View.pm -+++ b/lib/BackupPC/CGI/View.pm -@@ -102,7 +102,7 @@ sub action - $file = $bpc->ConfDir() . "/hosts"; - $linkHosts = 1; - } elsif ( $type eq "docs" ) { -- $file = $bpc->InstallDir() . "/share/doc/BackupPC/BackupPC.html"; -+ $file = $bpc->InstallDir() . "/doc/BackupPC.html"; - } elsif ( $host ne "" ) { - if ( !defined($In{num}) ) { - # get the latest LOG file diff --git a/BackupPC-4.1.3-docfix.patch b/BackupPC-4.1.3-docfix.patch new file mode 100644 index 0000000..e9c1780 --- /dev/null +++ b/BackupPC-4.1.3-docfix.patch @@ -0,0 +1,39 @@ +--- a/configure.pl ++++ b/configure.pl +@@ -949,7 +949,7 @@ sub DoInstall + # Create install directories + # + foreach my $dir ( qw(bin +- share share/doc share/doc/BackupPC ++ doc + lib lib/BackupPC + lib/BackupPC/CGI + lib/BackupPC/Config +@@ -1085,13 +1085,13 @@ sub DoInstall + print("Making Apache configuration file for suid-perl\n"); + InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644); + +- print("Installing docs in $DestDir$Conf{InstallDir}/share/doc/BackupPC\n"); ++ print("Installing docs in $DestDir$Conf{InstallDir}/doc\n"); + foreach my $doc ( qw(BackupPC.pod BackupPC.html) ) { +- InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/share/doc/BackupPC/$doc", 0444); ++ InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/doc/$doc", 0444); + # + # clean up files from old directory + # +- unlink("$DestDir$Conf{InstallDir}/doc/$doc") if ( -f "$DestDir$Conf{InstallDir}/doc/$doc" ); ++ #unlink("$DestDir$Conf{InstallDir}/doc/$doc") if ( -f "$DestDir$Conf{InstallDir}/doc/$doc" ); + } + # + # clean up old directory (ok if it quietly fails if there are other files in that directory) +--- a/lib/BackupPC/CGI/View.pm ++++ b/lib/BackupPC/CGI/View.pm +@@ -102,7 +102,7 @@ sub action + $file = $bpc->ConfDir() . "/hosts"; + $linkHosts = 1; + } elsif ( $type eq "docs" ) { +- $file = $bpc->InstallDir() . "/share/doc/BackupPC/BackupPC.html"; ++ $file = $bpc->InstallDir() . "/doc/BackupPC.html"; + } elsif ( $host ne "" ) { + if ( !defined($In{num}) ) { + # get the latest LOG file diff --git a/BackupPC.spec b/BackupPC.spec index 1c9265a..6a580f8 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,17 +10,16 @@ %global ver_major 4 %global ver_minor 1 -%global ver_patch 2 +%global ver_patch 3 %global ver_under %{ver_major}_%{ver_minor}_%{ver_patch} Name: BackupPC Version: %{ver_major}.%{ver_minor}.%{ver_patch} Release: 1%{?dist} Summary: High-performance backup system -Group: Applications/System + License: GPLv2+ URL: http://backuppc.github.io/backuppc/index.html - Source0: https://github.com/backuppc/backuppc/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate @@ -51,10 +50,13 @@ BuildRequires: systemd Requires: perl(Net::FTP::AutoReconnect) Requires: perl(Net::FTP::RetrHandle) +Requires: bzip2 Requires: httpd Requires: iputils Requires: openssh-clients +%if ! 0%{?el6} Requires: par2cmdline +%endif Requires: rrdtool Requires: rsync-bpc >= 3.0.9.6 Requires: perl(Archive::Zip) @@ -296,7 +298,7 @@ fi %dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/* +%config(noreplace) %attr(-,backuppc,apache) %{_sysconfdir}/%{name}/* %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/sbin @@ -320,6 +322,13 @@ fi %changelog +* Sun Jun 4 2017 Richard Shaw - 4.1.3-1 +- Update to latest upstream release. + +* Sun May 28 2017 Richard Shaw - 4.1.2-2 +- Change permissions on config files to be in the apache group. +- Update systemd service file to start httpd automatically. + * Tue May 2 2017 Richard Shaw - 4.1.2-1 - Update to latest upstream release, 4.1.2. diff --git a/sources b/sources index fd9f85e..262531c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.1.2.tar.gz) = 5dbbced04981f4e83a8ed4752e6e4163a6083fc30c9076c74650ed195b281098f8ea9711c09b4df73f0e61405aa9e4c9d452ca9a5750fcc0345bab8d9e992232 +SHA512 (BackupPC-4.1.3.tar.gz) = dafac2ac9c5544135c440510fe741eb2866d6b3c2cd8e593ab90ff7f907cdf2531e8e2eebbf42d23d4dd9747b002b1c821e89a287ca418581a0953c548fbdfd0