From ebab704fb9acc69aa009968e78ff7b8a327c7b5a Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 22 Sep 2007 12:07:23 +0000 Subject: [PATCH 001/168] Upgrade to 3.0.0 --- BackupPC-2.1.2pl2.diff | 202 ---------------------------------- BackupPC.spec | 241 +++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 173 insertions(+), 272 deletions(-) delete mode 100644 BackupPC-2.1.2pl2.diff diff --git a/BackupPC-2.1.2pl2.diff b/BackupPC-2.1.2pl2.diff deleted file mode 100644 index e98ff4f..0000000 --- a/BackupPC-2.1.2pl2.diff +++ /dev/null @@ -1,202 +0,0 @@ -# -# BackupPC-2.1.2pl2.diff: BackupPC patch file generated -# on Sun Jun 18 19:36:32 2006. -# -# This patch file should be applied to a cleanly unpacked BackupPC -# version 2.1.2. Do not apply any old patch files; each -# patch file accumulates all previous changes. -# -# Example: -# -# # fetch BackupPC-2.1.2.tar.gz -# # fetch BackupPC-2.1.2pl2.diff -# tar zxvf BackupPC-2.1.2.tar.gz -# cd BackupPC-2.1.2 -# patch -p0 < ../BackupPC-2.1.2pl2.diff -# perl configure.pl -# -# ChangeLog: -# -# - In conf/config.pl, changed --devices to -D in $Conf{RsyncArgs} -# and $Conf{RsyncRestoreArgs} to fix "fileListReceive failed" and -# "Can't open .../f%2f for empty output" errors with rsync 2.6.7+. -# Fix proposed by Justin Pessa and Vincent Ho, and confirmed by -# Dan Niles. -# -# - Added patch from Michael (mna.news) to ignore "file is unchanged" -# message from tar 1.15.x during incremental backups. -# -# - Fixed creation of .rsrc directories in bin/BackupPC_tarExtract -# when used with xtar on MacOS. Reported by Samuel Bancal and -# Matthew Radey, who helped with debugging. -# -# - Fixed bug in BackupPC_tarExtract for files >8GB in size whose -# lengths are multiples of 256. Reported by Jamie Myers and -# Marko Tukiainen, who both helped debugging the problem. -# -# - Fixed bug in lib/BackupPC/Xfer/RsyncFileIO.pm that caused -# incorrected deleted attributes to be set in directories -# where one of the files had an rsync phase 1 retry during -# an incremental. Reported by Tony Nelson. -# ---- bin/BackupPC_tarExtract 2005-09-05 16:21:21.000000000 -0700 -+++ bin/BackupPC_tarExtract 2006-06-18 19:36:31.995945464 -0700 -@@ -58,7 +58,7 @@ - exit(1); - } - my $client = $1; --if ( $ARGV[1] !~ /^([\w\s\.\/\$-]+)$/ ) { -+if ( $ARGV[1] !~ /^([\w\s.\/$(){}[\]-]+)$/ ) { - print("$0: bad share name '$ARGV[1]'\n"); - exit(1); - } -@@ -101,7 +101,7 @@ - # Copyright 1998 Stephen Zander. All rights reserved. - # - my $tar_unpack_header -- = 'Z100 A8 A8 A8 A12 A12 A8 A1 Z100 A6 A2 Z32 Z32 A8 A8 A155 x12'; -+ = 'Z100 A8 A8 A8 a12 A12 A8 A1 Z100 A6 A2 Z32 Z32 A8 A8 A155 x12'; - my $tar_header_length = 512; - - my $BufSize = 1048576; # 1MB or 2^20 -@@ -251,7 +251,7 @@ - $name = $longName if ( defined($longName) ); - $linkname = $longLink if ( defined($longLink) ); - $name =~ s{^\./+}{}; -- $name =~ s{/+$}{}; -+ $name =~ s{/+\.?$}{}; - $name =~ s{//+}{/}g; - return { - name => $name, -@@ -313,7 +313,7 @@ - # - my($nRead); - #print("Reading $f->{name}, $f->{size} bytes, type $f->{type}\n"); -- pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $file, $f); -+ pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $f); - my $poolWrite = BackupPC::PoolWrite->new($bpc, - "$OutDir/$ShareName/$f->{mangleName}", - $f->{size}, $Compress); -@@ -351,7 +351,7 @@ - # a plain file. - # - $f->{size} = length($f->{linkname}); -- pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $file, $f); -+ pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $f); - my $poolWrite = BackupPC::PoolWrite->new($bpc, - "$OutDir/$ShareName/$f->{mangleName}", - $f->{size}, $Compress); -@@ -369,7 +369,7 @@ - # contents. - # - $f->{size} = length($f->{linkname}); -- pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $file, $f); -+ pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $f); - my $poolWrite = BackupPC::PoolWrite->new($bpc, - "$OutDir/$ShareName/$f->{mangleName}", - $f->{size}, $Compress); -@@ -393,7 +393,7 @@ - } else { - $data = "$f->{devmajor},$f->{devminor}"; - } -- pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $file, $f); -+ pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $f); - my $poolWrite = BackupPC::PoolWrite->new($bpc, - "$OutDir/$ShareName/$f->{mangleName}", - length($data), $Compress); -@@ -487,17 +487,21 @@ - # - sub pathCreate - { -- my($dir, $fullPath, $file, $f) = @_; -+ my($dir, $fullPath, $f) = @_; - - # - # Get parent directory of each of $dir and $fullPath - # -- $dir =~ s{/[^/]*$}{}; -+ # print("pathCreate: dir = $dir, fullPath = $fullPath\n"); -+ $dir =~ s{/([^/]*)$}{}; -+ my $file = $bpc->fileNameUnmangle($1); - $fullPath =~ s{/[^/]*$}{}; -- return if ( -d $fullPath ); -+ return if ( -d $fullPath || $file eq "" ); -+ unlink($fullPath) if ( -e $fullPath ); - mkpath($fullPath, 0, 0777); - $Attrib{$dir} = BackupPC::Attrib->new({ compress => $Compress }) - if ( !defined($Attrib{$dir}) ); -+ # print("pathCreate: adding file = $file to dir = $dir\n"); - $Attrib{$dir}->set($file, { - type => BPC_FTYPE_DIR, - mode => 0755, ---- lib/BackupPC/Lib.pm 2005-09-05 16:21:21.000000000 -0700 -+++ lib/BackupPC/Lib.pm 2006-06-18 19:36:32.035939384 -0700 -@@ -59,7 +59,7 @@ - TopDir => $topDir || '__TOPDIR__', - BinDir => $installDir || '__INSTALLDIR__', - LibDir => $installDir || '__INSTALLDIR__', -- Version => '2.1.2', -+ Version => '2.1.2pl2', - BackupFields => [qw( - num type startTime endTime - nFiles size nFilesExist sizeExist nFilesNew sizeNew ---- lib/BackupPC/Xfer/RsyncFileIO.pm 2005-09-05 16:21:21.000000000 -0700 -+++ lib/BackupPC/Xfer/RsyncFileIO.pm 2006-06-18 19:36:32.120926464 -0700 -@@ -405,6 +405,11 @@ - my($fio, $d) = @_; - my($poolWrite); - -+ # -+ # Don't write attributes on 2nd phase - they're already -+ # taken care of during the first phase. -+ # -+ return if ( $fio->{phase} > 0 ); - if ( !defined($d) ) { - # - # flush all entries (in reverse order) -@@ -932,6 +937,7 @@ - - close($fio->{rxInFd}) if ( defined($fio->{rxInFd}) ); - unlink("$fio->{outDirSh}RStmp") if ( -f "$fio->{outDirSh}RStmp" ); -+ $fio->{phase} = $phase; - - # - # Check the final md4 digest ---- lib/BackupPC/Xfer/Tar.pm 2005-09-05 16:21:21.000000000 -0700 -+++ lib/BackupPC/Xfer/Tar.pm 2006-06-18 19:36:32.110927984 -0700 -@@ -221,8 +221,13 @@ - $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 ); - $t->{fileCnt}++; - } else { -- $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 ); -- $t->{xferErrCnt}++; -+ # -+ # Ignore annoying log message on incremental for tar 1.15.x -+ # -+ if ( !/: file is unchanged; not dumped$/ ) { -+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 ); -+ $t->{xferErrCnt}++; -+ } - # - # If tar encounters a minor error, it will exit with a non-zero - # status. We still consider that ok. Remember if tar prints ---- conf/config.pl 2005-09-05 16:21:22.000000000 -0700 -+++ conf/config.pl 2006-06-18 19:36:31.968949568 -0700 -@@ -1052,7 +1052,7 @@ - '--perms', - '--owner', - '--group', -- '--devices', -+ '-D', - '--links', - '--times', - '--block-size=2048', -@@ -1086,7 +1086,7 @@ - '--perms', - '--owner', - '--group', -- '--devices', -+ '-D', - '--links', - '--times', - '--block-size=2048', diff --git a/BackupPC.spec b/BackupPC.spec index e1186f2..99067bf 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -1,29 +1,51 @@ -Name: BackupPC -Version: 2.1.2 -Release: 7%{?dist} -Summary: BackupPC - high-performance backup system +%if %{?fedora}%{?rhel} >= 5 +%define useselinux 1 +%else +%define useselinux 0 +%endif -Group: Applications/System -License: GPL -URL: http://backuppc.sourceforge.net/ -Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz -Source1: BackupPC.htaccess -Source2: BackupPC.logrotate -Patch0: BackupPC-2.1.2pl2.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +Name: BackupPC +Version: 3.0.0 +Release: 3%{?dist} +Summary: BackupPC - high-performance backup system -BuildRequires: /bin/cat /bin/df /bin/gtar %{_bindir}/nmblookup %{_bindir}/rsync %{_sbindir}/sendmail %{_bindir}/smbclient %{_bindir}/split %{_bindir}/ssh -Requires: httpd -Requires: perl-suidperl -Requires: perl(File::RsyncP) -Requires: rsync -Requires(pre): %{_sbindir}/useradd -Requires(preun): /sbin/service, /sbin/chkconfig -Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod -Requires(postun): /sbin/service +Group: Applications/System +License: GPLv2+ +URL: http://backuppc.sourceforge.net/ +Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz +Source1: BackupPC.htaccess +Source2: BackupPC.logrotate +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: /bin/cat +BuildRequires: /bin/df +BuildRequires: /bin/gtar +BuildRequires: %{_bindir}/nmblookup +BuildRequires: %{_bindir}/rsync +BuildRequires: %{_sbindir}/sendmail +BuildRequires: %{_bindir}/smbclient +BuildRequires: %{_bindir}/split +BuildRequires: %{_bindir}/ssh +BuildRequires: perl(Compress::Zlib) +Requires: httpd +Requires: perl-suidperl +Requires: perl(File::RsyncP) +Requires: perl(Compress::Zlib) +Requires: perl(Archive::Zip) +Requires: perl-Time-modules +Requires: perl(XML::RSS) +Requires: rsync +Requires(pre): %{_sbindir}/useradd +Requires(preun): initscripts, chkconfig +Requires(post): initscripts, chkconfig, %{_sbindir}/usermod +Requires(postun): initscripts +%if %{useselinux} +Requires: policycoreutils +BuildRequires: selinux-policy-devel, checkpolicy +%endif +Provides: backuppc = %{version} %description BackupPC is a high-performance, enterprise-grade system for backing up Linux @@ -32,98 +54,179 @@ and easy to install and maintain. %prep %setup -q -%patch0 -p0 -sed -i s/\"backuppc\"/\"$LOGNAME\"/ configure.pl +sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl +iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog +pushd doc +iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod +iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html +popd + +%if %{useselinux} +%{__mkdir} selinux +pushd selinux + +cat >%{name}.te <%{name}.fc < /dev/null || : +%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || : + %preun if [ $1 = 0 ]; then - /sbin/service %{name} stop > /dev/null 2>&1 || : - /sbin/chkconfig --del %{name} || : + service backuppc stop > /dev/null 2>&1 || : + chkconfig --del backuppc || : fi %post -/sbin/chkconfig --add %{name} || : -/sbin/service httpd condrestart > /dev/null 2>&1 || : +%if %{useselinux} + # Install/update Selinux policy + semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp + # files owned by RPM + fixfiles -R %{name} restore + # files created by app + restorecon -R %{_sysconfdir}/%{name} + restorecon -R %{_localstatedir}/lib/%{name} + restorecon -R %{_localstatedir}/log/%{name} +%endif +chkconfig --add backuppc || : +service httpd condrestart > /dev/null 2>&1 || : %{_sbindir}/usermod -a -G backuppc apache || : + %postun -/sbin/service httpd condrestart > /dev/null 2>&1 || : +service httpd condrestart > /dev/null 2>&1 || : +%if %{useselinux} +if [ "$1" -eq "0" ]; then + # Remove the SElinux policy. + semodule -r %{name} || : +fi +%endif + %files %defattr(-,root,root,-) %doc README ChangeLog LICENSE doc/ -%dir %{_datadir}/%{name}/ -%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} +%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) %{_sysconfdir}/logrotate.d/%{name} +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/sbin %{_datadir}/%{name}/[^s]* -%{_initrddir}/%{name} +%{_initrddir}/backuppc %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/ +%if %{useselinux} +%{_datadir}/selinux/packages/%{name}/%{name}.pp +%endif %changelog +* Fri Sep 21 2007 Johan Cwiklinski 3.0.0-3 +- Fixed SELinux policy module + +* Wed Sep 12 2007 Johan Cwiklinski 3.0.0-2 +- Added SELinux policy module + +* Tue Jan 30 2007 Johan Cwiklinski 3.0.0-1 +- Rebuild RPM for v 3.0.0 + * Sat Aug 16 2006 Mike McGrath 2.1.2-7 - Release bump for rebuild diff --git a/sources b/sources index 03eeb15..6edc6ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72fc0f09084f44c42ba5d22451cfe29b BackupPC-2.1.2.tar.gz +dc37728c1dc9225354523f279045f3f3 BackupPC-3.0.0.tar.gz From 4bf1a6a161706f31b3ec14b71aa43c3a3dcee45f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 03:31:20 +0000 Subject: [PATCH 002/168] Initialize branch F-8 for BackupPC --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 3b7cf0426b56c9f2798461edb973c348bc22297f Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Thu, 29 Nov 2007 06:48:35 +0000 Subject: [PATCH 003/168] New upstream release --- .cvsignore | 2 +- BackupPC-README.fedora | 15 +++++++++++++++ BackupPC.spec | 38 ++++++++++++++++++++++++-------------- sources | 2 +- 4 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 BackupPC-README.fedora diff --git a/.cvsignore b/.cvsignore index 32d4c29..0b0fffe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -BackupPC-3.0.0.tar.gz +BackupPC-3.1.0.tar.gz diff --git a/BackupPC-README.fedora b/BackupPC-README.fedora new file mode 100644 index 0000000..2eb08a0 --- /dev/null +++ b/BackupPC-README.fedora @@ -0,0 +1,15 @@ +BackupPC's README file for Fedora + +## BackupPC's user +For security reasons, backuppc user cannot log in. If you want to start manual backup (ie for debugging), you'll need to set it a shell : +usermod -s /bin/bash + +Do not forget to create an SSH key (ssk-keygen) and copy it to remote computers if you plan to use tar/rsynv over SSH backup method. + +## BackupPC's web interface +The CGI web interface is located at : +http://localhost/BackupPC + +You will need to create users in /etc/BackupPC/apache.users : +htpasswd -c /etc/BackupPC/apache.users username +(Note that the '-c' flag is only necessary to create the file) diff --git a/BackupPC.spec b/BackupPC.spec index 99067bf..ef812a1 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -5,8 +5,8 @@ %endif Name: BackupPC -Version: 3.0.0 -Release: 3%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: BackupPC - high-performance backup system Group: Applications/System @@ -15,6 +15,7 @@ URL: http://backuppc.sourceforge.net/ Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate +Source3: BackupPC-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,6 +38,7 @@ Requires: perl(Archive::Zip) Requires: perl-Time-modules Requires: perl(XML::RSS) Requires: rsync +Requires: samba-client Requires(pre): %{_sbindir}/useradd Requires(preun): initscripts, chkconfig Requires(post): initscripts, chkconfig, %{_sbindir}/usermod @@ -60,6 +62,7 @@ pushd doc iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html popd +cp %{SOURCE3} README.fedora %if %{useselinux} %{__mkdir} selinux @@ -68,17 +71,17 @@ pushd selinux cat >%{name}.te <%{name}.fc < 3.0.0-3 +* Thu Nov 29 2007 Johan Cwiklinski 3.1.0-1 +- New upstream version +- Added samba-client as a dependency +- Added readme.fedora +- Changed CGI admin path in default config file + +* Fri Sep 21 2007 Johan Cwiklinski 3.0.0-3 - Fixed SELinux policy module * Wed Sep 12 2007 Johan Cwiklinski 3.0.0-2 diff --git a/sources b/sources index 6edc6ab..91ff97a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc37728c1dc9225354523f279045f3f3 BackupPC-3.0.0.tar.gz +84b4471852ef910768eae9963ef932d2 BackupPC-3.1.0.tar.gz From 0bb09414fa131f51fd9152707e44c0866a0d8cb9 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Thu, 29 Nov 2007 06:59:25 +0000 Subject: [PATCH 004/168] New upstream release --- BackupPC-README.fedora | 15 +++++++++++++++ BackupPC.spec | 38 ++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 BackupPC-README.fedora diff --git a/BackupPC-README.fedora b/BackupPC-README.fedora new file mode 100644 index 0000000..2eb08a0 --- /dev/null +++ b/BackupPC-README.fedora @@ -0,0 +1,15 @@ +BackupPC's README file for Fedora + +## BackupPC's user +For security reasons, backuppc user cannot log in. If you want to start manual backup (ie for debugging), you'll need to set it a shell : +usermod -s /bin/bash + +Do not forget to create an SSH key (ssk-keygen) and copy it to remote computers if you plan to use tar/rsynv over SSH backup method. + +## BackupPC's web interface +The CGI web interface is located at : +http://localhost/BackupPC + +You will need to create users in /etc/BackupPC/apache.users : +htpasswd -c /etc/BackupPC/apache.users username +(Note that the '-c' flag is only necessary to create the file) diff --git a/BackupPC.spec b/BackupPC.spec index 99067bf..ef812a1 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -5,8 +5,8 @@ %endif Name: BackupPC -Version: 3.0.0 -Release: 3%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: BackupPC - high-performance backup system Group: Applications/System @@ -15,6 +15,7 @@ URL: http://backuppc.sourceforge.net/ Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate +Source3: BackupPC-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,6 +38,7 @@ Requires: perl(Archive::Zip) Requires: perl-Time-modules Requires: perl(XML::RSS) Requires: rsync +Requires: samba-client Requires(pre): %{_sbindir}/useradd Requires(preun): initscripts, chkconfig Requires(post): initscripts, chkconfig, %{_sbindir}/usermod @@ -60,6 +62,7 @@ pushd doc iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html popd +cp %{SOURCE3} README.fedora %if %{useselinux} %{__mkdir} selinux @@ -68,17 +71,17 @@ pushd selinux cat >%{name}.te <%{name}.fc < 3.0.0-3 +* Thu Nov 29 2007 Johan Cwiklinski 3.1.0-1 +- New upstream version +- Added samba-client as a dependency +- Added readme.fedora +- Changed CGI admin path in default config file + +* Fri Sep 21 2007 Johan Cwiklinski 3.0.0-3 - Fixed SELinux policy module * Wed Sep 12 2007 Johan Cwiklinski 3.0.0-2 diff --git a/sources b/sources index 6edc6ab..91ff97a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc37728c1dc9225354523f279045f3f3 BackupPC-3.0.0.tar.gz +84b4471852ef910768eae9963ef932d2 BackupPC-3.1.0.tar.gz From d178a4ccf2bb643101fafde5064827b528dcb779 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Thu, 29 Nov 2007 07:12:59 +0000 Subject: [PATCH 005/168] New upstream release --- BackupPC-README.fedora | 15 +++++++++++++++ BackupPC.spec | 38 ++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 BackupPC-README.fedora diff --git a/BackupPC-README.fedora b/BackupPC-README.fedora new file mode 100644 index 0000000..2eb08a0 --- /dev/null +++ b/BackupPC-README.fedora @@ -0,0 +1,15 @@ +BackupPC's README file for Fedora + +## BackupPC's user +For security reasons, backuppc user cannot log in. If you want to start manual backup (ie for debugging), you'll need to set it a shell : +usermod -s /bin/bash + +Do not forget to create an SSH key (ssk-keygen) and copy it to remote computers if you plan to use tar/rsynv over SSH backup method. + +## BackupPC's web interface +The CGI web interface is located at : +http://localhost/BackupPC + +You will need to create users in /etc/BackupPC/apache.users : +htpasswd -c /etc/BackupPC/apache.users username +(Note that the '-c' flag is only necessary to create the file) diff --git a/BackupPC.spec b/BackupPC.spec index 99067bf..ef812a1 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -5,8 +5,8 @@ %endif Name: BackupPC -Version: 3.0.0 -Release: 3%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: BackupPC - high-performance backup system Group: Applications/System @@ -15,6 +15,7 @@ URL: http://backuppc.sourceforge.net/ Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate +Source3: BackupPC-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,6 +38,7 @@ Requires: perl(Archive::Zip) Requires: perl-Time-modules Requires: perl(XML::RSS) Requires: rsync +Requires: samba-client Requires(pre): %{_sbindir}/useradd Requires(preun): initscripts, chkconfig Requires(post): initscripts, chkconfig, %{_sbindir}/usermod @@ -60,6 +62,7 @@ pushd doc iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html popd +cp %{SOURCE3} README.fedora %if %{useselinux} %{__mkdir} selinux @@ -68,17 +71,17 @@ pushd selinux cat >%{name}.te <%{name}.fc < 3.0.0-3 +* Thu Nov 29 2007 Johan Cwiklinski 3.1.0-1 +- New upstream version +- Added samba-client as a dependency +- Added readme.fedora +- Changed CGI admin path in default config file + +* Fri Sep 21 2007 Johan Cwiklinski 3.0.0-3 - Fixed SELinux policy module * Wed Sep 12 2007 Johan Cwiklinski 3.0.0-2 diff --git a/sources b/sources index 6edc6ab..91ff97a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc37728c1dc9225354523f279045f3f3 BackupPC-3.0.0.tar.gz +84b4471852ef910768eae9963ef932d2 BackupPC-3.1.0.tar.gz From 6dd27cff211d45a081b96ceb26997d32801c2f97 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 5 Apr 2008 08:41:11 +0000 Subject: [PATCH 006/168] Correcting nologin path --- BackupPC.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index ef812a1..a8b7daf 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: BackupPC - high-performance backup system Group: Applications/System @@ -163,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT %pre -%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || : +%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || : %preun @@ -222,6 +222,9 @@ fi %endif %changelog +* Sat Apr 05 2008 Johan Cwiklinski 3.1.0-2 +- correcting nologin path + * Thu Nov 29 2007 Johan Cwiklinski 3.1.0-1 - New upstream version - Added samba-client as a dependency From 669780d050811f010e024fe2909147a4763f7f47 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 5 Apr 2008 08:48:47 +0000 Subject: [PATCH 007/168] correcting nologin path --- BackupPC.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index ef812a1..a8b7daf 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: BackupPC - high-performance backup system Group: Applications/System @@ -163,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT %pre -%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || : +%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || : %preun @@ -222,6 +222,9 @@ fi %endif %changelog +* Sat Apr 05 2008 Johan Cwiklinski 3.1.0-2 +- correcting nologin path + * Thu Nov 29 2007 Johan Cwiklinski 3.1.0-1 - New upstream version - Added samba-client as a dependency From a62932f3cd143f7a19ef57730e2db65090d15a4e Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 11 Aug 2008 16:11:39 +0000 Subject: [PATCH 008/168] Avoiding "broken pipe" errors on update --- BackupPC.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index a8b7daf..c7b9f60 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: BackupPC - high-performance backup system Group: Applications/System @@ -174,6 +174,7 @@ fi %post %if %{useselinux} +( # Install/update Selinux policy semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp # files owned by RPM @@ -182,6 +183,7 @@ fi restorecon -R %{_sysconfdir}/%{name} restorecon -R %{_localstatedir}/lib/%{name} restorecon -R %{_localstatedir}/log/%{name} +) &>/dev/null %endif chkconfig --add backuppc || : service httpd condrestart > /dev/null 2>&1 || : @@ -192,8 +194,10 @@ service httpd condrestart > /dev/null 2>&1 || : service httpd condrestart > /dev/null 2>&1 || : %if %{useselinux} if [ "$1" -eq "0" ]; then + ( # Remove the SElinux policy. semodule -r %{name} || : + )&>/dev/null fi %endif @@ -222,6 +226,9 @@ fi %endif %changelog +* Mon Aug 11 2008 Johan Cwiklinski 3.1.0-3 +- using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149) + * Sat Apr 05 2008 Johan Cwiklinski 3.1.0-2 - correcting nologin path From 54194594f68851bb539643028d07312eb4a9f4a5 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 11 Aug 2008 16:21:28 +0000 Subject: [PATCH 009/168] Avoiding "broken pipe" errors on update --- BackupPC.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index a8b7daf..c7b9f60 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: BackupPC - high-performance backup system Group: Applications/System @@ -174,6 +174,7 @@ fi %post %if %{useselinux} +( # Install/update Selinux policy semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp # files owned by RPM @@ -182,6 +183,7 @@ fi restorecon -R %{_sysconfdir}/%{name} restorecon -R %{_localstatedir}/lib/%{name} restorecon -R %{_localstatedir}/log/%{name} +) &>/dev/null %endif chkconfig --add backuppc || : service httpd condrestart > /dev/null 2>&1 || : @@ -192,8 +194,10 @@ service httpd condrestart > /dev/null 2>&1 || : service httpd condrestart > /dev/null 2>&1 || : %if %{useselinux} if [ "$1" -eq "0" ]; then + ( # Remove the SElinux policy. semodule -r %{name} || : + )&>/dev/null fi %endif @@ -222,6 +226,9 @@ fi %endif %changelog +* Mon Aug 11 2008 Johan Cwiklinski 3.1.0-3 +- using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149) + * Sat Apr 05 2008 Johan Cwiklinski 3.1.0-2 - correcting nologin path From 7ce60bba0b34f21f4091c34af94dff6ac18313b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Sat, 23 Aug 2008 03:27:56 +0000 Subject: [PATCH 010/168] Initialize branch EL-5 for BackupPC --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 919f15b8751a3f741835a59ceb547821a69916ec Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 23 Aug 2008 09:46:47 +0000 Subject: [PATCH 011/168] Put the correct nologin path and fix SELinux issue --- BackupPC.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index ef812a1..cff0e59 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: BackupPC - high-performance backup system Group: Applications/System @@ -163,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT %pre -%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || : +%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || : %preun @@ -174,6 +174,7 @@ fi %post %if %{useselinux} +( # Install/update Selinux policy semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp # files owned by RPM @@ -182,6 +183,7 @@ fi restorecon -R %{_sysconfdir}/%{name} restorecon -R %{_localstatedir}/lib/%{name} restorecon -R %{_localstatedir}/log/%{name} +) &>/dev/null %endif chkconfig --add backuppc || : service httpd condrestart > /dev/null 2>&1 || : @@ -192,8 +194,10 @@ service httpd condrestart > /dev/null 2>&1 || : service httpd condrestart > /dev/null 2>&1 || : %if %{useselinux} if [ "$1" -eq "0" ]; then + ( # Remove the SElinux policy. semodule -r %{name} || : + )&>/dev/null fi %endif @@ -222,6 +226,10 @@ fi %endif %changelog +* Sat Aug 23 2008 Johan Cwiklinski 3.1.0-2 +- using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149) +- correcting nologin path + * Thu Nov 29 2007 Johan Cwiklinski 3.1.0-1 - New upstream version - Added samba-client as a dependency From 74068babaefe004273a3f4d7ec256d01bb7b8c8a Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 22 Nov 2008 19:56:46 +0000 Subject: [PATCH 012/168] Correction "poor" summary --- BackupPC.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index c7b9f60..403e09a 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -7,7 +7,7 @@ Name: BackupPC Version: 3.1.0 Release: 3%{?dist} -Summary: BackupPC - high-performance backup system +Summary: High-performance backup system Group: Applications/System License: GPLv2+ From 93488565711cdc8471a4c571e49fc7b4fa5ce0ee Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 23 Feb 2009 20:01:26 +0000 Subject: [PATCH 013/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 403e09a..f891c4c 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system Group: Applications/System @@ -226,6 +226,9 @@ fi %endif %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 3.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Aug 11 2008 Johan Cwiklinski 3.1.0-3 - using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149) From 8391b9da4b06b8dd2a5f97e14487ef1c577c2500 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Fri, 10 Apr 2009 16:04:54 +0000 Subject: [PATCH 014/168] Fix TopDir change (bug #473944) --- BackupPC-TopDir_change.patch | 21 +++++++++++++++++++++ BackupPC.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 BackupPC-TopDir_change.patch diff --git a/BackupPC-TopDir_change.patch b/BackupPC-TopDir_change.patch new file mode 100644 index 0000000..7500660 --- /dev/null +++ b/BackupPC-TopDir_change.patch @@ -0,0 +1,21 @@ +diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm +--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch 2009-04-10 17:57:04.000000000 +0200 ++++ BackupPC-3.1.0/lib/BackupPC/Lib.pm 2009-04-10 17:57:57.000000000 +0200 +@@ -152,8 +152,6 @@ sub new + # Clean up %ENV and setup other variables. + # + delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; +- $bpc->{PoolDir} = "$bpc->{TopDir}/pool"; +- $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool"; + if ( defined(my $error = $bpc->ConfigRead()) ) { + print(STDERR $error, "\n"); + return; +@@ -167,6 +165,8 @@ sub new + $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir}; + } + $bpc->{storage}->setPaths($paths); ++ $bpc->{PoolDir} = "$bpc->{TopDir}/pool"; ++ $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool"; + + # + # Verify we are running as the correct user diff --git a/BackupPC.spec b/BackupPC.spec index f891c4c..d949278 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: High-performance backup system Group: Applications/System @@ -16,6 +16,7 @@ Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora +Patch0: BackupPC-TopDir_change.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -56,6 +57,7 @@ and easy to install and maintain. %prep %setup -q +%patch0 -p1 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog pushd doc @@ -226,6 +228,9 @@ fi %endif %changelog +* Fri Apr 10 2009 Johan Cwiklinski 3.1.0-5 +- Fix TopDir change (bug #473944) + * Mon Feb 23 2009 Fedora Release Engineering - 3.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 98c33e14128250b20bf43b8c70fd103e7e443d3d Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 11 Apr 2009 19:31:55 +0000 Subject: [PATCH 015/168] Fix TopDir change (bug #473944) --- BackupPC.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index cff0e59..9a01d31 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,8 +6,8 @@ Name: BackupPC Version: 3.1.0 -Release: 2%{?dist} -Summary: BackupPC - high-performance backup system +Release: 3%{?dist} +Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -16,6 +16,7 @@ Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora +Patch0: BackupPC-TopDir_change.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -56,6 +57,7 @@ and easy to install and maintain. %prep %setup -q +%patch0 -p1 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog pushd doc @@ -226,6 +228,9 @@ fi %endif %changelog +* Fri Apr 10 2009 Johan Cwiklinski 3.1.0-3 +- Fix TopDir change (bug #473944) + * Sat Aug 23 2008 Johan Cwiklinski 3.1.0-2 - using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149) - correcting nologin path From 3c519ef9e0fa272d88d345122641ae253ce15262 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 11 Apr 2009 19:32:52 +0000 Subject: [PATCH 016/168] Patch has been forgotten --- BackupPC-TopDir_change.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 BackupPC-TopDir_change.patch diff --git a/BackupPC-TopDir_change.patch b/BackupPC-TopDir_change.patch new file mode 100644 index 0000000..7500660 --- /dev/null +++ b/BackupPC-TopDir_change.patch @@ -0,0 +1,21 @@ +diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm +--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch 2009-04-10 17:57:04.000000000 +0200 ++++ BackupPC-3.1.0/lib/BackupPC/Lib.pm 2009-04-10 17:57:57.000000000 +0200 +@@ -152,8 +152,6 @@ sub new + # Clean up %ENV and setup other variables. + # + delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; +- $bpc->{PoolDir} = "$bpc->{TopDir}/pool"; +- $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool"; + if ( defined(my $error = $bpc->ConfigRead()) ) { + print(STDERR $error, "\n"); + return; +@@ -167,6 +165,8 @@ sub new + $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir}; + } + $bpc->{storage}->setPaths($paths); ++ $bpc->{PoolDir} = "$bpc->{TopDir}/pool"; ++ $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool"; + + # + # Verify we are running as the correct user From c990f3a7a2a161d2f0c8e1dd0fb31c9c82f91a0b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 14:59:58 +0000 Subject: [PATCH 017/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index d949278..136a7b9 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: High-performance backup system Group: Applications/System @@ -228,6 +228,9 @@ fi %endif %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Apr 10 2009 Johan Cwiklinski 3.1.0-5 - Fix TopDir change (bug #473944) From 8e631e19514f8b3f23c146b6d2862b3ac1edb5da Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Fri, 18 Sep 2009 21:09:41 +0000 Subject: [PATCH 018/168] Fix SELinux rules (bug #512035) --- BackupPC.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 136a7b9..308cf36 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: High-performance backup system Group: Applications/System @@ -95,11 +95,9 @@ allow httpd_t httpd_sys_content_t:sock_file getattr; EOF cat >%{name}.fc < 3.1.0-7 +- Fix SELinux policy module for UserEmailInfo.pl file + * Fri Jul 24 2009 Fedora Release Engineering - 3.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 54258a7ae783a147a9d50c4a6f0c130f7df1aa9d Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Wed, 23 Sep 2009 16:07:49 +0000 Subject: [PATCH 019/168] Resolve bug #524630 --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 308cf36..770f975 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: High-performance backup system Group: Applications/System @@ -226,6 +226,9 @@ fi %endif %changelog +* Wed Sep 23 2009 Johan Cwiklinski 3.1.0-8 +- Rebuild with latest SELinux policy (bug #524630) + * Fri Sep 18 2009 Johan Cwiklinski 3.1.0-7 - Fix SELinux policy module for UserEmailInfo.pl file From dd6317ef87431ed7fecf82e950688e5f16a2203e Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Fri, 25 Sep 2009 14:10:13 +0000 Subject: [PATCH 020/168] Remove ClientNameAlias directive from CgiUserConfigEdit list to avoid security hole (bug #518412) --- BackupPC.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 770f975..9a49464 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: High-performance backup system Group: Applications/System @@ -150,6 +150,7 @@ sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl +sed -i 's|ClientNameAlias => 1,|ClientNameAlias => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl %if %{useselinux} # SElinux @@ -226,6 +227,9 @@ fi %endif %changelog +* Fri Sep 25 2009 Johan Cwiklinski 3.1.0-9 +- Fix security bug (bug #518412) + * Wed Sep 23 2009 Johan Cwiklinski 3.1.0-8 - Rebuild with latest SELinux policy (bug #524630) From 486083ab6e59b06f34442b534dd60bc643886f06 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:22 +0000 Subject: [PATCH 021/168] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a107c41..7d4d9a8 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := BackupPC SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a5d608f1c1dc76344ffec91a512dbc2a5ecf7fb4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:16:23 +0000 Subject: [PATCH 022/168] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a107c41..7d4d9a8 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := BackupPC SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 99b6b5389d1bf25c83861072bc47288ed37cf2e4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:16:23 +0000 Subject: [PATCH 023/168] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a107c41..7d4d9a8 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := BackupPC SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7c145bd44cea56785c2cbbd5c4da63178988bc0c Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Fri, 15 Jan 2010 20:26:47 +0000 Subject: [PATCH 024/168] Do not relabel backup directory: fix for bug #525948 --- BackupPC.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 9a49464..8c1c583 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: High-performance backup system Group: Applications/System @@ -178,8 +178,6 @@ fi ( # Install/update Selinux policy semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp - # files owned by RPM - fixfiles -R %{name} restore # files created by app restorecon -R %{_sysconfdir}/%{name} restorecon -R %{_localstatedir}/lib/%{name} @@ -227,6 +225,9 @@ fi %endif %changelog +* Fri Jan 15 2010 Johan Cwiklinski 3.1.0-10 +- Fix selinux labelling backup directoru (bug #525948) + * Fri Sep 25 2009 Johan Cwiklinski 3.1.0-9 - Fix security bug (bug #518412) From f4235b86d5e64cd3e6a3026d9f81f4299542c820 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Fri, 15 Jan 2010 21:08:19 +0000 Subject: [PATCH 025/168] Backpoorting latest changes made for Fedora --- BackupPC.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 9a01d31..adbb7ce 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system Group: Applications/System @@ -95,11 +95,9 @@ allow httpd_t httpd_sys_content_t:sock_file getattr; EOF cat >%{name}.fc < 1,|ClientNameAlias => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl %if %{useselinux} # SElinux @@ -179,8 +178,6 @@ fi ( # Install/update Selinux policy semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp - # files owned by RPM - fixfiles -R %{name} restore # files created by app restorecon -R %{_sysconfdir}/%{name} restorecon -R %{_localstatedir}/lib/%{name} @@ -228,6 +225,11 @@ fi %endif %changelog +* Fri Jan 15 2010 Johan Cwiklinski 3.1.0-4 +- Fix selinux labelling backup directoru (bug #525948) +- Fix security bug (bug #518412) +- Fix SELinux policy module for UserEmailInfo.pl file + * Fri Apr 10 2009 Johan Cwiklinski 3.1.0-3 - Fix TopDir change (bug #473944) From f168dc7561bdb8fc452a529962a96487662b42fa Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sun, 17 Jan 2010 13:34:17 +0000 Subject: [PATCH 026/168] Bug #525948 was not fixed --- BackupPC.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 8c1c583..ccad8c8 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: High-performance backup system Group: Applications/System @@ -180,7 +180,6 @@ fi semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp # files created by app restorecon -R %{_sysconfdir}/%{name} - restorecon -R %{_localstatedir}/lib/%{name} restorecon -R %{_localstatedir}/log/%{name} ) &>/dev/null %endif @@ -225,8 +224,11 @@ fi %endif %changelog +* Sun Jan 17 2010 Johan Cwiklinski 3.1.0-11 +- Really fix selinux labelling backup directory (bug #525948) + * Fri Jan 15 2010 Johan Cwiklinski 3.1.0-10 -- Fix selinux labelling backup directoru (bug #525948) +- Fix selinux labelling backup directory (bug #525948) * Fri Sep 25 2009 Johan Cwiklinski 3.1.0-9 - Fix security bug (bug #518412) From 5d96aa5d5d50ca5ab2c3a9e8598a3b37deae85c5 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sun, 17 Jan 2010 13:58:33 +0000 Subject: [PATCH 027/168] Bug #525948 was not fixed --- BackupPC.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index adbb7ce..290c24a 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: High-performance backup system Group: Applications/System @@ -180,7 +180,6 @@ fi semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp # files created by app restorecon -R %{_sysconfdir}/%{name} - restorecon -R %{_localstatedir}/lib/%{name} restorecon -R %{_localstatedir}/log/%{name} ) &>/dev/null %endif @@ -225,8 +224,11 @@ fi %endif %changelog +* Sun Jan 17 2010 Johan Cwiklinski 3.1.0-5 +- Really fix selinux labelling backup directory (bug #525948) + * Fri Jan 15 2010 Johan Cwiklinski 3.1.0-4 -- Fix selinux labelling backup directoru (bug #525948) +- Fix selinux labelling backup directory (bug #525948) - Fix security bug (bug #518412) - Fix SELinux policy module for UserEmailInfo.pl file From 11ec7659d29d664b78be5e6aee6096ad9063b673 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sun, 28 Feb 2010 17:26:02 +0000 Subject: [PATCH 028/168] Fix a typo in apache config file and add ::1 to default allowed hosts --- BackupPC.htaccess | 3 ++- BackupPC.spec | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/BackupPC.htaccess b/BackupPC.htaccess index 9e12c90..5b5672d 100644 --- a/BackupPC.htaccess +++ b/BackupPC.htaccess @@ -9,9 +9,10 @@ order deny,allow deny from all allow from 127.0.0.1 +allow from ::1 AuthType Basic AuthUserFile /etc/BackupPC/apache.users -AuthName "BackupPC +AuthName "BackupPC" require valid-user diff --git a/BackupPC.spec b/BackupPC.spec index ccad8c8..21b8276 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: High-performance backup system Group: Applications/System @@ -224,6 +224,10 @@ fi %endif %changelog +* Sun Feb 28 2010 Johan Cwiklinski 3.1.0-12 +- Add "::1" to the apache config file for default allowed adresses +- Fix a typo in the apache config file + * Sun Jan 17 2010 Johan Cwiklinski 3.1.0-11 - Really fix selinux labelling backup directory (bug #525948) From 68702f36c6a87f33b1c88097d4c913cda1de20b4 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 17 May 2010 17:59:06 +0000 Subject: [PATCH 029/168] Fix for bug #592762 --- BackupPC.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 21b8276..2d4bc52 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,13 +6,13 @@ Name: BackupPC Version: 3.1.0 -Release: 12%{?dist} +Release: 14%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ URL: http://backuppc.sourceforge.net/ -Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -95,8 +95,7 @@ allow httpd_t httpd_sys_content_t:sock_file getattr; EOF cat >%{name}.fc < 3.1.0-14 +- Fix for bug #592762 + * Sun Feb 28 2010 Johan Cwiklinski 3.1.0-12 - Add "::1" to the apache config file for default allowed adresses - Fix a typo in the apache config file From 2f843d5e8a55d26fa6c28a105b14f94c26689301 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 17 May 2010 18:25:44 +0000 Subject: [PATCH 030/168] Fix for bug #592762 --- BackupPC.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 290c24a..fc61adb 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,13 +6,13 @@ Name: BackupPC Version: 3.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ URL: http://backuppc.sourceforge.net/ -Source0: http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -95,8 +95,7 @@ allow httpd_t httpd_sys_content_t:sock_file getattr; EOF cat >%{name}.fc < 3.1.0-6 +- Fix for bug #592762 + * Sun Jan 17 2010 Johan Cwiklinski 3.1.0-5 - Really fix selinux labelling backup directory (bug #525948) From 8eda94e9f33070b466e60fb299131e8027369900 Mon Sep 17 00:00:00 2001 From: Mike McGrath Date: Fri, 9 Jul 2010 15:57:29 +0000 Subject: [PATCH 031/168] Rebuilding to fix broken perl-suidperl dep --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 2d4bc52..58cc11c 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 14%{?dist} +Release: 14.1%{?dist} Summary: High-performance backup system Group: Applications/System @@ -223,6 +223,9 @@ fi %endif %changelog +* Fri Jul 09 2010 Mike McGrath 3.1.0-14.1 +- Rebuilding to fix perl-suidperl broken dep + * Mon May 17 2010 Johan Cwiklinski 3.1.0-14 - Fix for bug #592762 From 7a212a3f0bd46a5d1ba201416cd88b73d7ec8c69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:46:13 +0000 Subject: [PATCH 032/168] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7d4d9a8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: BackupPC -# $Id$ -NAME := BackupPC -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 From 12092b056e8d6048ff3610b57449de3acd794ac3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:46:19 +0000 Subject: [PATCH 033/168] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7d4d9a8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: BackupPC -# $Id$ -NAME := BackupPC -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From a997b2d21322053f3876f0464f959b9a31307c9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:46:21 +0000 Subject: [PATCH 034/168] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7d4d9a8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: BackupPC -# $Id$ -NAME := BackupPC -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From b21075d8dcf0b54cbbdd098c7412b26ca5df580c Mon Sep 17 00:00:00 2001 From: trasher Date: Sat, 31 Jul 2010 22:21:07 +0200 Subject: [PATCH 035/168] perl-suidperl is no longer available (fix bug #611009) --- BackupPC.spec | 17 ++++++++++++++--- BackupPC_Admin.c | 10 ++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 BackupPC_Admin.c diff --git a/BackupPC.spec b/BackupPC.spec index 58cc11c..19f0137 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 14.1%{?dist} +Release: 15%{?dist} Summary: High-performance backup system Group: Applications/System @@ -16,9 +16,12 @@ Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora +#A C wrapper to use since perl-suidperl is no longer provided +Source4: BackupPC_Admin.c Patch0: BackupPC-TopDir_change.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +# No longer noarch due to the C wrapper +#BuildArch: noarch BuildRequires: /bin/cat BuildRequires: /bin/df @@ -32,7 +35,6 @@ BuildRequires: %{_bindir}/ssh BuildRequires: perl(Compress::Zlib) Requires: httpd -Requires: perl-suidperl Requires: perl(File::RsyncP) Requires: perl(Compress::Zlib) Requires: perl(Archive::Zip) @@ -101,6 +103,7 @@ EOF %endif %build +gcc -o BackupPC_Admin %{SOURCE4} $RPM_OPT_FLAGS %if %{useselinux} # SElinux pushd selinux @@ -151,6 +154,10 @@ sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROO sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl sed -i 's|ClientNameAlias => 1,|ClientNameAlias => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl +#perl-suidperl is no longer avaialable, we use a C wrapper +%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl +%{__install} -p -m 4755 BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/ + %if %{useselinux} # SElinux %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name} @@ -216,6 +223,7 @@ fi %{_initrddir}/backuppc %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin +%attr(750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin.pl %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/ %if %{useselinux} @@ -223,6 +231,9 @@ fi %endif %changelog +* Sat Jul 31 2010 Johan Cwiklinski 3.1.0-15 +- perl-suidperl is no longer available (fix bug #611009) + * Fri Jul 09 2010 Mike McGrath 3.1.0-14.1 - Rebuilding to fix perl-suidperl broken dep diff --git a/BackupPC_Admin.c b/BackupPC_Admin.c new file mode 100644 index 0000000..be3137f --- /dev/null +++ b/BackupPC_Admin.c @@ -0,0 +1,10 @@ +#include +#ifndef REAL_PATH +#define REAL_PATH "/usr/share/BackupPC/sbin/BackupPC_Admin.pl" +#endif +int main(ac, av) +char **av; +{ + execv(REAL_PATH, av); + return 0; +} From 7dd2c1901bab6f8a690c32cb16f6cb14979eba14 Mon Sep 17 00:00:00 2001 From: trasher Date: Mon, 2 Aug 2010 22:57:02 +0200 Subject: [PATCH 036/168] Debuginfo with no sources, fix bug #620257 --- BackupPC.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 19f0137..acdc292 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: High-performance backup system Group: Applications/System @@ -67,6 +67,7 @@ iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod. iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html popd cp %{SOURCE3} README.fedora +cp %{SOURCE4} BackupPC_Admin.c %if %{useselinux} %{__mkdir} selinux @@ -103,7 +104,7 @@ EOF %endif %build -gcc -o BackupPC_Admin %{SOURCE4} $RPM_OPT_FLAGS +gcc -o BackupPC_Admin BackupPC_Admin.c $RPM_OPT_FLAGS %if %{useselinux} # SElinux pushd selinux @@ -156,7 +157,7 @@ sed -i 's|ClientNameAlias => 1,|ClientNameAlias => 0,|' $RPM #perl-suidperl is no longer avaialable, we use a C wrapper %{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl -%{__install} -p -m 4755 BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/ +%{__install} -p BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/ %if %{useselinux} # SElinux @@ -231,6 +232,9 @@ fi %endif %changelog +* Mon Aug 02 2010 Johan Cwiklinski 3.1.0-16 +- Debugingo with no sources (fix bug #620257) + * Sat Jul 31 2010 Johan Cwiklinski 3.1.0-15 - perl-suidperl is no longer available (fix bug #611009) From 38fd6181295731a856780bd8d61460b41048f141 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 17:00:29 -0600 Subject: [PATCH 037/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index acdc292..0b3f5b5 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,7 +6,7 @@ Name: BackupPC Version: 3.1.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: High-performance backup system Group: Applications/System @@ -232,6 +232,9 @@ fi %endif %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Aug 02 2010 Johan Cwiklinski 3.1.0-16 - Debugingo with no sources (fix bug #620257) From 508f63bea4a794ab203e56194b4af413bb55b050 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 11:46:25 -0600 Subject: [PATCH 038/168] add lower case ScriptAlias for typing impaired --- BackupPC.htaccess | 1 + BackupPC.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/BackupPC.htaccess b/BackupPC.htaccess index 5b5672d..1538502 100644 --- a/BackupPC.htaccess +++ b/BackupPC.htaccess @@ -21,3 +21,4 @@ require valid-user Alias /BackupPC/images /usr/share/BackupPC/html/ ScriptAlias /BackupPC /usr/share/BackupPC/sbin/BackupPC_Admin +ScriptAlias /backuppc /usr/share/BackupPC/sbin/BackupPC_Admin diff --git a/BackupPC.spec b/BackupPC.spec index 0b3f5b5..c24c6b4 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -232,6 +232,9 @@ fi %endif %changelog +* Wed Jul 06 2011 Bernard Johnson - 3.1.0-18 +- add lower case script alias for typing impaired + * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 88946138eb8347c48c09a8b65c76d10a4531e48d Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 19:32:55 -0600 Subject: [PATCH 039/168] cleanup selinux macros --- BackupPC.spec | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index c24c6b4..fb79ede 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -1,12 +1,10 @@ -%if %{?fedora}%{?rhel} >= 5 -%define useselinux 1 -%else -%define useselinux 0 +%if 0%{?rhel} && 0%{?rhel} < 5 +%define without_selinux 1 %endif Name: BackupPC Version: 3.1.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: High-performance backup system Group: Applications/System @@ -46,7 +44,7 @@ Requires(pre): %{_sbindir}/useradd Requires(preun): initscripts, chkconfig Requires(post): initscripts, chkconfig, %{_sbindir}/usermod Requires(postun): initscripts -%if %{useselinux} +%if ! 0%{?without_selinux} Requires: policycoreutils BuildRequires: selinux-policy-devel, checkpolicy %endif @@ -69,7 +67,7 @@ popd cp %{SOURCE3} README.fedora cp %{SOURCE4} BackupPC_Admin.c -%if %{useselinux} +%if ! 0%{?without_selinux} %{__mkdir} selinux pushd selinux @@ -105,7 +103,7 @@ EOF %build gcc -o BackupPC_Admin BackupPC_Admin.c $RPM_OPT_FLAGS -%if %{useselinux} +%if ! 0%{?without_selinux} # SElinux pushd selinux make -f %{_datadir}/selinux/devel/Makefile @@ -159,7 +157,7 @@ sed -i 's|ClientNameAlias => 1,|ClientNameAlias => 0,|' $RPM %{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl %{__install} -p BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/ -%if %{useselinux} +%if ! 0%{?without_selinux} # SElinux %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name} %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp @@ -181,7 +179,7 @@ if [ $1 = 0 ]; then fi %post -%if %{useselinux} +%if ! 0%{?without_selinux} ( # Install/update Selinux policy semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp @@ -197,7 +195,7 @@ service httpd condrestart > /dev/null 2>&1 || : %postun service httpd condrestart > /dev/null 2>&1 || : -%if %{useselinux} +%if ! 0%{?without_selinux} if [ "$1" -eq "0" ]; then ( # Remove the SElinux policy. @@ -227,13 +225,14 @@ fi %attr(750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin.pl %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/ -%if %{useselinux} +%if ! 0%{?without_selinux} %{_datadir}/selinux/packages/%{name}/%{name}.pp %endif %changelog * Wed Jul 06 2011 Bernard Johnson - 3.1.0-18 - add lower case script alias for typing impaired +- cleanup selinux macros * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From f2059c0ca5152f05e90ad33b74c925cff4f314ad Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 19:37:51 -0600 Subject: [PATCH 040/168] add Mac OS X as a backup client to description --- BackupPC.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index fb79ede..aa7302d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -52,8 +52,8 @@ Provides: backuppc = %{version} %description BackupPC is a high-performance, enterprise-grade system for backing up Linux -and WinXX PCs and laptops to a server's disk. BackupPC is highly configurable -and easy to install and maintain. +and WinXX and Mac OS X PCs and laptops to a server's disk. BackupPC is highly +configurable and easy to install and maintain. %prep %setup -q From 5b6c88c7136a5dcf6d83b1f894a0525dd3c41623 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 19:42:07 -0600 Subject: [PATCH 041/168] minor spec cleanup --- BackupPC.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index aa7302d..3c86f15 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -56,14 +56,14 @@ and WinXX and Mac OS X PCs and laptops to a server's disk. BackupPC is highly configurable and easy to install and maintain. %prep + %setup -q %patch0 -p1 + sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl -iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog -pushd doc -iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod -iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html -popd +for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do + iconv -f ISO-8859-1 -t UTF-8 $f > $f.utf && mv $f.utf $f +done cp %{SOURCE3} README.fedora cp %{SOURCE4} BackupPC_Admin.c @@ -233,6 +233,7 @@ fi * Wed Jul 06 2011 Bernard Johnson - 3.1.0-18 - add lower case script alias for typing impaired - cleanup selinux macros +- minor spec cleanup * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 33549dd05be4acc93d2950df0dde32d823de2b5b Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 19:43:19 -0600 Subject: [PATCH 042/168] remove x bit from documentation files --- BackupPC.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BackupPC.spec b/BackupPC.spec index 3c86f15..4f5a49e 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -64,6 +64,9 @@ sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do iconv -f ISO-8859-1 -t UTF-8 $f > $f.utf && mv $f.utf $f done + +chmod a-x LICENSE README + cp %{SOURCE3} README.fedora cp %{SOURCE4} BackupPC_Admin.c From 10e8106a896b04ad5a9135486ff275dee4b01200 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 19:46:01 -0600 Subject: [PATCH 043/168] v 3.2.1 --- BackupPC.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 4f5a49e..d15f714 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -3,8 +3,8 @@ %endif Name: BackupPC -Version: 3.1.0 -Release: 18%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: High-performance backup system Group: Applications/System @@ -233,7 +233,8 @@ fi %endif %changelog -* Wed Jul 06 2011 Bernard Johnson - 3.1.0-18 +* Wed Jul 06 2011 Bernard Johnson - 3.2.1-1 +- v 3.2.1 - add lower case script alias for typing impaired - cleanup selinux macros - minor spec cleanup From 822391ab0ad4b4cbef022cb74c1c3f3c014155ca Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 20:54:08 -0600 Subject: [PATCH 044/168] add missing popd --- BackupPC.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/BackupPC.spec b/BackupPC.spec index d15f714..f38ce2a 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -102,6 +102,7 @@ cat >%{name}.fc < Date: Wed, 6 Jul 2011 21:40:59 -0600 Subject: [PATCH 045/168] make samba dependency on actual files required to EL5 can use samba-client or samba3x-client (bz #667479) --- BackupPC.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index f38ce2a..fc39980 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -39,7 +39,10 @@ Requires: perl(Archive::Zip) Requires: perl-Time-modules Requires: perl(XML::RSS) Requires: rsync -Requires: samba-client +# This is a file dependency so EL5 can use samba or samba-client or +# samba3x-client +Requires: %{_bindir}/smbclient +Requires: %{_bindir}/nmblookup Requires(pre): %{_sbindir}/useradd Requires(preun): initscripts, chkconfig Requires(post): initscripts, chkconfig, %{_sbindir}/usermod @@ -239,6 +242,8 @@ fi - add lower case script alias for typing impaired - cleanup selinux macros - minor spec cleanup +- make samba dependency on actual files required to EL5 can use samba-client + or samba3x-client (bz #667479) * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 692236909eba2494e942a264cae6eb63f4212456 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 22:01:49 -0600 Subject: [PATCH 046/168] - unbundle perl(Net::FTP::AutoReconnect) and perl(Net::FTP::RetrHandle) - remove old patch that is no longer needed --- BackupPC.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index fc39980..2e59676 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -16,10 +16,8 @@ Source2: BackupPC.logrotate Source3: BackupPC-README.fedora #A C wrapper to use since perl-suidperl is no longer provided Source4: BackupPC_Admin.c -Patch0: BackupPC-TopDir_change.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# No longer noarch due to the C wrapper -#BuildArch: noarch BuildRequires: /bin/cat BuildRequires: /bin/df @@ -32,6 +30,9 @@ BuildRequires: %{_bindir}/split BuildRequires: %{_bindir}/ssh BuildRequires: perl(Compress::Zlib) +# Unbundled libraries +Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) + Requires: httpd Requires: perl(File::RsyncP) Requires: perl(Compress::Zlib) @@ -61,7 +62,6 @@ configurable and easy to install and maintain. %prep %setup -q -%patch0 -p1 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -108,6 +108,13 @@ EOF popd %endif +# attempt to unbundle as much as possible +for m in Net/FTP; do + rm -rf lib/$m + pwd; ls -l + sed -i "\@lib/$m@d" configure.pl +done + %build gcc -o BackupPC_Admin BackupPC_Admin.c $RPM_OPT_FLAGS %if ! 0%{?without_selinux} @@ -244,6 +251,8 @@ fi - minor spec cleanup - make samba dependency on actual files required to EL5 can use samba-client or samba3x-client (bz #667479) +- unbundle perl(Net::FTP::AutoReconnect) and perl(Net::FTP::RetrHandle) +- remove old patch that is no longer needed * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 2fc22852e0e7bb1487bb6efd89903385d4f04683 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 6 Jul 2011 22:17:55 -0600 Subject: [PATCH 047/168] remove old patch --- BackupPC-TopDir_change.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 BackupPC-TopDir_change.patch diff --git a/BackupPC-TopDir_change.patch b/BackupPC-TopDir_change.patch deleted file mode 100644 index 7500660..0000000 --- a/BackupPC-TopDir_change.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm ---- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch 2009-04-10 17:57:04.000000000 +0200 -+++ BackupPC-3.1.0/lib/BackupPC/Lib.pm 2009-04-10 17:57:57.000000000 +0200 -@@ -152,8 +152,6 @@ sub new - # Clean up %ENV and setup other variables. - # - delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; -- $bpc->{PoolDir} = "$bpc->{TopDir}/pool"; -- $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool"; - if ( defined(my $error = $bpc->ConfigRead()) ) { - print(STDERR $error, "\n"); - return; -@@ -167,6 +165,8 @@ sub new - $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir}; - } - $bpc->{storage}->setPaths($paths); -+ $bpc->{PoolDir} = "$bpc->{TopDir}/pool"; -+ $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool"; - - # - # Verify we are running as the correct user From bbae64c8dca720f4532d48f4a8fa6cb25a9bbf68 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Thu, 7 Jul 2011 22:16:49 -0600 Subject: [PATCH 048/168] attempt to make sure $Conf{TopDir} is listed in updatedb PRUNEPATHS, otherwise at least generate a warning on statup (bz #554491) --- BackupPC-3.2.1-locatedb.patch | 37 +++++++++++++++++++++++++++++++++++ BackupPC.spec | 20 ++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 BackupPC-3.2.1-locatedb.patch diff --git a/BackupPC-3.2.1-locatedb.patch b/BackupPC-3.2.1-locatedb.patch new file mode 100644 index 0000000..c631383 --- /dev/null +++ b/BackupPC-3.2.1-locatedb.patch @@ -0,0 +1,37 @@ +diff -Naur BackupPC-3.2.1-pristine/init.d/src/linux-backuppc BackupPC-3.2.1/init.d/src/linux-backuppc +--- BackupPC-3.2.1-pristine/init.d/src/linux-backuppc 2011-04-24 21:31:55.000000000 -0600 ++++ BackupPC-3.2.1/init.d/src/linux-backuppc 2011-07-07 21:36:41.363281386 -0600 +@@ -20,6 +20,25 @@ + + RETVAL=0 + ++topDirCheck() ++{ ++ updatedb=/etc/updatedb.conf ++ topdir=$(perl <<_EOF_ ++ require '__CONFDIR__/config.pl'; ++ print \$Conf{TopDir}; ++_EOF_ ++) ++ if [ -r $updatedb ]; then ++ grep ^PRUNEPATHS $updatedb | grep ${topdir%%/} > /dev/null ++ if [ $? -eq 1]; then ++ logger -t BackupPC -s "WARNING: Your BackupPC \$Conf{TopDir} is not listed in the locate" ++ logger -t BackupPC -s "database configuration's PRUNEPATHS. This may cause all of your" ++ logger -t BackupPC -s "backed up files to be indexed!" ++ fi ++ fi ++} ++ ++ + start() { + # + # You can set the SMB share password here is you wish. Otherwise +@@ -38,6 +57,7 @@ + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/backuppc || \ + RETVAL=1 ++ topDirCheck + return $RETVAL + } + diff --git a/BackupPC.spec b/BackupPC.spec index 2e59676..d23316a 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -11,6 +11,7 @@ Group: Applications/System License: GPLv2+ URL: http://backuppc.sourceforge.net/ Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar.gz +Patch0: BackupPC-3.2.1-locatedb.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -63,6 +64,8 @@ configurable and easy to install and maintain. %setup -q +%patch0 -p1 -b .locatedb + sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do iconv -f ISO-8859-1 -t UTF-8 $f > $f.utf && mv $f.utf $f @@ -206,6 +209,14 @@ chkconfig --add backuppc || : service httpd condrestart > /dev/null 2>&1 || : %{_sbindir}/usermod -a -G backuppc apache || : +# add BackupPC backup directories to PRUNEPATHS in locate database +UPDATEDB=/etc/updatedb.conf +if [ -w $UPDATEDB ]; then + grep ^PRUNEPATHS $UPDATEDB | grep %{_sharedstatedir}/%{name} > /dev/null + if [ $? -eq 1 ]; then + sed -i '\@PRUNEPATHS@s@"$@ '%{_sharedstatedir}/%{name}'"@' $UPDATEDB + fi +fi %postun service httpd condrestart > /dev/null 2>&1 || : @@ -215,6 +226,11 @@ if [ "$1" -eq "0" ]; then # Remove the SElinux policy. semodule -r %{name} || : )&>/dev/null + + # remove BackupPC backup directories from PRUNEPATHS in locate database + if [ -w $UPDATEDB ]; then + sed -i '\@PRUNEPATHS@s@[ ]*'%{_sharedstatedir}/%{name}'@@' $UPDATEDB + fi fi %endif @@ -244,7 +260,7 @@ fi %endif %changelog -* Wed Jul 06 2011 Bernard Johnson - 3.2.1-1 +* Thu Jul 07 2011 Bernard Johnson - 3.2.1-1 - v 3.2.1 - add lower case script alias for typing impaired - cleanup selinux macros @@ -253,6 +269,8 @@ fi or samba3x-client (bz #667479) - unbundle perl(Net::FTP::AutoReconnect) and perl(Net::FTP::RetrHandle) - remove old patch that is no longer needed +- attempt to make sure $Conf{TopDir} is listed in updatedb PRUNEPATHS, + otherwise at least generate a warning on statup (bz #554491) * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From d7abe116d536f169dd66ae5d01f86a391fef7604 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Thu, 7 Jul 2011 22:30:05 -0600 Subject: [PATCH 049/168] move sockets to /var/run (bz #719499) --- BackupPC.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BackupPC.spec b/BackupPC.spec index d23316a..0b7eb8d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -12,6 +12,7 @@ License: GPLv2+ URL: http://backuppc.sourceforge.net/ Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Patch0: BackupPC-3.2.1-locatedb.patch +Patch1: BackupPC-3.2.1-rundir.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -65,6 +66,7 @@ configurable and easy to install and maintain. %setup -q %patch0 -p1 -b .locatedb +%patch1 -p1 -b .rundir sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -271,6 +273,7 @@ fi - remove old patch that is no longer needed - attempt to make sure $Conf{TopDir} is listed in updatedb PRUNEPATHS, otherwise at least generate a warning on statup (bz #554491) +- move sockets to /var/run (bz #719499) * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 0128b7f004ef0c45d4acb4077c35e5a547ce0279 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 00:05:06 -0600 Subject: [PATCH 050/168] update to 3.2.1 sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0b0fffe..53d8af1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ BackupPC-3.1.0.tar.gz +/BackupPC-3.2.1.tar.gz diff --git a/sources b/sources index 91ff97a..cb0804f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84b4471852ef910768eae9963ef932d2 BackupPC-3.1.0.tar.gz +2334fafb8e03284225a9b8a7fb230012 BackupPC-3.2.1.tar.gz From b8e7c8415354b838284863cfaf85ed632f89bd3f Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 20:49:21 -0600 Subject: [PATCH 051/168] add support for systemd starting at F16 (bz #699441) --- BackupPC.spec | 64 ++++++++++++++++++++++++++++++++++++++++++------ backuppc.service | 13 ++++++++++ 2 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 backuppc.service diff --git a/BackupPC.spec b/BackupPC.spec index 0b7eb8d..22fc83f 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -2,6 +2,10 @@ %define without_selinux 1 %endif +%if 0%{?fedora} && 0%{?fedora} > 15 +%global _with_systemd 1 +%endif + Name: BackupPC Version: 3.2.1 Release: 1%{?dist} @@ -18,6 +22,7 @@ Source2: BackupPC.logrotate Source3: BackupPC-README.fedora #A C wrapper to use since perl-suidperl is no longer provided Source4: BackupPC_Admin.c +Source5: backuppc.service BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,6 +36,9 @@ BuildRequires: %{_bindir}/smbclient BuildRequires: %{_bindir}/split BuildRequires: %{_bindir}/ssh BuildRequires: perl(Compress::Zlib) +%if 0%{?_with_systemd} +BuildRequires: systemd-units +%endif # Unbundled libraries Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) @@ -47,9 +55,16 @@ Requires: rsync Requires: %{_bindir}/smbclient Requires: %{_bindir}/nmblookup Requires(pre): %{_sbindir}/useradd +%if 0%{?_with_systemd} +Requires(preun): systemd-units +Requires(post): systemd-units, %{_sbindir}/usermod +Requires(postun): systemd-units +%else Requires(preun): initscripts, chkconfig Requires(post): initscripts, chkconfig, %{_sbindir}/usermod Requires(postun): initscripts +%endif + %if ! 0%{?without_selinux} Requires: policycoreutils BuildRequires: selinux-policy-devel, checkpolicy @@ -155,18 +170,26 @@ do done sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc +%if 0%{?_with_systemd} +%{__mkdir} -p $RPM_BUILD_ROOT/%{_unitdir} +%else %{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir} +%endif %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ %{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc +%if 0%{?_with_systemd} +%{__cp} %{SOURCE5} %{buildroot}/%{_unitdir}/ +%else %{__cp} init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc +%endif %{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf %{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} +%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} %{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/* -%{__chmod} 755 $RPM_BUILD_ROOT%{_initrddir}/backuppc sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl @@ -193,8 +216,14 @@ rm -rf $RPM_BUILD_ROOT %preun if [ $1 = 0 ]; then - service backuppc stop > /dev/null 2>&1 || : - chkconfig --del backuppc || : + # Package removal, not upgrade + %if 0%{?_with_systemd} + /bin/systemctl --no-reload disable backuppc.service > /dev/null 2>&1 || : + /bin/systemctl stop backuppc.service > /dev/null 2>&1 || : + %else + service backuppc stop > /dev/null 2>&1 || : + chkconfig --del backuppc || : + %endif fi %post @@ -207,9 +236,18 @@ fi restorecon -R %{_localstatedir}/log/%{name} ) &>/dev/null %endif -chkconfig --add backuppc || : -service httpd condrestart > /dev/null 2>&1 || : -%{_sbindir}/usermod -a -G backuppc apache || : + +if [ $1 -eq 1 ]; then + # initial installation + %if 0%{?_with_systemd} + /bin/systemctl daemon-reload > /dev/null 2>&1 || : + %else + chkconfig --add backuppc || : + service httpd condrestart > /dev/null 2>&1 || : + %endif + %{_sbindir}/usermod -a -G backuppc apache || : +fi + # add BackupPC backup directories to PRUNEPATHS in locate database UPDATEDB=/etc/updatedb.conf @@ -235,6 +273,12 @@ if [ "$1" -eq "0" ]; then fi fi %endif +if [ $1 -ge 1]; then + # Package upgrade, not uninstall + %if 0%{?_with_systemd} + /bin/systemctl try-restart backuppc.service > /dev/null 2>&1 || : + %endif +fi %files @@ -251,7 +295,12 @@ fi %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/sbin %{_datadir}/%{name}/[^s]* -%{_initrddir}/backuppc + +%if 0%{?_with_systemd} +%attr(0644,root,root) %{_unitdir}/backuppc.service +%else +%attr(0755,root,root) %{_initrddir}/backuppc +%endif %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin %attr(750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin.pl @@ -274,6 +323,7 @@ fi - attempt to make sure $Conf{TopDir} is listed in updatedb PRUNEPATHS, otherwise at least generate a warning on statup (bz #554491) - move sockets to /var/run (bz #719499) +- add support for systemd starting at F16 (bz #699441) * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/backuppc.service b/backuppc.service new file mode 100644 index 0000000..d9f32c9 --- /dev/null +++ b/backuppc.service @@ -0,0 +1,13 @@ +[Unit] +Description= BackupPC server +After=syslog.target + +[Service] +Type=oneshot +User=backuppc +Group=backuppc +ExecStart=/usr/share/BackupPC/bin/BackupPC -d +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target From 617ec7e4da8550cc04ed4b8433eaf75c50c0fcc9 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 20:56:37 -0600 Subject: [PATCH 052/168] spec cleanup --- BackupPC.spec | 50 +++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 22fc83f..e18a592 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -26,13 +26,10 @@ Source5: backuppc.service BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: /bin/cat -BuildRequires: /bin/df -BuildRequires: /bin/gtar -BuildRequires: %{_bindir}/nmblookup +BuildRequires: /bin/cat, /bin/df, /bin/gtar +BuildRequires: %{_bindir}/smbclient, %{_bindir}/nmblookup BuildRequires: %{_bindir}/rsync BuildRequires: %{_sbindir}/sendmail -BuildRequires: %{_bindir}/smbclient BuildRequires: %{_bindir}/split BuildRequires: %{_bindir}/ssh BuildRequires: perl(Compress::Zlib) @@ -44,16 +41,13 @@ BuildRequires: systemd-units Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) Requires: httpd -Requires: perl(File::RsyncP) -Requires: perl(Compress::Zlib) -Requires: perl(Archive::Zip) -Requires: perl-Time-modules -Requires: perl(XML::RSS) +Requires: perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip) +Requires: perl-Time-modules, perl(XML::RSS) Requires: rsync # This is a file dependency so EL5 can use samba or samba-client or # samba3x-client -Requires: %{_bindir}/smbclient -Requires: %{_bindir}/nmblookup +Requires: %{_bindir}/smbclient, %{_bindir}/nmblookup + Requires(pre): %{_sbindir}/useradd %if 0%{?_with_systemd} Requires(preun): systemd-units @@ -144,8 +138,6 @@ gcc -o BackupPC_Admin BackupPC_Admin.c $RPM_OPT_FLAGS popd %endif - - %install rm -rf $RPM_BUILD_ROOT perl configure.pl \ @@ -171,33 +163,33 @@ done sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc %if 0%{?_with_systemd} -%{__mkdir} -p $RPM_BUILD_ROOT/%{_unitdir} +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} %else -%{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir} +mkdir -p $RPM_BUILD_ROOT%{_initrddir} %endif -%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ -%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ -%{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} -%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc %if 0%{?_with_systemd} -%{__cp} %{SOURCE5} %{buildroot}/%{_unitdir}/ +cp -a %{SOURCE5} %{buildroot}/%{_unitdir}/ %else -%{__cp} init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc +cp -a init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc %endif -%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf -%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} -%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf +cp -a %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} +cp -a %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} -%{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/* +chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/* sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl sed -i 's|ClientNameAlias => 1,|ClientNameAlias => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl #perl-suidperl is no longer avaialable, we use a C wrapper -%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl -%{__install} -p BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/ +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl +install -p BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/ %if ! 0%{?without_selinux} # SElinux @@ -315,7 +307,7 @@ fi - v 3.2.1 - add lower case script alias for typing impaired - cleanup selinux macros -- minor spec cleanup +- spec cleanup - make samba dependency on actual files required to EL5 can use samba-client or samba3x-client (bz #667479) - unbundle perl(Net::FTP::AutoReconnect) and perl(Net::FTP::RetrHandle) From c9b7abdccc47ee0f4fb139a6ebb74ff16360e02b Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 21:03:39 -0600 Subject: [PATCH 053/168] typo --- BackupPC.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index e18a592..755482d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -170,7 +170,7 @@ mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} %if 0%{?_with_systemd} cp -a %{SOURCE5} %{buildroot}/%{_unitdir}/ From 519f21a0bfc20a4dcd43f3d28d5fca4e03012737 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 21:08:33 -0600 Subject: [PATCH 054/168] create directory under /var/run for BackupPC socket --- BackupPC-3.2.1-rundir.patch | 24 ++++++++++++++++++++++++ BackupPC.spec | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 BackupPC-3.2.1-rundir.patch diff --git a/BackupPC-3.2.1-rundir.patch b/BackupPC-3.2.1-rundir.patch new file mode 100644 index 0000000..79efff1 --- /dev/null +++ b/BackupPC-3.2.1-rundir.patch @@ -0,0 +1,24 @@ +diff -Naur BackupPC-3.2.1-pristine/bin/BackupPC BackupPC-3.2.1/bin/BackupPC +--- BackupPC-3.2.1-pristine/bin/BackupPC 2011-04-24 21:31:54.000000000 -0600 ++++ BackupPC-3.2.1/bin/BackupPC 2011-07-07 22:25:55.287651463 -0600 +@@ -1885,7 +1885,7 @@ + print(LOG $bpc->timeStamp, "unix socket() failed: $!\n"); + exit(1); + } +- my $sockFile = "$LogDir/BackupPC.sock"; ++ my $sockFile = "/var/run/BackupPC/BackupPC.sock"; + unlink($sockFile); + if ( !bind(SERVER_UNIX, sockaddr_un($sockFile)) ) { + print(LOG $bpc->timeStamp, "unix bind() failed: $!\n"); +diff -Naur BackupPC-3.2.1-pristine/lib/BackupPC/Lib.pm BackupPC-3.2.1/lib/BackupPC/Lib.pm +--- BackupPC-3.2.1-pristine/lib/BackupPC/Lib.pm 2011-04-24 21:31:55.000000000 -0600 ++++ BackupPC-3.2.1/lib/BackupPC/Lib.pm 2011-07-07 22:26:46.744614593 -0600 +@@ -686,7 +686,7 @@ + # + # First try the unix-domain socket + # +- my $sockFile = "$bpc->{LogDir}/BackupPC.sock"; ++ my $sockFile = "/var/run/BackupPC/BackupPC.sock"; + socket(*FH, PF_UNIX, SOCK_STREAM, 0) || return "unix socket: $!"; + if ( !connect(*FH, sockaddr_un($sockFile)) ) { + my $err = "unix connect: $!"; diff --git a/BackupPC.spec b/BackupPC.spec index 755482d..120ed74 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -171,6 +171,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name} %if 0%{?_with_systemd} cp -a %{SOURCE5} %{buildroot}/%{_unitdir}/ @@ -279,6 +280,7 @@ fi %dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/ +%dir %attr(-,backuppc,backuppc) %{_localstatedir}/run/%{name} %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/* From 50e54edcf840831fde5cf5e4e9932edd3811791c Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 21:16:51 -0600 Subject: [PATCH 055/168] patch to move pid dir under /var/run --- BackupPC-3.2.1-piddir.patch | 36 ++++++++++++++++++++++++++++++++++++ BackupPC.spec | 3 +++ 2 files changed, 39 insertions(+) create mode 100644 BackupPC-3.2.1-piddir.patch diff --git a/BackupPC-3.2.1-piddir.patch b/BackupPC-3.2.1-piddir.patch new file mode 100644 index 0000000..ed3e56a --- /dev/null +++ b/BackupPC-3.2.1-piddir.patch @@ -0,0 +1,36 @@ +diff -Naur BackupPC-3.2.1-pristine/bin/BackupPC BackupPC-3.2.1/bin/BackupPC +--- BackupPC-3.2.1-pristine/bin/BackupPC 2011-04-24 21:31:54.000000000 -0600 ++++ BackupPC-3.2.1/bin/BackupPC 2011-07-08 21:14:46.609762024 -0600 +@@ -363,11 +363,11 @@ + # Write out our initial status and save our PID + # + StatusWrite(); +- unlink("$LogDir/BackupPC.pid"); +- if ( open(PID, ">", "$LogDir/BackupPC.pid") ) { ++ unlink("/var/run/BackupPC/BackupPC.pid"); ++ if ( open(PID, ">", "/var/run/BackupPC/BackupPC.pid") ) { + print(PID $$); + close(PID); +- chmod(0444, "$LogDir/BackupPC.pid"); ++ chmod(0444, "/var/run/BackupPC/BackupPC.pid"); + } + + # +@@ -1846,7 +1846,7 @@ + close(LOG); + LogFileOpen(); + print(LOG "Fatal error: unhandled signal $SigName\n"); +- unlink("$LogDir/BackupPC.pid"); ++ unlink("/var/run/BackupPC/BackupPC.pid"); + confess("Got new signal $SigName... quitting\n"); + } else { + $SigName = shift; +@@ -1968,7 +1968,7 @@ + } + delete($Info{pid}); + StatusWrite(); +- unlink("$LogDir/BackupPC.pid"); ++ unlink("/var/run/BackupPC/BackupPC.pid"); + exit(1); + } + diff --git a/BackupPC.spec b/BackupPC.spec index 120ed74..98098a5 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -17,6 +17,7 @@ URL: http://backuppc.sourceforge.net/ Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Patch0: BackupPC-3.2.1-locatedb.patch Patch1: BackupPC-3.2.1-rundir.patch +Patch2: BackupPC-3.2.1-piddir.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -76,6 +77,7 @@ configurable and easy to install and maintain. %patch0 -p1 -b .locatedb %patch1 -p1 -b .rundir +%patch2 -p1 -b .piddir sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -318,6 +320,7 @@ fi otherwise at least generate a warning on statup (bz #554491) - move sockets to /var/run (bz #719499) - add support for systemd starting at F16 (bz #699441) +- patch to move pid dir under /var/run * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From ede6d414c88edd5484f198ca4d91dc7f0508b1b9 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 22:57:21 -0600 Subject: [PATCH 056/168] add underscore in front of without_selinux macro name --- BackupPC.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 98098a5..7041a76 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -1,5 +1,5 @@ %if 0%{?rhel} && 0%{?rhel} < 5 -%define without_selinux 1 +%define _without_selinux 1 %endif %if 0%{?fedora} && 0%{?fedora} > 15 @@ -60,7 +60,7 @@ Requires(post): initscripts, chkconfig, %{_sbindir}/usermod Requires(postun): initscripts %endif -%if ! 0%{?without_selinux} +%if ! 0%{?_without_selinux} Requires: policycoreutils BuildRequires: selinux-policy-devel, checkpolicy %endif @@ -89,7 +89,7 @@ chmod a-x LICENSE README cp %{SOURCE3} README.fedora cp %{SOURCE4} BackupPC_Admin.c -%if ! 0%{?without_selinux} +%if ! 0%{?_without_selinux} %{__mkdir} selinux pushd selinux @@ -133,7 +133,7 @@ done %build gcc -o BackupPC_Admin BackupPC_Admin.c $RPM_OPT_FLAGS -%if ! 0%{?without_selinux} +%if ! 0%{?_without_selinux} # SElinux pushd selinux make -f %{_datadir}/selinux/devel/Makefile @@ -194,7 +194,7 @@ sed -i 's|ClientNameAlias => 1,|ClientNameAlias => 0,|' $RPM mv $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl install -p BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/ -%if ! 0%{?without_selinux} +%if ! 0%{?_without_selinux} # SElinux %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name} %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp @@ -222,7 +222,7 @@ if [ $1 = 0 ]; then fi %post -%if ! 0%{?without_selinux} +%if ! 0%{?_without_selinux} ( # Install/update Selinux policy semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp @@ -255,7 +255,7 @@ fi %postun service httpd condrestart > /dev/null 2>&1 || : -%if ! 0%{?without_selinux} +%if ! 0%{?_without_selinux} if [ "$1" -eq "0" ]; then ( # Remove the SElinux policy. @@ -302,7 +302,7 @@ fi %attr(750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin.pl %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/ -%if ! 0%{?without_selinux} +%if ! 0%{?_without_selinux} %{_datadir}/selinux/packages/%{name}/%{name}.pp %endif From bb0d1c134c2c39ec1bba622b7a51dea61f3a3fe0 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 22:58:37 -0600 Subject: [PATCH 057/168] resolve conflicts --- BackupPC.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BackupPC.spec b/BackupPC.spec index 7041a76..7e3391d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -41,6 +41,9 @@ BuildRequires: systemd-units # Unbundled libraries Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) +# Unbundled libraries +Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) + Requires: httpd Requires: perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip) Requires: perl-Time-modules, perl(XML::RSS) @@ -321,6 +324,8 @@ fi - move sockets to /var/run (bz #719499) - add support for systemd starting at F16 (bz #699441) - patch to move pid dir under /var/run +- minor spec cleanup +- unbundle Net::FTP::* * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 7e26821ff80206ed7730e0cd2a1ce0d345e19c01 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 23:00:00 -0600 Subject: [PATCH 058/168] resolve conflicts --- BackupPC.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BackupPC.spec b/BackupPC.spec index 7e3391d..3e24741 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -44,6 +44,9 @@ Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) # Unbundled libraries Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) +# Unbundled libraries +Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) + Requires: httpd Requires: perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip) Requires: perl-Time-modules, perl(XML::RSS) From e66c69aaf26df147167e1d7230b0290c57c6a49c Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 23:15:38 -0600 Subject: [PATCH 059/168] add support for tmpfiles.d & minor cleanup --- BackupPC.spec | 19 +++++++++---------- BackupPC.tmpfiles | 1 + 2 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 BackupPC.tmpfiles diff --git a/BackupPC.spec b/BackupPC.spec index 3e24741..477a850 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -1,4 +1,4 @@ -%if 0%{?rhel} && 0%{?rhel} < 5 + %define _without_selinux 1 %endif @@ -24,6 +24,7 @@ Source3: BackupPC-README.fedora #A C wrapper to use since perl-suidperl is no longer provided Source4: BackupPC_Admin.c Source5: backuppc.service +Source6: BackupPC.tmpfiles BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,12 +42,6 @@ BuildRequires: systemd-units # Unbundled libraries Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) -# Unbundled libraries -Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) - -# Unbundled libraries -Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) - Requires: httpd Requires: perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip) Requires: perl-Time-modules, perl(XML::RSS) @@ -172,17 +167,19 @@ sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc %if 0%{?_with_systemd} mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d %else mkdir -p $RPM_BUILD_ROOT%{_initrddir} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name} %endif mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name} %if 0%{?_with_systemd} cp -a %{SOURCE5} %{buildroot}/%{_unitdir}/ +cp -a %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/backuppc %else cp -a init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc %endif @@ -288,7 +285,6 @@ fi %dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/ -%dir %attr(-,backuppc,backuppc) %{_localstatedir}/run/%{name} %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/* @@ -299,9 +295,11 @@ fi %{_datadir}/%{name}/[^s]* %if 0%{?_with_systemd} -%attr(0644,root,root) %{_unitdir}/backuppc.service +%{_unitdir}/backuppc.service +%{_sysconfdir}/tmpfiles.d/backuppc %else %attr(0755,root,root) %{_initrddir}/backuppc +%dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name} %endif %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin @@ -329,6 +327,7 @@ fi - patch to move pid dir under /var/run - minor spec cleanup - unbundle Net::FTP::* +- add support for tmpfiles.d * Mon Feb 07 2011 Fedora Release Engineering - 3.1.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/BackupPC.tmpfiles b/BackupPC.tmpfiles new file mode 100644 index 0000000..9d940cc --- /dev/null +++ b/BackupPC.tmpfiles @@ -0,0 +1 @@ +D /var/run/BackupPC backukppc backuppc 775 - From 7e21ac5118311d6c3f4de752b34c33a57c20693f Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 23:21:32 -0600 Subject: [PATCH 060/168] cleanup of spec and change case of tmpfiles config file --- BackupPC.spec | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 477a850..9e7c6e4 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -166,26 +166,25 @@ done sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc %if 0%{?_with_systemd} -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d +install -d $RPM_BUILD_ROOT/%{_unitdir} +install -d $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d %else -mkdir -p $RPM_BUILD_ROOT%{_initrddir} -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name} +install -d $RPM_BUILD_ROOT/%{_initrddir} +install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name} %endif -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -d $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/ +install -d $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/ +install -d $RPM_BUILD_ROOT/%{_localstatedir}/log/%{name} +install -d $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} %if 0%{?_with_systemd} -cp -a %{SOURCE5} %{buildroot}/%{_unitdir}/ -cp -a %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/backuppc +install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/ +install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/BackupPC.conf %else cp -a init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc %endif -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf -cp -a %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} -cp -a %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name} chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/* @@ -296,7 +295,7 @@ fi %if 0%{?_with_systemd} %{_unitdir}/backuppc.service -%{_sysconfdir}/tmpfiles.d/backuppc +%{_sysconfdir}/tmpfiles.d/BackupPC.conf %else %attr(0755,root,root) %{_initrddir}/backuppc %dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name} From 75f77c0f20b8d1c933b62f02ef8dbb0ea4858ee8 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 23:27:49 -0600 Subject: [PATCH 061/168] change tmpfiles conf file to upper and lower case based on %name --- BackupPC.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 9e7c6e4..e6c1e90 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -179,7 +179,7 @@ install -d $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} %if 0%{?_with_systemd} install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/ -install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/BackupPC.conf +install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/%{name}.conf %else cp -a init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc %endif @@ -189,7 +189,7 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name} chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/* sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl -sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl +sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/%{name}";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl sed -i 's|ClientNameAlias => 1,|ClientNameAlias => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl #perl-suidperl is no longer avaialable, we use a C wrapper @@ -295,7 +295,7 @@ fi %if 0%{?_with_systemd} %{_unitdir}/backuppc.service -%{_sysconfdir}/tmpfiles.d/BackupPC.conf +%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf %else %attr(0755,root,root) %{_initrddir}/backuppc %dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name} From 9dc89db56e9ef0b1ddad5b88c129dbdab2c49b78 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 23:37:03 -0600 Subject: [PATCH 062/168] fix missing macro begin --- BackupPC.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index e6c1e90..d1b8c33 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -1,5 +1,5 @@ - -%define _without_selinux 1 +%if 0%{?rhel} && 0%{?rhel} < 5 +%global _without_selinux 1 %endif %if 0%{?fedora} && 0%{?fedora} > 15 From f7b478582cbd513742bea38bcab847680124eb70 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 8 Jul 2011 23:47:01 -0600 Subject: [PATCH 063/168] fix typos and update date in changelog --- BackupPC.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index d1b8c33..b705532 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -310,9 +310,9 @@ fi %endif %changelog -* Thu Jul 07 2011 Bernard Johnson - 3.2.1-1 +* Fri Jul 08 2011 Bernard Johnson - 3.2.1-1 - v 3.2.1 -- add lower case script alias for typing impaired +- add lower case script URL alias for typing impaired - cleanup selinux macros - spec cleanup - make samba dependency on actual files required to EL5 can use samba-client @@ -324,7 +324,6 @@ fi - move sockets to /var/run (bz #719499) - add support for systemd starting at F16 (bz #699441) - patch to move pid dir under /var/run -- minor spec cleanup - unbundle Net::FTP::* - add support for tmpfiles.d From 091e785f0c1c16d34074382ad39f96a6ba81c6f0 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Mon, 11 Jul 2011 09:40:56 -0600 Subject: [PATCH 064/168] fix syntax error in scriptlet --- BackupPC.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index b705532..0c63fd5 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -270,7 +270,7 @@ if [ "$1" -eq "0" ]; then fi fi %endif -if [ $1 -ge 1]; then +if [ $1 -ge 1 ]; then # Package upgrade, not uninstall %if 0%{?_with_systemd} /bin/systemctl try-restart backuppc.service > /dev/null 2>&1 || : From 5b92a362647876fe7ea4d14efe519f5a7bc79614 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Mon, 11 Jul 2011 21:23:00 -0600 Subject: [PATCH 065/168] fix selinux contexts for /var/run socket --- BackupPC.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 0c63fd5..15398a2 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -106,21 +106,21 @@ require { type ping_exec_t; type sendmail_exec_t; class file getattr; - type httpd_sys_content_t; + type var_run_t; class sock_file getattr; } -allow httpd_t httpd_sys_content_t:sock_file write; +allow httpd_t var_run_t:sock_file write; allow httpd_t initrc_t:unix_stream_socket connectto; allow httpd_t ping_exec_t:file getattr; allow httpd_t sendmail_exec_t:file getattr; allow httpd_t ssh_exec_t:file getattr; -allow httpd_t httpd_sys_content_t:sock_file getattr; +allow httpd_t var_run_t:sock_file getattr; EOF cat >%{name}.fc < Date: Tue, 12 Jul 2011 09:58:38 -0600 Subject: [PATCH 066/168] fix syntax error --- BackupPC-3.2.1-locatedb.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC-3.2.1-locatedb.patch b/BackupPC-3.2.1-locatedb.patch index c631383..70978e5 100644 --- a/BackupPC-3.2.1-locatedb.patch +++ b/BackupPC-3.2.1-locatedb.patch @@ -15,7 +15,7 @@ diff -Naur BackupPC-3.2.1-pristine/init.d/src/linux-backuppc BackupPC-3.2.1/init +) + if [ -r $updatedb ]; then + grep ^PRUNEPATHS $updatedb | grep ${topdir%%/} > /dev/null -+ if [ $? -eq 1]; then ++ if [ $? -eq 1 ]; then + logger -t BackupPC -s "WARNING: Your BackupPC \$Conf{TopDir} is not listed in the locate" + logger -t BackupPC -s "database configuration's PRUNEPATHS. This may cause all of your" + logger -t BackupPC -s "backed up files to be indexed!" From 9848779e1c8c1ff543451f8114df82e4b9d8f0fb Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 29 Jul 2011 17:40:41 -0600 Subject: [PATCH 067/168] update sources to current version --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5121bf0..b8dcdba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -BackupPC-2.1.2.tar.gz +BackupPC-3.1.2.tar.gz From c6ae0fc8f7de5ba107fea151a05cec66045afa72 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 12 Aug 2011 21:58:21 -0600 Subject: [PATCH 068/168] - change macro conditionals to include tmpfiles.d support starting at Fedora 15 (bz #730053) - change install lines to preserve timestamps --- BackupPC.spec | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 15398a2..d20ceb2 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -2,13 +2,19 @@ %global _without_selinux 1 %endif +# tmpfiles.d support starts in Fedora 15 +%if 0%{?fedora} && 0%{?fedora} > 14 +%global _with_tmpfilesd 1 +%endif + +# systemd was introduced in Fedora 15, but we don't support it until Fedora 16 %if 0%{?fedora} && 0%{?fedora} > 15 %global _with_systemd 1 %endif Name: BackupPC Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system Group: Applications/System @@ -165,26 +171,27 @@ do done sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc +%if 0%{?_with_tmpfilesd} +install -d $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d +install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/%{name}.conf +%endif + %if 0%{?_with_systemd} install -d $RPM_BUILD_ROOT/%{_unitdir} -install -d $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d +install -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/ %else install -d $RPM_BUILD_ROOT/%{_initrddir} install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name} +install -p -m 0755 init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc %endif + install -d $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/ install -d $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/ install -d $RPM_BUILD_ROOT/%{_localstatedir}/log/%{name} install -d $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} -%if 0%{?_with_systemd} -install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/ -install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/%{name}.conf -%else -cp -a init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc -%endif -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name} +install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf +install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name} chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/* @@ -310,6 +317,11 @@ fi %endif %changelog +* Fri Aug 12 2011 Bernard Johnson - 3.2.2-2 +- change macro conditionals to include tmpfiles.d support starting at + Fedora 15 (bz #730053) +- change install lines to preserve timestamps + * Fri Jul 08 2011 Bernard Johnson - 3.2.1-1 - v 3.2.1 - add lower case script URL alias for typing impaired From cbb6886607607c708352af1760e7fc3fd5f5a2f8 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 12 Aug 2011 22:11:52 -0600 Subject: [PATCH 069/168] break %_with_tmpfilesd out of %_with_systemd macro in %files section --- BackupPC.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index d20ceb2..8632fe0 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -300,14 +300,18 @@ fi %dir %{_datadir}/%{name}/sbin %{_datadir}/%{name}/[^s]* -%if 0%{?_with_systemd} -%{_unitdir}/backuppc.service +%if 0%{?_with_tmpfilesd} %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf %else -%attr(0755,root,root) %{_initrddir}/backuppc %dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name} %endif +%if 0%{?_with_systemd} +%{_unitdir}/backuppc.service +%else +%attr(0755,root,root) %{_initrddir}/backuppc +%endif + %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin %attr(750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin.pl %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/ From 61bd6ff306bcda31c1717b31beb041e44734ffc6 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 19 Aug 2011 16:01:31 -0600 Subject: [PATCH 070/168] wrong order in file --- BackupPC.tmpfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.tmpfiles b/BackupPC.tmpfiles index 9d940cc..3df527d 100644 --- a/BackupPC.tmpfiles +++ b/BackupPC.tmpfiles @@ -1 +1 @@ -D /var/run/BackupPC backukppc backuppc 775 - +D /var/run/BackupPC 0775 root backuppc - From e34dc440e378d4f046aa6ff329c5403fc0bf3a88 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 19 Aug 2011 16:07:49 -0600 Subject: [PATCH 071/168] bump rel --- BackupPC.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 8632fe0..8b38a6f 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -14,7 +14,7 @@ Name: BackupPC Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance backup system Group: Applications/System @@ -321,7 +321,7 @@ fi %endif %changelog -* Fri Aug 12 2011 Bernard Johnson - 3.2.2-2 +* Fri Aug 12 2011 Bernard Johnson - 3.2.2-3 - change macro conditionals to include tmpfiles.d support starting at Fedora 15 (bz #730053) - change install lines to preserve timestamps From 66b314d7dce04d08fa684df30c6211855fdb3b72 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 24 Aug 2011 17:31:58 -0600 Subject: [PATCH 072/168] fix release --- BackupPC.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 8b38a6f..e0d7ca4 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -14,7 +14,7 @@ Name: BackupPC Version: 3.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system Group: Applications/System @@ -321,7 +321,7 @@ fi %endif %changelog -* Fri Aug 12 2011 Bernard Johnson - 3.2.2-3 +* Fri Aug 12 2011 Bernard Johnson - 3.2.1-4 - change macro conditionals to include tmpfiles.d support starting at Fedora 15 (bz #730053) - change install lines to preserve timestamps From edd69b6cb6ccbf3eeb339ddf9bdde17d8debb56b Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Mon, 19 Sep 2011 21:02:42 -0600 Subject: [PATCH 073/168] - fix postun scriptlet error (bz #736946) - make postun scriptlet more coherent --- BackupPC.spec | 55 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index e0d7ca4..94ee0cd 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -12,9 +12,11 @@ %global _with_systemd 1 %endif +%global _updatedb_conf /etc/updatedb.conf + Name: BackupPC Version: 3.2.1 -Release: 4%{?dist} +Release: 6%{?dist} Summary: High-performance backup system Group: Applications/System @@ -254,37 +256,40 @@ fi # add BackupPC backup directories to PRUNEPATHS in locate database -UPDATEDB=/etc/updatedb.conf -if [ -w $UPDATEDB ]; then - grep ^PRUNEPATHS $UPDATEDB | grep %{_sharedstatedir}/%{name} > /dev/null +if [ -w %{_updatedb_conf} ]; then + grep ^PRUNEPATHS %{_updatedb_conf} | grep %{_sharedstatedir}/%{name} > /dev/null if [ $? -eq 1 ]; then - sed -i '\@PRUNEPATHS@s@"$@ '%{_sharedstatedir}/%{name}'"@' $UPDATEDB + sed -i '\@PRUNEPATHS@s@"$@ '%{_sharedstatedir}/%{name}'"@' %{_updatedb_conf} + fi +fi +: + +%postun +# clear out any BackupPC configuration in apache +service httpd condrestart > /dev/null 2>&1 || : + +if [ $1 -eq 0 ]; then + # uninstall + %if ! 0%{?_without_selinux} + # Remove the SElinux policy. + semodule -r %{name} &> /dev/null || : + %endif + + # remove BackupPC backup directories from PRUNEPATHS in locate database + if [ -w %{_updatedb_conf} ]; then + sed -i '\@PRUNEPATHS@s@[ ]*'%{_sharedstatedir}/%{name}'@@' %{_updatedb_conf} || : fi fi -%postun -service httpd condrestart > /dev/null 2>&1 || : -%if ! 0%{?_without_selinux} -if [ "$1" -eq "0" ]; then - ( - # Remove the SElinux policy. - semodule -r %{name} || : - )&>/dev/null - - # remove BackupPC backup directories from PRUNEPATHS in locate database - if [ -w $UPDATEDB ]; then - sed -i '\@PRUNEPATHS@s@[ ]*'%{_sharedstatedir}/%{name}'@@' $UPDATEDB - fi -fi -%endif -if [ $1 -ge 1 ]; then - # Package upgrade, not uninstall +if [ $1 -eq 1 ]; then + # package upgrade, not uninstall %if 0%{?_with_systemd} /bin/systemctl try-restart backuppc.service > /dev/null 2>&1 || : %endif + # at least one command required + : fi - %files %defattr(-,root,root,-) %doc README README.fedora ChangeLog LICENSE doc/ @@ -321,6 +326,10 @@ fi %endif %changelog +* Mon Sep 19 2011 Bernard Johnson - 3.2.1-5 +- fix postun scriptlet error (bz #736946) +- make postun scriptlet more coherent + * Fri Aug 12 2011 Bernard Johnson - 3.2.1-4 - change macro conditionals to include tmpfiles.d support starting at Fedora 15 (bz #730053) From 69ab8a06dc505fb358ceb956d66d5a1c49d025ab Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Tue, 20 Sep 2011 09:07:42 -0600 Subject: [PATCH 074/168] change selinux context on log files to httpd_log_t (bz #730704) --- BackupPC.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 94ee0cd..00e1d36 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -103,7 +103,7 @@ cp %{SOURCE4} BackupPC_Admin.c pushd selinux cat >%{name}.te <%{name}.fc < - 3.2.1-5 - fix postun scriptlet error (bz #736946) - make postun scriptlet more coherent +- change selinux context on log files to httpd_log_t (bz #730704) * Fri Aug 12 2011 Bernard Johnson - 3.2.1-4 - change macro conditionals to include tmpfiles.d support starting at From 39950154b2696fda070564707c88a7d8440faeff Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Wed, 21 Sep 2011 23:24:17 -0600 Subject: [PATCH 075/168] add dir read to selinux context --- BackupPC.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 00e1d36..1bcfb59 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -103,7 +103,7 @@ cp %{SOURCE4} BackupPC_Admin.c pushd selinux cat >%{name}.te <%{name}.fc < - 3.2.1-5 +* Wed Sep 21 2011 Bernard Johnson - 3.2.1-6 - fix postun scriptlet error (bz #736946) - make postun scriptlet more coherent -- change selinux context on log files to httpd_log_t (bz #730704) +- change selinux context on log files to httpd_log_t and allow access + to them (bz #730704) * Fri Aug 12 2011 Bernard Johnson - 3.2.1-4 - change macro conditionals to include tmpfiles.d support starting at From ba2bd4e27063243676a5c1430b40bff3743396bb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:12:54 -0600 Subject: [PATCH 076/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 1bcfb59..cbca9b9 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -16,7 +16,7 @@ Name: BackupPC Version: 3.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: High-performance backup system Group: Applications/System @@ -332,6 +332,9 @@ fi %endif %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 3.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Sep 21 2011 Bernard Johnson - 3.2.1-6 - fix postun scriptlet error (bz #736946) - make postun scriptlet more coherent From 1acf8427cc936af63a4df03646037b7663a3752b Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Sun, 22 Jan 2012 18:52:42 -0700 Subject: [PATCH 077/168] - change %%{_sharedstatedir} to %%{_localstatedir}/lib as these expand differently on EL (bz #767719) - fix XSS vulnerability (bz #749846, bz #749847, bz #749848) CVE-2011-3361 - additional documentation about enabling correct channels in RHEL to resolve all dependencies (bz #749627) - fix bug with missing tmpfiles.d directory --- BackupPC-3.2.1-fix-XSS-vulnerability.patch | 41 ++++++++++++++++++++++ BackupPC-README.fedora | 6 ++-- BackupPC.spec | 26 +++++++++----- README.RHEL | 22 ++++++++++++ 4 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 BackupPC-3.2.1-fix-XSS-vulnerability.patch create mode 100644 README.RHEL diff --git a/BackupPC-3.2.1-fix-XSS-vulnerability.patch b/BackupPC-3.2.1-fix-XSS-vulnerability.patch new file mode 100644 index 0000000..96ae9b1 --- /dev/null +++ b/BackupPC-3.2.1-fix-XSS-vulnerability.patch @@ -0,0 +1,41 @@ +Date: Thu, 27 Oct 2011 16:00:48 -0500 +From: Jamie Strandboge +To: Craig Barratt , coley@...us.mitre.org, + oss-security +Cc: security@...ntu.com +Subject: CVE Request: Security issue in backuppc + +Hi Craig, + +While preparing updates to fix CVE-2011-3361 in Ubuntu I discovered +another XSS vulnerability in View.pm when accessing the following URLs +in backuppc: +index.cgi?action=view&type=XferLOG&num=&host= +index.cgi?action=view&type=XferErr&num=&host= + +You are being emailed as the upstream contact. Please keep +oss-security@...ts.openwall.com[1] CC'd for any updates on this issue. + +To oss-security, can I have a CVE for this? It is essentially the same +vulnerability and fix as for CVE-2011-3361, but in CGI/View.pm instead +of CGI/Browse.pm. Attached is a patch to fix this issue. Tested on +3.0.0, 3.1.0, 3.2.0 and 3.2.1. + +-- +Jamie Strandboge | http://www.canonical.com + +diff -u backuppc-3.2.0/lib/BackupPC/CGI/View.pm backuppc-3.2.0/lib/BackupPC/CGI/View.pm +--- backuppc-3.2.0/lib/BackupPC/CGI/View.pm ++++ backuppc-3.2.0/lib/BackupPC/CGI/View.pm +@@ -46,7 +46,7 @@ + my $compress = 0; + my $fh; + my $host = $In{host}; +- my $num = $In{num}; ++ my $num = ${EscHTML($In{num})}; + my $type = $In{type}; + my $linkHosts = 0; + my($file, $comment); + +[ CONTENT OF TYPE application/pgp-signature SKIPPED ] + diff --git a/BackupPC-README.fedora b/BackupPC-README.fedora index 2eb08a0..448c279 100644 --- a/BackupPC-README.fedora +++ b/BackupPC-README.fedora @@ -1,10 +1,12 @@ BackupPC's README file for Fedora ## BackupPC's user -For security reasons, backuppc user cannot log in. If you want to start manual backup (ie for debugging), you'll need to set it a shell : +For security reasons, backuppc user cannot log in. If you want to start manual +backup (ie for debugging), you'll need to set it a shell : usermod -s /bin/bash -Do not forget to create an SSH key (ssk-keygen) and copy it to remote computers if you plan to use tar/rsynv over SSH backup method. +Do not forget to create an SSH key (ssk-keygen) and copy it to remote computers +if you plan to use tar/rsync over SSH backup method. ## BackupPC's web interface The CGI web interface is located at : diff --git a/BackupPC.spec b/BackupPC.spec index cbca9b9..e2c5293 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -26,6 +26,7 @@ Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar Patch0: BackupPC-3.2.1-locatedb.patch Patch1: BackupPC-3.2.1-rundir.patch Patch2: BackupPC-3.2.1-piddir.patch +Patch3: BackupPC-3.2.1-fix-XSS-vulnerability.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -33,6 +34,7 @@ Source3: BackupPC-README.fedora Source4: BackupPC_Admin.c Source5: backuppc.service Source6: BackupPC.tmpfiles +Source7: README.RHEL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +89,7 @@ configurable and easy to install and maintain. %patch0 -p1 -b .locatedb %patch1 -p1 -b .rundir %patch2 -p1 -b .piddir +%patch3 -p1 -b .fix-XSS-vulnerability sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -96,6 +99,7 @@ done chmod a-x LICENSE README cp %{SOURCE3} README.fedora +cp %{SOURCE7} README.RHEL cp %{SOURCE4} BackupPC_Admin.c %if ! 0%{?_without_selinux} @@ -183,13 +187,13 @@ sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc install -d $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/%{name}.conf %endif +install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name} %if 0%{?_with_systemd} install -d $RPM_BUILD_ROOT/%{_unitdir} install -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/ %else install -d $RPM_BUILD_ROOT/%{_initrddir} -install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name} install -p -m 0755 init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc %endif @@ -263,9 +267,9 @@ fi # add BackupPC backup directories to PRUNEPATHS in locate database if [ -w %{_updatedb_conf} ]; then - grep ^PRUNEPATHS %{_updatedb_conf} | grep %{_sharedstatedir}/%{name} > /dev/null + grep ^PRUNEPATHS %{_updatedb_conf} | grep %{_localstatedir}/lib/%{name} > /dev/null if [ $? -eq 1 ]; then - sed -i '\@PRUNEPATHS@s@"$@ '%{_sharedstatedir}/%{name}'"@' %{_updatedb_conf} + sed -i '\@PRUNEPATHS@s@"$@ '%{_localstatedir}/lib/%{name}'"@' %{_updatedb_conf} fi fi : @@ -283,7 +287,7 @@ if [ $1 -eq 0 ]; then # remove BackupPC backup directories from PRUNEPATHS in locate database if [ -w %{_updatedb_conf} ]; then - sed -i '\@PRUNEPATHS@s@[ ]*'%{_sharedstatedir}/%{name}'@@' %{_updatedb_conf} || : + sed -i '\@PRUNEPATHS@s@[ ]*'%{_localstatedir}/lib/%{name}'@@' %{_updatedb_conf} || : fi fi @@ -298,7 +302,7 @@ fi %files %defattr(-,root,root,-) -%doc README README.fedora ChangeLog LICENSE doc/ +%doc README README.fedora README.RHEL ChangeLog LICENSE doc/ %dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/ @@ -313,9 +317,8 @@ fi %if 0%{?_with_tmpfilesd} %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf -%else -%dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name} %endif +%dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name} %if 0%{?_with_systemd} %{_unitdir}/backuppc.service @@ -332,8 +335,13 @@ fi %endif %changelog -* Thu Jan 12 2012 Fedora Release Engineering - 3.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Sun Jan 22 2012 Bernard Johnson - 3.2.1-7 +- change %%{_sharedstatedir} to %%{_localstatedir}/lib as these expand + differently on EL (bz #767719) +- fix XSS vulnerability (bz #749846, bz #749847, bz #749848) CVE-2011-3361 +- additional documentation about enabling correct channels in RHEL to resolve + all dependencies (bz #749627) +- fix bug with missing tmpfiles.d directory * Wed Sep 21 2011 Bernard Johnson - 3.2.1-6 - fix postun scriptlet error (bz #736946) diff --git a/README.RHEL b/README.RHEL new file mode 100644 index 0000000..78c5abe --- /dev/null +++ b/README.RHEL @@ -0,0 +1,22 @@ +If you are installing this software on a Red Hat Enterprise Linux (RHEL) +server, you will have to subscribe to the "RHEL Server Optional" before +attempting to install this component. If you do no enable this channel, you +will receive an error that looks similar to this: + + --> Finished Dependency Resolution + Error: Package: BackupPC-3.2.1-1.el6.x86_64 (epel) + Requires: perl(Archive::Zip) + Error: Package: BackupPC-3.2.1-1.el6.x86_64 (epel) + Requires: perl(XML::RSS) + Error: Package: BackupPC-3.2.1-1.el6.x86_64 (epel) + Requires: perl-Time-modules + Error: Package: BackupPC-3.2.1-1.el6.x86_64 (epel) + Requires: perl(Time::ParseDate) + You could try using --skip-broken to work around the problem + You could try running: rpm -Va --nofiles --nodigest + + +References: +http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F +https://access.redhat.com/kb/docs/DOC-11313 +https://bugzilla.redhat.com/show_bug.cgi?id=749627 From b41886aef28caad01d71ec1046303fbd823156f7 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Sun, 22 Jan 2012 19:13:24 -0700 Subject: [PATCH 078/168] - add perl(Digest::MD5) to list of build and install dependencies --- BackupPC.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index e2c5293..4e60b3d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -44,7 +44,7 @@ BuildRequires: %{_bindir}/rsync BuildRequires: %{_sbindir}/sendmail BuildRequires: %{_bindir}/split BuildRequires: %{_bindir}/ssh -BuildRequires: perl(Compress::Zlib) +BuildRequires: perl(Compress::Zlib), perl(Digest::MD5) %if 0%{?_with_systemd} BuildRequires: systemd-units %endif @@ -54,7 +54,7 @@ Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) Requires: httpd Requires: perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip) -Requires: perl-Time-modules, perl(XML::RSS) +Requires: perl-Time-modules, perl(XML::RSS), perl(Digest::MD5) Requires: rsync # This is a file dependency so EL5 can use samba or samba-client or # samba3x-client @@ -342,6 +342,7 @@ fi - additional documentation about enabling correct channels in RHEL to resolve all dependencies (bz #749627) - fix bug with missing tmpfiles.d directory +- add perl(Digest::MD5) to list of build and install dependencies * Wed Sep 21 2011 Bernard Johnson - 3.2.1-6 - fix postun scriptlet error (bz #736946) From d46ad1e0bbcf12e7056aa222761a2274719c1e6d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 07:53:18 -0500 Subject: [PATCH 079/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 4e60b3d..393d571 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -16,7 +16,7 @@ Name: BackupPC Version: 3.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: High-performance backup system Group: Applications/System @@ -335,6 +335,9 @@ fi %endif %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 3.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sun Jan 22 2012 Bernard Johnson - 3.2.1-7 - change %%{_sharedstatedir} to %%{_localstatedir}/lib as these expand differently on EL (bz #767719) From f0cb08889a4c9239538e14a57b12fc3ad3d1a4b4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 9 Dec 2012 22:21:45 +0000 Subject: [PATCH 080/168] Fix FTBFS on F-18+ --- BackupPC.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 393d571..fd54c10 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -16,12 +16,12 @@ Name: BackupPC Version: 3.2.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: High-performance backup system - Group: Applications/System License: GPLv2+ URL: http://backuppc.sourceforge.net/ + Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar.gz Patch0: BackupPC-3.2.1-locatedb.patch Patch1: BackupPC-3.2.1-rundir.patch @@ -36,15 +36,14 @@ Source5: backuppc.service Source6: BackupPC.tmpfiles Source7: README.RHEL -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: /bin/cat, /bin/df, /bin/gtar BuildRequires: %{_bindir}/smbclient, %{_bindir}/nmblookup -BuildRequires: %{_bindir}/rsync -BuildRequires: %{_sbindir}/sendmail -BuildRequires: %{_bindir}/split -BuildRequires: %{_bindir}/ssh -BuildRequires: perl(Compress::Zlib), perl(Digest::MD5) +BuildRequires: rsync +BuildRequires: coreutils +BuildRequires: tar +BuildRequires: openssh-clients +BuildRequires: perl(Compress::Zlib) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(Digest::MD5) %if 0%{?_with_systemd} BuildRequires: systemd-units %endif @@ -103,7 +102,7 @@ cp %{SOURCE7} README.RHEL cp %{SOURCE4} BackupPC_Admin.c %if ! 0%{?_without_selinux} -%{__mkdir} selinux +mkdir selinux pushd selinux cat >%{name}.te < 3.2.1-9 +- Fix FTBFS on F-18+ + * Wed Jul 18 2012 Fedora Release Engineering - 3.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 234f1cbfaaff48c5bf714644055723d5e71b23e0 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Mon, 24 Dec 2012 13:42:18 -0700 Subject: [PATCH 081/168] cleanup build macros for Fedora --- BackupPC.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index fd54c10..02c8d7d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -2,21 +2,17 @@ %global _without_selinux 1 %endif -# tmpfiles.d support starts in Fedora 15 -%if 0%{?fedora} && 0%{?fedora} > 14 -%global _with_tmpfilesd 1 -%endif - -# systemd was introduced in Fedora 15, but we don't support it until Fedora 16 -%if 0%{?fedora} && 0%{?fedora} > 15 -%global _with_systemd 1 +# tmpfiles.d & systemd support in all supported Fedora now, but not RHEL +%if 0%{?rhel} +%global _with_tmpfilesd 0 +%global _with_systemd 0 %endif %global _updatedb_conf /etc/updatedb.conf Name: BackupPC Version: 3.2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -334,6 +330,9 @@ fi %endif %changelog +* Sun Dec 24 2012 Bernard Johnson 3.2.1-10 +- cleanup build macros for Fedora + * Sun Dec 6 2012 Peter Robinson 3.2.1-9 - Fix FTBFS on F-18+ From 86a19c173b01a07c887f8b880e53a86176ea56d7 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Mon, 24 Dec 2012 16:25:27 -0700 Subject: [PATCH 082/168] CVE-2011-5081 BackupPC: XSS flaw in RestoreFile.pm (bz #795017, #795018, #795019) --- BackupPC-3.2.1-fix-XSS-vulnerability2.patch | 18 ++++++++++++++++++ BackupPC.spec | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 BackupPC-3.2.1-fix-XSS-vulnerability2.patch diff --git a/BackupPC-3.2.1-fix-XSS-vulnerability2.patch b/BackupPC-3.2.1-fix-XSS-vulnerability2.patch new file mode 100644 index 0000000..32e28bb --- /dev/null +++ b/BackupPC-3.2.1-fix-XSS-vulnerability2.patch @@ -0,0 +1,18 @@ +CVE-2011-5081 BackupPC: XSS flaw in RestoreFile.pm +--- backuppc-3.2.1.orig/lib/BackupPC/CGI/RestoreFile.pm ++++ backuppc-3.2.1/lib/BackupPC/CGI/RestoreFile.pm +@@ -154,12 +154,12 @@ + my $a = $view->fileAttrib($num, $share, $dir); + if ( $dir =~ m{(^|/)\.\.(/|$)} || !defined($a) ) { + $dir = decode_utf8($dir); +- ErrorExit("Can't restore bad file ${EscHTML($dir)} ($num, $share)"); ++ ErrorExit("Can't restore bad file ${EscHTML($dir)} (${EscHTML($num)}, ${EscHTML($share)})"); + } + my $f = BackupPC::FileZIO->open($a->{fullPath}, 0, $a->{compress}); + if ( !defined($f) ) { + my $fullPath = decode_utf8($a->{fullPath}); +- ErrorExit("Unable to open file ${EscHTML($fullPath)} ($num, $share)"); ++ ErrorExit("Unable to open file ${EscHTML($fullPath)} (${EscHTML($num)}, ${EscHTML($share)})"); + } + my $data; + if ( !$skipHardLink && $a->{type} == BPC_FTYPE_HARDLINK ) { diff --git a/BackupPC.spec b/BackupPC.spec index 02c8d7d..18c586d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -23,6 +23,7 @@ Patch0: BackupPC-3.2.1-locatedb.patch Patch1: BackupPC-3.2.1-rundir.patch Patch2: BackupPC-3.2.1-piddir.patch Patch3: BackupPC-3.2.1-fix-XSS-vulnerability.patch +Patch4: BackupPC-3.2.1-fix-XSS-vulnerability2.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -85,6 +86,7 @@ configurable and easy to install and maintain. %patch1 -p1 -b .rundir %patch2 -p1 -b .piddir %patch3 -p1 -b .fix-XSS-vulnerability +%patch4 -p1 -b .fix-XSS-vulnerability2 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -332,6 +334,8 @@ fi %changelog * Sun Dec 24 2012 Bernard Johnson 3.2.1-10 - cleanup build macros for Fedora +- CVE-2011-5081 BackupPC: XSS flaw in RestoreFile.pm + (bz #795017, #795018, #795019) * Sun Dec 6 2012 Peter Robinson 3.2.1-9 - Fix FTBFS on F-18+ From fea7b0ed15fd30fcfae78df940eee1a5757a72ad Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Mon, 24 Dec 2012 16:26:38 -0700 Subject: [PATCH 083/168] fix deprecated qw messages (partial fix for bz #755076) --- BackupPC-3.2.1-qw.patch | 28 ++++++++++++++++++++++++++++ BackupPC.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 BackupPC-3.2.1-qw.patch diff --git a/BackupPC-3.2.1-qw.patch b/BackupPC-3.2.1-qw.patch new file mode 100644 index 0000000..859ed09 --- /dev/null +++ b/BackupPC-3.2.1-qw.patch @@ -0,0 +1,28 @@ +Remove these messages: +Text.pm: Use of qw(...) as parentheses is deprecated at /usr/share/BackupPC/lib/BackupPC/Storage/Text.pm line 301. +Lib.pm: Use of qw(...) as parentheses is deprecated at /usr/share/BackupPC/lib/BackupPC/Lib.pm line 1412. + +diff -Naur BackupPC-3.2.1-pristine/lib/BackupPC/Lib.pm BackupPC-3.2.1/lib/BackupPC/Lib.pm +--- BackupPC-3.2.1-pristine/lib/BackupPC/Lib.pm 2012-12-24 15:01:44.518877629 -0700 ++++ BackupPC-3.2.1/lib/BackupPC/Lib.pm 2011-04-24 21:31:55.000000000 -0600 +@@ -1409,7 +1409,7 @@ + + $conf->{$shareName} = [ $conf->{$shareName} ] + if ( ref($conf->{$shareName}) ne "ARRAY" ); +- foreach my $param qw(BackupFilesOnly BackupFilesExclude) { ++ foreach my $param (qw(BackupFilesOnly BackupFilesExclude)) { + next if ( !defined($conf->{$param}) ); + if ( ref($conf->{$param}) eq "HASH" ) { + # +diff -Naur BackupPC-3.2.1-pristine/lib/BackupPC/Storage/Text.pm BackupPC-3.2.1/lib/BackupPC/Storage/Text.pm +--- BackupPC-3.2.1-pristine/lib/BackupPC/Storage/Text.pm 2012-12-24 15:03:16.017830715 -0700 ++++ BackupPC-3.2.1/lib/BackupPC/Storage/Text.pm 2011-04-24 21:31:55.000000000 -0600 +@@ -298,7 +298,7 @@ + # + # Promote BackupFilesOnly and BackupFilesExclude to hashes + # +- foreach my $param qw(BackupFilesOnly BackupFilesExclude) { ++ foreach my $param (qw(BackupFilesOnly BackupFilesExclude)) { + next if ( !defined($conf->{$param}) || ref($conf->{$param}) eq "HASH" ); + $conf->{$param} = [ $conf->{$param} ] + if ( ref($conf->{$param}) ne "ARRAY" ); diff --git a/BackupPC.spec b/BackupPC.spec index 18c586d..130706f 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -24,6 +24,7 @@ Patch1: BackupPC-3.2.1-rundir.patch Patch2: BackupPC-3.2.1-piddir.patch Patch3: BackupPC-3.2.1-fix-XSS-vulnerability.patch Patch4: BackupPC-3.2.1-fix-XSS-vulnerability2.patch +Patch5: BackupPC-3.2.1-qw.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -87,6 +88,7 @@ configurable and easy to install and maintain. %patch2 -p1 -b .piddir %patch3 -p1 -b .fix-XSS-vulnerability %patch4 -p1 -b .fix-XSS-vulnerability2 +%patch5 -p1 -b .qw sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -334,6 +336,7 @@ fi %changelog * Sun Dec 24 2012 Bernard Johnson 3.2.1-10 - cleanup build macros for Fedora +- fix deprecated qw messages (partial fix for bz #755076) - CVE-2011-5081 BackupPC: XSS flaw in RestoreFile.pm (bz #795017, #795018, #795019) From 1166e6406e9e63af33eba9bde6618bf203a8cec3 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Mon, 24 Dec 2012 16:42:24 -0700 Subject: [PATCH 084/168] Broken configuration for httpd 2.4 (bz #871353) --- BackupPC.htaccess | 25 +++++++++++++++++++------ BackupPC.spec | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/BackupPC.htaccess b/BackupPC.htaccess index 1538502..1ebc77e 100644 --- a/BackupPC.htaccess +++ b/BackupPC.htaccess @@ -1,4 +1,4 @@ - + # BackupPC requires valid authentication in order for the web interface to # function properly. One can view the web interface without authentication # though all functionality is disabled. @@ -6,15 +6,28 @@ # htpasswd -c /etc/BackupPC/apache.users yourusername # -order deny,allow -deny from all -allow from 127.0.0.1 -allow from ::1 AuthType Basic AuthUserFile /etc/BackupPC/apache.users AuthName "BackupPC" -require valid-user + + # Apache 2.4 + + Require valid-user + + Require local + + + + + # Apache 2.2 + order deny,allow + deny from all + allow from 127.0.0.1 + allow from ::1 + require valid-user + + diff --git a/BackupPC.spec b/BackupPC.spec index 130706f..f89378e 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -339,6 +339,7 @@ fi - fix deprecated qw messages (partial fix for bz #755076) - CVE-2011-5081 BackupPC: XSS flaw in RestoreFile.pm (bz #795017, #795018, #795019) +- Broken configuration for httpd 2.4 (bz #871353) * Sun Dec 6 2012 Peter Robinson 3.2.1-9 - Fix FTBFS on F-18+ From e77bfb305dff9bd2d82ed874d0d5000ce585a5ef Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Tue, 25 Dec 2012 18:40:32 -0700 Subject: [PATCH 085/168] BuildRoot required for RHEL5 --- BackupPC.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BackupPC.spec b/BackupPC.spec index f89378e..ca9d4e5 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -74,6 +74,9 @@ BuildRequires: selinux-policy-devel, checkpolicy %endif Provides: backuppc = %{version} +# BuildRoot required for RHEL5 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description BackupPC is a high-performance, enterprise-grade system for backing up Linux and WinXX and Mac OS X PCs and laptops to a server's disk. BackupPC is highly From 7a0175bb8a254e221bb8f54c3c105f553dd08b89 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Sun, 20 Jan 2013 12:23:26 -0700 Subject: [PATCH 086/168] Missing backuppc.service file after upgrade to 3.2.1-10 causes service to exit at start (bz #896626) --- BackupPC.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index ca9d4e5..20451cb 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -3,16 +3,16 @@ %endif # tmpfiles.d & systemd support in all supported Fedora now, but not RHEL -%if 0%{?rhel} -%global _with_tmpfilesd 0 -%global _with_systemd 0 +%if 0%{?fedora} +%global _with_tmpfilesd 1 +%global _with_systemd 1 %endif %global _updatedb_conf /etc/updatedb.conf Name: BackupPC Version: 3.2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -337,6 +337,10 @@ fi %endif %changelog +* Sun Jan 20 2013 Bernard Johnson 3.2.1-11 +- Missing backuppc.service file after upgrade to 3.2.1-10 causes service to + exit at start (bz #896626) + * Sun Dec 24 2012 Bernard Johnson 3.2.1-10 - cleanup build macros for Fedora - fix deprecated qw messages (partial fix for bz #755076) From bf152341f9c53259deed13a332bfa679dc91ab7c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 08:50:38 -0600 Subject: [PATCH 087/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 20451cb..7f66b3e 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -12,7 +12,7 @@ Name: BackupPC Version: 3.2.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -337,6 +337,9 @@ fi %endif %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 3.2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jan 20 2013 Bernard Johnson 3.2.1-11 - Missing backuppc.service file after upgrade to 3.2.1-10 causes service to exit at start (bz #896626) From 0c2b5fb8d0e5aa03c7cce60279b710afad8de094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 31 Mar 2013 22:42:57 +0300 Subject: [PATCH 088/168] Add build dependency on Pod::Usage (#913855). - Fix bogus dates in %changelog. --- BackupPC.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 7f66b3e..83c6dab 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -12,7 +12,7 @@ Name: BackupPC Version: 3.2.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -42,6 +42,7 @@ BuildRequires: openssh-clients BuildRequires: perl(Compress::Zlib) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Digest::MD5) +BuildRequires: perl(Pod::Usage) %if 0%{?_with_systemd} BuildRequires: systemd-units %endif @@ -337,6 +338,10 @@ fi %endif %changelog +* Sun Mar 31 2013 Ville Skyttä - 3.2.1-13 +- Add build dependency on Pod::Usage (#913855). +- Fix bogus dates in %%changelog. + * Wed Feb 13 2013 Fedora Release Engineering - 3.2.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -344,14 +349,14 @@ fi - Missing backuppc.service file after upgrade to 3.2.1-10 causes service to exit at start (bz #896626) -* Sun Dec 24 2012 Bernard Johnson 3.2.1-10 +* Mon Dec 24 2012 Bernard Johnson 3.2.1-10 - cleanup build macros for Fedora - fix deprecated qw messages (partial fix for bz #755076) - CVE-2011-5081 BackupPC: XSS flaw in RestoreFile.pm (bz #795017, #795018, #795019) - Broken configuration for httpd 2.4 (bz #871353) -* Sun Dec 6 2012 Peter Robinson 3.2.1-9 +* Sun Dec 9 2012 Peter Robinson 3.2.1-9 - Fix FTBFS on F-18+ * Wed Jul 18 2012 Fedora Release Engineering - 3.2.1-8 @@ -458,7 +463,7 @@ fi * Tue Jan 30 2007 Johan Cwiklinski 3.0.0-1 - Rebuild RPM for v 3.0.0 -* Sat Aug 16 2006 Mike McGrath 2.1.2-7 +* Sat Aug 26 2006 Mike McGrath 2.1.2-7 - Release bump for rebuild * Tue Jul 25 2006 Mike McGrath 2.1.2-6 From 2fec4fcf1a8fcc0530c03458dc34996459454844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 10:29:48 +0200 Subject: [PATCH 089/168] Perl 5.18 rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 83c6dab..77c01f2 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -12,7 +12,7 @@ Name: BackupPC Version: 3.2.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -338,6 +338,9 @@ fi %endif %changelog +* Wed Jul 17 2013 Petr Pisar - 3.2.1-14 +- Perl 5.18 rebuild + * Sun Mar 31 2013 Ville Skyttä - 3.2.1-13 - Add build dependency on Pod::Usage (#913855). - Fix bogus dates in %%changelog. From b1256db9fde137f58552bb75a54edadb47050f02 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 17:28:42 -0500 Subject: [PATCH 090/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 77c01f2..ce7617a 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -12,7 +12,7 @@ Name: BackupPC Version: 3.2.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -338,6 +338,9 @@ fi %endif %changelog +* Fri Aug 02 2013 Fedora Release Engineering - 3.2.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar - 3.2.1-14 - Perl 5.18 rebuild From efcae7d060879ecafeb2c283eb50b61b8d3ade75 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 21 Feb 2014 22:06:01 -0700 Subject: [PATCH 091/168] fix typo --- BackupPC.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BackupPC.spec b/BackupPC.spec index ce7617a..d446a24 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -338,6 +338,10 @@ fi %endif %changelog +* Fri Feb 21 2014 Bernard Johnson - 3.3.0-1 +- v 3.3.0 +- fixed typos + * Fri Aug 02 2013 Fedora Release Engineering - 3.2.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From afceebfac09d3afe06e1c6e428f83b1e52aa06ea Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 21 Feb 2014 22:18:47 -0700 Subject: [PATCH 092/168] add patch provided by Johan Cwiklinski https://bugzilla.redhat.com/show_bug.cgi?id=957393 --- BackupPC-3.2.1-fix-XSS-vulnerability.patch | 41 ------------------ BackupPC-3.2.1-fix-XSS-vulnerability2.patch | 18 -------- BackupPC-3.2.1-qw.patch | 28 ------------- BackupPC.spec | 46 +++++++++++++++++---- 4 files changed, 38 insertions(+), 95 deletions(-) delete mode 100644 BackupPC-3.2.1-fix-XSS-vulnerability.patch delete mode 100644 BackupPC-3.2.1-fix-XSS-vulnerability2.patch delete mode 100644 BackupPC-3.2.1-qw.patch diff --git a/BackupPC-3.2.1-fix-XSS-vulnerability.patch b/BackupPC-3.2.1-fix-XSS-vulnerability.patch deleted file mode 100644 index 96ae9b1..0000000 --- a/BackupPC-3.2.1-fix-XSS-vulnerability.patch +++ /dev/null @@ -1,41 +0,0 @@ -Date: Thu, 27 Oct 2011 16:00:48 -0500 -From: Jamie Strandboge -To: Craig Barratt , coley@...us.mitre.org, - oss-security -Cc: security@...ntu.com -Subject: CVE Request: Security issue in backuppc - -Hi Craig, - -While preparing updates to fix CVE-2011-3361 in Ubuntu I discovered -another XSS vulnerability in View.pm when accessing the following URLs -in backuppc: -index.cgi?action=view&type=XferLOG&num=&host= -index.cgi?action=view&type=XferErr&num=&host= - -You are being emailed as the upstream contact. Please keep -oss-security@...ts.openwall.com[1] CC'd for any updates on this issue. - -To oss-security, can I have a CVE for this? It is essentially the same -vulnerability and fix as for CVE-2011-3361, but in CGI/View.pm instead -of CGI/Browse.pm. Attached is a patch to fix this issue. Tested on -3.0.0, 3.1.0, 3.2.0 and 3.2.1. - --- -Jamie Strandboge | http://www.canonical.com - -diff -u backuppc-3.2.0/lib/BackupPC/CGI/View.pm backuppc-3.2.0/lib/BackupPC/CGI/View.pm ---- backuppc-3.2.0/lib/BackupPC/CGI/View.pm -+++ backuppc-3.2.0/lib/BackupPC/CGI/View.pm -@@ -46,7 +46,7 @@ - my $compress = 0; - my $fh; - my $host = $In{host}; -- my $num = $In{num}; -+ my $num = ${EscHTML($In{num})}; - my $type = $In{type}; - my $linkHosts = 0; - my($file, $comment); - -[ CONTENT OF TYPE application/pgp-signature SKIPPED ] - diff --git a/BackupPC-3.2.1-fix-XSS-vulnerability2.patch b/BackupPC-3.2.1-fix-XSS-vulnerability2.patch deleted file mode 100644 index 32e28bb..0000000 --- a/BackupPC-3.2.1-fix-XSS-vulnerability2.patch +++ /dev/null @@ -1,18 +0,0 @@ -CVE-2011-5081 BackupPC: XSS flaw in RestoreFile.pm ---- backuppc-3.2.1.orig/lib/BackupPC/CGI/RestoreFile.pm -+++ backuppc-3.2.1/lib/BackupPC/CGI/RestoreFile.pm -@@ -154,12 +154,12 @@ - my $a = $view->fileAttrib($num, $share, $dir); - if ( $dir =~ m{(^|/)\.\.(/|$)} || !defined($a) ) { - $dir = decode_utf8($dir); -- ErrorExit("Can't restore bad file ${EscHTML($dir)} ($num, $share)"); -+ ErrorExit("Can't restore bad file ${EscHTML($dir)} (${EscHTML($num)}, ${EscHTML($share)})"); - } - my $f = BackupPC::FileZIO->open($a->{fullPath}, 0, $a->{compress}); - if ( !defined($f) ) { - my $fullPath = decode_utf8($a->{fullPath}); -- ErrorExit("Unable to open file ${EscHTML($fullPath)} ($num, $share)"); -+ ErrorExit("Unable to open file ${EscHTML($fullPath)} (${EscHTML($num)}, ${EscHTML($share)})"); - } - my $data; - if ( !$skipHardLink && $a->{type} == BPC_FTYPE_HARDLINK ) { diff --git a/BackupPC-3.2.1-qw.patch b/BackupPC-3.2.1-qw.patch deleted file mode 100644 index 859ed09..0000000 --- a/BackupPC-3.2.1-qw.patch +++ /dev/null @@ -1,28 +0,0 @@ -Remove these messages: -Text.pm: Use of qw(...) as parentheses is deprecated at /usr/share/BackupPC/lib/BackupPC/Storage/Text.pm line 301. -Lib.pm: Use of qw(...) as parentheses is deprecated at /usr/share/BackupPC/lib/BackupPC/Lib.pm line 1412. - -diff -Naur BackupPC-3.2.1-pristine/lib/BackupPC/Lib.pm BackupPC-3.2.1/lib/BackupPC/Lib.pm ---- BackupPC-3.2.1-pristine/lib/BackupPC/Lib.pm 2012-12-24 15:01:44.518877629 -0700 -+++ BackupPC-3.2.1/lib/BackupPC/Lib.pm 2011-04-24 21:31:55.000000000 -0600 -@@ -1409,7 +1409,7 @@ - - $conf->{$shareName} = [ $conf->{$shareName} ] - if ( ref($conf->{$shareName}) ne "ARRAY" ); -- foreach my $param qw(BackupFilesOnly BackupFilesExclude) { -+ foreach my $param (qw(BackupFilesOnly BackupFilesExclude)) { - next if ( !defined($conf->{$param}) ); - if ( ref($conf->{$param}) eq "HASH" ) { - # -diff -Naur BackupPC-3.2.1-pristine/lib/BackupPC/Storage/Text.pm BackupPC-3.2.1/lib/BackupPC/Storage/Text.pm ---- BackupPC-3.2.1-pristine/lib/BackupPC/Storage/Text.pm 2012-12-24 15:03:16.017830715 -0700 -+++ BackupPC-3.2.1/lib/BackupPC/Storage/Text.pm 2011-04-24 21:31:55.000000000 -0600 -@@ -298,7 +298,7 @@ - # - # Promote BackupFilesOnly and BackupFilesExclude to hashes - # -- foreach my $param qw(BackupFilesOnly BackupFilesExclude) { -+ foreach my $param (qw(BackupFilesOnly BackupFilesExclude)) { - next if ( !defined($conf->{$param}) || ref($conf->{$param}) eq "HASH" ); - $conf->{$param} = [ $conf->{$param} ] - if ( ref($conf->{$param}) ne "ARRAY" ); diff --git a/BackupPC.spec b/BackupPC.spec index d446a24..5a17d3c 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -11,8 +11,8 @@ %global _updatedb_conf /etc/updatedb.conf Name: BackupPC -Version: 3.2.1 -Release: 15%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -22,9 +22,6 @@ Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar Patch0: BackupPC-3.2.1-locatedb.patch Patch1: BackupPC-3.2.1-rundir.patch Patch2: BackupPC-3.2.1-piddir.patch -Patch3: BackupPC-3.2.1-fix-XSS-vulnerability.patch -Patch4: BackupPC-3.2.1-fix-XSS-vulnerability2.patch -Patch5: BackupPC-3.2.1-qw.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -90,15 +87,43 @@ configurable and easy to install and maintain. %patch0 -p1 -b .locatedb %patch1 -p1 -b .rundir %patch2 -p1 -b .piddir -%patch3 -p1 -b .fix-XSS-vulnerability -%patch4 -p1 -b .fix-XSS-vulnerability2 -%patch5 -p1 -b .qw sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do iconv -f ISO-8859-1 -t UTF-8 $f > $f.utf && mv $f.utf $f done +#incorrect FSF address +sed -i 's|59 Temple Place, Suite 330, Boston, MA *02111-1307 USA|51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA|' \ + lib/BackupPC/CGI/Queue.pm \ + bin/BackupPC_archive \ + lib/BackupPC/CGI/StartServer.pm \ + lib/BackupPC/CGI/HostInfo.pm \ + lib/BackupPC/CGI/Archive.pm \ + lib/BackupPC/CGI/LOGlist.pm \ + lib/BackupPC/FileZIO.pm \ + lib/BackupPC/CGI/GeneralInfo.pm \ + lib/BackupPC/CGI/Browse.pm \ + lib/BackupPC/CGI/RSS.pm \ + lib/BackupPC/CGI/Restore.pm \ + lib/BackupPC/CGI/RestoreFile.pm \ + bin/BackupPC_restore \ + lib/BackupPC/CGI/DirHistory.pm \ + lib/BackupPC/Xfer/Archive.pm \ + lib/BackupPC/Config/Meta.pm \ + lib/BackupPC/CGI/ArchiveInfo.pm \ + lib/BackupPC/CGI/ReloadServer.pm \ + lib/BackupPC/CGI/View.pm \ + bin/BackupPC_tarExtract \ + lib/BackupPC/CGI/EmailSummary.pm \ + lib/BackupPC/Xfer/RsyncFileIO.pm \ + lib/BackupPC/CGI/RestoreInfo.pm \ + lib/BackupPC/CGI/StartStopBackup.pm \ + lib/BackupPC/CGI/StopServer.pm \ + lib/BackupPC/CGI/AdminOptions.pm \ + lib/BackupPC/CGI/Summary.pm \ + lib/BackupPC/CGI/EditConfig.pm + chmod a-x LICENSE README cp %{SOURCE3} README.fedora @@ -338,6 +363,11 @@ fi %endif %changelog +* Sun Apr 28 2013 Johan Cwiklinski 3.3.0-1 +- Last upstream release +- Remove no longer needeed patches +- Fix incorrect-fsf-address to reduce rpmlint output + * Fri Feb 21 2014 Bernard Johnson - 3.3.0-1 - v 3.3.0 - fixed typos From 6ba0a170522c5831c67cd47e714ee8527b619127 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 21 Feb 2014 22:21:14 -0700 Subject: [PATCH 093/168] fix typo in README.RHEL --- BackupPC.spec | 5 ++++- README.RHEL | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 5a17d3c..9634dba 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -12,7 +12,7 @@ Name: BackupPC Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -363,6 +363,9 @@ fi %endif %changelog +* Fri Feb 21 2014 Bernard Johnson 3.3.0-2 +- fix typo in README.RHEL + * Sun Apr 28 2013 Johan Cwiklinski 3.3.0-1 - Last upstream release - Remove no longer needeed patches diff --git a/README.RHEL b/README.RHEL index 78c5abe..3acd5d5 100644 --- a/README.RHEL +++ b/README.RHEL @@ -1,6 +1,6 @@ If you are installing this software on a Red Hat Enterprise Linux (RHEL) server, you will have to subscribe to the "RHEL Server Optional" before -attempting to install this component. If you do no enable this channel, you +attempting to install this component. If you do not enable this channel, you will receive an error that looks similar to this: --> Finished Dependency Resolution From 03bacb0a0712886c8b1d26a679ae6d9b4837e76c Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 21 Feb 2014 22:25:53 -0700 Subject: [PATCH 094/168] enable PIE build (bz #965523) --- BackupPC.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BackupPC.spec b/BackupPC.spec index 9634dba..34c6f06 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -1,3 +1,6 @@ +# enable -PIE build +%global _hardened_build 1 + %if 0%{?rhel} && 0%{?rhel} < 5 %global _without_selinux 1 %endif @@ -365,6 +368,7 @@ fi %changelog * Fri Feb 21 2014 Bernard Johnson 3.3.0-2 - fix typo in README.RHEL +- enable PIE build (bz #965523) * Sun Apr 28 2013 Johan Cwiklinski 3.3.0-1 - Last upstream release From 7f5e2c7639b85490f5c2ec8b050aa905033ff4b9 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 21 Feb 2014 22:35:01 -0700 Subject: [PATCH 095/168] v 3.3.0 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b8dcdba..76fd675 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ BackupPC-3.1.2.tar.gz +/BackupPC-3.3.0.tar.gz diff --git a/sources b/sources index cb0804f..266d990 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2334fafb8e03284225a9b8a7fb230012 BackupPC-3.2.1.tar.gz +2942a31daeec7c7bb227d843b7846f38 BackupPC-3.3.0.tar.gz From dc0e62db4db23062d6ab420e97cb417a93890f64 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 21 Feb 2014 22:35:35 -0700 Subject: [PATCH 096/168] fixup dates to be chronological --- BackupPC.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 34c6f06..70fe22c 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -370,7 +370,7 @@ fi - fix typo in README.RHEL - enable PIE build (bz #965523) -* Sun Apr 28 2013 Johan Cwiklinski 3.3.0-1 +* Fri Feb 21 2014 Johan Cwiklinski 3.3.0-1 - Last upstream release - Remove no longer needeed patches - Fix incorrect-fsf-address to reduce rpmlint output From 03b31624d0e2a148b25596e9ad58bd37ae5babc2 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Fri, 21 Feb 2014 22:54:13 -0700 Subject: [PATCH 097/168] - add patch that causes getpwnam to return only uid to fix selinux denials (bz #827854) --- BackupPC-3.3.0-fix-shadow-access.patch | 24 ++++++++++++++++++++++++ BackupPC.spec | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 BackupPC-3.3.0-fix-shadow-access.patch diff --git a/BackupPC-3.3.0-fix-shadow-access.patch b/BackupPC-3.3.0-fix-shadow-access.patch new file mode 100644 index 0000000..5dc2755 --- /dev/null +++ b/BackupPC-3.3.0-fix-shadow-access.patch @@ -0,0 +1,24 @@ +diff -Naur BackupPC-3.3.0-pristine/lib/BackupPC/CGI/Lib.pm BackupPC-3.3.0/lib/BackupPC/CGI/Lib.pm +--- BackupPC-3.3.0-pristine/lib/BackupPC/CGI/Lib.pm 2013-04-14 14:43:32.000000000 -0600 ++++ BackupPC-3.3.0/lib/BackupPC/CGI/Lib.pm 2014-02-21 22:42:25.844412429 -0700 +@@ -144,7 +144,7 @@ + # Verify we are running as the correct user + # + if ( $Conf{BackupPCUserVerify} +- && $> != (my $uid = (getpwnam($Conf{BackupPCUser}))[2]) ) { ++ && $> != (my $uid = (getpwnam($Conf{BackupPCUser}))) ) { + ErrorExit(eval("qq{$Lang->{Wrong_user__my_userid_is___}}"), <{Conf}{BackupPCUserVerify} +- && $> != (my $uid = (getpwnam($bpc->{Conf}{BackupPCUser}))[2]) ) { ++ && $> != (my $uid = (getpwnam($bpc->{Conf}{BackupPCUser}))) ) { + print(STDERR "$0: Wrong user: my userid is $>, instead of $uid" + . " ($bpc->{Conf}{BackupPCUser})\n"); + print(STDERR "Please su $bpc->{Conf}{BackupPCUser} first\n"); diff --git a/BackupPC.spec b/BackupPC.spec index 70fe22c..816a7d0 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -25,6 +25,7 @@ Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar Patch0: BackupPC-3.2.1-locatedb.patch Patch1: BackupPC-3.2.1-rundir.patch Patch2: BackupPC-3.2.1-piddir.patch +Patch3: BackupPC-3.3.0-fix-shadow-access.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -90,6 +91,7 @@ configurable and easy to install and maintain. %patch0 -p1 -b .locatedb %patch1 -p1 -b .rundir %patch2 -p1 -b .piddir +%patch3 -p1 -b .shadow-access sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -369,6 +371,8 @@ fi * Fri Feb 21 2014 Bernard Johnson 3.3.0-2 - fix typo in README.RHEL - enable PIE build (bz #965523) +- add patch that causes getpwnam to return only uid to fix selinux denials + (bz #827854) * Fri Feb 21 2014 Johan Cwiklinski 3.3.0-1 - Last upstream release From b45016b6e60aee402877947d4716bcdf6611d137 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Sat, 22 Feb 2014 16:41:12 -0700 Subject: [PATCH 098/168] add local-fs.target and remote-fs.target to startup dependency (bz #959309) --- BackupPC.spec | 1 + backuppc.service | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 816a7d0..2ce7abd 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -373,6 +373,7 @@ fi - enable PIE build (bz #965523) - add patch that causes getpwnam to return only uid to fix selinux denials (bz #827854) +- add local-fs.target and remote-fs.target to startup dependency (bz #959309) * Fri Feb 21 2014 Johan Cwiklinski 3.3.0-1 - Last upstream release diff --git a/backuppc.service b/backuppc.service index d9f32c9..2bf870c 100644 --- a/backuppc.service +++ b/backuppc.service @@ -1,6 +1,6 @@ [Unit] Description= BackupPC server -After=syslog.target +After=syslog.target local-fs.target remote-fs.target [Service] Type=oneshot From dd0e33e80943aa288fa223ee0755b4d17a7586c3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 17:23:49 -0500 Subject: [PATCH 099/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 2ce7abd..d738d76 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -368,6 +368,9 @@ fi %endif %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Feb 21 2014 Bernard Johnson 3.3.0-2 - fix typo in README.RHEL - enable PIE build (bz #965523) From df10f9dab3b91132316363a219a7f29128b468be Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 18:13:02 +0000 Subject: [PATCH 100/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index d738d76..a70acbc 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -368,6 +368,9 @@ fi %endif %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 06 2014 Fedora Release Engineering - 3.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 27fbd0faa345e01e5f815cc4269f8c3378f33ec9 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Sat, 14 Mar 2015 21:13:24 -0600 Subject: [PATCH 101/168] v 3.3.1 --- BackupPC.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index a70acbc..1cad38a 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -14,8 +14,8 @@ %global _updatedb_conf /etc/updatedb.conf Name: BackupPC -Version: 3.3.0 -Release: 4%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -368,6 +368,9 @@ fi %endif %changelog +* Sat Mar 14 2015 Bernard Johnson - 3.3.1-1 +- v 3.3.1 + * Fri Aug 15 2014 Fedora Release Engineering - 3.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 7c8cedb487cc1215a7c19aa6064607d009cb817f Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Sat, 14 Mar 2015 21:14:05 -0600 Subject: [PATCH 102/168] v 3.3.1 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 76fd675..5713cb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ BackupPC-3.1.2.tar.gz /BackupPC-3.3.0.tar.gz +/BackupPC-3.3.1.tar.gz diff --git a/sources b/sources index 266d990..384dd58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2942a31daeec7c7bb227d843b7846f38 BackupPC-3.3.0.tar.gz +5efdcdd48e9e0d4ef7a706902d1f8b3d BackupPC-3.3.1.tar.gz From 40b5b6c4273382735310ee6fd5d0211eaec35eed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 22:42:02 +0000 Subject: [PATCH 103/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 1cad38a..86b78cc 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -368,6 +368,9 @@ fi %endif %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Mar 14 2015 Bernard Johnson - 3.3.1-1 - v 3.3.1 From 6ebede0b31fcd8238197bb587cd8e33672d42df5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:19:41 +0000 Subject: [PATCH 104/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 86b78cc..2ca5237 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -368,6 +368,9 @@ fi %endif %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 24945718cb964bffb06f4ba314e87f884e13b05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:37:47 +0200 Subject: [PATCH 105/168] Mandatory Perl build-requires added --- BackupPC.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/BackupPC.spec b/BackupPC.spec index 2ca5237..5311025 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -40,6 +40,7 @@ BuildRequires: rsync BuildRequires: coreutils BuildRequires: tar BuildRequires: openssh-clients +BuildRequires: perl-generators BuildRequires: perl(Compress::Zlib) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Digest::MD5) From 6902942aa41f2375e710a0922c0f9a750df36ab5 Mon Sep 17 00:00:00 2001 From: Benjamin Lefoul Date: Wed, 29 Jun 2016 16:49:44 +0200 Subject: [PATCH 106/168] Support for systemd and tmpfiles in RHEL7. --- BackupPC.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 5311025..4878eb1 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -5,8 +5,8 @@ %global _without_selinux 1 %endif -# tmpfiles.d & systemd support in all supported Fedora now, but not RHEL -%if 0%{?fedora} +# tmpfiles.d & systemd support in all supported Fedora now, but not RHEL < 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %global _with_tmpfilesd 1 %global _with_systemd 1 %endif @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -369,6 +369,9 @@ fi %endif %changelog +* Wed Jun 29 2016 Benjamin Lefoul - 3.3.1-4 +- Support for systemd and tmpfiles for RHEL >= 7 + * Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From fea361207d38fddcd8d46b9511d181437fd90deb Mon Sep 17 00:00:00 2001 From: Benjamin Lefoul Date: Fri, 15 Jul 2016 10:43:20 +0200 Subject: [PATCH 107/168] Deprecation of defined(@array) in Perl. --- BackupPC-3.3.1-perl_defined_at_deprecation.patch | 11 +++++++++++ BackupPC.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 BackupPC-3.3.1-perl_defined_at_deprecation.patch diff --git a/BackupPC-3.3.1-perl_defined_at_deprecation.patch b/BackupPC-3.3.1-perl_defined_at_deprecation.patch new file mode 100644 index 0000000..afc71c2 --- /dev/null +++ b/BackupPC-3.3.1-perl_defined_at_deprecation.patch @@ -0,0 +1,11 @@ +--- BackupPC-3.3.1/lib/BackupPC/CGI/Browse.pm.orig 2016-07-15 10:32:24.007070271 +0200 ++++ BackupPC-3.3.1/lib/BackupPC/CGI/Browse.pm 2016-07-15 10:33:00.920213213 +0200 +@@ -65,7 +65,7 @@ + # + # 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}; + } diff --git a/BackupPC.spec b/BackupPC.spec index 4878eb1..8310fe8 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -26,6 +26,7 @@ Patch0: BackupPC-3.2.1-locatedb.patch Patch1: BackupPC-3.2.1-rundir.patch Patch2: BackupPC-3.2.1-piddir.patch Patch3: BackupPC-3.3.0-fix-shadow-access.patch +Patch4: BackupPC-3.3.1-perl_defined_at_deprecation.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -93,6 +94,7 @@ configurable and easy to install and maintain. %patch1 -p1 -b .rundir %patch2 -p1 -b .piddir %patch3 -p1 -b .shadow-access +%patch4 -p1 -b .Browse.pm sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -369,6 +371,9 @@ fi %endif %changelog +* Fri Jul 15 2016 Benjamin Lefoul - 3.3.1-5 +- Deprecation of defined(@array) in perl + * Wed Jun 29 2016 Benjamin Lefoul - 3.3.1-4 - Support for systemd and tmpfiles for RHEL >= 7 From f8e95280d0918e0dd7512a56b043a2a8c098ee43 Mon Sep 17 00:00:00 2001 From: Benjamin Lefoul Date: Fri, 15 Jul 2016 10:48:26 +0200 Subject: [PATCH 108/168] Backup of pre-deprecation file. --- BackupPC.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 8310fe8..c29b7a7 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -94,7 +94,7 @@ configurable and easy to install and maintain. %patch1 -p1 -b .rundir %patch2 -p1 -b .piddir %patch3 -p1 -b .shadow-access -%patch4 -p1 -b .Browse.pm +%patch4 -p1 -b .oldperl sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do From 6917caa9115d9870bc2fcf8e9c0d1a57579f8490 Mon Sep 17 00:00:00 2001 From: Benjamin Lefoul Date: Tue, 18 Oct 2016 08:59:00 +0200 Subject: [PATCH 109/168] Some IPv6 support (BZ 1385630) --- BackupPC-3.3.1-IPv6-support.patch | 171 ++++++++++++++++++++++++++++++ BackupPC.spec | 7 +- 2 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 BackupPC-3.3.1-IPv6-support.patch diff --git a/BackupPC-3.3.1-IPv6-support.patch b/BackupPC-3.3.1-IPv6-support.patch new file mode 100644 index 0000000..7576879 --- /dev/null +++ b/BackupPC-3.3.1-IPv6-support.patch @@ -0,0 +1,171 @@ +Index: configure.pl +=================================================================== +RCS file: /cvsroot/backuppc/BackupPC/configure.pl,v +retrieving revision 1.51 +diff -u -w -r1.51 configure.pl +--- configure.pl 12 Jan 2015 00:56:40 -0000 1.51 ++++ configure.pl 17 Oct 2016 10:42:05 -0000 +@@ -253,6 +253,7 @@ + nmblookup => "NmbLookupPath", + rsync => "RsyncClientPath", + ping => "PingPath", ++ 'ping6/ping' => "PingPath6", + df => "DfPath", + 'ssh/ssh2' => "SshPath", + sendmail => "SendmailPath", +Index: bin/BackupPC_dump +=================================================================== +RCS file: /cvsroot/backuppc/BackupPC/bin/BackupPC_dump,v +retrieving revision 1.51 +diff -u -w -r1.51 BackupPC_dump +--- bin/BackupPC_dump 12 Jan 2015 00:56:40 -0000 1.51 ++++ bin/BackupPC_dump 17 Oct 2016 10:42:05 -0000 +@@ -493,7 +493,7 @@ + } else { + $host = $client; + } +- if ( !defined(gethostbyname($host)) ) { ++ if ( !defined($bpc->resolve($host)) ) { + # + # Ok, NS doesn't know about it. Maybe it is a NetBios name + # instead. +Index: bin/BackupPC_restore +=================================================================== +RCS file: /cvsroot/backuppc/BackupPC/bin/BackupPC_restore,v +retrieving revision 1.36 +diff -u -w -r1.36 BackupPC_restore +--- bin/BackupPC_restore 12 Jan 2015 00:56:40 -0000 1.36 ++++ bin/BackupPC_restore 17 Oct 2016 10:42:05 -0000 +@@ -167,7 +167,7 @@ + # Find its IP address + # + if ( $hostIP !~ /\d+\.\d+\.\d+\.\d+/ ) { +- if ( !defined(gethostbyname($host)) ) { ++ if ( !defined($bpc->resolve($host)) ) { + # + # Ok, NS doesn't know about it. Maybe it is a NetBios name + # instead. +Index: conf/config.pl +=================================================================== +RCS file: /cvsroot/backuppc/BackupPC/conf/config.pl,v +retrieving revision 1.58 +diff -u -w -r1.58 config.pl +--- conf/config.pl 12 Jan 2015 00:56:40 -0000 1.58 ++++ conf/config.pl 17 Oct 2016 10:42:06 -0000 +@@ -1652,9 +1652,24 @@ + $Conf{PingPath} = ''; + + # ++# Like PingPath, but for IPv6. Security caution: normal users ++# should not be allowed to write to this file or directory. ++# In some environments, this is something like '/usr/bin/ping6'. ++# In modern environments, the regular ping command can handle both ++# IPv4 and IPv6. In the latter case, just set it to $Conf{PingPath} ++# ++# If you want to disable ping checking for IPv6 hosts, set this to ++# some program that exits with 0 status, eg: ++# ++# $Conf{PingPath6} = '/bin/echo'; ++# ++$Conf{PingPath6} = ''; ++ ++# + # Ping command. The following variables are substituted at run-time: + # +-# $pingPath path to ping ($Conf{PingPath}) ++# $pingPath path to ping ($Conf{PingPath} or $Conf{PingPath6}) ++# depending on the address type of $host. + # $host host name + # + # Wade Brown reports that on solaris 2.6 and 2.7 ping -s returns the wrong +Index: lib/BackupPC/Config.pm +=================================================================== +RCS file: /cvsroot/backuppc/BackupPC/lib/BackupPC/Config.pm,v +retrieving revision 1.3 +diff -u -w -r1.3 Config.pm +--- lib/BackupPC/Config.pm 2 Aug 2003 08:01:43 -0000 1.3 ++++ lib/BackupPC/Config.pm 17 Oct 2016 10:42:06 -0000 +@@ -269,6 +269,9 @@ + PingPath => {struct => 'SCALAR', + type => 'STRING', }, + ++ PingPath6 => {struct => 'SCALAR', ++ type => 'STRING', }, ++ + PingArgs => {struct => 'SCALAR', + type => 'STRING', }, + +Index: lib/BackupPC/Lib.pm +=================================================================== +RCS file: /cvsroot/backuppc/BackupPC/lib/BackupPC/Lib.pm,v +retrieving revision 1.53 +diff -u -w -r1.53 Lib.pm +--- lib/BackupPC/Lib.pm 12 Jan 2015 00:56:41 -0000 1.53 ++++ lib/BackupPC/Lib.pm 17 Oct 2016 10:42:06 -0000 +@@ -982,7 +982,7 @@ + } + + my $args = { +- pingPath => $bpc->{Conf}{PingPath}, ++ pingPath => $bpc->getPingPathByAddressType( $host ), + host => $host, + }; + $pingCmd = $bpc->cmdVarSubstitute($bpc->{Conf}{PingCmd}, $args); +@@ -1543,4 +1543,27 @@ + return $glob; + } + ++# ++# Attempts to resolve a hostname. ++# Return 4 if it resolves to an IPv4 address, 6 if it resolves to an IPv6 ++# address or undef if it can not be resolved. ++# ++sub resolve ++{ ++ my ( $bpc, $host ) = @_; ++ my ( $err, @addrs ) = Socket::getaddrinfo($host); ++ return undef if ( $err ); ++ return (($addrs[0])->{'family'} == Socket::AF_INET6) ? 6 : 4; ++} ++ ++# ++# Return pingPath depending on address type of target. ++# ++sub getPingPathByAddressType ++{ ++ my ( $bpc, $host ) = @_; ++ my $at = $bpc->resolve( $host ) || 4; ++ return ($at == 6) ? $bpc->{Conf}{PingPath6} : $bpc->{Conf}{PingPath}; ++} ++ + 1; +Index: lib/BackupPC/CGI/EditConfig.pm +=================================================================== +RCS file: /cvsroot/backuppc/BackupPC/lib/BackupPC/CGI/EditConfig.pm,v +retrieving revision 1.29 +diff -u -w -r1.29 EditConfig.pm +--- lib/BackupPC/CGI/EditConfig.pm 12 Jan 2015 00:56:41 -0000 1.29 ++++ lib/BackupPC/CGI/EditConfig.pm 17 Oct 2016 10:42:06 -0000 +@@ -86,6 +86,7 @@ + {name => "SshPath"}, + {name => "NmbLookupPath"}, + {name => "PingPath"}, ++ {name => "PingPath6"}, + {name => "DfPath"}, + {name => "SplitPath"}, + {name => "ParPath"}, +Index: lib/BackupPC/Config/Meta.pm +=================================================================== +RCS file: /cvsroot/backuppc/BackupPC/lib/BackupPC/Config/Meta.pm,v +retrieving revision 1.28 +diff -u -w -r1.28 Meta.pm +--- lib/BackupPC/Config/Meta.pm 12 Jan 2015 00:56:41 -0000 1.28 ++++ lib/BackupPC/Config/Meta.pm 17 Oct 2016 10:42:06 -0000 +@@ -85,6 +85,7 @@ + SshPath => {type => "execPath", undefIfEmpty => 1}, + NmbLookupPath => {type => "execPath", undefIfEmpty => 1}, + PingPath => {type => "execPath", undefIfEmpty => 1}, ++ PingPath6 => {type => "execPath", undefIfEmpty => 1}, + DfPath => {type => "execPath", undefIfEmpty => 1}, + DfCmd => "string", + SplitPath => {type => "execPath", undefIfEmpty => 1}, diff --git a/BackupPC.spec b/BackupPC.spec index c29b7a7..51eceee 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -27,6 +27,7 @@ Patch1: BackupPC-3.2.1-rundir.patch Patch2: BackupPC-3.2.1-piddir.patch Patch3: BackupPC-3.3.0-fix-shadow-access.patch Patch4: BackupPC-3.3.1-perl_defined_at_deprecation.patch +Patch5: BackupPC-3.3.1-IPv6-support.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -95,6 +96,7 @@ configurable and easy to install and maintain. %patch2 -p1 -b .piddir %patch3 -p1 -b .shadow-access %patch4 -p1 -b .oldperl +%patch5 -p0 -b .ipv6support sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -371,6 +373,9 @@ fi %endif %changelog +* Tue Oct 18 2016 Benjamin Lefoul - 3.3.1-6 +- Some IPv6 support (BZ 1385630) + * Fri Jul 15 2016 Benjamin Lefoul - 3.3.1-5 - Deprecation of defined(@array) in perl From 6901d6f37fab8c7ce7514d09c36e17562c0a1ee7 Mon Sep 17 00:00:00 2001 From: Benjamin Lefoul Date: Thu, 22 Dec 2016 14:57:17 +0100 Subject: [PATCH 110/168] BZ 1259481 - Perl unescaped braces fixed --- ...upPC-3.3.1-perl_unescaped_left_brace.patch | 38 +++++++++++++++++++ BackupPC.spec | 7 +++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 BackupPC-3.3.1-perl_unescaped_left_brace.patch diff --git a/BackupPC-3.3.1-perl_unescaped_left_brace.patch b/BackupPC-3.3.1-perl_unescaped_left_brace.patch new file mode 100644 index 0000000..c8930a0 --- /dev/null +++ b/BackupPC-3.3.1-perl_unescaped_left_brace.patch @@ -0,0 +1,38 @@ +--- BackupPC-3.3.1/lib/BackupPC/Lib.pm.orig 2016-12-22 14:40:02.589015927 +0100 ++++ BackupPC-3.3.1/lib/BackupPC/Lib.pm 2016-12-22 14:41:37.511427617 +0100 +@@ -1261,7 +1261,7 @@ + # + # Replace scalar variables first + # +- $arg =~ s[\${(\w+)}(\+?)]{ ++ $arg =~ s[\$\{(\w+)}(\+?)]{ + exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY" + ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1}) + : "\${$1}$2" +@@ -1270,7 +1270,7 @@ + # Now replicate any array arguments; this just works for just one + # array var in each argument. + # +- if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) { ++ if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) { + my $pre = $1; + my $var = $2; + my $esc = $3; +@@ -1295,7 +1295,7 @@ + sub cmdExecOrEval + { + my($bpc, $cmd, @args) = @_; +- ++ + if ( (ref($cmd) eq "ARRAY" ? $cmd->[0] : $cmd) =~ /^\&/ ) { + $cmd = join(" ", @$cmd) if ( ref($cmd) eq "ARRAY" ); + print(STDERR "cmdExecOrEval: about to eval perl code $cmd\n") +@@ -1336,7 +1336,7 @@ + my($bpc, $cmd, $stdoutCB, $ignoreStderr, $pidHandlerCB, @args) = @_; + my($pid, $out, $allOut); + local(*CHILD); +- ++ + $? = 0; + if ( (ref($cmd) eq "ARRAY" ? $cmd->[0] : $cmd) =~ /^\&/ ) { + $cmd = join(" ", @$cmd) if ( ref($cmd) eq "ARRAY" ); diff --git a/BackupPC.spec b/BackupPC.spec index 51eceee..aacae8d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -28,6 +28,7 @@ Patch2: BackupPC-3.2.1-piddir.patch Patch3: BackupPC-3.3.0-fix-shadow-access.patch Patch4: BackupPC-3.3.1-perl_defined_at_deprecation.patch Patch5: BackupPC-3.3.1-IPv6-support.patch +Patch6: BackupPC-3.3.1-perl_unescaped_left_brace.patch Source1: BackupPC.htaccess Source2: BackupPC.logrotate Source3: BackupPC-README.fedora @@ -97,6 +98,7 @@ configurable and easy to install and maintain. %patch3 -p1 -b .shadow-access %patch4 -p1 -b .oldperl %patch5 -p0 -b .ipv6support +%patch6 -p1 -b .unescaped_brace_perl sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do @@ -373,6 +375,9 @@ fi %endif %changelog +* Thu Dec 22 2016 Benjamin Lefoul - 3.3.1-7 +- Perl unescaped braces (BZ 1259481) + * Tue Oct 18 2016 Benjamin Lefoul - 3.3.1-6 - Some IPv6 support (BZ 1385630) From 78ee0b17c771bac1b4cc4cafb715dcb2a08d1a2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 04:59:47 +0000 Subject: [PATCH 111/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index aacae8d..b2c5e95 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -375,6 +375,9 @@ fi %endif %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Dec 22 2016 Benjamin Lefoul - 3.3.1-7 - Perl unescaped braces (BZ 1259481) From eb4442879667c4b11129c4b43f1444263699358d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 13 Jan 2017 23:11:15 +0200 Subject: [PATCH 112/168] Move tmpfiles.d config to %{_tmpfilesdir}, install LICENSE as %license --- BackupPC.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index b2c5e95..512d67d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: 3.3.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -224,8 +224,8 @@ done sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc %if 0%{?_with_tmpfilesd} -install -d $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d -install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/%{name}.conf +install -d $RPM_BUILD_ROOT/%{_tmpfilesdir} +install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf %endif install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name} @@ -342,7 +342,8 @@ fi %files %defattr(-,root,root,-) -%doc README README.fedora README.RHEL ChangeLog LICENSE doc/ +%doc README README.fedora README.RHEL ChangeLog doc/ +%license LICENSE %dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/ @@ -356,7 +357,7 @@ fi %{_datadir}/%{name}/[^s]* %if 0%{?_with_tmpfilesd} -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %endif %dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name} @@ -375,6 +376,10 @@ fi %endif %changelog +* Wed Mar 1 2017 Ville Skyttä - 3.3.1-9 +- Move tmpfiles.d config to %%{_tmpfilesdir} +- Install LICENSE as %%license + * Fri Feb 10 2017 Fedora Release Engineering - 3.3.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From d51543eef99f6d7c17a2d887bc09ed403ee71c40 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 4 Apr 2017 19:23:21 -0500 Subject: [PATCH 113/168] Update to latest upstream release, 4.1.1. --- .gitignore | 1 + BackupPC-3.2.1-locatedb.patch | 37 --- BackupPC-3.2.1-piddir.patch | 36 --- BackupPC-3.2.1-rundir.patch | 24 -- BackupPC-3.3.0-fix-shadow-access.patch | 24 -- BackupPC-3.3.1-IPv6-support.patch | 171 ---------- ...PC-3.3.1-perl_defined_at_deprecation.patch | 11 - ...upPC-3.3.1-perl_unescaped_left_brace.patch | 38 --- BackupPC-4.1.1-docfix.patch | 39 +++ BackupPC.htaccess | 9 +- BackupPC.spec | 306 ++++++++---------- BackupPC_Admin.c | 16 +- BackupPC-README.fedora => README.setup | 16 +- backuppc.service | 6 +- sources | 2 +- 15 files changed, 201 insertions(+), 535 deletions(-) delete mode 100644 BackupPC-3.2.1-locatedb.patch delete mode 100644 BackupPC-3.2.1-piddir.patch delete mode 100644 BackupPC-3.2.1-rundir.patch delete mode 100644 BackupPC-3.3.0-fix-shadow-access.patch delete mode 100644 BackupPC-3.3.1-IPv6-support.patch delete mode 100644 BackupPC-3.3.1-perl_defined_at_deprecation.patch delete mode 100644 BackupPC-3.3.1-perl_unescaped_left_brace.patch create mode 100644 BackupPC-4.1.1-docfix.patch rename BackupPC-README.fedora => README.setup (67%) diff --git a/.gitignore b/.gitignore index 5713cb9..5da92fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-3.3.0.tar.gz /BackupPC-3.3.1.tar.gz +/BackupPC-4.1.1.tar.gz diff --git a/BackupPC-3.2.1-locatedb.patch b/BackupPC-3.2.1-locatedb.patch deleted file mode 100644 index 70978e5..0000000 --- a/BackupPC-3.2.1-locatedb.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur BackupPC-3.2.1-pristine/init.d/src/linux-backuppc BackupPC-3.2.1/init.d/src/linux-backuppc ---- BackupPC-3.2.1-pristine/init.d/src/linux-backuppc 2011-04-24 21:31:55.000000000 -0600 -+++ BackupPC-3.2.1/init.d/src/linux-backuppc 2011-07-07 21:36:41.363281386 -0600 -@@ -20,6 +20,25 @@ - - RETVAL=0 - -+topDirCheck() -+{ -+ updatedb=/etc/updatedb.conf -+ topdir=$(perl <<_EOF_ -+ require '__CONFDIR__/config.pl'; -+ print \$Conf{TopDir}; -+_EOF_ -+) -+ if [ -r $updatedb ]; then -+ grep ^PRUNEPATHS $updatedb | grep ${topdir%%/} > /dev/null -+ if [ $? -eq 1 ]; then -+ logger -t BackupPC -s "WARNING: Your BackupPC \$Conf{TopDir} is not listed in the locate" -+ logger -t BackupPC -s "database configuration's PRUNEPATHS. This may cause all of your" -+ logger -t BackupPC -s "backed up files to be indexed!" -+ fi -+ fi -+} -+ -+ - start() { - # - # You can set the SMB share password here is you wish. Otherwise -@@ -38,6 +57,7 @@ - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/backuppc || \ - RETVAL=1 -+ topDirCheck - return $RETVAL - } - diff --git a/BackupPC-3.2.1-piddir.patch b/BackupPC-3.2.1-piddir.patch deleted file mode 100644 index ed3e56a..0000000 --- a/BackupPC-3.2.1-piddir.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur BackupPC-3.2.1-pristine/bin/BackupPC BackupPC-3.2.1/bin/BackupPC ---- BackupPC-3.2.1-pristine/bin/BackupPC 2011-04-24 21:31:54.000000000 -0600 -+++ BackupPC-3.2.1/bin/BackupPC 2011-07-08 21:14:46.609762024 -0600 -@@ -363,11 +363,11 @@ - # Write out our initial status and save our PID - # - StatusWrite(); -- unlink("$LogDir/BackupPC.pid"); -- if ( open(PID, ">", "$LogDir/BackupPC.pid") ) { -+ unlink("/var/run/BackupPC/BackupPC.pid"); -+ if ( open(PID, ">", "/var/run/BackupPC/BackupPC.pid") ) { - print(PID $$); - close(PID); -- chmod(0444, "$LogDir/BackupPC.pid"); -+ chmod(0444, "/var/run/BackupPC/BackupPC.pid"); - } - - # -@@ -1846,7 +1846,7 @@ - close(LOG); - LogFileOpen(); - print(LOG "Fatal error: unhandled signal $SigName\n"); -- unlink("$LogDir/BackupPC.pid"); -+ unlink("/var/run/BackupPC/BackupPC.pid"); - confess("Got new signal $SigName... quitting\n"); - } else { - $SigName = shift; -@@ -1968,7 +1968,7 @@ - } - delete($Info{pid}); - StatusWrite(); -- unlink("$LogDir/BackupPC.pid"); -+ unlink("/var/run/BackupPC/BackupPC.pid"); - exit(1); - } - diff --git a/BackupPC-3.2.1-rundir.patch b/BackupPC-3.2.1-rundir.patch deleted file mode 100644 index 79efff1..0000000 --- a/BackupPC-3.2.1-rundir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur BackupPC-3.2.1-pristine/bin/BackupPC BackupPC-3.2.1/bin/BackupPC ---- BackupPC-3.2.1-pristine/bin/BackupPC 2011-04-24 21:31:54.000000000 -0600 -+++ BackupPC-3.2.1/bin/BackupPC 2011-07-07 22:25:55.287651463 -0600 -@@ -1885,7 +1885,7 @@ - print(LOG $bpc->timeStamp, "unix socket() failed: $!\n"); - exit(1); - } -- my $sockFile = "$LogDir/BackupPC.sock"; -+ my $sockFile = "/var/run/BackupPC/BackupPC.sock"; - unlink($sockFile); - if ( !bind(SERVER_UNIX, sockaddr_un($sockFile)) ) { - print(LOG $bpc->timeStamp, "unix bind() failed: $!\n"); -diff -Naur BackupPC-3.2.1-pristine/lib/BackupPC/Lib.pm BackupPC-3.2.1/lib/BackupPC/Lib.pm ---- BackupPC-3.2.1-pristine/lib/BackupPC/Lib.pm 2011-04-24 21:31:55.000000000 -0600 -+++ BackupPC-3.2.1/lib/BackupPC/Lib.pm 2011-07-07 22:26:46.744614593 -0600 -@@ -686,7 +686,7 @@ - # - # First try the unix-domain socket - # -- my $sockFile = "$bpc->{LogDir}/BackupPC.sock"; -+ my $sockFile = "/var/run/BackupPC/BackupPC.sock"; - socket(*FH, PF_UNIX, SOCK_STREAM, 0) || return "unix socket: $!"; - if ( !connect(*FH, sockaddr_un($sockFile)) ) { - my $err = "unix connect: $!"; diff --git a/BackupPC-3.3.0-fix-shadow-access.patch b/BackupPC-3.3.0-fix-shadow-access.patch deleted file mode 100644 index 5dc2755..0000000 --- a/BackupPC-3.3.0-fix-shadow-access.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur BackupPC-3.3.0-pristine/lib/BackupPC/CGI/Lib.pm BackupPC-3.3.0/lib/BackupPC/CGI/Lib.pm ---- BackupPC-3.3.0-pristine/lib/BackupPC/CGI/Lib.pm 2013-04-14 14:43:32.000000000 -0600 -+++ BackupPC-3.3.0/lib/BackupPC/CGI/Lib.pm 2014-02-21 22:42:25.844412429 -0700 -@@ -144,7 +144,7 @@ - # Verify we are running as the correct user - # - if ( $Conf{BackupPCUserVerify} -- && $> != (my $uid = (getpwnam($Conf{BackupPCUser}))[2]) ) { -+ && $> != (my $uid = (getpwnam($Conf{BackupPCUser}))) ) { - ErrorExit(eval("qq{$Lang->{Wrong_user__my_userid_is___}}"), <{Conf}{BackupPCUserVerify} -- && $> != (my $uid = (getpwnam($bpc->{Conf}{BackupPCUser}))[2]) ) { -+ && $> != (my $uid = (getpwnam($bpc->{Conf}{BackupPCUser}))) ) { - print(STDERR "$0: Wrong user: my userid is $>, instead of $uid" - . " ($bpc->{Conf}{BackupPCUser})\n"); - print(STDERR "Please su $bpc->{Conf}{BackupPCUser} first\n"); diff --git a/BackupPC-3.3.1-IPv6-support.patch b/BackupPC-3.3.1-IPv6-support.patch deleted file mode 100644 index 7576879..0000000 --- a/BackupPC-3.3.1-IPv6-support.patch +++ /dev/null @@ -1,171 +0,0 @@ -Index: configure.pl -=================================================================== -RCS file: /cvsroot/backuppc/BackupPC/configure.pl,v -retrieving revision 1.51 -diff -u -w -r1.51 configure.pl ---- configure.pl 12 Jan 2015 00:56:40 -0000 1.51 -+++ configure.pl 17 Oct 2016 10:42:05 -0000 -@@ -253,6 +253,7 @@ - nmblookup => "NmbLookupPath", - rsync => "RsyncClientPath", - ping => "PingPath", -+ 'ping6/ping' => "PingPath6", - df => "DfPath", - 'ssh/ssh2' => "SshPath", - sendmail => "SendmailPath", -Index: bin/BackupPC_dump -=================================================================== -RCS file: /cvsroot/backuppc/BackupPC/bin/BackupPC_dump,v -retrieving revision 1.51 -diff -u -w -r1.51 BackupPC_dump ---- bin/BackupPC_dump 12 Jan 2015 00:56:40 -0000 1.51 -+++ bin/BackupPC_dump 17 Oct 2016 10:42:05 -0000 -@@ -493,7 +493,7 @@ - } else { - $host = $client; - } -- if ( !defined(gethostbyname($host)) ) { -+ if ( !defined($bpc->resolve($host)) ) { - # - # Ok, NS doesn't know about it. Maybe it is a NetBios name - # instead. -Index: bin/BackupPC_restore -=================================================================== -RCS file: /cvsroot/backuppc/BackupPC/bin/BackupPC_restore,v -retrieving revision 1.36 -diff -u -w -r1.36 BackupPC_restore ---- bin/BackupPC_restore 12 Jan 2015 00:56:40 -0000 1.36 -+++ bin/BackupPC_restore 17 Oct 2016 10:42:05 -0000 -@@ -167,7 +167,7 @@ - # Find its IP address - # - if ( $hostIP !~ /\d+\.\d+\.\d+\.\d+/ ) { -- if ( !defined(gethostbyname($host)) ) { -+ if ( !defined($bpc->resolve($host)) ) { - # - # Ok, NS doesn't know about it. Maybe it is a NetBios name - # instead. -Index: conf/config.pl -=================================================================== -RCS file: /cvsroot/backuppc/BackupPC/conf/config.pl,v -retrieving revision 1.58 -diff -u -w -r1.58 config.pl ---- conf/config.pl 12 Jan 2015 00:56:40 -0000 1.58 -+++ conf/config.pl 17 Oct 2016 10:42:06 -0000 -@@ -1652,9 +1652,24 @@ - $Conf{PingPath} = ''; - - # -+# Like PingPath, but for IPv6. Security caution: normal users -+# should not be allowed to write to this file or directory. -+# In some environments, this is something like '/usr/bin/ping6'. -+# In modern environments, the regular ping command can handle both -+# IPv4 and IPv6. In the latter case, just set it to $Conf{PingPath} -+# -+# If you want to disable ping checking for IPv6 hosts, set this to -+# some program that exits with 0 status, eg: -+# -+# $Conf{PingPath6} = '/bin/echo'; -+# -+$Conf{PingPath6} = ''; -+ -+# - # Ping command. The following variables are substituted at run-time: - # --# $pingPath path to ping ($Conf{PingPath}) -+# $pingPath path to ping ($Conf{PingPath} or $Conf{PingPath6}) -+# depending on the address type of $host. - # $host host name - # - # Wade Brown reports that on solaris 2.6 and 2.7 ping -s returns the wrong -Index: lib/BackupPC/Config.pm -=================================================================== -RCS file: /cvsroot/backuppc/BackupPC/lib/BackupPC/Config.pm,v -retrieving revision 1.3 -diff -u -w -r1.3 Config.pm ---- lib/BackupPC/Config.pm 2 Aug 2003 08:01:43 -0000 1.3 -+++ lib/BackupPC/Config.pm 17 Oct 2016 10:42:06 -0000 -@@ -269,6 +269,9 @@ - PingPath => {struct => 'SCALAR', - type => 'STRING', }, - -+ PingPath6 => {struct => 'SCALAR', -+ type => 'STRING', }, -+ - PingArgs => {struct => 'SCALAR', - type => 'STRING', }, - -Index: lib/BackupPC/Lib.pm -=================================================================== -RCS file: /cvsroot/backuppc/BackupPC/lib/BackupPC/Lib.pm,v -retrieving revision 1.53 -diff -u -w -r1.53 Lib.pm ---- lib/BackupPC/Lib.pm 12 Jan 2015 00:56:41 -0000 1.53 -+++ lib/BackupPC/Lib.pm 17 Oct 2016 10:42:06 -0000 -@@ -982,7 +982,7 @@ - } - - my $args = { -- pingPath => $bpc->{Conf}{PingPath}, -+ pingPath => $bpc->getPingPathByAddressType( $host ), - host => $host, - }; - $pingCmd = $bpc->cmdVarSubstitute($bpc->{Conf}{PingCmd}, $args); -@@ -1543,4 +1543,27 @@ - return $glob; - } - -+# -+# Attempts to resolve a hostname. -+# Return 4 if it resolves to an IPv4 address, 6 if it resolves to an IPv6 -+# address or undef if it can not be resolved. -+# -+sub resolve -+{ -+ my ( $bpc, $host ) = @_; -+ my ( $err, @addrs ) = Socket::getaddrinfo($host); -+ return undef if ( $err ); -+ return (($addrs[0])->{'family'} == Socket::AF_INET6) ? 6 : 4; -+} -+ -+# -+# Return pingPath depending on address type of target. -+# -+sub getPingPathByAddressType -+{ -+ my ( $bpc, $host ) = @_; -+ my $at = $bpc->resolve( $host ) || 4; -+ return ($at == 6) ? $bpc->{Conf}{PingPath6} : $bpc->{Conf}{PingPath}; -+} -+ - 1; -Index: lib/BackupPC/CGI/EditConfig.pm -=================================================================== -RCS file: /cvsroot/backuppc/BackupPC/lib/BackupPC/CGI/EditConfig.pm,v -retrieving revision 1.29 -diff -u -w -r1.29 EditConfig.pm ---- lib/BackupPC/CGI/EditConfig.pm 12 Jan 2015 00:56:41 -0000 1.29 -+++ lib/BackupPC/CGI/EditConfig.pm 17 Oct 2016 10:42:06 -0000 -@@ -86,6 +86,7 @@ - {name => "SshPath"}, - {name => "NmbLookupPath"}, - {name => "PingPath"}, -+ {name => "PingPath6"}, - {name => "DfPath"}, - {name => "SplitPath"}, - {name => "ParPath"}, -Index: lib/BackupPC/Config/Meta.pm -=================================================================== -RCS file: /cvsroot/backuppc/BackupPC/lib/BackupPC/Config/Meta.pm,v -retrieving revision 1.28 -diff -u -w -r1.28 Meta.pm ---- lib/BackupPC/Config/Meta.pm 12 Jan 2015 00:56:41 -0000 1.28 -+++ lib/BackupPC/Config/Meta.pm 17 Oct 2016 10:42:06 -0000 -@@ -85,6 +85,7 @@ - SshPath => {type => "execPath", undefIfEmpty => 1}, - NmbLookupPath => {type => "execPath", undefIfEmpty => 1}, - PingPath => {type => "execPath", undefIfEmpty => 1}, -+ PingPath6 => {type => "execPath", undefIfEmpty => 1}, - DfPath => {type => "execPath", undefIfEmpty => 1}, - DfCmd => "string", - SplitPath => {type => "execPath", undefIfEmpty => 1}, diff --git a/BackupPC-3.3.1-perl_defined_at_deprecation.patch b/BackupPC-3.3.1-perl_defined_at_deprecation.patch deleted file mode 100644 index afc71c2..0000000 --- a/BackupPC-3.3.1-perl_defined_at_deprecation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- BackupPC-3.3.1/lib/BackupPC/CGI/Browse.pm.orig 2016-07-15 10:32:24.007070271 +0200 -+++ BackupPC-3.3.1/lib/BackupPC/CGI/Browse.pm 2016-07-15 10:33:00.920213213 +0200 -@@ -65,7 +65,7 @@ - # - # 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}; - } diff --git a/BackupPC-3.3.1-perl_unescaped_left_brace.patch b/BackupPC-3.3.1-perl_unescaped_left_brace.patch deleted file mode 100644 index c8930a0..0000000 --- a/BackupPC-3.3.1-perl_unescaped_left_brace.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- BackupPC-3.3.1/lib/BackupPC/Lib.pm.orig 2016-12-22 14:40:02.589015927 +0100 -+++ BackupPC-3.3.1/lib/BackupPC/Lib.pm 2016-12-22 14:41:37.511427617 +0100 -@@ -1261,7 +1261,7 @@ - # - # Replace scalar variables first - # -- $arg =~ s[\${(\w+)}(\+?)]{ -+ $arg =~ s[\$\{(\w+)}(\+?)]{ - exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY" - ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1}) - : "\${$1}$2" -@@ -1270,7 +1270,7 @@ - # Now replicate any array arguments; this just works for just one - # array var in each argument. - # -- if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) { -+ if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) { - my $pre = $1; - my $var = $2; - my $esc = $3; -@@ -1295,7 +1295,7 @@ - sub cmdExecOrEval - { - my($bpc, $cmd, @args) = @_; -- -+ - if ( (ref($cmd) eq "ARRAY" ? $cmd->[0] : $cmd) =~ /^\&/ ) { - $cmd = join(" ", @$cmd) if ( ref($cmd) eq "ARRAY" ); - print(STDERR "cmdExecOrEval: about to eval perl code $cmd\n") -@@ -1336,7 +1336,7 @@ - my($bpc, $cmd, $stdoutCB, $ignoreStderr, $pidHandlerCB, @args) = @_; - my($pid, $out, $allOut); - local(*CHILD); -- -+ - $? = 0; - if ( (ref($cmd) eq "ARRAY" ? $cmd->[0] : $cmd) =~ /^\&/ ) { - $cmd = join(" ", @$cmd) if ( ref($cmd) eq "ARRAY" ); diff --git a/BackupPC-4.1.1-docfix.patch b/BackupPC-4.1.1-docfix.patch new file mode 100644 index 0000000..dc8fcf2 --- /dev/null +++ b/BackupPC-4.1.1-docfix.patch @@ -0,0 +1,39 @@ +--- 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.htaccess b/BackupPC.htaccess index 1ebc77e..e63c3b9 100644 --- a/BackupPC.htaccess +++ b/BackupPC.htaccess @@ -1,4 +1,4 @@ - + # BackupPC requires valid authentication in order for the web interface to # function properly. One can view the web interface without authentication # though all functionality is disabled. @@ -28,10 +28,9 @@ AuthName "BackupPC" require valid-user - - + Alias /BackupPC/images /usr/share/BackupPC/html/ -ScriptAlias /BackupPC /usr/share/BackupPC/sbin/BackupPC_Admin -ScriptAlias /backuppc /usr/share/BackupPC/sbin/BackupPC_Admin +ScriptAlias /BackupPC /usr/libexec/BackupPC/BackupPC_Admin +ScriptAlias /backuppc /usr/libexec/BackupPC/BackupPC_Admin diff --git a/BackupPC.spec b/BackupPC.spec index 512d67d..bd04216 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -1,10 +1,5 @@ -# enable -PIE build %global _hardened_build 1 -%if 0%{?rhel} && 0%{?rhel} < 5 -%global _without_selinux 1 -%endif - # tmpfiles.d & systemd support in all supported Fedora now, but not RHEL < 7 %if 0%{?fedora} || 0%{?rhel} >= 7 %global _with_tmpfilesd 1 @@ -13,136 +8,103 @@ %global _updatedb_conf /etc/updatedb.conf +%global ver_major 4 +%global ver_minor 1 +%global ver_patch 1 +%global ver_under %{ver_major}_%{ver_minor}_%{ver_patch} + Name: BackupPC -Version: 3.3.1 -Release: 9%{?dist} +Version: %{ver_major}.%{ver_minor}.%{ver_patch} +Release: 1%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ -URL: http://backuppc.sourceforge.net/ +URL: http://backuppc.github.io/backuppc/index.html -Source0: http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar.gz -Patch0: BackupPC-3.2.1-locatedb.patch -Patch1: BackupPC-3.2.1-rundir.patch -Patch2: BackupPC-3.2.1-piddir.patch -Patch3: BackupPC-3.3.0-fix-shadow-access.patch -Patch4: BackupPC-3.3.1-perl_defined_at_deprecation.patch -Patch5: BackupPC-3.3.1-IPv6-support.patch -Patch6: BackupPC-3.3.1-perl_unescaped_left_brace.patch +Source0: https://github.com/backuppc/backuppc/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess Source2: BackupPC.logrotate -Source3: BackupPC-README.fedora +Source3: README.setup #A C wrapper to use since perl-suidperl is no longer provided Source4: BackupPC_Admin.c Source5: backuppc.service Source6: BackupPC.tmpfiles Source7: README.RHEL -BuildRequires: %{_bindir}/smbclient, %{_bindir}/nmblookup -BuildRequires: rsync -BuildRequires: coreutils -BuildRequires: tar -BuildRequires: openssh-clients +Patch0: BackupPC-4.1.1-docfix.patch + BuildRequires: perl-generators +BuildRequires: perl(BackupPC::XS) >= 0.53 +BuildRequires: perl(CGI) BuildRequires: perl(Compress::Zlib) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Digest::MD5) +BuildRequires: perl(Encode) +BuildRequires: perl(File::Listing) BuildRequires: perl(Pod::Usage) +BuildRequires: perl(version) %if 0%{?_with_systemd} -BuildRequires: systemd-units +BuildRequires: systemd %endif # Unbundled libraries -Requires: perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle) +Requires: perl(Net::FTP::AutoReconnect) +Requires: perl(Net::FTP::RetrHandle) Requires: httpd -Requires: perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip) -Requires: perl-Time-modules, perl(XML::RSS), perl(Digest::MD5) -Requires: rsync -# This is a file dependency so EL5 can use samba or samba-client or -# samba3x-client -Requires: %{_bindir}/smbclient, %{_bindir}/nmblookup +Requires: iputils +Requires: openssh-clients +Requires: par2cmdline +Requires: rrdtool +Requires: rsync-bpc >= 3.0.9.6 +Requires: perl(Archive::Zip) +Requires: perl(BackupPC::XS) >= 0.53 +Requires: perl(CGI) +Requires: perl(Compress::Zlib) +Requires: perl(Digest::MD5) +Requires: perl(Encode) +Requires: perl(File::Listing) +Requires: perl-Time-modules +Requires: perl(version) +Requires: perl(XML::RSS) +Requires: samba-client Requires(pre): %{_sbindir}/useradd %if 0%{?_with_systemd} -Requires(preun): systemd-units -Requires(post): systemd-units, %{_sbindir}/usermod -Requires(postun): systemd-units +Requires(preun): systemd +Requires(post): systemd %{_sbindir}/usermod +Requires(postun): systemd %else Requires(preun): initscripts, chkconfig Requires(post): initscripts, chkconfig, %{_sbindir}/usermod Requires(postun): initscripts %endif -%if ! 0%{?_without_selinux} Requires: policycoreutils BuildRequires: selinux-policy-devel, checkpolicy -%endif Provides: backuppc = %{version} -# BuildRoot required for RHEL5 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description BackupPC is a high-performance, enterprise-grade system for backing up Linux and WinXX and Mac OS X PCs and laptops to a server's disk. BackupPC is highly configurable and easy to install and maintain. +NOTE: Proper configuration is required after install, see README.setup for more +information. + + %prep +%autosetup -p1 -%setup -q - -%patch0 -p1 -b .locatedb -%patch1 -p1 -b .rundir -%patch2 -p1 -b .piddir -%patch3 -p1 -b .shadow-access -%patch4 -p1 -b .oldperl -%patch5 -p0 -b .ipv6support -%patch6 -p1 -b .unescaped_brace_perl - -sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl -for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do +for f in ChangeLog; do iconv -f ISO-8859-1 -t UTF-8 $f > $f.utf && mv $f.utf $f done -#incorrect FSF address -sed -i 's|59 Temple Place, Suite 330, Boston, MA *02111-1307 USA|51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA|' \ - lib/BackupPC/CGI/Queue.pm \ - bin/BackupPC_archive \ - lib/BackupPC/CGI/StartServer.pm \ - lib/BackupPC/CGI/HostInfo.pm \ - lib/BackupPC/CGI/Archive.pm \ - lib/BackupPC/CGI/LOGlist.pm \ - lib/BackupPC/FileZIO.pm \ - lib/BackupPC/CGI/GeneralInfo.pm \ - lib/BackupPC/CGI/Browse.pm \ - lib/BackupPC/CGI/RSS.pm \ - lib/BackupPC/CGI/Restore.pm \ - lib/BackupPC/CGI/RestoreFile.pm \ - bin/BackupPC_restore \ - lib/BackupPC/CGI/DirHistory.pm \ - lib/BackupPC/Xfer/Archive.pm \ - lib/BackupPC/Config/Meta.pm \ - lib/BackupPC/CGI/ArchiveInfo.pm \ - lib/BackupPC/CGI/ReloadServer.pm \ - lib/BackupPC/CGI/View.pm \ - bin/BackupPC_tarExtract \ - lib/BackupPC/CGI/EmailSummary.pm \ - lib/BackupPC/Xfer/RsyncFileIO.pm \ - lib/BackupPC/CGI/RestoreInfo.pm \ - lib/BackupPC/CGI/StartStopBackup.pm \ - lib/BackupPC/CGI/StopServer.pm \ - lib/BackupPC/CGI/AdminOptions.pm \ - lib/BackupPC/CGI/Summary.pm \ - lib/BackupPC/CGI/EditConfig.pm +cp %{SOURCE3} . +cp %{SOURCE7} . +cp %{SOURCE4} . -chmod a-x LICENSE README - -cp %{SOURCE3} README.fedora -cp %{SOURCE7} README.RHEL -cp %{SOURCE4} BackupPC_Admin.c - -%if ! 0%{?_without_selinux} mkdir selinux pushd selinux @@ -177,113 +139,112 @@ EOF cat >%{name}.fc < 1,|ClientNameAlias => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl - -#perl-suidperl is no longer avaialable, we use a C wrapper -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl -install -p BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/ - -%if ! 0%{?_without_selinux} - # SElinux - %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name} - %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp -%endif - - -%clean -rm -rf $RPM_BUILD_ROOT +# SElinux +mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name} +install -m 0644 selinux/%{name}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.pp %pre %{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || : - %preun +%if 0%{?_with_systemd} +%systemd_preun backuppc.service +%else if [ $1 = 0 ]; then # Package removal, not upgrade - %if 0%{?_with_systemd} - /bin/systemctl --no-reload disable backuppc.service > /dev/null 2>&1 || : - /bin/systemctl stop backuppc.service > /dev/null 2>&1 || : - %else service backuppc stop > /dev/null 2>&1 || : chkconfig --del backuppc || : - %endif fi +%endif %post -%if ! 0%{?_without_selinux} ( # Install/update Selinux policy semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp @@ -291,19 +252,16 @@ fi restorecon -R %{_sysconfdir}/%{name} restorecon -R %{_localstatedir}/log/%{name} ) &>/dev/null -%endif +%if 0%{?_with_systemd} +%systemd_post backuppc.service +%else if [ $1 -eq 1 ]; then # initial installation - %if 0%{?_with_systemd} - /bin/systemctl daemon-reload > /dev/null 2>&1 || : - %else chkconfig --add backuppc || : - service httpd condrestart > /dev/null 2>&1 || : - %endif - %{_sbindir}/usermod -a -G backuppc apache || : fi - +%{_sbindir}/usermod -a -G backuppc apache || : +%endif # add BackupPC backup directories to PRUNEPATHS in locate database if [ -w %{_updatedb_conf} ]; then @@ -320,41 +278,29 @@ service httpd condrestart > /dev/null 2>&1 || : if [ $1 -eq 0 ]; then # uninstall - %if ! 0%{?_without_selinux} # Remove the SElinux policy. semodule -r %{name} &> /dev/null || : - %endif - # remove BackupPC backup directories from PRUNEPATHS in locate database if [ -w %{_updatedb_conf} ]; then sed -i '\@PRUNEPATHS@s@[ ]*'%{_localstatedir}/lib/%{name}'@@' %{_updatedb_conf} || : fi fi -if [ $1 -eq 1 ]; then - # package upgrade, not uninstall - %if 0%{?_with_systemd} - /bin/systemctl try-restart backuppc.service > /dev/null 2>&1 || : - %endif - # at least one command required - : -fi +%systemd_postun_with_restart backuppc.service + %files -%defattr(-,root,root,-) -%doc README README.fedora README.RHEL ChangeLog doc/ +%doc README.md README.setup README.RHEL ChangeLog doc/* %license LICENSE - %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) %{_sysconfdir}/logrotate.d/%{name} - -%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/sbin %{_datadir}/%{name}/[^s]* +%attr(750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin %if 0%{?_with_tmpfilesd} %{_tmpfilesdir}/%{name}.conf @@ -367,15 +313,21 @@ fi %attr(0755,root,root) %{_initrddir}/backuppc %endif -%attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin -%attr(750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin.pl +%attr(4750,backuppc,apache) %{_libexecdir}/%{name}/BackupPC_Admin %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/ - -%if ! 0%{?_without_selinux} %{_datadir}/selinux/packages/%{name}/%{name}.pp -%endif + %changelog +* Thu Mar 30 2017 Richard Shaw - 4.1.1-1 +- Update to latest upstream release, 4.1.1. + +* Sat Mar 25 2017 Richard Shaw - 4.1.0-1 +- Update to latest upstream release, 4.1.0. + +* Thu Mar 9 2017 Richard Shaw - 4.0.0-1 +- Update to latest upstream release, 4.0.0. + * Wed Mar 1 2017 Ville Skyttä - 3.3.1-9 - Move tmpfiles.d config to %%{_tmpfilesdir} - Install LICENSE as %%license diff --git a/BackupPC_Admin.c b/BackupPC_Admin.c index be3137f..db75d6b 100644 --- a/BackupPC_Admin.c +++ b/BackupPC_Admin.c @@ -1,10 +1,12 @@ #include -#ifndef REAL_PATH -#define REAL_PATH "/usr/share/BackupPC/sbin/BackupPC_Admin.pl" -#endif -int main(ac, av) -char **av; +#include +#include + +int main( int argc, char ** argv, char ** envp ) { - execv(REAL_PATH, av); - return 0; + if( setgid(getegid()) ) perror( "setgid" ); + if( setuid(geteuid()) ) perror( "setuid" ); + execv( "/usr/share/BackupPC/sbin/BackupPC_Admin", argv ); + perror( argv[0] ); + return errno; } diff --git a/BackupPC-README.fedora b/README.setup similarity index 67% rename from BackupPC-README.fedora rename to README.setup index 448c279..501ebd9 100644 --- a/BackupPC-README.fedora +++ b/README.setup @@ -1,13 +1,23 @@ -BackupPC's README file for Fedora +BackupPC's README file for Fedora & EPEL ## BackupPC's user For security reasons, backuppc user cannot log in. If you want to start manual backup (ie for debugging), you'll need to set it a shell : + +Permanent: usermod -s /bin/bash +or + +Temporary: +su -s /bin/bash -l backuppc + + Do not forget to create an SSH key (ssk-keygen) and copy it to remote computers if you plan to use tar/rsync over SSH backup method. +The easiest way to do this (after logging in as the backuppc user) is to use ssh-copy-id + ## BackupPC's web interface The CGI web interface is located at : http://localhost/BackupPC @@ -15,3 +25,7 @@ http://localhost/BackupPC You will need to create users in /etc/BackupPC/apache.users : htpasswd -c /etc/BackupPC/apache.users username (Note that the '-c' flag is only necessary to create the file) + +Once complete, add that user as an admin in config.pl: + +$Conf{BackupPCUser} = '' diff --git a/backuppc.service b/backuppc.service index 2bf870c..1b0bd86 100644 --- a/backuppc.service +++ b/backuppc.service @@ -3,11 +3,11 @@ Description= BackupPC server After=syslog.target local-fs.target remote-fs.target [Service] -Type=oneshot +Type=simple User=backuppc Group=backuppc -ExecStart=/usr/share/BackupPC/bin/BackupPC -d -RemainAfterExit=yes +ExecStart=/usr/share/BackupPC/bin/BackupPC +PIDFile=/var/run/BackupPC/BackupPC.pid [Install] WantedBy=multi-user.target diff --git a/sources b/sources index 384dd58..2b81f87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5efdcdd48e9e0d4ef7a706902d1f8b3d BackupPC-3.3.1.tar.gz +SHA512 (BackupPC-4.1.1.tar.gz) = 3c7589bc8e28f65f373ca92342b4231cc586a63c6bb3ee3aec3f81ae6a8b6154a386db750e087e73b955e5016a92c4638033bfc7070a00325eaf41a181c10368 From 339fcd70b820f39b835787d7fd95af2d39929574 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 2 May 2017 07:39:42 -0500 Subject: [PATCH 114/168] Update to latest upstream release, 4.1.2. --- .gitignore | 1 + BackupPC.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5da92fd..a13555b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-3.3.0.tar.gz /BackupPC-3.3.1.tar.gz /BackupPC-4.1.1.tar.gz +/BackupPC-4.1.2.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index bd04216..1c9265a 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ %global ver_major 4 %global ver_minor 1 -%global ver_patch 1 +%global ver_patch 2 %global ver_under %{ver_major}_%{ver_minor}_%{ver_patch} Name: BackupPC @@ -68,20 +68,21 @@ Requires: perl-Time-modules Requires: perl(version) Requires: perl(XML::RSS) Requires: samba-client +Requires: sendmail -Requires(pre): %{_sbindir}/useradd +Requires(pre): shadow-utils %if 0%{?_with_systemd} Requires(preun): systemd -Requires(post): systemd %{_sbindir}/usermod +Requires(post): systemd shadow-utils Requires(postun): systemd %else -Requires(preun): initscripts, chkconfig -Requires(post): initscripts, chkconfig, %{_sbindir}/usermod +Requires(preun): initscripts chkconfig +Requires(post): initscripts chkconfig shadow-utils Requires(postun): initscripts %endif Requires: policycoreutils -BuildRequires: selinux-policy-devel, checkpolicy +BuildRequires: selinux-policy-devel checkpolicy Provides: backuppc = %{version} @@ -319,6 +320,9 @@ fi %changelog +* Tue May 2 2017 Richard Shaw - 4.1.2-1 +- Update to latest upstream release, 4.1.2. + * Thu Mar 30 2017 Richard Shaw - 4.1.1-1 - Update to latest upstream release, 4.1.1. diff --git a/sources b/sources index 2b81f87..fd9f85e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.1.1.tar.gz) = 3c7589bc8e28f65f373ca92342b4231cc586a63c6bb3ee3aec3f81ae6a8b6154a386db750e087e73b955e5016a92c4638033bfc7070a00325eaf41a181c10368 +SHA512 (BackupPC-4.1.2.tar.gz) = 5dbbced04981f4e83a8ed4752e6e4163a6083fc30c9076c74650ed195b281098f8ea9711c09b4df73f0e61405aa9e4c9d452ca9a5750fcc0345bab8d9e992232 From fbea894e342e2030bff0a60f7e33b35b9a3d2c98 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 5 Jun 2017 12:47:24 -0500 Subject: [PATCH 115/168] Update to latest upstream release. --- .gitignore | 1 + ...-docfix.patch => BackupPC-4.1.3-docfix.patch | 12 ++++++------ BackupPC.spec | 17 +++++++++++++---- sources | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) rename BackupPC-4.1.1-docfix.patch => BackupPC-4.1.3-docfix.patch (86%) 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.3-docfix.patch similarity index 86% rename from BackupPC-4.1.1-docfix.patch rename to BackupPC-4.1.3-docfix.patch index dc8fcf2..e9c1780 100644 --- a/BackupPC-4.1.1-docfix.patch +++ b/BackupPC-4.1.3-docfix.patch @@ -1,15 +1,15 @@ --- a/configure.pl +++ b/configure.pl -@@ -934,7 +934,7 @@ sub DoInstall - # +@@ -949,7 +949,7 @@ sub DoInstall # Create install directories # -- foreach my $dir ( qw(bin share/doc/BackupPC -+ foreach my $dir ( qw(bin doc + foreach my $dir ( qw(bin +- share share/doc share/doc/BackupPC ++ doc + lib lib/BackupPC lib/BackupPC/CGI lib/BackupPC/Config - lib/BackupPC/Lang -@@ -1064,13 +1064,13 @@ sub DoInstall +@@ -1085,13 +1085,13 @@ sub DoInstall print("Making Apache configuration file for suid-perl\n"); InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644); 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 From 9814010ebefe558bfe03e10ff41d5aa4b82d1c3e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 5 Jun 2017 12:57:13 -0500 Subject: [PATCH 116/168] Fix patch name. --- BackupPC.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 6a580f8..469d861 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -30,7 +30,7 @@ Source5: backuppc.service Source6: BackupPC.tmpfiles Source7: README.RHEL -Patch0: BackupPC-4.1.1-docfix.patch +Patch0: BackupPC-4.1.3-docfix.patch BuildRequires: perl-generators BuildRequires: perl(BackupPC::XS) >= 0.53 From 0775d2d77567f2512b48377fa900e93ead95cf03 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 5 Jul 2017 07:21:59 -0500 Subject: [PATCH 117/168] Change requirement from the sendmail package to the sendmail binary which is also provided by the default MTA, postfix. --- BackupPC.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 469d861..258dce6 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -70,7 +70,7 @@ Requires: perl-Time-modules Requires: perl(version) Requires: perl(XML::RSS) Requires: samba-client -Requires: sendmail +Requires: %{_sbindir}/sendmail Requires(pre): shadow-utils %if 0%{?_with_systemd} @@ -322,6 +322,10 @@ fi %changelog +* Tue Jul 4 2017 Richard Shaw - 4.1.3-2 +- Change requirement from the sendmail package to the sendmail binary + which is also provided by the default MTA, postfix. + * Sun Jun 4 2017 Richard Shaw - 4.1.3-1 - Update to latest upstream release. From e06bd5db04ed9dd431e803d2e49b1de6965cc246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 01:39:41 +0000 Subject: [PATCH 118/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 258dce6..975eab5 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -322,6 +322,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 4.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jul 4 2017 Richard Shaw - 4.1.3-2 - Change requirement from the sendmail package to the sendmail binary which is also provided by the default MTA, postfix. From 30e2a22b784dafbabf072ff40c403a9b5db2a10b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 16:48:21 +0000 Subject: [PATCH 119/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 975eab5..33f2adc 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -322,6 +322,9 @@ fi %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 4.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 4.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 3f0c5b110a25692eea9b1e7a0f69e9d3b204d247 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 27 Nov 2017 12:44:59 -0600 Subject: [PATCH 120/168] Update to latest upstream release. --- .gitignore | 1 + BackupPC.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0fdf238..6be992a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-4.1.1.tar.gz /BackupPC-4.1.2.tar.gz /BackupPC-4.1.3.tar.gz +/BackupPC-4.1.4.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index 33f2adc..c867cd2 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,12 +10,12 @@ %global ver_major 4 %global ver_minor 1 -%global ver_patch 3 +%global ver_patch 4 %global ver_under %{ver_major}_%{ver_minor}_%{ver_patch} Name: BackupPC Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 4%{?dist} +Release: 1%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -322,6 +322,12 @@ fi %changelog +* Sat Nov 25 2017 Richard Shaw - 4.1.4-1 +- Update to latest upstream release. + +* Thu Nov 09 2017 Richard Shaw - 4.1.3-4.1 +- Add patch to set lib location correctly in BackupPC_zipCreate.pl + * Wed Aug 02 2017 Fedora Release Engineering - 4.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 262531c..a549491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.1.3.tar.gz) = dafac2ac9c5544135c440510fe741eb2866d6b3c2cd8e593ab90ff7f907cdf2531e8e2eebbf42d23d4dd9747b002b1c821e89a287ca418581a0953c548fbdfd0 +SHA512 (BackupPC-4.1.4.tar.gz) = fd589d21974b86d50e32ca3351155d38222675dbe0bdede763898fcaedaf4ae7c2a5a70f91f7792e7c965bf19afe1075ce93d3e82081241ced97728e0eab8cae From 64461b0c6f707be7ce3c73ecf925d61de97f127b Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 4 Dec 2017 07:36:11 -0600 Subject: [PATCH 121/168] Update to latest upstream release. --- .gitignore | 1 + BackupPC.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6be992a..38684ed 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-4.1.2.tar.gz /BackupPC-4.1.3.tar.gz /BackupPC-4.1.4.tar.gz +/BackupPC-4.1.5.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index c867cd2..04f11b9 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ %global ver_major 4 %global ver_minor 1 -%global ver_patch 4 +%global ver_patch 5 %global ver_under %{ver_major}_%{ver_minor}_%{ver_patch} Name: BackupPC @@ -322,6 +322,9 @@ fi %changelog +* Mon Dec 4 2017 Richard Shaw - 4.1.5-1 +- Update to latest upstream release. + * Sat Nov 25 2017 Richard Shaw - 4.1.4-1 - Update to latest upstream release. diff --git a/sources b/sources index a549491..0c614a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.1.4.tar.gz) = fd589d21974b86d50e32ca3351155d38222675dbe0bdede763898fcaedaf4ae7c2a5a70f91f7792e7c965bf19afe1075ce93d3e82081241ced97728e0eab8cae +SHA512 (BackupPC-4.1.5.tar.gz) = 438ef439d1c6079faa500c65d7b15f437cce0fe40a7e7539dbed9e68bb1b48aba360f152232ddb98bc24269b5c29baa198830c5b874434f1b45941fdebdbcb17 From 0d10f0c368065e8839fb05b429b0690fe2c7e232 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 8 Jan 2018 11:00:47 -0600 Subject: [PATCH 122/168] Change user to root for /var/log/BackupPC, fixes #1531696. --- BackupPC.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 04f11b9..83254a1 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -295,7 +295,7 @@ fi %files %doc README.md README.setup README.RHEL ChangeLog doc/* %license LICENSE -%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} +%dir %attr(-,root,backuppc) %{_localstatedir}/log/%{name} %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %config(noreplace) %attr(-,backuppc,apache) %{_sysconfdir}/%{name}/* From 92450a5c29674c56810cf7f9e8cd909cbab6b993 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:25:36 +0000 Subject: [PATCH 123/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 83254a1..5edb02e 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -15,7 +15,7 @@ Name: BackupPC Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -322,6 +322,9 @@ fi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 4.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Dec 4 2017 Richard Shaw - 4.1.5-1 - Update to latest upstream release. From ddb6f910d0ab4688262ac1fc52f38a269d86aaa8 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 18 Feb 2018 11:15:46 -0600 Subject: [PATCH 124/168] Add BuildRequires for gcc per https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires --- BackupPC.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/BackupPC.spec b/BackupPC.spec index 5edb02e..8a7cdd5 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -32,6 +32,7 @@ Source7: README.RHEL Patch0: BackupPC-4.1.3-docfix.patch +BuildRequires: gcc BuildRequires: perl-generators BuildRequires: perl(BackupPC::XS) >= 0.53 BuildRequires: perl(CGI) From c9b2794567095bc4e6a0d259119223a13b8147a0 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 18 Feb 2018 11:20:47 -0600 Subject: [PATCH 125/168] SystemD macro specfile cleanup. --- BackupPC.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 8a7cdd5..ce5429e 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -1,6 +1,6 @@ %global _hardened_build 1 -# tmpfiles.d & systemd support in all supported Fedora now, but not RHEL < 7 +# tmpfiles.d & systemd not supported in RHEL < 7 %if 0%{?fedora} || 0%{?rhel} >= 7 %global _with_tmpfilesd 1 %global _with_systemd 1 @@ -75,9 +75,8 @@ Requires: %{_sbindir}/sendmail Requires(pre): shadow-utils %if 0%{?_with_systemd} -Requires(preun): systemd -Requires(post): systemd shadow-utils -Requires(postun): systemd +Requires(post): shadow-utils +%{?systemd_requires} %else Requires(preun): initscripts chkconfig Requires(post): initscripts chkconfig shadow-utils @@ -86,7 +85,7 @@ Requires(postun): initscripts Requires: policycoreutils BuildRequires: selinux-policy-devel checkpolicy -Provides: backuppc = %{version} +Provides: backuppc = %{version}-%{release} %description From 45c52b7a209ac0980b12381f57ef1b7cba915ebc Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 16 Apr 2018 14:42:45 -0500 Subject: [PATCH 126/168] Update to 4.2.0. --- .gitignore | 1 + BackupPC.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 38684ed..6d0497f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-4.1.3.tar.gz /BackupPC-4.1.4.tar.gz /BackupPC-4.1.5.tar.gz +/BackupPC-4.2.0.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index ce5429e..2737cd2 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -9,13 +9,13 @@ %global _updatedb_conf /etc/updatedb.conf %global ver_major 4 -%global ver_minor 1 -%global ver_patch 5 +%global ver_minor 2 +%global ver_patch 0 %global ver_under %{ver_major}_%{ver_minor}_%{ver_patch} Name: BackupPC Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: 2%{?dist} +Release: 1%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -322,6 +322,9 @@ fi %changelog +* Mon Apr 9 2018 Richard Shaw - 4.2.0-1 +- Update to 4.2.0. + * Wed Feb 07 2018 Fedora Release Engineering - 4.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 0c614a0..842fe19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.1.5.tar.gz) = 438ef439d1c6079faa500c65d7b15f437cce0fe40a7e7539dbed9e68bb1b48aba360f152232ddb98bc24269b5c29baa198830c5b874434f1b45941fdebdbcb17 +SHA512 (BackupPC-4.2.0.tar.gz) = c3ec8833d743a0503573abe427d5030b7df84ff5e0aa0971cd53f1bf8d793a138a47b7fb1a22eb4820ae3860571868022aeb5135af5e30b09a414bcf3210ecb3 From ba734567b406bae60e749821d63e00e22b1c0afc Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 7 May 2018 13:34:45 -0500 Subject: [PATCH 127/168] Update to 4.2.1. --- .gitignore | 1 + BackupPC.spec | 10 ++++------ sources | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6d0497f..3d737ba 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-4.1.4.tar.gz /BackupPC-4.1.5.tar.gz /BackupPC-4.2.0.tar.gz +/BackupPC-4.2.1.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index 2737cd2..fbaedd7 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -8,13 +8,8 @@ %global _updatedb_conf /etc/updatedb.conf -%global ver_major 4 -%global ver_minor 2 -%global ver_patch 0 -%global ver_under %{ver_major}_%{ver_minor}_%{ver_patch} - Name: BackupPC -Version: %{ver_major}.%{ver_minor}.%{ver_patch} +Version: 4.2.1 Release: 1%{?dist} Summary: High-performance backup system @@ -322,6 +317,9 @@ fi %changelog +* Mon May 07 2018 Richard Shaw - 4.2.1-1 +- Update to 4.2.1. + * Mon Apr 9 2018 Richard Shaw - 4.2.0-1 - Update to 4.2.0. diff --git a/sources b/sources index 842fe19..06c2ed3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.2.0.tar.gz) = c3ec8833d743a0503573abe427d5030b7df84ff5e0aa0971cd53f1bf8d793a138a47b7fb1a22eb4820ae3860571868022aeb5135af5e30b09a414bcf3210ecb3 +SHA512 (BackupPC-4.2.1.tar.gz) = 797c1130008097262bc786613f8d9530a8ef83836f719aa49869e9b4252feee5f6b620609b9af1b1266cc8aaebccfb0f9fe4d086cc4450fefddb6b80fc9cee8b From 0d452fee1c819d507fec7d2e0a66ff055250eaff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 18:55:22 +0000 Subject: [PATCH 128/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index fbaedd7..894dde0 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -317,6 +317,9 @@ fi %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon May 07 2018 Richard Shaw - 4.2.1-1 - Update to 4.2.1. From a6a783b7df984ec82081e38804ad9bbcc91fe92e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 11 Oct 2018 11:45:06 -0500 Subject: [PATCH 129/168] Revert accidental change to log dir permissions. Don't package /run dir when using tmpfiles. --- BackupPC.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 894dde0..bcea633 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -196,8 +196,9 @@ chmod +x %{buildroot}%{_datadir}/%{name}/bin/* %if 0%{?_with_tmpfilesd} mkdir -p %{buildroot}%{_tmpfilesdir} install -p -m 0644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}/%{name}.conf -%endif +%else mkdir -p %{buildroot}%{_localstatedir}/run/%{name} +%endif %if 0%{?_with_systemd} mkdir -p %{buildroot}%{_unitdir} @@ -290,7 +291,7 @@ fi %files %doc README.md README.setup README.RHEL ChangeLog doc/* %license LICENSE -%dir %attr(-,root,backuppc) %{_localstatedir}/log/%{name} +%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,apache) %{_sysconfdir}/%{name}/* @@ -302,8 +303,9 @@ fi %if 0%{?_with_tmpfilesd} %{_tmpfilesdir}/%{name}.conf +%else +%dir %attr(0775,root,backuppc) %{_localstatedir}/run/%{name} %endif -%dir %attr(0775,backuppc,backuppc) %{_localstatedir}/run/%{name} %if 0%{?_with_systemd} %{_unitdir}/backuppc.service @@ -317,6 +319,10 @@ fi %changelog +* Thu Oct 11 2018 Richard Shaw - 4.2.1-3 +- Revert accidental change to log dir permissions. +- Don't package /run dir when using tmpfiles. + * Thu Jul 12 2018 Fedora Release Engineering - 4.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 95a8aba4088e787c1eaa7077db18ba97d3b4775c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 5 Nov 2018 11:35:25 -0700 Subject: [PATCH 130/168] Add reload support to systemd service file --- BackupPC.spec | 5 ++++- backuppc.service | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index bcea633..0b2c223 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -319,6 +319,9 @@ fi %changelog +* Mon Nov 05 2018 Orion Poplawski - 4.2.1-4 +- Add reload support to systemd service file + * Thu Oct 11 2018 Richard Shaw - 4.2.1-3 - Revert accidental change to log dir permissions. - Don't package /run dir when using tmpfiles. diff --git a/backuppc.service b/backuppc.service index 1b0bd86..ab1fee6 100644 --- a/backuppc.service +++ b/backuppc.service @@ -7,6 +7,7 @@ Type=simple User=backuppc Group=backuppc ExecStart=/usr/share/BackupPC/bin/BackupPC +ExecReload=/bin/kill -HUP $MAINPID PIDFile=/var/run/BackupPC/BackupPC.pid [Install] From 0518db57b1123d16442fe77cf0280e4bb3709072 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 26 Nov 2018 08:08:51 -0600 Subject: [PATCH 131/168] Update to 4.3.0. --- .gitignore | 1 + BackupPC.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3d737ba..b389ed8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-4.1.5.tar.gz /BackupPC-4.2.0.tar.gz /BackupPC-4.2.1.tar.gz +/BackupPC-4.3.0.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index bcea633..fbe3c8c 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -9,8 +9,8 @@ %global _updatedb_conf /etc/updatedb.conf Name: BackupPC -Version: 4.2.1 -Release: 3%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -319,6 +319,9 @@ fi %changelog +* Mon Nov 26 2018 Richard Shaw - 4.3.04.3.0-11 +- Update to 4.3.0. + * Thu Oct 11 2018 Richard Shaw - 4.2.1-3 - Revert accidental change to log dir permissions. - Don't package /run dir when using tmpfiles. diff --git a/sources b/sources index 06c2ed3..cd2faa1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.2.1.tar.gz) = 797c1130008097262bc786613f8d9530a8ef83836f719aa49869e9b4252feee5f6b620609b9af1b1266cc8aaebccfb0f9fe4d086cc4450fefddb6b80fc9cee8b +SHA512 (BackupPC-4.3.0.tar.gz) = 07f8a00a61b9867dea8f3c91dda11f1137a966f7b87b1b144eb3b7292956d0dcf5c019821f9110dfb25540e5d9020615559729ab4baab4776d64b30f1ac0f7c3 From ff2b495762ad405b12868e29413832a3a2471564 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 27 Nov 2018 07:53:44 -0600 Subject: [PATCH 132/168] Fix changlog that rpmdev-bumpspec borked. --- BackupPC.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index b95233b..847fc45 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -319,7 +319,7 @@ fi %changelog -* Mon Nov 26 2018 Richard Shaw - 4.3.04.3.0-11 +* Mon Nov 26 2018 Richard Shaw - 4.3.0-1 - Update to 4.3.0. * Mon Nov 05 2018 Orion Poplawski - 4.2.1-4 From 3266827f881449e553301d9a4b1f650b7019f501 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:23:17 +0000 Subject: [PATCH 133/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 847fc45..b8cb279 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -319,6 +319,9 @@ fi %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 4.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Nov 26 2018 Richard Shaw - 4.3.0-1 - Update to 4.3.0. From b8a09119d9041fbeab4366e7f75444e26a2f552a Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 14 Jul 2019 16:50:00 -0500 Subject: [PATCH 134/168] Update to 4.3.1. --- .gitignore | 1 + BackupPC.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b389ed8..d052547 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-4.2.0.tar.gz /BackupPC-4.2.1.tar.gz /BackupPC-4.3.0.tar.gz +/BackupPC-4.3.1.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index b8cb279..229620f 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -9,8 +9,8 @@ %global _updatedb_conf /etc/updatedb.conf Name: BackupPC -Version: 4.3.0 -Release: 2%{?dist} +Version: 4.3.1 +Release: 1%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -319,6 +319,9 @@ fi %changelog +* Sun Jul 14 2019 Richard Shaw - 4.3.1-1 +- Update to 4.3.1. + * Thu Jan 31 2019 Fedora Release Engineering - 4.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index cd2faa1..d8c4598 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.3.0.tar.gz) = 07f8a00a61b9867dea8f3c91dda11f1137a966f7b87b1b144eb3b7292956d0dcf5c019821f9110dfb25540e5d9020615559729ab4baab4776d64b30f1ac0f7c3 +SHA512 (BackupPC-4.3.1.tar.gz) = acabc8d79779bfa599192af88938dbdbf7bf12e82564f3c25398cc4bc04207ea21494974bec20779433f0207fd82b17107c538437309950d619ca3a9856e721f From 79a36d960a57dd72123e197c113223417dc9032f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 15:40:39 +0000 Subject: [PATCH 135/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 229620f..1616d4f 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -319,6 +319,9 @@ fi %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jul 14 2019 Richard Shaw - 4.3.1-1 - Update to 4.3.1. From 4a778563c848ae9e3720383dffc7f990003a61aa Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sat, 12 Oct 2019 10:26:10 -0500 Subject: [PATCH 136/168] Add selinux context for /var/lib/BackupPC to stop AVCs with LOCK files. --- BackupPC.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 1616d4f..2b5ee88 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -109,8 +109,9 @@ pushd selinux cat >%{name}.te <%{name}.fc < - 4.3.1-3 +- Add selinux context for /var/lib/BackupPC to stop AVCs with LOCK files. + * Wed Jul 24 2019 Fedora Release Engineering - 4.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 886b144c0155e54854e396e905958bd5b9832e90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 09:11:41 +0000 Subject: [PATCH 137/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 2b5ee88..82fad75 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -322,6 +322,9 @@ fi %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 4.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Oct 12 2019 Richard Shaw - 4.3.1-3 - Add selinux context for /var/lib/BackupPC to stop AVCs with LOCK files. From de902f4a5fda81b1512c5a1cb8f7a26dcfd49831 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 18 Feb 2020 15:47:44 -0600 Subject: [PATCH 138/168] Update to 4.3.2. Update SELinux permissions, fixes RHBZ#1791369. --- .gitignore | 1 + BackupPC.spec | 34 +++++++++++++++++----------------- sources | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index d052547..630d2c5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-4.2.1.tar.gz /BackupPC-4.3.0.tar.gz /BackupPC-4.3.1.tar.gz +/BackupPC-4.3.2.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index 82fad75..e7c6668 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -9,8 +9,8 @@ %global _updatedb_conf /etc/updatedb.conf Name: BackupPC -Version: 4.3.1 -Release: 4%{?dist} +Version: 4.3.2 +Release: 1%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -107,28 +107,24 @@ mkdir selinux pushd selinux cat >%{name}.te < - 4.3.2-1 +- Update to 4.3.2. +- Update SELinux permissions, fixes RHBZ#1791369. + * Tue Jan 28 2020 Fedora Release Engineering - 4.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d8c4598..9375d13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.3.1.tar.gz) = acabc8d79779bfa599192af88938dbdbf7bf12e82564f3c25398cc4bc04207ea21494974bec20779433f0207fd82b17107c538437309950d619ca3a9856e721f +SHA512 (BackupPC-4.3.2.tar.gz) = cb7134aa2980bee392da445e0dacf883e4f2b9487e698e4438bb4badcf2c0400727595af8f0135ecf2e5d363e619b414535b69707ac3e460706784e0f1f18749 From 05fc0b3af73ded5f26a201e0f9dfef17cb6816b6 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 2 Mar 2020 16:14:54 -0600 Subject: [PATCH 139/168] Add httpd config file to packaging to manage permissions. --- BackupPC.spec | 5 ++++- README.setup | 12 +++++++----- apache.users | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 apache.users diff --git a/BackupPC.spec b/BackupPC.spec index e7c6668..57496f0 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -24,6 +24,7 @@ Source4: BackupPC_Admin.c Source5: backuppc.service Source6: BackupPC.tmpfiles Source7: README.RHEL +Source8: apache.users Patch0: BackupPC-4.1.3-docfix.patch @@ -216,6 +217,8 @@ install -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf install -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -p -m 0644 %{SOURCE7} \ + %{buildroot}%{_sysconfdir}/%{name}/ # perl-suidperl is no longer avaialable, we use a C wrapper mkdir -p %{buildroot}%{_datadir}/%{name}/sbin @@ -291,7 +294,7 @@ fi %doc README.md README.setup README.RHEL ChangeLog doc/* %license LICENSE %dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} -%dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/ +%dir %attr(-,backuppc,apache) %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %config(noreplace) %attr(-,backuppc,apache) %{_sysconfdir}/%{name}/* %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} diff --git a/README.setup b/README.setup index 501ebd9..761921d 100644 --- a/README.setup +++ b/README.setup @@ -5,7 +5,7 @@ For security reasons, backuppc user cannot log in. If you want to start manual backup (ie for debugging), you'll need to set it a shell : Permanent: -usermod -s /bin/bash +usermod -s /bin/bash backuppc or @@ -13,18 +13,20 @@ Temporary: su -s /bin/bash -l backuppc -Do not forget to create an SSH key (ssk-keygen) and copy it to remote computers -if you plan to use tar/rsync over SSH backup method. +Do not forget to create an SSH key (ssk-keygen) as the backuppc user and copy +it to remote computers if you plan to use tar/rsync over SSH backup method. The easiest way to do this (after logging in as the backuppc user) is to use ssh-copy-id +ssh-copy-id @ + + ## BackupPC's web interface The CGI web interface is located at : http://localhost/BackupPC You will need to create users in /etc/BackupPC/apache.users : -htpasswd -c /etc/BackupPC/apache.users username -(Note that the '-c' flag is only necessary to create the file) +htpasswd /etc/BackupPC/apache.users Once complete, add that user as an admin in config.pl: diff --git a/apache.users b/apache.users new file mode 100644 index 0000000..57dff0b --- /dev/null +++ b/apache.users @@ -0,0 +1,2 @@ +# You will need to create at least one user to be able to login +# htpasswd /etc/BackupPC/apache.users From 8b08ce47fac7adc7a6316211fb9a6e55981a0975 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 12 Mar 2020 14:52:38 -0500 Subject: [PATCH 140/168] Add patch to allow prevention of backups being deleted. Add apache.users config file to control permissions and update related SETUP documentation. Fix PID file to be created in /run instead of /var/run. --- BackupPC-4.1.3-docfix.patch | 4 ++-- BackupPC-no_delete.patch | 12 ++++++++++++ BackupPC.spec | 14 +++++++++----- BackupPC.tmpfiles | 2 +- backuppc.service | 2 +- 5 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 BackupPC-no_delete.patch diff --git a/BackupPC-4.1.3-docfix.patch b/BackupPC-4.1.3-docfix.patch index e9c1780..cf65e4e 100644 --- a/BackupPC-4.1.3-docfix.patch +++ b/BackupPC-4.1.3-docfix.patch @@ -1,6 +1,6 @@ --- a/configure.pl +++ b/configure.pl -@@ -949,7 +949,7 @@ sub DoInstall +@@ -950,7 +950,7 @@ sub DoInstall # Create install directories # foreach my $dir ( qw(bin @@ -9,7 +9,7 @@ lib lib/BackupPC lib/BackupPC/CGI lib/BackupPC/Config -@@ -1085,13 +1085,13 @@ sub DoInstall +@@ -1086,13 +1086,13 @@ sub DoInstall print("Making Apache configuration file for suid-perl\n"); InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644); diff --git a/BackupPC-no_delete.patch b/BackupPC-no_delete.patch new file mode 100644 index 0000000..79b37fd --- /dev/null +++ b/BackupPC-no_delete.patch @@ -0,0 +1,12 @@ +--- a/bin/BackupPC_dump ++++ b/bin/BackupPC_dump +@@ -1871,6 +1871,9 @@ sub BackupFullExpire + my $noDelete = $i + 1 < @$Backups ? $Backups->[$i+1]{noFill} : 0; + $noDelete = 0 if ( !$Backups[$i]{preV4} ); + ++ #Don't delete full backups that have '.save' in their root directory ++ $noDelete = 1 if -e $Dir . "/" . $Backups[$i]{num} . "/.save"; ++ + if ( !$noDelete && + ($fullKeepIdx >= @$fullKeepCnt + || $k > 0 diff --git a/BackupPC.spec b/BackupPC.spec index 57496f0..ac4317d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -27,6 +27,7 @@ Source7: README.RHEL Source8: apache.users Patch0: BackupPC-4.1.3-docfix.patch +Patch1: BackupPC-no_delete.patch BuildRequires: gcc BuildRequires: perl-generators @@ -217,7 +218,7 @@ install -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf install -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -install -p -m 0644 %{SOURCE7} \ +install -p -m 0644 %{SOURCE8} \ %{buildroot}%{_sysconfdir}/%{name}/ # perl-suidperl is no longer avaialable, we use a C wrapper @@ -321,6 +322,12 @@ fi %changelog +* Thu Mar 12 2020 Richard Shaw - 4.3.2-2 +- Add patch to allow prevention of backups being deleted. +- Add apache.users config file to control permissions and update related SETUP + documentation. +- Fix PID file to be created in /run instead of /var/run. + * Tue Feb 18 2020 Richard Shaw - 4.3.2-1 - Update to 4.3.2. - Update SELinux permissions, fixes RHBZ#1791369. @@ -521,9 +528,6 @@ fi - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Mon Aug 02 2010 Johan Cwiklinski 3.1.0-16 -- Debugingo with no sources (fix bug #620257) - -* Sat Jul 31 2010 Johan Cwiklinski 3.1.0-15 - perl-suidperl is no longer available (fix bug #611009) * Fri Jul 09 2010 Mike McGrath 3.1.0-14.1 diff --git a/BackupPC.tmpfiles b/BackupPC.tmpfiles index 3df527d..adf9e65 100644 --- a/BackupPC.tmpfiles +++ b/BackupPC.tmpfiles @@ -1 +1 @@ -D /var/run/BackupPC 0775 root backuppc - +D /run/BackupPC 0775 root backuppc - diff --git a/backuppc.service b/backuppc.service index ab1fee6..042e155 100644 --- a/backuppc.service +++ b/backuppc.service @@ -8,7 +8,7 @@ User=backuppc Group=backuppc ExecStart=/usr/share/BackupPC/bin/BackupPC ExecReload=/bin/kill -HUP $MAINPID -PIDFile=/var/run/BackupPC/BackupPC.pid +PIDFile=/run/BackupPC/BackupPC.pid [Install] WantedBy=multi-user.target From 0fd33e52c0a531c71ca690d48a80c37a580a788c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 25 Mar 2020 10:34:22 +0100 Subject: [PATCH 141/168] Add perl dependencies needed for build; Remove duplicities from run-requires --- BackupPC.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index ac4317d..aedfc7b 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -37,8 +37,18 @@ BuildRequires: perl(Compress::Zlib) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Digest::MD5) BuildRequires: perl(Encode) +BuildRequires: perl(File::Copy) BuildRequires: perl(File::Listing) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Spec) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(Getopt::Std) +BuildRequires: perl(lib) BuildRequires: perl(Pod::Usage) +BuildRequires: perl(Socket) +BuildRequires: perl(strict) +BuildRequires: perl(utf8) +BuildRequires: perl(vars) BuildRequires: perl(version) %if 0%{?_with_systemd} BuildRequires: systemd @@ -57,16 +67,8 @@ Requires: par2cmdline %endif Requires: rrdtool Requires: rsync-bpc >= 3.0.9.6 -Requires: perl(Archive::Zip) Requires: perl(BackupPC::XS) >= 0.53 -Requires: perl(CGI) -Requires: perl(Compress::Zlib) -Requires: perl(Digest::MD5) -Requires: perl(Encode) -Requires: perl(File::Listing) Requires: perl-Time-modules -Requires: perl(version) -Requires: perl(XML::RSS) Requires: samba-client Requires: %{_sbindir}/sendmail @@ -322,6 +324,10 @@ fi %changelog +* Wed Mar 25 2020 Jitka Plesnikova - 4.3.2-3 +- Add perl dependencies needed for build +- Remove duplicities from run-requires + * Thu Mar 12 2020 Richard Shaw - 4.3.2-2 - Add patch to allow prevention of backups being deleted. - Add apache.users config file to control permissions and update related SETUP From 84f13cfba5e855c58f4f0443d5b0c0a56d7d27b7 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 21 Jun 2020 14:04:43 -0500 Subject: [PATCH 142/168] Update to 4.4.0. --- .gitignore | 1 + BackupPC.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 630d2c5..735abac 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ BackupPC-3.1.2.tar.gz /BackupPC-4.3.0.tar.gz /BackupPC-4.3.1.tar.gz /BackupPC-4.3.2.tar.gz +/BackupPC-4.4.0.tar.gz diff --git a/BackupPC.spec b/BackupPC.spec index aedfc7b..454e8c8 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -9,8 +9,8 @@ %global _updatedb_conf /etc/updatedb.conf Name: BackupPC -Version: 4.3.2 -Release: 3%{?dist} +Version: 4.4.0 +Release: 1%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -324,6 +324,9 @@ fi %changelog +* Sun Jun 21 2020 Richard Shaw - 4.4.0-1 +- Update to 4.4.0. + * Wed Mar 25 2020 Jitka Plesnikova - 4.3.2-3 - Add perl dependencies needed for build - Remove duplicities from run-requires diff --git a/sources b/sources index 9375d13..51a184f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (BackupPC-4.3.2.tar.gz) = cb7134aa2980bee392da445e0dacf883e4f2b9487e698e4438bb4badcf2c0400727595af8f0135ecf2e5d363e619b414535b69707ac3e460706784e0f1f18749 +SHA512 (BackupPC-4.4.0.tar.gz) = 0c88447ab000c4a452034d5d8a074cd56801c7b38b0886e686e446c73ecfd0a40f0aa08703f76d16c31b24aec85c10c4ed1815d0cb67be5a1d66e5caeb3de418 From 4190d34fe284d2ceb5e4de630f13f554cf1aa18a Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 21 Jun 2020 14:12:42 -0500 Subject: [PATCH 143/168] Update patches for new release. --- BackupPC-4.1.3-docfix.patch | 32 ++++++++++++++++++-------------- BackupPC-no_delete.patch | 12 ------------ BackupPC.spec | 1 - 3 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 BackupPC-no_delete.patch diff --git a/BackupPC-4.1.3-docfix.patch b/BackupPC-4.1.3-docfix.patch index cf65e4e..9edeb7a 100644 --- a/BackupPC-4.1.3-docfix.patch +++ b/BackupPC-4.1.3-docfix.patch @@ -1,15 +1,17 @@ ---- a/configure.pl -+++ b/configure.pl -@@ -950,7 +950,7 @@ sub DoInstall +Index: BackupPC-4.4.0/configure.pl +=================================================================== +--- BackupPC-4.4.0.orig/configure.pl ++++ BackupPC-4.4.0/configure.pl +@@ -946,7 +946,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 -@@ -1086,13 +1086,13 @@ sub DoInstall +- share share/doc share/doc/BackupPC ++ doc + lib lib/BackupPC + lib/BackupPC/CGI + lib/BackupPC/Config +@@ -1074,13 +1074,13 @@ sub DoInstall print("Making Apache configuration file for suid-perl\n"); InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644); @@ -26,14 +28,16 @@ } # # 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"; +Index: BackupPC-4.4.0/lib/BackupPC/CGI/View.pm +=================================================================== +--- BackupPC-4.4.0.orig/lib/BackupPC/CGI/View.pm ++++ BackupPC-4.4.0/lib/BackupPC/CGI/View.pm +@@ -104,7 +104,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-no_delete.patch b/BackupPC-no_delete.patch deleted file mode 100644 index 79b37fd..0000000 --- a/BackupPC-no_delete.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/bin/BackupPC_dump -+++ b/bin/BackupPC_dump -@@ -1871,6 +1871,9 @@ sub BackupFullExpire - my $noDelete = $i + 1 < @$Backups ? $Backups->[$i+1]{noFill} : 0; - $noDelete = 0 if ( !$Backups[$i]{preV4} ); - -+ #Don't delete full backups that have '.save' in their root directory -+ $noDelete = 1 if -e $Dir . "/" . $Backups[$i]{num} . "/.save"; -+ - if ( !$noDelete && - ($fullKeepIdx >= @$fullKeepCnt - || $k > 0 diff --git a/BackupPC.spec b/BackupPC.spec index 454e8c8..be757fd 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -27,7 +27,6 @@ Source7: README.RHEL Source8: apache.users Patch0: BackupPC-4.1.3-docfix.patch -Patch1: BackupPC-no_delete.patch BuildRequires: gcc BuildRequires: perl-generators From 71e1101463db59d77bc845d2da31a199353132e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 10:13:18 +0000 Subject: [PATCH 144/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index be757fd..414a2bf 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -323,6 +323,9 @@ fi %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 4.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 21 2020 Richard Shaw - 4.4.0-1 - Update to 4.4.0. From 8ecf3398eb734790c6ec937b33cf1481dc68ef7f Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 4 Oct 2020 09:07:19 -0500 Subject: [PATCH 145/168] Add requires on webserver and recommends httpd to allow other webservers to be used. --- BackupPC.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BackupPC.spec b/BackupPC.spec index 414a2bf..84a4cff 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -58,7 +58,12 @@ Requires: perl(Net::FTP::AutoReconnect) Requires: perl(Net::FTP::RetrHandle) Requires: bzip2 +%if 0%{?fedora} || 0%{?rhel} >= 8 +Requires: webserver +Recommends: httpd +%else Requires: httpd +%endif Requires: iputils Requires: openssh-clients %if ! 0%{?el6} From ce09e637c8228567743b93a2f0e3d2113b63c15c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 02:42:01 +0000 Subject: [PATCH 146/168] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- BackupPC.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/BackupPC.spec b/BackupPC.spec index 84a4cff..f556c33 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -88,6 +88,7 @@ Requires(postun): initscripts Requires: policycoreutils BuildRequires: selinux-policy-devel checkpolicy +BuildRequires: make Provides: backuppc = %{version}-%{release} From c3e6e7525e18a7ff1e392578fbeb5dd02309de97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 22:16:18 +0000 Subject: [PATCH 147/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index f556c33..e2bf1a2 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -329,6 +329,9 @@ fi %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 4.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 4.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c0368369def4dfee3c009a52abca04ec9d7d4f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:08 +0100 Subject: [PATCH 148/168] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- BackupPC.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index e2bf1a2..5064000 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -329,6 +329,10 @@ fi %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 4.4.0-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Jan 25 2021 Fedora Release Engineering - 4.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 156586b036a5b5e4b294055abc49e245979efa13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 10:44:47 +0000 Subject: [PATCH 149/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 0e930ee80fce0fa449373239649e669a9b03242f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:39:09 +0000 Subject: [PATCH 150/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 5064000..9c9d16c 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -329,6 +329,9 @@ fi %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 4.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 4.4.0-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 20e0cabd4bcd783fef8cee38b4c411b14c0e8a4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 19:13:35 +0000 Subject: [PATCH 151/168] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 9c9d16c..0e80399 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -329,6 +329,9 @@ fi %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 4.4.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 4.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From afef48ff47c2ba6df7d7b8ef12824b94ea84f72f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 18:27:08 +0000 Subject: [PATCH 152/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 0e80399..c806a06 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -329,6 +329,9 @@ fi %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 4.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 4.4.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fe45fbc0f8e8c1d99af01c8f671a929baf880a29 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 23 Aug 2022 06:46:53 -0500 Subject: [PATCH 153/168] Add patch to fix #2091514 where saving a configuration change in the web UI would replace {} with () in the config file. --- ...70b9b849b2c86ae6301dd722c97757bc9256.patch | 45 +++++++++++++++++++ BackupPC.spec | 8 +++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 2c9270b9b849b2c86ae6301dd722c97757bc9256.patch diff --git a/2c9270b9b849b2c86ae6301dd722c97757bc9256.patch b/2c9270b9b849b2c86ae6301dd722c97757bc9256.patch new file mode 100644 index 0000000..06df763 --- /dev/null +++ b/2c9270b9b849b2c86ae6301dd722c97757bc9256.patch @@ -0,0 +1,45 @@ +From 2c9270b9b849b2c86ae6301dd722c97757bc9256 Mon Sep 17 00:00:00 2001 +From: Craig Barratt <19445341+craigbarratt@users.noreply.github.com> +Date: Fri, 15 Apr 2022 11:45:57 -0700 +Subject: [PATCH] remove erroneous 2nd argument to Data::Dumper; see #466 + +--- + configure.pl | 2 +- + lib/BackupPC/Storage/Text.pm | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.pl b/configure.pl +index 6826ebcd..d5deef58 100755 +--- a/configure.pl ++++ b/configure.pl +@@ -668,7 +668,7 @@ + if ( defined($Conf{CgiUserConfigEdit}{$p}) ); + } + $Conf{CgiUserConfigEdit} = $new; +- my $d = Data::Dumper->new([$new], [*value]); ++ my $d = Data::Dumper->new([$new]); + $d->Indent(1); + $d->Terse(1); + $d->Sortkeys(1); +diff --git a/lib/BackupPC/Storage/Text.pm b/lib/BackupPC/Storage/Text.pm +index e9df664f..09fcb246 100644 +--- a/lib/BackupPC/Storage/Text.pm ++++ b/lib/BackupPC/Storage/Text.pm +@@ -422,7 +422,7 @@ sub ConfigFileMerge + my $var = $1; + $skipExpr = "\$fakeVar = $2\n"; + if ( exists($newConf->{$var}) ) { +- my $d = Data::Dumper->new([$newConf->{$var}], [*value]); ++ my $d = Data::Dumper->new([$newConf->{$var}]); + $d->Indent(1); + $d->Terse(1); + $d->Sortkeys(1); +@@ -454,7 +454,7 @@ sub ConfigFileMerge + # + foreach my $var ( sort(keys(%$newConf)) ) { + next if ( $done->{$var} ); +- my $d = Data::Dumper->new([$newConf->{$var}], [*value]); ++ my $d = Data::Dumper->new([$newConf->{$var}]); + $d->Indent(1); + $d->Terse(1); + $d->Sortkeys(1); diff --git a/BackupPC.spec b/BackupPC.spec index c806a06..22dab4c 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -27,6 +27,8 @@ Source7: README.RHEL Source8: apache.users Patch0: BackupPC-4.1.3-docfix.patch +# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2091514 +Patch1: https://github.com/backuppc/backuppc/commit/2c9270b9b849b2c86ae6301dd722c97757bc9256.patch BuildRequires: gcc BuildRequires: perl-generators @@ -329,6 +331,10 @@ fi %changelog +* Tue Aug 23 2022 Richard Shaw - 4.4.0-8 +- Add patch to fix #2091514 where saving a configuration change in the web UI + would replace {} with () in the config file. + * Wed Jul 20 2022 Fedora Release Engineering - 4.4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 43fac9c218234cb0d473eec93246117860cfee00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 19:38:09 +0000 Subject: [PATCH 154/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 22dab4c..b570eaf 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -331,6 +331,9 @@ fi %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 4.4.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Aug 23 2022 Richard Shaw - 4.4.0-8 - Add patch to fix #2091514 where saving a configuration change in the web UI would replace {} with () in the config file. From 025d9faadb8b86e636081f0a6892397c863fbf27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 10:58:14 +0000 Subject: [PATCH 155/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index b570eaf..15cfed8 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -331,6 +331,9 @@ fi %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4.4.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 4.4.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4e955ebfa2d4c9f6ab12fe78fbd2f80abed1a0aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jan 2024 12:07:52 +0000 Subject: [PATCH 156/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 15cfed8..cbfa576 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -331,6 +331,9 @@ fi %changelog +* Thu Jan 18 2024 Fedora Release Engineering - 4.4.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 4.4.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 3839f77cdbc2c773740369673ea930a559ffcfc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 09:13:51 +0000 Subject: [PATCH 157/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index cbfa576..fe1263e 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -331,6 +331,9 @@ fi %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.4.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Fedora Release Engineering - 4.4.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d257177f62f22c3020f9dba22dda7fd80832f374 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 20:44:40 +0000 Subject: [PATCH 158/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index fe1263e..92949d2 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -331,6 +331,9 @@ fi %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 4.4.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4.4.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 41bc11d5f42caadec91752aa059f7c84b3d0a869 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 25 Mar 2024 14:02:08 -0600 Subject: [PATCH 159/168] Create and own /etc/BackupPC/pc --- BackupPC.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 92949d2..2d42621 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -221,7 +221,7 @@ install -p -m 0755 systemd/src/init.d/linux-backuppc %{buildroot}%{_initrddir}/b mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ mkdir -p %{buildroot}%{_localstatedir}/log/%{name} -mkdir -p %{buildroot}%{_sysconfdir}/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/pc install -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf @@ -331,6 +331,9 @@ fi %changelog +* Mon Mar 25 2024 Orion Poplawski - 4.4.0-14 +- Create and own /etc/BackupPC/pc + * Mon Jan 22 2024 Fedora Release Engineering - 4.4.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From edbff7c7b15247dab5e11f43730b963f7dced425 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 14:43:54 +0000 Subject: [PATCH 160/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 2d42621..2630780 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: High-performance backup system License: GPLv2+ @@ -331,6 +331,9 @@ fi %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.4.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Mar 25 2024 Orion Poplawski - 4.4.0-14 - Create and own /etc/BackupPC/pc From b03f2170dac4dd24a737f5346099d537772149c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 23:05:25 +0200 Subject: [PATCH 161/168] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- BackupPC.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index 2630780..2cf6d39 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,10 +10,11 @@ Name: BackupPC Version: 4.4.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: High-performance backup system -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://backuppc.github.io/backuppc/index.html Source0: https://github.com/backuppc/backuppc/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: BackupPC.htaccess @@ -331,6 +332,9 @@ fi %changelog +* Thu Jul 25 2024 Miroslav Suchý - 4.4.0-16 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 4.4.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6abe186d5bb350b1337cd68066637a44aaabb6c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 08:24:48 +0000 Subject: [PATCH 162/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 2cf6d39..f7691f6 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: High-performance backup system # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -332,6 +332,9 @@ fi %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.4.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 4.4.0-16 - convert license to SPDX From edbec1d7f2b6e90b4618e521e3a2ffab961e5efd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:21:05 +0000 Subject: [PATCH 163/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index f7691f6..f8d5846 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: High-performance backup system # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -332,6 +332,9 @@ fi %changelog +* Mon Jan 20 2025 Fedora Release Engineering - 4.4.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 4.4.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8419cc70b8e6e64de2bbc5b5aaf3c2447c9e5e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:18 +0100 Subject: [PATCH 164/168] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- BackupPC.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/BackupPC.spec b/BackupPC.spec index f8d5846..f31ae42 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: High-performance backup system # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -79,7 +79,6 @@ Requires: perl-Time-modules Requires: samba-client Requires: %{_sbindir}/sendmail -Requires(pre): shadow-utils %if 0%{?_with_systemd} Requires(post): shadow-utils %{?systemd_requires} @@ -160,6 +159,11 @@ for m in Net/FTP; do sed -i "\@lib/$m@d" configure.pl done +# Create a sysusers.d config file +cat >backuppc.sysusers.conf < /dev/null || : %preun %if 0%{?_with_systemd} @@ -329,9 +333,13 @@ fi %attr(4750,backuppc,apache) %{_libexecdir}/%{name}/BackupPC_Admin %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/ %{_datadir}/selinux/packages/%{name}/%{name}.pp +%{_sysusersdir}/backuppc.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.4.0-19 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Mon Jan 20 2025 Fedora Release Engineering - 4.4.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8621a37579fcee538f755d153577091eab5b4dc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:41:39 +0000 Subject: [PATCH 165/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index f31ae42..93d1f3d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: High-performance backup system # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -337,6 +337,9 @@ fi %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.4.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.4.0-19 - Add sysusers.d config file to allow rpm to create users/groups automatically From 33097a061f4f4fed4eb11dd6c229d155ef5c41dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 02:27:57 +0000 Subject: [PATCH 166/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index 93d1f3d..f723018 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: High-performance backup system # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -337,6 +337,9 @@ fi %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 4.4.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 4.4.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 6e70bbdca34ac768bacd271baf4bb32936b71502 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 06:22:02 +0000 Subject: [PATCH 167/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index f723018..e5cd229 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: High-performance backup system # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -337,6 +337,9 @@ fi %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 4.4.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jan 16 2026 Fedora Release Engineering - 4.4.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From c7f5ecc282a04499610a39710194132a2471edcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 15 Jul 2026 17:32:05 +0000 Subject: [PATCH 168/168] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- BackupPC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BackupPC.spec b/BackupPC.spec index e5cd229..3a7d4c2 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -10,7 +10,7 @@ Name: BackupPC Version: 4.4.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: High-performance backup system # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -337,6 +337,9 @@ fi %changelog +* Wed Jul 15 2026 Fedora Release Engineering - 4.4.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Jan 16 2026 Fedora Release Engineering - 4.4.0-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild