Create pid directory in initscript, wrt bug #464130. Thanks to parafin <help AT imtrappedininter.net> for discovering this issue

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 31 insertions, 18 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 970883680bb7..ba9f22a7a7c0 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.37 2013/07/23 09:56:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.38 2013/07/23 10:01:35 pinkbyte Exp $
+
+  23 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> files/jabberd2-2.2.4.init,
+  files/jabberd2-2.2.8.init, jabberd2-2.2.14-r1.ebuild:
+  Create pid directory in initscript, wrt bug #464130. Thanks to parafin <help
+  AT imtrappedininter.net> for discovering this issue
 
 *jabberd2-2.2.14-r1 (23 Jul 2013)
 
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 716914473bf8..4ab2cfd24b20 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -3,11 +3,11 @@ Hash: SHA256
 
 AUX jabberd2-2.2.1.init 1625 SHA256 23c37f789d84575824a3cd8d009c88e7035ca1222cdb24e0c8437e1a6e55bec1 SHA512 a910b391be0deb85319563e07d74d0442c3accc1ec24b5ee9235d869b759576e0cae9c947b948d0a4735703177eb4baa5eb23d86f29c5134ef491e12a51c9505 WHIRLPOOL 48cd1a62ee3e123495429809c7ab7ee62c48ab4b2edab1c9523684371a9f5ebd8261b8a93136b3aa9d126cb3773d0d85acb1fc5113f9e88cdeb82f9c02ab06bf
 AUX jabberd2-2.2.1.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
-AUX jabberd2-2.2.4.init 1625 SHA256 f01a66b3303f1ac366492e913a82952996b75619335ae210357e43e4fbed37a7 SHA512 df57e053ca7e4a8af841d659295ea4a5d747b21b6ae49f238a66cb7583e6cee6e50b5ad2781c42bda142a16e6bc9bce1aecfb12bec4b1974b652639f1e164ee8 WHIRLPOOL 3c56c3f588048db901dcf20554387e303df0876d9a6962406568e4a061854930f8b1b539d8b1a35ba1a175c2f4ba39929709ab009a8a529bc161a6bd19adad5d
+AUX jabberd2-2.2.4.init 1679 SHA256 9bdce2fdf388b90a84f049da9ba7d805f9db50fb14d647cd7195d906ccec6a2e SHA512 b93cf7858fa4154aaeb5823febc1cbb44cc859699ddc41be7a38ba53e9e7c2b02a9d3d58eb9ce474e97151945cf859c3d4a7c220b6107074d9a292a53de50f0b WHIRLPOOL e507db5f53e68640c71f0c4be2b92bdc166cd7a7bbaa2421571d5011a0b4de36bf2433174678a22317caa0e808822b61fb03e4709b4fe27349bce0291cab9c51
 AUX jabberd2-2.2.4.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
 AUX jabberd2-2.2.5.init 1622 SHA256 0f89246b7240f7f4ce528734a054d32bb63c7195c4a278362265ed818d6049e3 SHA512 e207bc463ae5248ad35197fced982be62ca860fc079a778c0c20ac4e51b4f825820ecb0d69a0a33013d02d30cfcea8f2fa265a4a54a1af565182087fe6cc6327 WHIRLPOOL 7ee7f65ab2d409333b1d96911ef49ff6e5019e4bfa1b6d69e86cf18eec07f072099055edf9a53656978f5ca597e13f30eb50162025cab60bb41e8fe95e831934
 AUX jabberd2-2.2.5.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
