From dd853572e4b008c92e54ae828540690b8fdc993b Mon Sep 17 00:00:00 2001
From: Horea Christian <h.chr@mail.ru>
Date: Wed, 16 Oct 2013 02:27:55 +0200
Subject: [PATCH] Now running btsync as user, with appropriate instructions

---
 net-p2p/btsync/Manifest             |  6 +++---
 net-p2p/btsync/btsync-1.1.70.ebuild | 23 +++++++++++++++++++++--
 net-p2p/btsync/files/btsync.service |  3 +--
 net-p2p/btsync/files/config         |  2 +-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/net-p2p/btsync/Manifest b/net-p2p/btsync/Manifest
index 294a70b..252d0bd 100644
--- a/net-p2p/btsync/Manifest
+++ b/net-p2p/btsync/Manifest
@@ -1,8 +1,8 @@
-AUX btsync.service 223 SHA256 38cd401694c27ddaedee6378b837802805d89efd6ab88a8163d26f0c1646bd5f SHA512 9fdb4b201381adc41b3c5f19ac40e5b56713d810e4548f0825aa6c86a6750cb75550f7a0873ecdc5db7d95aed636cba873b31480e777257b641a6e74be4b3164 WHIRLPOOL b1b748a9b72308014e2378e23e838887057c276259973c6fe1751b3f4e2005d4f09b9a034c7631d0cab3bb3e09b3be5dc5734ff251776db739542c3e770a650c
-AUX config 1811 SHA256 3a215afa356950b93a737b7798cc30f679a824372def00e53b21b16ddbd293dc SHA512 913a0a14b9314455e7f11b3b4629aff9df75ecbd8058c12eded8d72f8067b8b81e2180121916dfd4b695c54958ec28722e45086bd23a9529d2c788631be4e68b WHIRLPOOL d528600613f280d4c51825d1da30e09185e586de07cb7a863a95847945e49ed3b5e39863007abad2a3a2afbc6320bb90f789fcfa0bed4c1f7d7cf6c4d0a0e95f
+AUX btsync.service 206 SHA256 92a8e752633fe3d90b8081b3989e2b1a3bb8459b6022eec3a3fedbf9215ce847 SHA512 6dc27cb1c8ac56c509c61344bbba3feaf43f76c18054b3c4357bd870f334781574771d0b92efe17c98db11c6d486f2ca991a39d3bf8e7a37da0e1d49a646477b WHIRLPOOL c6456b5b9b58b81d9099671028c34bf13b61fca73a3759569a07a84d9ec7dd0006acb491e0aa63dd73f586f7237ae27f681c4c7d32bb17651cd718f9493cbbf1
+AUX config 1817 SHA256 6b7612f6d34b0ea2c522f1bf879924a3eec1ab4ce2823dd1bf125923df835896 SHA512 edd42219782d2898bc1d472f0bc523d0a9e36fcb957ad710c23db81ca185b03227cc4fbc0305b1ad622a9fd8b5d642c5278e24964514a79dd10a2523c6416267 WHIRLPOOL b557b2c84f19426071989f3e929e818e48e7b35cf6c6e2322000e7bc0caa0d3613e295b680ed8ff89985be96ee76681378b4ed17e488ae67c07c0035dfb07950
 AUX init.d/btsync 804 SHA256 023bd5c1f36b17af6c81343279fb7a4314e9172663ed8da35fb6731ecc47cb76 SHA512 4238f89b41019fb73f5a328e05d687785d946b80694787a17ffdcc020be71df7a7751479659f82c890e674679bc5b5b4b208a9c48b8926433f9d979fab3cb983 WHIRLPOOL ab167800ebc416474614866ae9c708e8546c6abcb25dc464c95c67f4f2355ce77503f6045572c55772e8fba00a15b0db8cbcbd09dc16abae1d5eb5447c705575
 DIST btsync_arm-1.1.70.tar.gz 1279220 SHA256 d79b3cf1881fcab95614693569c950d07dd93ffb70cefd901963dec54b75a05b SHA512 321079de894170eafdd8f923f2e1bfd0909904d350b678707f67566ed0afd1ef8af333270b791d6a429774d7e454da4ef064b417be36b338de2e53599e699bd3 WHIRLPOOL f6499199eae078bc7609aa190a61800866dffbc40fcf08f1ae65456ab6ebf36123e5542b3bbff39f0e61d7ae7161d97684ebed3f091145a90e6eb0b789d3db41
 DIST btsync_i386-1.1.70.tar.gz 1367784 SHA256 25161852b8eaddf50ae385771f79bac47818467bc5cabc539a64d985e8af4dc6 SHA512 ac18a91a2d9549388541c2c7dabcae1e8b04534115d3c7e5d93b3fe984c801ebdeed931d63d59e7e7e767587fe42d2bb80e6833127b4cf475d30130314f5c864 WHIRLPOOL a5b12b32a521b7f730b8e9cd1505ac4b7ccd56f0d5f91a1988192b32a539a48380d040d6485327153051708c4d5919d517202d90aaf3c8033bdb730b72981314
 DIST btsync_powerpc-1.1.70.tar.gz 1451029 SHA256 7d68783020627a019363c20d776aaf017bde023886989cac4bd96528fdae9faf SHA512 7f0e22d1cf10e7ebbae78e43cbd84d4d4de2b20478a6605534ee4c04ade68b2bbdea33049a9861cfd53badc4e7e7b2ff24e35c3156d3cf62a8828300094ba5ba WHIRLPOOL ab33985672e29c69c7aaa9729c93dd35a78152fde6b64adaba8a04f93f3ef4006defe240d127e33f6f348a7b825a3ce2e642228f43beb64ecd2fb811f300bdf3
 DIST btsync_x64-1.1.70.tar.gz 1449204 SHA256 7197ac1a23ff593b1cc6ef124cb2555376aac4637f368483ed2e0d5230b3dec2 SHA512 768f960935cacd1ccc655e9182ada0ddf61d4b8fd0dc8a5386182a46014e6bd11f1743a78884f17b9d3b04d6668bb98c56bce8019c902a216ed26d65a60492c7 WHIRLPOOL 6261713d643ef0eb9816837975a0d0af534819cf978de8370b088c93bd86770f3053c0976e27aee32fc00b0ecf1a9a01cf083e95c1325dcd632896a6e6b5bf2c
