main/backuppc: fix socket path

2 files changed, 26 insertions, 0 deletions

diff --git a/main/backuppc/APKBUILD b/main/backuppc/APKBUILD
index ebe849aaa0..efb602f8d2 100644
--- a/main/backuppc/APKBUILD
+++ b/main/backuppc/APKBUILD
@@ -17,6 +17,7 @@ source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$_rea
         configure.pl.patch
         remove-deprecated-perl-defined-at.patch
         fix-pidfile-path.patch
+        fix-socket-path.patch
         backuppc.initd"
 builddir="$srcdir/$_realname-$pkgver"
 
@@ -75,14 +76,17 @@ md5sums="5efdcdd48e9e0d4ef7a706902d1f8b3d  BackupPC-3.3.1.tar.gz
 2a25b036d273ea67b69aa62e4cd7c28f  configure.pl.patch
 eaff2abac13ea00427e9c895e0dc881c  remove-deprecated-perl-defined-at.patch
 c95caf4db25e308defdcf6dae1662006  fix-pidfile-path.patch
+c7910c310a37c7f7e675f5d8555ad303  fix-socket-path.patch
 59aba6f5819ca9a620342a8678325794  backuppc.initd"
 sha256sums="c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c  BackupPC-3.3.1.tar.gz
 86988fbe8e8763abee8861f5bb03bf6bb7fd2430623f78fc921502b6759ad48d  configure.pl.patch
 202cb3b03bccd3f2af97db737e67ed8daf2a015ca0bb86b8908d8b5cee9ae9db  remove-deprecated-perl-defined-at.patch
 6e5e33e0f30b8259ae097e2b5ede9b9864765b3bf4a30c85f37df5f929332c76  fix-pidfile-path.patch
+161c9662063aca9f6f20e17ceeed69d03a1c4fb75efb61614b29b0c63b04d00f  fix-socket-path.patch
 5d270ac3c4ed573a61836b0185eb2cac97116a86a5f65f593bf1c2a124f21867  backuppc.initd"
 sha512sums="b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6  BackupPC-3.3.1.tar.gz
 a38361fd0e54a4c0100a7bf94b09483e5ba246dc45d6955d275542dd5662d8da11d9580685195b7d4dfa9a07c0487a52a14a95340737e70889ffe5c5e26d5ff8  configure.pl.patch
 f834c223fd14db6401d0eb162d7794dcc9d040d397f914386769bc3dd82209078c6d0dc331ee1d8943a8ea07ad8c2975929511617b2cd85e85db4f5bbd5fff09  remove-deprecated-perl-defined-at.patch
 15fdb58e038160775fe4deebf6c8adbc128a37da2a866ef00e1eea202c396220cdd1c0547a45f11127dbdc957eaed5188cb87a05467d25647fb462be28c51ce7  fix-pidfile-path.patch
+4391bdfaa3044a4eecec617fbcba1bf21bdd9389e3d3a73f62e74e6b818de40fc1600e26b358cf35a6bac01086ed12a3ff7abba64e67d11c7a91b2046c239189  fix-socket-path.patch
 288bba10ca4dd585638625321395e0a40aca30169a122c443f7c6fcd55143e6fcdfa5d39595bacf06cc4960b6e17992a57ec3d3a7ddd9b140e44da4ebdd019d3  backuppc.initd"
diff --git a/main/backuppc/fix-socket-path.patch b/main/backuppc/fix-socket-path.patch
new file mode 100644
index 0000000000..ebc582fa26
--- /dev/null
+++ b/main/backuppc/fix-socket-path.patch
@@ -0,0 +1,22 @@
+--- a/bin/BackupPC
++++ b/bin/BackupPC
+@@ -1885,7 +1885,7 @@
+             print(LOG $bpc->timeStamp, "unix socket() failed: $!\n");
+             exit(1);
+         }
+-        my $sockFile = "$LogDir/BackupPC.sock";
++        my $sockFile = "/run/backuppc/BackupPC.sock";
+         unlink($sockFile);
+         if ( !bind(SERVER_UNIX, sockaddr_un($sockFile)) ) {
+             print(LOG $bpc->timeStamp, "unix bind() failed: $!\n");
+--- a/lib/BackupPC/Lib.pm
++++ b/lib/BackupPC/Lib.pm
+@@ -686,7 +686,7 @@
+     #
+     # First try the unix-domain socket
+     #
+-    my $sockFile = "$bpc->{LogDir}/BackupPC.sock";
++    my $sockFile = "/run/backuppc/BackupPC.sock";
+     socket(*FH, PF_UNIX, SOCK_STREAM, 0)     || return "unix socket: $!";
+     if ( !connect(*FH, sockaddr_un($sockFile)) ) {
+         my $err = "unix connect: $!";