From 50e54edcf840831fde5cf5e4e9932edd3811791c Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Jul 09 2011 03:16:51 +0000 Subject: patch to move pid dir under /var/run --- 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