-EBUILD btsync-1.1.70.ebuild 1040 SHA256 e116855cdddd972c85299406b9cf16b84faac0876918b53b6a3e349b157e72bb SHA512 9e450fa69f19ea8088426749093dfc0b3aa114d1bd6e65d98cc51697a6343ea3e7e31a9829ec65e79f071140f2cba5cf5cbb18f1c1ac853dae30c0fdc531b2b0 WHIRLPOOL 486cc23859d1da651673a2b2c3f6be640e6ecbdc13942371eae252b2125be7ef1f61e1bb7209fae991fae6ecd6fff382c6113cf2ce866a3413069dc8be32a29a
+EBUILD btsync-1.1.70.ebuild 1438 SHA256 75de7a1888f43215cc512feb66427b672fc3cc7c15b6ef8ae3531e709c250755 SHA512 79c4c51a525dd6f3a4f09398270db4184a3e15a206e2c5d07736e9e07aa08dc9a955ad793a0bfa2119161a06e812bdd8a05edddeaac77b973dc320db2d8f39a2 WHIRLPOOL 39a8a37110fec1ae8bc63c4175748e3aba1cb4cdb9cb350b999595297d813c209d31d4052b6a02d5875bba70ad98e8ac880541e1d80d9c4a82dc6a8a21f2a131
diff --git a/net-p2p/btsync/btsync-1.1.70.ebuild b/net-p2p/btsync/btsync-1.1.70.ebuild
index 141054e..72dff4e 100644
--- a/net-p2p/btsync/btsync-1.1.70.ebuild
+++ b/net-p2p/btsync/btsync-1.1.70.ebuild
@@ -28,7 +28,6 @@ S="${WORKDIR}"
 
 pkg_setup() {
 	enewgroup btsync
-	enewuser btsync -1 -1 -1 "btsync,users"
 }
 
 src_install() {
@@ -38,5 +37,25 @@ src_install() {
 	doins "${FILESDIR}/config"
 	doinitd "${FILESDIR}/init.d/${PN}"
 	systemd_dounit "${FILESDIR}"/btsync.service
-	fowners -R btsync:btsync /opt/${PN}
+	mkdir ${D}/opt/${PN}/pid/
+	fowners -R root:btsync /opt/${PN}
+	fperms -R 775 /opt/${PN}
+}
+
+pkg_postinst() {
+ewarn "You have to add your user to the btsync group to use btsync.
+Do this by running the following command from a root terminal:
+
+	usermod -a -G btsync your_user
+
+If you are using systemd you should start the service per user:
+
+	systemctl start btsync@your_user
+
+
+You may also tell your system to automatically launch btsync:
+
+	systemctl enable btsync@your_user
+ 
+"
 }
diff --git a/net-p2p/btsync/files/btsync.service b/net-p2p/btsync/files/btsync.service
index 71037ec..9792898 100644
--- a/net-p2p/btsync/files/btsync.service
+++ b/net-p2p/btsync/files/btsync.service
@@ -3,8 +3,7 @@ Description=Bittorent Sync service
 After=network.target
  
 [Service]
-User=btsync
-Group=btsync
+User=%I
 ExecStart=/opt/btsync/btsync --config /etc/btsync/config --nodaemon
 Restart=on-abort
 
diff --git a/net-p2p/btsync/files/config b/net-p2p/btsync/files/config
index 1ab8c25..5c4babf 100644
--- a/net-p2p/btsync/files/config
+++ b/net-p2p/btsync/files/config
@@ -10,7 +10,7 @@
   "storage_path" : "/opt/btsync/storage",
 
 // uncomment next line if you want to set location of pid file
-// "pid_file" : "/var/run/btsync.pid",
+  "pid_file" : "/opt/btsync/pid/btsync.pid",
 
   "check_for_updates" : true, 
   "use_upnp" : true,                              // use UPnP for port mapping