From 519f21a0bfc20a4dcd43f3d28d5fca4e03012737 Mon Sep 17 00:00:00 2001 From: Bernard Johnson Date: Jul 09 2011 03:08:33 +0000 Subject: create directory under /var/run for BackupPC socket --- 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}/*