Add WorkingDirectory to systemd unit, bug #494704. Thanks Roc Vallès!

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 20 insertions, 16 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index c8eddcba145a..a66258135480 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/thttpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.68 2013/12/20 00:57:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.69 2013/12/20 15:17:46 blueness Exp $
+
+  20 Dec 2013; Anthony G. Basile <blueness@gentoo.org> files/thttpd.service:
+  Add WorkingDirectory to systemd unit, bug #494704.  Thanks Roc Vallès!
 
   20 Dec 2013; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix gpg signing of manifest, again!
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index 9e55f4b91b02..052304e7a0d5 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -7,27 +7,27 @@ AUX thttpd.conf.sample 670 SHA256 abdf9f7c6685f846ee2bd482d60b8f8cedc3747cbc3d32
 AUX thttpd.confd.1 1263 SHA256 79e5cb1fba2b80c1c7970093861f8afe7e09d723faf8e044fc540742abdc37bc SHA512 83b8d5aebf180c398e27695bcfc9b847f6535302b4521be460ffd2e867b20fcf1083bcacdb605e557038c54631546a7ee1ba928611a6a23d786fb9f6ef9e0ee0 WHIRLPOOL a8bec5f119ac3e3856938c1753f8bde1f8d1839c94f3a1f4180d29932f2c79066e64b696f18babf847367bb4f96c9267567a0a6db9239bbc0ce1946738781ca8
 AUX thttpd.init.1 734 SHA256 d3945c6fd088c02a51157c4aaf722f4b9b5accfa5aded37fe26fd447904621cd SHA512 8fba38fbf1591a665e08ad8ef7f3b02e99ec8b6708f8b3941a913e088367d00c68210ea8019cc88b30deadd3372c8fb05188019a5c4deb94444d12e81aaad106 WHIRLPOOL 8c7e0506ac5b4c74325b12a034da81a2f4ae8eeaa10f5e39ba70093568e6b7e202f493c66754210585c8a42ab90b188071e4d734ee23069c913d69ad62255a41
 AUX thttpd.logrotate 197 SHA256 0399d9fdc31a5555307d33c4744b21271e9d7d4d6ded78573fb9b2210f593bc6 SHA512 a481c8c2d3a4526b04d6c95873336e46368e32e6f254f7453f5ccefe38cb11104ecacd7829caa7881df81c0d36c1dd4f60a91bbc7696fa349ed9c2cc7ddc84cd WHIRLPOOL 79577136bbfdf6b2b6026f1e114d4af8a66712abd0efc892f96f5ac0c084341621a3f413102764a750bf101237b9ae52424a2cd6f1b0b92b4430037faf954a6b
-AUX thttpd.service 239 SHA256 252b2200f79a02c1046fe3caed36ad1dd953e8faf164d12ccce15516e243242f SHA512 fb2e4e0bdd91387d16c163850b1b952f543659cf36875e6277e13bd76816c16c5df72f035a389be544e450d71ef95b1a6f06f0197ed05624e4bc73db2756c00c WHIRLPOOL e66dc384925fd65295a8b37945db65cc125b2942185a759420a8d3eeaa18f727c582054859041efab01452bb82a579b334b28dd958a17da20b56a9869d4574c4
+AUX thttpd.service 275 SHA256 6678560794e456da8a27d21b355bc2f30bf0284197b03c01dd4fadc55abfbc25 SHA512 f3d5f1d4845aa058b8d8cfc9fe2558778c599e02164365e0e8474a65f0c3fc2cc1fa47f0f2187c353201537ba796f5e9afc7670a35c4efdb6c491dc1ea060a89 WHIRLPOOL 2309ceb1a0a1cb2780855aa8b94312b1fa71623b15e2e5cd2b40fa0cf9859acf20eafc3aa85a559a7a6aa6d4fb30b9060e2b1b6cc233908b34e70a76c4efe0b7
 DIST sthttpd-2.26.4.tar.gz 194544 SHA256 78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb SHA512 64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bfaaaa7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87 WHIRLPOOL e38cce33dd417ce8e30426d0764797e24ebfab2060bacf2f27ee2717b2025e48e6f32245cc6a5ebfed856f8755098f1540ec7ed2005aad1aeff65454dd731c1a
 EBUILD thttpd-2.26.4-r2.ebuild 1783 SHA256 9b19c81f545d3d749534aaee094c1d3ec8475ca6f37ba5e064f27946a957ebb6 SHA512 a13b96f34998772a8d2aa7f30d5b7be5b366dad744c6cefbe57ce13959bd2423be0c4a243ca7c0b09b5a3451520dd843af8bac177b3bb7226d9cf1870f1f1015 WHIRLPOOL f7ab1a936cd55b94fbe72bbce6e5ad97737f863ab50221ccf46b7eac9710c43dd6511f009907d5854fcce34c75031e353223f3fad8c2849b17406b481993d615
 EBUILD thttpd-2.26.4-r3.ebuild 1847 SHA256 04c7b1e395c364b696ad045203e21ad315261dd36c9e5ef0b9a48ba8ad86dcd5 SHA512 89312da40d708e5b314746bf03a204e4b3a99928df01110c718a337c7aa05d6d84313e76752d182d75b7096a11a83fc5f7433f1b8b0c5a84fd9ab7f39cfe0272 WHIRLPOOL 595ae27c2e5bffbdf72222eb2d72f174d7ab54773013f8b19f5974f6a9fbef8ba1567bb977ab88dda19c19781bf27308e2c4ca497215b453d70004fbc19b8e00
 EBUILD thttpd-9999.ebuild 1977 SHA256 4f1eeae24a97f9da40ff70144b145018e50def9e9a52c1b8c409235737fb5951 SHA512 1a307144cfa67af48d961db1e04e0bb5a1739dcd36d8d26f7069c7057b86d7ff93f4697d50c4c0333d73be24a89a685246a9c00da6384f50ac47a41405c8b86f WHIRLPOOL 33cea17a40131dd79e27ea4ff14b7146da2cab142ff8b7b440d4353342a618bd238d89274d7f4c8d71c006f0de5507f31db7c2de76a3f591c76205c48ec46e82