-AUX jabberd2-2.2.8.init 1625 SHA256 38e08cc155b9a7f7781a3255f7a1bbb885fed9eb22d72a37349b5f7790cf1689 SHA512 02ef6d0c67291a9d7f7fc313c3e075fbca9d8bf7d74a63fb8326d112f90657e39828eb47220eaceecc58e56452bbbf3303f00e26c0a8e03473b8f47664687129 WHIRLPOOL 0ef41ded73116611910d5156c43d68abae44898d4c3b87198adc1e94fe3a4ce51a77850fabf4d662d1beaefd6757095d6753a3cc4a7f5d5698922bd463f6a383
+AUX jabberd2-2.2.8.init 1675 SHA256 7cb895e641d4b58120a3e37bd7d19849b45ca180b2d8cd41ebc25821f4cb6e8f SHA512 12e596478d821f610c44173e501ddcb92da0e95df9827b3b4bcd29c9d7176684a94f4c8db30294d37fd9a35208cc500c1059fcf5444d430b8f16f2a9ed8a2910 WHIRLPOOL 94dc6c29b4a86691b1fbace24f89b8b7abc9011dd4a80f51aa0e41fba818efb6249212319840b449d9e57442539578b61164c392e2144ee8db0db9950966f922
 AUX jabberd2-2.2.8.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
 DIST jabberd-2.2.1.tar.bz2 645496 SHA256 6790e4f76febc2889bbe463c85879a4cccc9e6d72f98c9d0bb2a6fe0fa848aa6
 DIST jabberd-2.2.14.tar.bz2 615984 SHA256 cd6bd518dda172935ad16f180f40ba6ebf7d4aa83ef4f9445ac6b55b438a9e3f SHA512 96f33990d8d7c1b4751530f483c6ac0ded0936b73465f3a52cab853f3cea2af218cd15a7e3d911732f730775fb24e95211e9f4a722138d674484c8a564e23418 WHIRLPOOL a3d380fc90c1fb63e46e7f1484a38d7b58852562455f987852f4db275c01583cfef8c43057e69ba3d6b440260c12ad97cd4e31456b091211f7b4344eb93f2c46
@@ -15,20 +15,20 @@ DIST jabberd-2.2.4.tar.bz2 649737 SHA256 8cb7a69e92b8a7994a42ba28b910bc90e3174a7
 DIST jabberd-2.2.5.tar.bz2 649910 SHA256 14c36491f2fe83caacac6bef49b77dc43d56c76bc375fc0cf85e8373010f54e9 SHA512 374eaa85f05a9b3346f6f7afc42f83d8caecaa2d0e200a70f806d499836f19ab291d55e6a50ac8c91ba60f2cfaf7ec23345bf9b02948d601571aae4e8adf956d WHIRLPOOL abdaddaec56ec6c102ff7883f8f8fdbb11d0b076413addf2b51cab67d1eea104466c5db55a068f35dbca4e3276a4d99f922fd25815c7f9b688c91b3598459a34
 DIST jabberd-2.2.8.tar.bz2 631830 SHA256 772959b0582fca92168f151252fd6a2286b715d72959ce494ca92935957961a3 SHA512 f993bc36ab6aeac9eba773f133f6c543f2f3095f89aaefe2cffe6bd3b2390527054b815209cda429f6198451793ab1ee76f715b477e86c655d449d04d3a224ba WHIRLPOOL 0afa43253087504087d4eb866a363e1fabd5b4c2b33df389ee0a057a9c4048711b78b17c950c442e0d84e138ce317f19657208af98697c3e69ac44df9c38afa9
 EBUILD jabberd2-2.2.1.ebuild 2924 SHA256 adb842dfba0a645cbe823746e04aa281778517f2beba19e36857ac99783c39d7 SHA512 1ca53896c662b2f4b131970cc28302c010c9aca3bf96d857645f65edd368e8274e40413eafdcf992f034b87e7193b7819ca7515cd1c8e475ec1e10061c573d5a WHIRLPOOL d5391805d19d9e1a2f21c0bac9d49b54d4906c4add56c27a71bca78642d0d2c640b032aca67767d51b298a59717a7c0b327567270b3db70cc1047aa7bb4e16a3
