From 8dd8119f85707e3c3c38485066dbb66b3e1e5f03 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 13:15:05 +0000 Subject: [PATCH 1/5] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 5c9a13b2b1d1886f72065c39191f843deae6d2a3 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 11 Aug 2008 16:20:46 +0000 Subject: [PATCH 2/5] 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 75d4bd0e2914bd0f12ab898c8991f62cbe2bc9ba Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Fri, 10 Apr 2009 16:14:47 +0000 Subject: [PATCH 3/5] Fix TopDir change (bug #473944) --- BackupPC-TopDir_change.patch | 21 +++++++++++++++++++++ BackupPC.spec | 9 +++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) 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 c7b9f60..b3b172d 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -6,8 +6,8 @@ Name: BackupPC Version: 3.1.0 -Release: 3%{?dist} -Summary: BackupPC - high-performance backup system +Release: 4%{?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-4 +- Fix TopDir change (bug #473944) + * Mon Aug 11 2008 Johan Cwiklinski 3.1.0-3 - using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149) From f15b7c191703761301957c76ed0a500c54b6136a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:16:24 +0000 Subject: [PATCH 4/5] 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 72d463bf4eeaeceba2e6e35b2a26d7dfb3d27503 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:46:22 +0000 Subject: [PATCH 5/5] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9