-MISC ChangeLog 12406 SHA256 545f19aad35518156f1b0496ea14a301b2d0a37985cdfab545f05965b9d4af9a SHA512 192d81b37fd32c96b4ea866e64c5f70c2fc71625f80b66b6fdb46af6dcd1402745a0278d33f0b0cc33d579c361924bfbd1601b5d774c5234db632bf6c4059e4e WHIRLPOOL e4efd4341e7588d15d94e48ecaf031d3efba5b0b471d46d8aefb46f83eaea53857494ba1dbaf81aefe7672a46a6463383b78d9a940ea7cdbc9bd48527b66d07d
+MISC ChangeLog 12558 SHA256 954a6d59c84edd2d4d597e577469677be204caa305363c3a58947359dd3c7234 SHA512 4d515cdbcdb0231970a13b2ace51df21f3521920efbda669034142c947eccc200164112bb8ce3bace475f96a61a549a21485e220e7a07c4388aa01ff24dd444a WHIRLPOOL b0bcf1f3e44b2d61d968881f380f87660b93333789ea289494bb9d88bb91cd41d88a4d9638b53b7b1b6438090f0f98d346f3117fb20820d33c9bf4993c939c3c
 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSs5Y3AAoJEJOE+m71LUu6QDsP/13z4EpIRt/+eBXBgr/UMKPZ
-3htbpkHUgp5ti150TyvhXYgIua8LAWijy4pYG8r18kas+bK7MLN0AxrKxwN6hK1z
-tA0gCuekb6TcSO7ijn4PMQLSHHI5VH9v5M/G80d8T1B+QW0eZjyfRSBqG0QLLk/n
-X27LF01cEjyDCaxVwiKEcJGopu+dXtNhSAND8n1duHMCKGWTg4Is4+4MG5fOG648
-oLgUpdmW0GTR+WUBTL1Z5WPry5hAuBAys13+xI54qmR/Zk4ItFDBr01jTZOw/XET
-iSkYiD/exfgqTNLwyX6Fpq9BDqQFgTrTynMpSYV+Gl5X6NuJM2i2a63nhLwIO+vo
-W1rwB4+P4g5dzl6CYwj/GnhtDfqdoW1oVqLNqE/CPcp6hkZGQCNQESLxquWhiiNN
-4tschH6YQoZshcg2VAqrJ7pfyHJ9eGVSypbdgrxCdgjU2q7Jjlv+CgrBlg63HkxE
-h5U+KPdmC7bJ5LdstNjNmlhClNtLIIGf5p7RldlfliCUq8+xngvGZdRNgynOvHi5
-L/akPUPL5HxoVLilXcbVvPMFSRBLgphhr2lXM5D9U2RDbX1yL6XkspDwRREdXvhQ
-9JA1OD6KBi82vhrGQAy9JeRmK8CzpkWGplmdvCQoQRRKYnjZ6FkIjPPbyI6F17wQ
-pmHWHzn/QXXB9MZYPYAx
-=uZ5q
+iQIcBAEBCAAGBQJStF/wAAoJEJOE+m71LUu6iRcQAKNZqi1dGWDQl7mQ+lk8ImNG
+hWMCc56VFxp7kfgqpBYpzQ6g4fNd4Il2ApYAGNvojBvAf1b9toJLwyx9YqLX1G6B
+0FCAj2KoMj14GD/FqWKcUtVqBvrvlkzEIw1u+q1V3kxNQzZA5PEQT5q280O6rH+z
+dcRrxETaqNhB1MZGqA+TwZ7iuxPeBMOVJf48UhkVyFMFYcv6wkIcaapVM5DIw1P2
+uZTfUi7L3ekhFPm0HW/lgerdGwpIhxq0oBykx2Y9WFMFNDp7G2JJgSvWZGUi7HPK
+bbIC4Cfs+cic3ut0H64KLtNlzdRUwydyyqJCuc1NTAZ9i2bvpR3EBWnXa58bk74U
+ZGVxI7q5QZfA0bc13vuR6MF6fYTn8yFVNriQdqRM9AQkPSva1JEJFAHU82DvSTTO
+MGJ4i4/t0Lt3HDPW2Ck5rnCy0ud2uXcyGs/we347ODPWhds4YyHtghfZSjKTYhmT
+T6f7hldUpUkTNCOjMu3EUYqccFPrH4A0Vq6u1CV2QAo98RrcMzZxJVZWRLpx5P8B
+C3Y57YLN2mHyqZaa7oqj2S+Q2caWWhGIeqoHkhLcZQt2NwwzzSBrxC1hAvqD585T
+tvwAeRoICFblsMz5tet3vzFRNjI9z0kd+wZoB/AvPIoV8IpG6Pg1bYwRYJrALg9T
+LsPThR+nR8zyhm1SAQcJ
+=Cunt
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/files/thttpd.service b/www-servers/thttpd/files/thttpd.service
index 09898de2642e..4e56c0877d70 100644
--- a/www-servers/thttpd/files/thttpd.service
+++ b/www-servers/thttpd/files/thttpd.service
@@ -5,6 +5,7 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/var/run/thttpd.pid
+WorkingDirectory=/var/www/localhost
 ExecStart=/usr/sbin/thttpd -C /etc/thttpd/thttpd.conf
 
 [Install]