-EBUILD jabberd2-2.2.14-r1.ebuild 2803 SHA256 8ea3983647bfa32d81d57d80d8a98f72c492a31ddccf9f2e4bc5800cd9fa67f4 SHA512 252ca952262cee36d289d7deb600d7ce563ec0641f6af6f7a521105726adf586e01471fbfdc06d51fd57dd536e424326a73dce1f18744cf739cae9df1bcf59ef WHIRLPOOL cfd61f107035094917af9a4a04d591b28d5adb14609e956da423754dd5de4bd1d0597f7c1c557afed62d7113ad92803b4cdb2cac220dd8b1e22657d684f8c94c
+EBUILD jabberd2-2.2.14-r1.ebuild 2799 SHA256 a5ba380fd01232f08e84f60d97582beaa53ad652b482816fbcb47a23c5877d3c SHA512 e319f5406698023405a9cb670ad5ee89e6bd4ce1728982a68f43cc2c05541abcefee6f527b2b151959fab5490f13646cfa878ddce89d904dd06a39fb07c78ae5 WHIRLPOOL e7d67abae0d6b97b44ecb07da8d4ca82a399bbaa5dba3e5f4db4927d9a37fdde9b64d5360f247692db99405033a77921fe849369c65e14fa8a013322045e3182
 EBUILD jabberd2-2.2.4.ebuild 2928 SHA256 a7213d1461da20fcb1b072bc0474a01c52a396ab54017b6dc13fd9a6df9a05da SHA512 bd72498f3507365d1c0bc41110d02d8db620c84a816e970bc994499e2ba830e23226981da55d40bb9db43d8889f69c89ade58eb3b50fc853e7a1a9aa4bbcd43d WHIRLPOOL 330aa8b7d368c60bf611b7a2373b784db9693f1c12ffdc2309311101eae3743d00b40ebc030d33e389a2a450b37a76646b1ac14d53a3557a770566c8838a9e3b
 EBUILD jabberd2-2.2.5.ebuild 2932 SHA256 44661830750e303cb98124b2928d97a815d900708bd118a0341a436fe968bae7 SHA512 8bac71bb13c99d311710a2afafab15118104b23f4e827a95783d29f8a5645516fcdbf0061ca4825669dd6e4ea8af6b75f67db25c32f4473a7170f434291f6f34 WHIRLPOOL 0f7d416c3318ec47c8bd2756cd2faabbe89d4d0675dde2230948ac61e02931a465a9556e648c6c57a02fb6c875fe19079878763d0e0762d7a47777505b400c39
 EBUILD jabberd2-2.2.8.ebuild 2942 SHA256 eb4d0ecd1e1d9f11bf07b0e7cc3fb46ba3e33f0bf433682ba36ee4ba19977419 SHA512 96636183e459b7d6af5509442a65af4cb8b88e60959fdb80e07ac25c0d99ccbe97de12954eb3cd6924fdd7bc544c6978ca9c567b571cbb6004ea0fba40f5568d WHIRLPOOL 06c59c6d787f58b4161e78dd5ec391780bc542f926f8b7886f06b9781693b4f4e3cf2f0f4737c513322342d7d9b5987737c8cb181f9fe1f153c14f2da4582b47
-MISC ChangeLog 6892 SHA256 3907e5429eeade173de7f127941fe0a93688d2177e14f354b60cc9b0ad539f74 SHA512 5591c3a5780b900ee4e01a59f62d4189201d9ee4e17da2d4c5aba1fa0d8543c112f02b93e1137d4f1d1b6a84de85d81539b48ba0d3c557c7272132739e81dc23 WHIRLPOOL 1829e7d5e6319aa83a0262244d21ff920497751ed689d26a5b76aa010bbf40f850328bbeca90be3456728e2f2d09437a556984722319885cbeb9fb7703648d00
+MISC ChangeLog 7159 SHA256 fe401a717757db5c0e2d441269cb2b8bb5953b5b2d3282d8ed246ffc68882148 SHA512 57ace74d080a79ef980d3a76076b95f6a5f1ad75a89f6835a62cb1971ad974925523328bc8051525f4c43414a18bfecf343c5f2eaa0ce4216e5d1158c38ebd81 WHIRLPOOL 525c7c7a04778b09d50ae520ef8a520de73ac3739a3f4523e3c15d7281a7e24b4177be4601a452fe796878ff2be70faf438eaef0d153d1085e9800953bc11738
 MISC metadata.xml 271 SHA256 dbad96cdc49c6a58779fce3ec4f7f95044faf6e63e1002942b8e95e8372f078a SHA512 c71820d9a0de9f41d71aec053a8b4b5ce21642d42da0940e2883e34b30f3ed1d05ac6f1d566b421519cb557cc4d4402c61a25f2781c46b886ae6a5a668d16e8a WHIRLPOOL e1693ab9877fc3db5cc40e20ead595828a2571b4e65df2c7d63e5fa3d9b6c9a539d3c377726b63a4a0c8eb676989718ee949ed4edc50a5ec444332f42ba19b6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR7lNGAAoJECo/aRed92678QAIAIUN1PKvmGDPMxYBPl5TSD7J
-IImDXd99XQ2s1sI/oUWrmVQzu9UZWrQhk4tp3YIVtmg1aDsYZ2vYuCFexMmV6tzp
-k3wKJevCb8Nq1wilueNRtPlF2kJ39f7dg9iAiCNBnAvEzMPooyL8UWkqGVjjQxSS
-wVkf98HiUDmXLmPMCDnmW6pzrEWgmf7gZfXwdji5sLjZKear41+cIPN+ZPjG3Bxs
-593Ky0BXbeIvN2qxFRHTs4Ibud0/YrCQonL3CBivJXbeENs2g6If+Ul1UEh5AuZ3
-ZFv4+DbM7oez/w5mWJlNnkooA18mBadDYNcNViFzSO833lLqikTgqoztI+v4AOM=
-=s18e
+iQEcBAEBCAAGBQJR7lSAAAoJECo/aRed9267Dc4H/AsM3yzX4UuqNPPrLz7kI0cB
+IMSByjGR28ltaVBBq9d7axetRdkNh3NdRRJm3lKzV60AC4ZqudHv7YN6JpIXTjKK
+G7zV5gXTMU6Ie66V0+zELI0HqJpMysSND3YVwmiyQhzBifwIbbagfzAGljC4p6/u
+vYoah5h4NKsTgkHWrnV7x6E/eJoO/MUW0sqjyJYxvcdBd5Mqslou4FABMNmMkHen
+l95RdxVHxQ3WduvlQYLUOnaRrvh+po5F/2fLviMj25tiUQDYZZeCzfbUOEvarOpH
+cx8ElajdkU1J48EeCKA4savgFVXPuWBqa1xVvFh+uX3+8xOlczp9lS7oR9NqTBk=
+=8XTb
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/jabberd2-2.2.4.init b/net-im/jabberd2/files/jabberd2-2.2.4.init
index 8d40b606428b..aa4b88876285 100644
--- a/net-im/jabberd2/files/jabberd2-2.2.4.init
+++ b/net-im/jabberd2/files/jabberd2-2.2.4.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.4.init,v 1.1 2008/09/15 01:33:55 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.4.init,v 1.2 2013/07/23 10:01:35 pinkbyte Exp $
 
 depend() {
 	need net
@@ -26,6 +26,10 @@ stopJabberServices() {
 
 }
 
+start_pre() {
+	checkpath -d -o jabber /var/run/jabber
+}
+
 start() {
 
 	einfo "Starting Jabber Server ..."
diff --git a/net-im/jabberd2/files/jabberd2-2.2.8.init b/net-im/jabberd2/files/jabberd2-2.2.8.init
index 0c64021a449a..2a838267e300 100644
--- a/net-im/jabberd2/files/jabberd2-2.2.8.init
+++ b/net-im/jabberd2/files/jabberd2-2.2.8.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.8.init,v 1.1 2009/05/08 15:24:09 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.8.init,v 1.2 2013/07/23 10:01:35 pinkbyte Exp $
 
 depend() {
 	need net
@@ -26,6 +26,10 @@ stopJabberServices() {
 
 }
 
+start_pre() {
+	checkpath -d -o jabber /run/jabber
+}
+
 start() {
 
 	einfo "Starting Jabber Server ..."
diff --git a/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild b/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
index 72c8eeeccd51..69f023f7186c 100644
--- a/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
+++ b/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild,v 1.1 2013/07/23 09:56:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild,v 1.2 2013/07/23 10:01:35 pinkbyte Exp $
 
 EAPI=5
 
@@ -76,7 +76,7 @@ src_install() {
 
 	pushd "${D}/etc/jabber/" &>/dev/null || die
 	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \
+		-e 's,/var/lib/jabberd/pid/,/run/jabber/,g' \
 		-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \
 		-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \
 		*.xml *.xml.dist || die "sed failed"