From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- sys-devel/distcc/Manifest | 27 +-- sys-devel/distcc/distcc-3.1-r10.ebuild | 169 -------------- sys-devel/distcc/distcc-3.2_rc1-r4.ebuild | 6 +- sys-devel/distcc/distcc-3.2_rc1-r5.ebuild | 6 +- sys-devel/distcc/distcc-3.3.2-r4.ebuild | 200 ++++++++++++++++ sys-devel/distcc/distcc-3.3.ebuild | 52 +++-- sys-devel/distcc/files/3.0/conf | 40 ---- sys-devel/distcc/files/3.0/distcc-config | 122 ---------- sys-devel/distcc/files/3.1/conf | 35 --- sys-devel/distcc/files/3.1/init | 31 --- sys-devel/distcc/files/3.2/distcc-config | 2 +- sys-devel/distcc/files/distcc-3.1-argc-fix.patch | 17 -- .../distcc/files/distcc-3.1-freedesktop.patch | 76 ------ sys-devel/distcc/files/distcc-3.1-python.patch | 258 --------------------- .../distcc/files/distcc-3.3.2-freedesktop.patch | 112 +++++++++ .../distcc/files/distcc-3.3.2-noexist-crash.patch | 22 ++ sys-devel/distcc/files/distcc-config | 148 ++++++------ sys-devel/distcc/files/distccd.confd | 37 +++ sys-devel/distcc/files/distccd.initd | 13 ++ sys-devel/distcc/metadata.xml | 4 + 20 files changed, 514 insertions(+), 863 deletions(-) delete mode 100644 sys-devel/distcc/distcc-3.1-r10.ebuild create mode 100644 sys-devel/distcc/distcc-3.3.2-r4.ebuild delete mode 100644 sys-devel/distcc/files/3.0/conf delete mode 100644 sys-devel/distcc/files/3.0/distcc-config delete mode 100644 sys-devel/distcc/files/3.1/conf delete mode 100644 sys-devel/distcc/files/3.1/init delete mode 100644 sys-devel/distcc/files/distcc-3.1-argc-fix.patch delete mode 100644 sys-devel/distcc/files/distcc-3.1-freedesktop.patch delete mode 100644 sys-devel/distcc/files/distcc-3.1-python.patch create mode 100644 sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch create mode 100644 sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch create mode 100644 sys-devel/distcc/files/distccd.confd create mode 100644 sys-devel/distcc/files/distccd.initd (limited to 'sys-devel/distcc') diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index 82e959d17fec..411e05ca6c14 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1,28 +1,25 @@ -AUX 3.0/conf 1287 BLAKE2B 167936b142892a5a9176b080724d734ef568e108c7c017b4b3be8ef927538a62a4755f1c88dc16444c30a833af45b9254bcf0c7bbda9a1e5d3987c195c91b128 SHA512 e3c32d1bf67fa475ce7b8f6f27835ca604eca23bcb338312c3b93d59123c2747a7c45b2ba7fe19a0c3eec9dca409aa036b1c7aa3776d0f163bd06ac7bb6b2e94 -AUX 3.0/distcc-config 3287 BLAKE2B 7e70217f6d2e8e8a4818b124930d18fe1a6167ce8334697a4acd2460669df49cc27f28e9952ef7897aab3417a2d8596c6c19999008ab5296bd23785158efc8ae SHA512 e42c6a7ca191e52937f5754ae4f17f421c78d4e42690b01f1e07ffa057e96f303c4cd9fdaa545df9afbb6596d23bd1d1d51a7467fdb039a6993979ee01eb4754 -AUX 3.1/conf 1143 BLAKE2B 83bed673a7e24dff406b05d0f23a067db5cb3aa18028cfbb295b89e440a47b6f3fe560982b40c3edcb70b9960d5b08e024e16cac46c282b73cb330f7b24f446a SHA512 11330d0725ace3d4d48615d0b29a296c89a462047b9d1aa5600b835be064cc6a1ce66958214c518e5bcd8e3048fa7f9aa4f59beb7cbb59494b363358e1447831 -AUX 3.1/init 671 BLAKE2B 1ccb01319545b0263e15f87ad5543da5b76adfe6453d0b49b640f25b10e6d387a4ad88a5fb9faf6b15b74a73bf424e2175a0d54c5a3bd71e599cbd132afb6817 SHA512 5e1ff2c6c72ec761afac48c17e5c558617b512676a007e076f9ecbdd1f69b95ff626929952b2f5fff9a927f0422bd2fded297ad494d64c1113ea11c55dcbe605 AUX 3.2/conf 1287 BLAKE2B 167936b142892a5a9176b080724d734ef568e108c7c017b4b3be8ef927538a62a4755f1c88dc16444c30a833af45b9254bcf0c7bbda9a1e5d3987c195c91b128 SHA512 e3c32d1bf67fa475ce7b8f6f27835ca604eca23bcb338312c3b93d59123c2747a7c45b2ba7fe19a0c3eec9dca409aa036b1c7aa3776d0f163bd06ac7bb6b2e94 -AUX 3.2/distcc-config 5213 BLAKE2B b0d28a381cc7b5de76939696312d316c6043baf3642d84b701705d41d73b8beac26286b2fde61887a968c212350360b59e1586302f791a4d2085996785f7845a SHA512 4863ce7fdd2f754d1b689533d04e2a306f61adecf85b9fb8a7ff4a74e94f3cad74ca25cdffe9c7f8857d490ee94af1ceef8a097709bb9b77a4bef59af3e0fe71 +AUX 3.2/distcc-config 5212 BLAKE2B 5be838fec5e9dfa25bd12f1dd535e95078c2fc9a57e7b7615652d276cbf2e6f05df2db455bf7005a3aabe9d71d39b362b07c7b1d0ac3d2474b76575120f4c0a7 SHA512 f465b6c2a203e0b39ccf36af2098ea7b56fedf3679336b0d3ba07716e8e6edaab2b03c78e428eb6fbaab27403e397d0dec880f853eba5cec4471a67bb14a576c AUX 3.2/init 671 BLAKE2B 1ccb01319545b0263e15f87ad5543da5b76adfe6453d0b49b640f25b10e6d387a4ad88a5fb9faf6b15b74a73bf424e2175a0d54c5a3bd71e599cbd132afb6817 SHA512 5e1ff2c6c72ec761afac48c17e5c558617b512676a007e076f9ecbdd1f69b95ff626929952b2f5fff9a927f0422bd2fded297ad494d64c1113ea11c55dcbe605 AUX distcc-3.0-fix-fortify.patch 313 BLAKE2B a8832bdf00ad84332397815755063cfe9f8aa4faeb369a72da5482208cddb3818ce6da60f75d3d9435e05ffe7a9267fce137ece2c96e051ec228d303f40b2008 SHA512 11f125fd12398d7e7cdcbbb2bb57d5d374fc3dda0eb88d22176c1c9948393debaf4aa05975d79e6fa4ca8de69b332cd2a75b301868b473c42511901e38b4c2a1 AUX distcc-3.0-xinetd.patch 558 BLAKE2B a381f2282c71f0eb28dc218cd57a2a914f02ffedad068c8cb7a510ae0cbf0a200de38e2bb31918ce5e10960359e1452365f36393c804984db1054410156e4b61 SHA512 1c0aa31606e1ce828ad52c9fff672d9e13a00494b8a3441095aca101d76f0f296308e359330a85745e2c60533eb1dcf82cea3feff2d0a3154b204d56735f0d14 -AUX distcc-3.1-argc-fix.patch 480 BLAKE2B 19931311f8b6d160185ed6cd44d5ffc109dd4f385e2c7c76fdc2cbdfd9003024fe5b92124b0b89a5f906417dfb8c8642f8b1413a1cd9edadebcfffdc89281079 SHA512 da9266ee6ce36cf427324b94734fa6e368498422b0a3adcdde9bfe252e163173a989db323b9d2c7e2a2b1048aa76ede13d4dbd169fef34fc559e244a7b802b00 -AUX distcc-3.1-freedesktop.patch 2959 BLAKE2B 38da179cb7fb2262e9353594b43130775337d38172fe1fbeab6751b72d99cef080397a0f08da886c065608383c4e63a4b9a1979fccbc1f2f7b51c5042dcea1af SHA512 4eb6497179ca1f6b57d1b7f6ca8f58d2ad8b7a512f771cd63f835ddf457b988d188800a1d662463d0caec66c06ad151378145f5b910f6bd9eb922e0c228e43c9 -AUX distcc-3.1-python.patch 10754 BLAKE2B b89bc3e243adda2b6c544281831c0acf65c94c41f5b68084c33f39a95299a20f19a50b3e27a2dfa011742196812ca660869370b284b2de1a6e38929040a2ba14 SHA512 8a66113ef0157b6ec382883325f4acc1dcd7df573c3c7f14bf88429b6060687faa64862a53b510709f6429e082aad97be7934e964168d91f85086c8c5f764a1e AUX distcc-3.2_rc1-freedesktop.patch 3140 BLAKE2B ff3fe91dc9ad84185246611b7abc4f4a6aee7fcf5dc3365f6bc0f86218cbbc2528bd5f4c53b4063eaf510c973b1df4d40072801c5fe2172a03dbb51ae381628b SHA512 fe953e1884b498da9cbb83ca90af9e49b554ad56fef8a8f55b9e6b46e5904f7376e5e58a9123f4acb474e16577fb6c9371a12eddc29c07c5d488be847f4ed2ef AUX distcc-3.2_rc1-gssapi.patch 1638 BLAKE2B dac27f0480d828a04a58cafb63277ffa54de8556bc3ab2673b8900ec4a8c0893674f0a06bfc276cc43fd2b701ffd9329cedffafd1b19efaef22742b78cae1520 SHA512 c804189f87068f82e7cb18de4e8d30cc67db7cc7fbcb13872d44e3f6fb006b3c779adf9c6068ae50831ef649da718ddb33c0efc4354636aacc9a7217b3c9a348 AUX distcc-3.2_rc1-python.patch 10592 BLAKE2B 561cb33d2699faa069377fb4c43227cc5fd96c6c81176094cc0f7958c547d37076e204277360361e7a13b32b6bc4b91c8c5d266b853af156590b5c1f00846c07 SHA512 513c2fb9aa8f222a0f6062795fac1f855d67467d796b406c6b685e345554ce09a96ab9e594d6a05aad6c5a0f8c7906700529cfb562f2dd7c498d9078219b3d6b AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396f5d27ef77cb9341bda69e3f8319f3b779c760af27cb19e9a6f88a46f02fe888d4bf4fbaef6419beae239964c4ee47 SHA512 707b6ad02bb7ff1507cfbfbb4cee673d5f0dc776006e9b7e801deabccf05c6057b33ea43c6a3ddd1756b8d07ff1d5e3087b635f15285195ba795b8679ebdc860 -AUX distcc-config 4762 BLAKE2B c397692ab95257c604f069a3d3a311715d7990dfbc1bf6edf135122e531654b9055c870abe7effa041afb369011a7a04f7d86d12655a04f43c41db6e3846abf5 SHA512 a996e947de0b1156bf74587ad5c321dbad55fae61ee560eb3463bb3d3d5a125539ca1f5e6c9e50c6d0cdac6b4fe3ea489738a7c007c6adc9a3eec55939f139b7 +AUX distcc-3.3.2-freedesktop.patch 4210 BLAKE2B 7c1500df8cd8568d68c51a3d14eb7240f16adabf9c664b3295171901f4781a9d7b9b9510e577ca0b85abaf21b9783dd9fa98f351089dc98f52f6182bb841c658 SHA512 7454df35d134dff9f5640f7a1a4241b99fe4c6051682af185657837f25cb870c27885ec9be74b5f01075801542decb54daf7db5d80fbdbecf5c8c721a6ee4e7c +AUX distcc-3.3.2-noexist-crash.patch 732 BLAKE2B 36aa1175d9650ca4f7799e595346dd59d480b8ff478b286fcb93448e7cff1e64b1658869679687ebebdf39dc94fa183b3370fcddfc493ca4f858dd76289b24e0 SHA512 ff8369a7acc09ed366709000ed2fac726cc74d4bce29f9ed5b1dc40e683a250219e552d2caebde7d8a801cc40fb1a97086332a07fd4c295e688ef22f234c0116 +AUX distcc-config 5218 BLAKE2B 41d483481e483217ed6313b4f82ed66c4f006070c269bc5ee1283db9c000d12ab29a90d1813df2a590f87c02520e312c35901a7d3f1364480b68bb02d668d51d SHA512 fe3dee7a89ec16e103b52d3555d483b42e4cbe716e3e77f792c543fb2c82eca5f6b8e0d2809f16c805d55263471108ff2dea1f4a5d55826f67f8b94239aca946 AUX distcc-hardened.patch 1084 BLAKE2B 4b78fce2ab19b3832006a8b0092d3d38df07ce8225eb367c90256a158a41121e09269cd4bf59a1fc450db58eafe09e757f6e3ca4ae074a4567676701228c8289 SHA512 d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057 +AUX distccd.confd 1189 BLAKE2B 62791080d43004faf5fc4fb61e506bf3f0f8c2a677d4c24e7d44af692ca7b825e173624343f7e89ae7bff206fdf9543e0308ea4b2db90326c0de04eaaeb62f0b SHA512 1769bd32b1e03e7f8a8e6dea82c1709754d4d0fb12e59e9bdf885ac98f13e26d6c3fdf6575512a8b65299043beeb4b86f6c0b1c884daaee73a5c77d09e474545 +AUX distccd.initd 341 BLAKE2B 0781b860647e68511d19d592cb65cf4c03ea15a8499783755772f5a448393befc2b450de703168a2b062e9fe0d8690a7ea3cda271a5bad2560099c0b5dc6c12f SHA512 bd5aecda5153589a78cd5ff82c34b10176efbd994ab82caf8f63951c04983f6e65459784c1e7644a323ad1696aa0a62b38e863ee1c42a15241a60b22942f8dce AUX distccd.service 244 BLAKE2B db5796f93fe36b2ed09cf84e54bacdb3483917438feb823bdc786983beebac13408bbfc7dd40b6bfd49341b4a2135a21ae49769c14a904ef37eecfa98c03306f SHA512 0626a2da412df4a124ec8f3486b48af92895e97ad626bb848f14e60c9b016de313ca7c17a09565de95fa48233c9f7e37bf79038d1115b339a2033f0eacf0a22f AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6 -DIST distcc-3.1.tar.bz2 588820 BLAKE2B fbd00a9cf8af0b2a0c901a60086901e505d9859827a8249ed7937cb8298fc946f6f72470e40dba17e143dbf1525cb0aef4deec3d083268d608f24f1447301df0 SHA512 0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476 SHA512 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee +DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138 SHA512 fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10 DIST distcc-3.3.tar.gz 1171281 BLAKE2B f637cacbfdaaca6efb56e912de55fcfa49e3fffcb8f34649e339f16376250e18a20d30281a46f207992c0b300c726427a3ad5a77bd8976d2993f8f49b9b6b970 SHA512 459c175c8ac905bc70299e77ac11b6d24782bd69c9152126249c9af8fbb4c269e6f7317b02abf50cf6cc0405dd0f887e803320e19dc528a19c4c488640c615dc -EBUILD distcc-3.1-r10.ebuild 4499 BLAKE2B 8cf796bdbc315f8db8b0c52bc8108f0f2785b40e8dc14669a5675e00ee3dd9145b03f6c901137d7b726e78d372ef73206189f280831de11f3daa6f811356ee70 SHA512 22f383d20c3f6a028ad60b77692e680537dc4838aed70f9e17e05ea1aa52b137903a02f855651b5f381708e6ebe19edd201c11ac4269627866232c05752b067d -EBUILD distcc-3.2_rc1-r4.ebuild 5729 BLAKE2B 65c9309335e2479328f34ef428e308d77687306d158ba52cd7946d8128bdc221014845f5035614357b7bba934332bf69e9cb870e01dff2a8c319b66ea8d032e0 SHA512 34eafd30725c82f9f576d383a4a0886296fc992a9bc36c38bf103b42029a06e473515ff62f9ce8236448a89a6bbb4fef77bbb3d72582d1dc5da7da77701c4e8a -EBUILD distcc-3.2_rc1-r5.ebuild 5478 BLAKE2B b6ff728313a04a41303af86da66b812733d6e2a9b68cd6f5fa98efc482dd645800596b41c9f29ffe0c3a44de8716ab5f5a25ea3b3626aaf4909f204fbc3599b2 SHA512 f06ac6879e0b6f439494a4b44a1b190621f6b1fcd72284d9ca3ed1fdf283f74eba38b10a87face4d787aa1994ec4bc8563983225f7444cd219496024eaad4c7d -EBUILD distcc-3.3.ebuild 5421 BLAKE2B b322c9e6cf6382a3b5ed444606dbbe0f04caffd99fa93452ac030d96f747e8df3c4db8e5278ef2d904d6944e6c9f291814961b139e96d5f80e8a6064fd5f88e8 SHA512 756f91d6e86ccbcc6dff0316ee144cdaae909c02ecb6e65dcc974a182c5950365866415be77504416b692794cf5f85dbfc133b61ebfc077bac6279a56aac371b -MISC metadata.xml 578 BLAKE2B c49d0c85a80028a82eb3e1729709515c9a2161a506a9883f0e50b1cfe27f21b98b5ee9728f297e3e5b5a35d8ae3aad6e55424d9da9ef3018a71299aa1139988b SHA512 a1fd5bdea076ed862339dda2a21f5c0c4c56aa625927f0157889aa5310e9e86df2c957b587d56b276c3d0b3cc2d0eb69f15e40493cc36d44de97917659dba1a2 +EBUILD distcc-3.2_rc1-r4.ebuild 5603 BLAKE2B 92accfb9fbdec29da8376407a7ee9e67f387bbdf1c5f3da22707917c1f600b64613225536064518aeef0c65d82f7a29f1f8b26c7c47b1306aa80c395bbde5313 SHA512 1f2766a19aaf84f4c7d37fca9f85b2badda7fa0fac6e8f7d2c819b303f4edf6b399e89a93abeca868ea28511b2985791ec91c32db89cb05d04b1a2ce984e669b +EBUILD distcc-3.2_rc1-r5.ebuild 5352 BLAKE2B ce9e7fae150bf0b0a48784558783d59d7afb1dea0dd053d5de669aea041c755589382a59761f6b9006efa0e620e6c5e0aff8bf981eb3fa679a0123fa41e4e734 SHA512 470b5dd792430cca1c73ebfe10b8257e80d4d20a4ddd1dd9ec4164487d62fe995e1607f9d9b33c99a3550114c3b5146168c8832df3946fa157adba6afd2fdcfc +EBUILD distcc-3.3.2-r4.ebuild 5674 BLAKE2B abd5c70577bb67972230d2e2576d8dbd5ca4fc7fbe1eee31c24aa4c4426a4cfaae1b9f8bca5bc712bb4dcb64fea03c0ac3306c57120cdaad0f3ba7b5f5b59009 SHA512 dfa48e7cf62205db300a9c3123211985057c75aee138f7fef0734ec3ca98362002cf7aaf41dde4a2eba71df06dd1ccaf35ab068e88b3175a1bb8a68c1378b29e +EBUILD distcc-3.3.ebuild 5515 BLAKE2B 14908ba6f7c5e0027005f2213036ad48e9d15c24e595f9759d3c0697c2a0b880a0b48926c7cd9afd273d0050599e2b4abbdffee0b7adbb221f79a3109f598305 SHA512 b4a962d56e1b9fc478dc75475d4a8e7a531dbd58ded4975e541887c121b2ca6c944dfc6ba7fa55b2b358599b6d4a27770e4a56083b6a0b979c8f88a6b78cf607 +MISC metadata.xml 686 BLAKE2B 149386337b838821ca538556fa2548b759ed09a5a99ff2de536390ba0a39f30c72722e88e0e413122df2d893a317a25eed5e43046a0721b960e0c0b5bfbd8c8e SHA512 22eacde5aeb935c963a80bf5d3a39e4db08ad2613232aabba2a109748b29169ffca04cf53f946a6110d3cf66358ec53e4a025cbbe12a84597ea3130475e9343d diff --git a/sys-devel/distcc/distcc-3.1-r10.ebuild b/sys-devel/distcc/distcc-3.1-r10.ebuild deleted file mode 100644 index 49ff6bd82421..000000000000 --- a/sys-devel/distcc/distcc-3.1-r10.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user - -DESCRIPTION="Distribute compilation of C code across several machines on a network" -HOMEPAGE="http://distcc.org/" -SRC_URI="https://distcc.googlecode.com/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="avahi gtk hardened ipv6 selinux xinetd" - -RESTRICT="test" - -CDEPEND="${PYTHON_DEPS} - dev-libs/popt - avahi? ( >=net-dns/avahi-0.6[dbus] ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - !net-misc/pump - >=sys-devel/gcc-config-1.4.1 - selinux? ( sec-policy/selinux-distcc ) - xinetd? ( sys-apps/xinetd )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DISTCC_LOG="" -DCCC_PATH="/usr/$(get_libdir)/distcc/bin" -DISTCC_VERBOSE="0" - -pkg_setup() { - enewuser distcc 240 -1 -1 daemon - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.0-xinetd.patch" - # bug #253786 - epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" - # bug #255188 - epatch "${FILESDIR}/${P}-freedesktop.patch" - # bug #258364 - epatch "${FILESDIR}/${P}-python.patch" - # bug #351979 - epatch "${FILESDIR}/${P}-argc-fix.patch" - epatch_user - - sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die - - # Bugs #120001, #167844 and probably more. See patch for description. - use hardened && epatch "${FILESDIR}/distcc-hardened.patch" -} - -src_configure() { - local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" - # More legacy stuff? - [ "$(gcc-major-version)" = "2" ] && filter-lfs-flags - - # --disable-rfc2553 b0rked, bug #254176 - use ipv6 && myconf="${myconf} --enable-rfc2553" - - econf \ - $(use_with avahi) \ - $(use_with gtk) \ - ${myconf} -} - -src_install() { - # In rare cases, parallel make install failed - MAKEOPTS+=" -j1" - default - - dobin "${FILESDIR}/3.0/distcc-config" - - newinitd "${FILESDIR}/${PV}/init" distccd - systemd_dounit "${FILESDIR}/distccd.service" - systemd_install_serviced "${FILESDIR}/distccd.service.conf" - - cp "${FILESDIR}/3.1/conf" "${T}/distccd" || die - if use avahi; then - cat >> "${T}/distccd" <<-EOF - - # Enable zeroconf support in distccd - DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" - EOF - - sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die - fi - doconfd "${T}/distccd" - - cat > "${T}/02distcc" <<-EOF - # This file is managed by distcc-config; use it to change these settings. - DISTCC_LOG="${DISTCC_LOG}" - DCCC_PATH="${DCCC_PATH}" - DISTCC_VERBOSE="${DISTCC_VERBOSE}" - EOF - doenvd "${T}/02distcc" - - # create the masquerade directory - dodir "${DCCC_PATH}" - for f in cc c++ gcc g++; do - dosym /usr/bin/distcc "${DCCC_PATH}/${f}" - if [ "${f}" != "cc" ]; then - dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}" - fi - done - - if use gtk; then - einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" - einfo "This is to have a little sensability in naming schemes between distccmon programs" - mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die - dosym distccmon-gui /usr/bin/distccmon-gnome - fi - - if use xinetd; then - insinto /etc/xinetd.d - newins "doc/example/xinetd" distcc - fi - - rm -rf "${ED}/etc/default" || die - rm -f "${ED}/etc/distcc/clients.allow" || die - rm -f "${ED}/etc/distcc/commands.allow.sh" || die - - python_fix_shebang "${ED}" - python_optimize -} - -pkg_postinst() { - use gtk && fdo-mime_desktop_database_update - - if use ipv6; then - elog - elog "IPv6 is not supported yet by ${P}." - fi - elog - elog "Tips on using distcc with Gentoo can be found at" - elog "https://wiki.gentoo.org/wiki/Distcc" - elog - elog "How to use pump mode with Gentoo:" - elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" - elog "# pump emerge -u world" - elog - elog "To use the distccmon programs with Gentoo you should use this command:" - elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5" - - if use gtk; then - elog "Or:" - elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-gnome" - fi - - elog - elog "***SECURITY NOTICE***" - elog "If you are upgrading distcc please make sure to run etc-update to" - elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" - elog "added security precautions (the --listen and --allow directives)" - elog -} - -pkg_postrm() { - use gtk && fdo-mime_desktop_database_update -} diff --git a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild index d7ff5a79c40d..0267f059b07f 100644 --- a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild +++ b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild @@ -168,10 +168,8 @@ pkg_postinst() { elog "Tips on using distcc with Gentoo can be found at" elog "https://wiki.gentoo.org/wiki/Distcc" elog - elog "How to use pump mode with Gentoo:" - elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" - elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >> /etc/portage/make.conf" - elog "# emerge -u world" + elog "distcc-pump is known to cause breakage with multiple packages." + elog "Do NOT enable it globally." elog elog "To use the distccmon programs with Gentoo you should use this command:" elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" diff --git a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild index 7ce1fa8b8124..58a62383bae2 100644 --- a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild +++ b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild @@ -166,10 +166,8 @@ pkg_postinst() { elog "Tips on using distcc with Gentoo can be found at" elog "https://wiki.gentoo.org/wiki/Distcc" elog - elog "How to use pump mode with Gentoo:" - elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" - elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >> /etc/portage/make.conf" - elog "# emerge -u world" + elog "distcc-pump is known to cause breakage with multiple packages." + elog "Do NOT enable it globally." elog elog "To use the distccmon programs with Gentoo you should use this command:" elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild b/sys-devel/distcc/distcc-3.3.2-r4.ebuild new file mode 100644 index 000000000000..c7c8995c8d67 --- /dev/null +++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{5,6} ) + +inherit autotools flag-o-matic python-single-r1 systemd \ + toolchain-funcs user xdg-utils prefix + +DESCRIPTION="Distribute compilation of C code across several machines on a network" +HOMEPAGE="http://distcc.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf" + +RESTRICT="test" + +CDEPEND="${PYTHON_DEPS} + dev-libs/popt + gnome? ( + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + x11-libs/gtk+:2 + x11-libs/pango + ) + gssapi? ( net-libs/libgssglue ) + gtk? ( x11-libs/gtk+:2 ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) +" +DEPEND="${CDEPEND} + sys-devel/autoconf-archive + sys-libs/binutils-libs + virtual/pkgconfig" +RDEPEND="${CDEPEND} + !net-misc/pump + dev-util/shadowman + >=sys-devel/gcc-config-1.4.1 + selinux? ( sec-policy/selinux-distcc ) + xinetd? ( sys-apps/xinetd )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +S="${WORKDIR}/distcc" + +pkg_setup() { + enewuser distcc 240 -1 -1 daemon + python-single-r1_pkg_setup +} + +src_prepare() { + eapply "${FILESDIR}/${PN}-3.0-xinetd.patch" + # bug #255188 + eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch" + # SOCKSv5 support needed for Portage, bug #537616 + eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch" + # crash on missing directory + eapply "${FILESDIR}"/distcc-3.3.2-noexist-crash.patch + eapply_user + + # Bugs #120001, #167844 and probably more. See patch for description. + use hardened && eapply "${FILESDIR}/distcc-hardened.patch" + + sed -i \ + -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \ + -e "s:@PYTHON@:${EPYTHON}:" \ + pump.in || die "sed failed" + + sed \ + -e "s:@EPREFIX@:${EPREFIX:-/}:" \ + -e "s:@libdir@:/usr/lib:" \ + "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die + + hprefixify update-distcc-symlinks.py src/{serve,daemon}.c + python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config" + eautoreconf +} + +src_configure() { + local myconf=( + --disable-Werror + --libdir=/usr/lib + $(use_enable ipv6 rfc2553) + $(use_with gtk) + $(use_with gnome) + $(use_with gssapi auth) + $(use_with zeroconf avahi) + ) + + econf "${myconf[@]}" +} + +src_install() { + # override GZIP_BIN to stop it from compressing manpages + emake DESTDIR="${D}" GZIP_BIN=false install + python_optimize + + newinitd "${FILESDIR}/distccd.initd" distccd + systemd_dounit "${FILESDIR}/distccd.service" + systemd_install_serviced "${FILESDIR}/distccd.service.conf" + + cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die + if use zeroconf; then + cat >> "${T}/distccd" <<-EOF || die + + # Enable zeroconf support in distccd + DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" + EOF + + sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die + fi + doconfd "${T}/distccd" + + newenvd - 02distcc <<-EOF || die + # This file is managed by distcc-config; use it to change these settings. + # DISTCC_LOG and DISTCC_DIR should not be set. + DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}" + DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}" + DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}" + DISTCC_TCP_CORK="${DISTCC_TCP_CORK}" + DISTCC_SSH="${DISTCC_SSH}" + UNCACHED_ERR_FD="${UNCACHED_ERR_FD}" + DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" + DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" + EOF + + keepdir /usr/lib/distcc + + dobin "${T}/distcc-config" + + if use gnome || use gtk; then + einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" + einfo "This is to have a little sensability in naming schemes between distccmon programs" + mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die + dosym distccmon-gui /usr/bin/distccmon-gnome + fi + + if use xinetd; then + insinto /etc/xinetd.d + newins "doc/example/xinetd" distcc + fi + + insinto /usr/share/shadowman/tools + newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin" + newins - distccd <<<"${EPREFIX}/usr/lib/distcc" + + rm -r "${ED}/etc/default" || die + rm "${ED}/etc/distcc/clients.allow" || die + rm "${ED}/etc/distcc/commands.allow.sh" || die +} + +pkg_postinst() { + # remove the old paths when switching from libXX to lib + if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \ + -d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then + rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die + fi + + if [[ ${ROOT} == / ]]; then + eselect compiler-shadow update distcc + eselect compiler-shadow update distccd + fi + + use gnome && xdg_desktop_database_update + + elog + elog "Tips on using distcc with Gentoo can be found at" + elog "https://wiki.gentoo.org/wiki/Distcc" + elog + elog "distcc-pump is known to cause breakage with multiple packages." + elog "Do NOT enable it globally." + elog + elog "To use the distccmon programs with Gentoo you should use this command:" + elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" + + if use gnome || use gtk; then + elog "Or:" + elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome" + fi + + elog + elog "***SECURITY NOTICE***" + elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist" + elog "has been generated by compiler-shadow distccd. To revert to the old behavior, " + elog "you need to pass --make-me-a-botnet to distccd in /etc/conf.d/distccd." + elog "Cf. https://github.com/distcc/distcc/pull/243." +} + +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then + eselect compiler-shadow remove distcc + fi +} + +pkg_postrm() { + use gnome && xdg_desktop_database_update +} diff --git a/sys-devel/distcc/distcc-3.3.ebuild b/sys-devel/distcc/distcc-3.3.ebuild index fb9e944df2b1..4ee28df450ff 100644 --- a/sys-devel/distcc/distcc-3.3.ebuild +++ b/sys-devel/distcc/distcc-3.3.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Distribute compilation of C code across several machines on a netwo HOMEPAGE="http://distcc.org/" SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf" @@ -48,9 +48,6 @@ S="${WORKDIR}/${MY_P}" pkg_setup() { enewuser distcc 240 -1 -1 daemon python-single-r1_pkg_setup - - DCCC_PATH="/usr/$(get_libdir)/distcc/bin" - DISTCC_VERBOSE="0" } src_prepare() { @@ -65,34 +62,36 @@ src_prepare() { use hardened && eapply "${FILESDIR}/distcc-hardened.patch" sed -i \ - -e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \ + -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \ -e "s:@PYTHON@:${EPYTHON}:" \ pump.in || die "sed failed" sed \ -e "s:@EPREFIX@:${EPREFIX:-/}:" \ - -e "s:@libdir@:/usr/$(get_libdir):" \ + -e "s:@libdir@:/usr/lib:" \ "${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die hprefixify update-distcc-symlinks.py src/{serve,daemon}.c } src_configure() { - local myconf="--disable-Werror" + local myconf=( + --disable-Werror + $(use_with gtk) + $(use_with gnome) + $(use_with gssapi auth) + $(use_with zeroconf avahi) + ) # --disable-rfc2553 b0rked, bug #254176 - use ipv6 && myconf="${myconf} --enable-rfc2553" - - econf \ - $(use_with gtk) \ - $(use_with gnome) \ - $(use_with gssapi auth) \ - $(use_with zeroconf avahi) \ - ${myconf} + use ipv6 && myconf+=(--enable-rfc2553) + + econf "${myconf[@]}" } src_install() { - default + # override GZIP_BIN to stop it from compressing manpages + emake DESTDIR="${D}" GZIP_BIN=false install python_optimize newinitd "${FILESDIR}/3.2/init" distccd @@ -111,7 +110,7 @@ src_install() { fi doconfd "${T}/distccd" - cat > "${T}/02distcc" <<-EOF || die + newenvd - 02distcc <<-EOF || die # This file is managed by distcc-config; use it to change these settings. # DISTCC_LOG and DISTCC_DIR should not be set. DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}" @@ -123,9 +122,8 @@ src_install() { DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" EOF - doenvd "${T}/02distcc" - keepdir "${DCCC_PATH%bin}" + keepdir /usr/lib/distcc dobin "${T}/distcc-config" @@ -142,8 +140,8 @@ src_install() { fi insinto /usr/share/shadowman/tools - newins - distcc <<<"${EPREFIX}${DCCC_PATH}" - newins - distccd <<<"${EPREFIX}${DCCC_PATH%bin}" + newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin" + newins - distccd <<<"${EPREFIX}/usr/lib/distcc" rm -r "${ED}/etc/default" || die rm "${ED}/etc/distcc/clients.allow" || die @@ -151,6 +149,12 @@ src_install() { } pkg_postinst() { + # remove the old paths when switching from libXX to lib + if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \ + -d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then + rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die + fi + if [[ ${ROOT} == / ]]; then eselect compiler-shadow update distcc eselect compiler-shadow update distccd @@ -162,10 +166,8 @@ pkg_postinst() { elog "Tips on using distcc with Gentoo can be found at" elog "https://wiki.gentoo.org/wiki/Distcc" elog - elog "How to use pump mode with Gentoo:" - elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" - elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >> /etc/portage/make.conf" - elog "# emerge -u world" + elog "distcc-pump is known to cause breakage with multiple packages." + elog "Do NOT enable it globally." elog elog "To use the distccmon programs with Gentoo you should use this command:" elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" diff --git a/sys-devel/distcc/files/3.0/conf b/sys-devel/distcc/files/3.0/conf deleted file mode 100644 index c499271685e9..000000000000 --- a/sys-devel/distcc/files/3.0/conf +++ /dev/null @@ -1,40 +0,0 @@ -# /etc/conf.d/distccd: config file for /etc/init.d/distccd - -DISTCCD_OPTS="" - -# this is the distccd executable -DISTCCD_EXEC="/usr/bin/distccd" - -# this is where distccd will store its pid file -DISTCCD_PIDFILE="/var/run/distccd/distccd.pid" - -# set this option to run distccd with extra parameters -# Default port is 3632. For most people the default is okay. -DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632" - -# Logging -# You can change some logging options here: -# --log-file FILE -# --log-level LEVEL [critical,error,warning, notice, info, debug] -# -# Leaving --log-file blank will log to syslog -# example: --log-file /dev/null --log-level warning -# example: --log-level critical - -DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical" - -# SECURITY NOTICE: -# It is HIGHLY recommended that you use the --listen option -# for increased security. You can specify an IP to permit connections -# from or a CIDR mask -# --listen accepts only a single IP -# --allow is now mandatory as of distcc-2.18. -# example: --allow 192.168.0.0/24 -# example: --allow 192.168.0.5 --allow 192.168.0.150 -# example: --listen 192.168.0.2 -DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24" -#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2" - -# set this for niceness -# Default is 15 -DISTCCD_OPTS="${DISTCCD_OPTS} -N 15" diff --git a/sys-devel/distcc/files/3.0/distcc-config b/sys-devel/distcc/files/3.0/distcc-config deleted file mode 100644 index ed2a2eec435e..000000000000 --- a/sys-devel/distcc/files/3.0/distcc-config +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env python -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -import os, re, signal, sys -from string import rstrip -from subprocess import Popen - -options=[ - '--get-hosts', - '--set-hosts', - '--get-verbose', - '--set-verbose', - '--get-log', - '--set-log', - '--help', - '--get-env', - '--set-env' -] - -tmpcmdline=sys.argv[1:] -cmdline=[] -envfile = '/etc/env.d/02distcc' - -def exithandler(foo,bar): - os.kill(0,signal.SIGKILL) - sys.exit(1) - -signal.signal(signal.SIGINT,exithandler) - -def isroot(ret=0): - if os.getuid() != 0: - if ret == 0: - print '!!!',sys.argv[:1][0],tmpcmdline[0],'must be run as root' - sys.exit(1) - else: - retval = 0 - else: - retval = 1 - return retval - -def writeenv(var,value): - isroot() - distcc_env = [] - distcc_env = open(envfile, 'r').readlines() - distcc_env_new = open(envfile, 'w') - for i in range(len(distcc_env)): - if re.compile(var+'="(.*)"').match(distcc_env[i]): - distcc_env[i] = var+'="'+value+'"\n' - distcc_env_new.write(distcc_env[i]) - #print 'Set',var,'to:',value - Popen('/usr/sbin/env-update', shell=True) - print 'If you want to use these new settings in an existing shell,' - print 'you need to "source /etc/profile" to get the changes.' - -def readenv(var): - distcc_env = open(envfile, 'r').read() - match = re.compile(var+'="(.*)"').search(distcc_env) - if match: - print var+'='+match.group(1) - else: - print var,'not set.' - -def createdistccdir(dir): - if not os.path.exists(dir): - os.mkdir(dir) - os.chmod(dir, 0755) - -for x in tmpcmdline: - if not x: - continue - if x[0:2]=="--": - if not x in options: - print "!!! Error:",x,"is an invalid option." - sys.exit(1) - else: - cmdline = x - -if '--get-hosts' in tmpcmdline: - HOSTS_ENV = os.environ.get('DISTCC_HOSTS') - HOSTS_HOME = os.environ.get('HOME')+'/hosts' - if HOSTS_ENV: - print HOSTS_ENV - elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0: - print rstrip(open(HOSTS_HOME, 'r').read()) - elif os.path.exists('/etc/distcc/hosts'): - print rstrip(open('/etc/distcc/hosts', 'r').read()) - else: - print 'No configuration file found. Setup your hosts with --set-hosts.' -elif '--set-hosts' in tmpcmdline: - if isroot(1): - PATH = '/etc/distcc' - else: - PATH = os.environ.get('HOME') - createdistccdir(PATH) - open(PATH+'/hosts', 'w').write(cmdline + '\n') -elif '--get-verbose' in tmpcmdline: - readenv('DISTCC_VERBOSE') -elif '--set-verbose' in tmpcmdline: - writeenv('DISTCC_VERBOSE',tmpcmdline[1]) -elif '--get-log' in tmpcmdline: - readenv('DISTCC_LOG') -elif '--set-log' in tmpcmdline: - writeenv('DISTCC_LOG',tmpcmdline[1]) -elif '--get-env' in tmpcmdline: - if len(tmpcmdline) == 1: - print rstrip(open(envfile, 'r').read()) - elif len(tmpcmdline) == 2: - readenv(tmpcmdline[1]) - else: - print '!!! Error: Specify only one variable.' -elif '--set-env' in tmpcmdline: - if len(tmpcmdline) > 2 and len(tmpcmdline) <= 3: - isroot() - writeenv(tmpcmdline[1],tmpcmdline[2]) - else: - print '!!! Error: Awaiting two parameters.' -else: - print 'Usage: %s --set-hosts DISTCC_HOSTS | --get-hosts' % sys.argv[0] - print ' %s --set-verbose { 0 | 1 } | --get-verbose' % sys.argv[0] - print ' %s --set-log FILE | --get-log' % sys.argv[0] - print ' %s --set-env VARIABLE VALUE | --get-env [VARIABLE]' % sys.argv[0] diff --git a/sys-devel/distcc/files/3.1/conf b/sys-devel/distcc/files/3.1/conf deleted file mode 100644 index 39f6e3e86f45..000000000000 --- a/sys-devel/distcc/files/3.1/conf +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/conf.d/distccd: config file for /etc/init.d/distccd - -# this is the distccd executable -DISTCCD_EXEC="/usr/bin/distccd" - -# this is where distccd will store its pid file -DISTCCD_PIDFILE="/var/run/distccd/distccd.pid" - -# Ports: -# Default port is 3632. For most people the default is okay. -# -# Logging: -# You can change some logging options here: -# --log-file FILE -# --log-level LEVEL [critical,error,warning, notice, info, debug] -# -# Leaving --log-file blank will log to syslog -# example: --log-file /dev/null --log-level warning -# example: --log-level critical -# -# Nice level: -# The default nice level is 15. You can change it by adding: -N xx -# where xx is the nice level. - -# SECURITY NOTICE: -# It is HIGHLY recommended that you use the --listen option -# for increased security. You can specify an IP to permit connections -# from or a CIDR mask -# --listen accepts only a single IP -# --allow is now mandatory as of distcc-2.18. -# example: --allow 192.168.0.0/24 -# example: --allow 192.168.0.5 --allow 192.168.0.150 -# example: --listen 192.168.0.2 - -DISTCCD_OPTS="--port 3632 --log-level notice --log-file /var/log/distccd.log -N 15" diff --git a/sys-devel/distcc/files/3.1/init b/sys-devel/distcc/files/3.1/init deleted file mode 100644 index e89dcb3702b7..000000000000 --- a/sys-devel/distcc/files/3.1/init +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use avahi-daemon ypbind -} - -start() { - ebegin "Starting distccd" - - if [ ! -e /var/run/distccd ] ; then - mkdir -p /var/run/distccd - chown distcc:daemon /var/run/distccd - fi - - # Load PATH and GCC_SPECS from gcc-config, bug #262773 - eval "$(gcc-config -E)" - - start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" --user distcc -- \ - --daemon --pid-file "${DISTCCD_PIDFILE}" \ - ${DISTCCD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping distccd" - start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" - eend $? -} diff --git a/sys-devel/distcc/files/3.2/distcc-config b/sys-devel/distcc/files/3.2/distcc-config index cff742c6d22c..4902a9a42c5a 100644 --- a/sys-devel/distcc/files/3.2/distcc-config +++ b/sys-devel/distcc/files/3.2/distcc-config @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/sys-devel/distcc/files/distcc-3.1-argc-fix.patch b/sys-devel/distcc/files/distcc-3.1-argc-fix.patch deleted file mode 100644 index d7f30b5567fa..000000000000 --- a/sys-devel/distcc/files/distcc-3.1-argc-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -this fixes virtualbox not compiling with distcc - -https://bugs.gentoo.org/show_bug.cgi?id=351979 -http://code.google.com/p/distcc/issues/detail?id=83 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626926 - ---- distcc-3.1.orig/source/src/arg.c -+++ distcc-3.1/source/src/arg.c -@@ -515,6 +515,8 @@ - } - free(argv); - *argv_ptr = argv = new_argv; -+ i += extra_args - 1; -+ argc += extra_args - 1; - } - } - return 0; diff --git a/sys-devel/distcc/files/distcc-3.1-freedesktop.patch b/sys-devel/distcc/files/distcc-3.1-freedesktop.patch deleted file mode 100644 index b23db21a2558..000000000000 --- a/sys-devel/distcc/files/distcc-3.1-freedesktop.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur distcc-3.1.orig/Makefile.in distcc-3.1/Makefile.in ---- distcc-3.1.orig/Makefile.in 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/Makefile.in 2009-02-02 00:40:20.000000000 +0900 -@@ -49,13 +49,14 @@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datadir)/pixmaps -+desktopdir = $(datadir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -1003,7 +1004,8 @@ - @echo " documents $(DESTDIR)$(docdir)" - @echo " programs $(DESTDIR)$(bindir)" - @echo " system configuration $(DESTDIR)$(sysconfdir)" -- @echo " shared data files $(DESTDIR)$(pkgdatadir)" -+ @echo " icons $(DESTDIR)$(icondir)" -+ @echo " .desktop file $(DESTDIR)$(desktopdir)" - - - # install-sh can't handle multiple arguments, but we don't need any -@@ -1086,10 +1088,10 @@ - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(icondir) -+ $(mkinstalldirs) $(DESTDIR)$(desktopdir) -+ $(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir) -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir) - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff -Naur distcc-3.1.orig/gnome/distccmon-gnome.desktop distcc-3.1/gnome/distccmon-gnome.desktop ---- distcc-3.1.orig/gnome/distccmon-gnome.desktop 2008-12-03 06:50:27.000000000 +0900 -+++ distcc-3.1/gnome/distccmon-gnome.desktop 2009-02-02 00:40:55.000000000 +0900 -@@ -1,13 +1,11 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 - Exec=distccmon-gnome - Name=distcc monitor - GenericName=Distributed Compile Monitor - Comment=Graphical view of distributed compile tasks --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome-icon - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;Development; - StartupNotify=true -diff -Naur distcc-3.1.orig/src/mon-gnome.c distcc-3.1/src/mon-gnome.c ---- distcc-3.1.orig/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900 -+++ distcc-3.1/src/mon-gnome.c 2009-02-02 00:41:18.000000000 +0900 -@@ -599,7 +599,7 @@ - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome-icon.png", - NULL); - #endif - diff --git a/sys-devel/distcc/files/distcc-3.1-python.patch b/sys-devel/distcc/files/distcc-3.1-python.patch deleted file mode 100644 index 733357a53932..000000000000 --- a/sys-devel/distcc/files/distcc-3.1-python.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -Naur distcc-3.1.orig/bench/statistics.py distcc-3.1/bench/statistics.py ---- distcc-3.1.orig/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900 -+++ distcc-3.1/bench/statistics.py 2009-03-17 01:29:26.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2.2 -+#! /usr/bin/env python - - # benchmark -- automated system for testing distcc correctness - # and performance on various source trees. -diff -Naur distcc-3.1.orig/configure distcc-3.1/configure ---- distcc-3.1.orig/configure 2008-12-03 06:50:34.000000000 +0900 -+++ distcc-3.1/configure 2009-03-17 01:31:09.000000000 +0900 -@@ -3629,7 +3629,7 @@ - # - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. --for ac_prog in python2.5 python-2.5 python2.4 python-2.4 python -+for ac_prog in python - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -diff -Naur distcc-3.1.orig/configure.ac distcc-3.1/configure.ac ---- distcc-3.1.orig/configure.ac 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/configure.ac 2009-03-17 01:29:04.000000000 +0900 -@@ -243,7 +243,7 @@ - # - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. --AC_PATH_PROGS(PYTHON, [python2.5 python-2.5 python2.4 python-2.4 python]) -+AC_PATH_PROGS(PYTHON, [python]) - AC_ARG_VAR(PYTHON, [Python interpreter]) - # Python 1 doesn't even support -V - if ! "$PYTHON" -V 2>&1 | grep "^Python" >/dev/null; then -diff -Naur distcc-3.1.orig/include_server/basics.py distcc-3.1/include_server/basics.py ---- distcc-3.1.orig/include_server/basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/basics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/basics_test.py distcc-3.1/include_server/basics_test.py ---- distcc-3.1.orig/include_server/basics_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/basics_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/c_extensions_test.py distcc-3.1/include_server/c_extensions_test.py ---- distcc-3.1.orig/include_server/c_extensions_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/c_extensions_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/cache_basics.py distcc-3.1/include_server/cache_basics.py ---- distcc-3.1.orig/include_server/cache_basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/cache_basics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/compiler_defaults.py distcc-3.1/include_server/compiler_defaults.py ---- distcc-3.1.orig/include_server/compiler_defaults.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/compiler_defaults.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/compress_files.py distcc-3.1/include_server/compress_files.py ---- distcc-3.1.orig/include_server/compress_files.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/compress_files.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer.py distcc-3.1/include_server/include_analyzer.py ---- distcc-3.1.orig/include_server/include_analyzer.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py distcc-3.1/include_server/include_analyzer_memoizing_node.py ---- distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_memoizing_node.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py distcc-3.1/include_server/include_analyzer_memoizing_node_test.py ---- distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_memoizing_node_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_test.py distcc-3.1/include_server/include_analyzer_test.py ---- distcc-3.1.orig/include_server/include_analyzer_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_server.py distcc-3.1/include_server/include_server.py ---- distcc-3.1.orig/include_server/include_server.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_server.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_server_test.py distcc-3.1/include_server/include_server_test.py ---- distcc-3.1.orig/include_server/include_server_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_server_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/macro_eval.py distcc-3.1/include_server/macro_eval.py ---- distcc-3.1.orig/include_server/macro_eval.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/macro_eval.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/macro_eval_test.py distcc-3.1/include_server/macro_eval_test.py ---- distcc-3.1.orig/include_server/macro_eval_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/macro_eval_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/mirror_path.py distcc-3.1/include_server/mirror_path.py ---- distcc-3.1.orig/include_server/mirror_path.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/mirror_path.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/mirror_path_test.py distcc-3.1/include_server/mirror_path_test.py ---- distcc-3.1.orig/include_server/mirror_path_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/mirror_path_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_command.py distcc-3.1/include_server/parse_command.py ---- distcc-3.1.orig/include_server/parse_command.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_command.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_command_test.py distcc-3.1/include_server/parse_command_test.py ---- distcc-3.1.orig/include_server/parse_command_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_command_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_file.py distcc-3.1/include_server/parse_file.py ---- distcc-3.1.orig/include_server/parse_file.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_file.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_file_test.py distcc-3.1/include_server/parse_file_test.py ---- distcc-3.1.orig/include_server/parse_file_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_file_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/run.py distcc-3.1/include_server/run.py ---- distcc-3.1.orig/include_server/run.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/run.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/setup.py distcc-3.1/include_server/setup.py ---- distcc-3.1.orig/include_server/setup.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/setup.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/statistics.py distcc-3.1/include_server/statistics.py ---- distcc-3.1.orig/include_server/statistics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/statistics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/test/onetest.py distcc-3.1/test/onetest.py ---- distcc-3.1.orig/test/onetest.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.1/test/onetest.py 2009-03-17 01:29:44.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/test/testdistcc.py distcc-3.1/test/testdistcc.py ---- distcc-3.1.orig/test/testdistcc.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.1/test/testdistcc.py 2009-03-17 01:29:36.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2.2 -+#! /usr/bin/env python - - # Copyright (C) 2002, 2003, 2004 by Martin Pool - # Copyright 2007 Google Inc. diff --git a/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch b/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch new file mode 100644 index 000000000000..7b735ebec7f9 --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch @@ -0,0 +1,112 @@ +From d852c808d6f470031f40edec9ebe980afc69b9b9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 8 Dec 2018 12:50:07 +0100 +Subject: [PATCH] Fix desktop spec compliance of distccmon-gnome install + +--- + Makefile.in | 18 ++++++++++-------- + gnome/distccmon-gnome.desktop | 7 +++---- + ...mon-gnome-icon.png => distccmon-gnome.png} | Bin + src/mon-gnome.c | 2 +- + 4 files changed, 14 insertions(+), 13 deletions(-) + rename gnome/{distccmon-gnome-icon.png => distccmon-gnome.png} (100%) + +diff --git a/Makefile.in b/Makefile.in +index 6e1e467..1106559 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -52,13 +52,14 @@ mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include + docdir = @docdir@ +-pkgdatadir = $(datadir)/@PACKAGE_NAME@ ++icondir = $(datarootdir)/pixmaps ++desktopdir = $(datarootdir)/applications + + include_server_builddir = $(builddir)/_include_server + + # These must be done from here, not from autoconf, because they can + # contain variable expansions written in Make syntax. Ew. +-DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" ++DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" + + # arguments to pkgconfig + GNOME_PACKAGES = @GNOME_PACKAGES@ +@@ -387,7 +388,7 @@ man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \ + man/lsdistcc_1.html man/pump_1.html man/include_server_1.html + MEN = $(man1_MEN) + +-gnome_data = gnome/distccmon-gnome-icon.png \ ++gnome_data = gnome/distccmon-gnome.png \ + gnome/distccmon-gnome.desktop + + popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ +@@ -1033,7 +1034,8 @@ showpaths: + @echo " programs $(DESTDIR)$(bindir)" + @echo " sbin programs $(DESTDIR)$(sbindir)" + @echo " system configuration $(DESTDIR)$(sysconfdir)" +- @echo " shared data files $(DESTDIR)$(pkgdatadir)" ++ @echo " icon file $(DESTDIR)$(icondir)" ++ @echo " application file $(DESTDIR)$(desktopdir)" + + + # install-sh can't handle multiple arguments, but we don't need any +@@ -1129,10 +1131,10 @@ install-example: $(example_DOCS) + done + + install-gnome-data: $(gnome_data) +- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" +- for p in $(gnome_data); do \ +- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ +- done ++ $(mkinstalldirs) "$(DESTDIR)$(icondir)" ++ $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" ++ $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" ++ $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" + + install-conf: $(conf_files) $(default_files) + $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" +diff --git a/gnome/distccmon-gnome.desktop b/gnome/distccmon-gnome.desktop +index bd1fa26..7205f5e 100644 +--- a/gnome/distccmon-gnome.desktop ++++ b/gnome/distccmon-gnome.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] +-Version=0.9.4 +-Encoding=UTF-8 ++Version=1.0 + Exec=distccmon-gnome + Name=distcc monitor + Name[sv]=distcc övervakare +@@ -8,9 +7,9 @@ GenericName=Distributed Compile Monitor + GenericName[sv]=Distribuerad kompilerings-övervakare + Comment=Graphical view of distributed compile tasks + Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter +-Icon=distccmon-gnome-icon.png ++Icon=distccmon-gnome + TryExec=distccmon-gnome + Terminal=false + Type=Application +-Categories=GNOME;Application;Development; ++Categories=GNOME;GTK;Development; + StartupNotify=true +diff --git a/gnome/distccmon-gnome-icon.png b/gnome/distccmon-gnome.png +similarity index 100% +rename from gnome/distccmon-gnome-icon.png +rename to gnome/distccmon-gnome.png +diff --git a/src/mon-gnome.c b/src/mon-gnome.c +index 24681d0..bfc286d 100644 +--- a/src/mon-gnome.c ++++ b/src/mon-gnome.c +@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwin (void) + + #if GTK_CHECK_VERSION(2,2,0) + gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), +- PKGDATADIR "/distccmon-gnome-icon.png", ++ ICONDIR "/distccmon-gnome.png", + NULL); + #endif + +-- +2.20.0.rc2 + diff --git a/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch b/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch new file mode 100644 index 000000000000..7f378082d99e --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch @@ -0,0 +1,22 @@ +From 24f73c5cd8f839bd520eb52e91d0d26e07689373 Mon Sep 17 00:00:00 2001 +From: Shawn Landden +Date: Wed, 29 Aug 2018 04:52:38 -0700 +Subject: [PATCH] fix #304 + +--- + src/daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon.c b/src/daemon.c +index 5765982..c8fee7c 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -166,7 +166,7 @@ static void dcc_warn_masquerade_whitelist(void) { + rs_log_crit(LIBDIR "/distcc not found. %s", warn); + dcc_exit(EXIT_COMPILER_MISSING); + } +- if (!readdir(e) && !readdir(d)) { ++ if ((!e || !readdir(e)) && (!d || !readdir(d))) { + rs_log_crit(LIBDIR "/distcc empty. %s", warn); + dcc_exit(EXIT_COMPILER_MISSING); + } diff --git a/sys-devel/distcc/files/distcc-config b/sys-devel/distcc/files/distcc-config index 094307c10507..974620d107fb 100644 --- a/sys-devel/distcc/files/distcc-config +++ b/sys-devel/distcc/files/distcc-config @@ -1,9 +1,8 @@ #!/usr/bin/env python -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -import os, re, signal, sys, commands, pwd -from string import rstrip +import os, re, signal, subprocess, sys options=[ '--get-hosts', @@ -12,7 +11,8 @@ options=[ '--set-verbose', '--get-log', '--set-log', - '--install', + '--update-masquerade', + '--update-masquerade-with-crossdev', '--help', '--get-env', '--set-env' @@ -20,7 +20,20 @@ options=[ tmpcmdline=sys.argv[1:] cmdline=[] -envfile = '/etc/env.d/02distcc' + +eprefix = '@EPREFIX@' +bindir = os.path.join(eprefix, 'usr', 'bin') +sbindir = os.path.join(eprefix, 'usr', 'sbin') +libdir = os.path.join(eprefix, '@libdir@') +sysconfdir = os.path.join(eprefix, 'etc') + +gcc_config = os.path.join(bindir, 'gcc-config') +env_update = os.path.join(sbindir, 'env-update') +envfile = os.path.join(sysconfdir, 'env.d', '02distcc') +default_distcc_dir = os.path.join(sysconfdir, 'distcc') +hostfile = os.path.join(default_distcc_dir, 'hosts') +distcc_path = os.path.join(bindir, 'distcc') +dccc_dir = os.path.join(libdir, 'distcc', 'bin') def exithandler(foo,bar): os.kill(0,signal.SIGKILL) @@ -31,7 +44,7 @@ signal.signal(signal.SIGINT,exithandler) def isroot(ret=0): if os.getuid() != 0: if ret == 0: - print '!!!',sys.argv[:1][0],tmpcmdline[0],'must be run as root' + print('!!! %s %s must be run as root' % (sys.argv[:1][0],tmpcmdline[0])) sys.exit(1) else: retval = 0 @@ -48,69 +61,83 @@ def writeenv(var,value): if re.compile(var+'="(.*)"').match(distcc_env[i]): distcc_env[i] = var+'="'+value+'"\n' distcc_env_new.write(distcc_env[i]) - #print 'Set',var,'to:',value - os.popen('/usr/sbin/env-update') - print 'If you want to use these new settings in an existing shell,' - print 'you need to "source /etc/profile" to get the changes.' + #print('Set %s to: %s ' % (var,value)) + subprocess.Popen(env_update, shell=True) + print('If you want to use these new settings in an existing shell,') + print('you need to "source /etc/profile" to get the changes.') def readenv(var): distcc_env = open(envfile, 'r').read() match = re.compile(var+'="(.*)"').search(distcc_env) if match: - print var+'='+match.group(1) + print(var+'='+match.group(1)) else: - print var,'not set.' - -def permissions(path,user,group): - for file in os.listdir(path): - #print 'Configuring',path+file+'...' - os.chown(path+file,user,group) + print(var,'not set.') -def installlinks(chost=''): +def installlink(chost='', version=''): for file in ['gcc', 'cc', 'c++', 'g++']: - path = '/usr/lib/distcc/bin/' if not chost == '': - file = chost+'-'+file - if os.path.exists('/usr/bin/'+file): - #print 'Creating',path+file,'symlink...' - if not os.path.exists(path+file): - os.symlink('/usr/bin/distcc',path+file) + file = '%s-%s' % (chost,file) + if not version == '': + file = '%s-%s' % (file,version) + path = os.path.join(dccc_dir,file) + if os.path.exists(os.path.join(bindir,file)): + if not os.path.exists(path): + print('Creating %s symlink...' % (path)) + os.symlink(distcc_path,path) #else: - # print 'Already exists. Skipping...' + # print('Already exists. Skipping...') + +def installlinks(): + p = subprocess.Popen([gcc_config+" -C -l"], shell=True, stdout=subprocess.PIPE) + lines = p.stdout.read().decode().rstrip().split('\n') + for line in lines: + columns = line.split() + if len(columns) >= 2: + matches = re.match("(.*)-(.*)", columns[1]) + chost = matches.group(1) + version = matches.group(2) + installlink(chost) + installlink(chost, version) + +def uninstalllinks(): + for root, dirs, files in os.walk(dccc_dir): + for file in files: + os.remove(os.path.join(root, file)) def createdistccdir(dir): if not os.path.exists(dir): os.mkdir(dir) - os.chmod(dir, 1777) + os.chmod(dir, 0o755) for x in tmpcmdline: if not x: continue if x[0:2]=="--": if not x in options: - print "!!! Error:",x,"is an invalid option." + print("!!! Error: %s is an invalid option." % (x)) sys.exit(1) else: cmdline = x if '--get-hosts' in tmpcmdline: HOSTS_ENV = os.environ.get('DISTCC_HOSTS') - HOSTS_HOME = os.environ.get('HOME')+'/hosts' + HOSTS_HOME = os.path.join(os.environ.get('HOME'), '.distcc', 'hosts') if HOSTS_ENV: - print HOSTS_ENV + print(HOSTS_ENV) elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0: - print HOSTS_HOME - elif os.path.exists('/etc/distcc/hosts'): - print rstrip(open('/etc/distcc/hosts', 'r').read()) + print(HOSTS_HOME) + elif os.path.exists(hostfile): + print(open(hostfile, 'r').read().rstrip()) else: - print 'No configuration file found. Setup your hosts with --set-hosts.' + print('No configuration file found. Setup your hosts with --set-hosts.') elif '--set-hosts' in tmpcmdline: if isroot(1): - PATH = '/etc/distcc' + PATH = default_distcc_dir else: - PATH = os.environ.get('HOME') + PATH = os.path.join(os.environ.get('HOME'), '.distcc') createdistccdir(PATH) - open(PATH+'/hosts', 'w').write(cmdline + '\n') + open(os.path.join(PATH, 'hosts'), 'w').write(cmdline + '\n') elif '--get-verbose' in tmpcmdline: readenv('DISTCC_VERBOSE') elif '--set-verbose' in tmpcmdline: @@ -119,46 +146,35 @@ elif '--get-log' in tmpcmdline: readenv('DISTCC_LOG') elif '--set-log' in tmpcmdline: writeenv('DISTCC_LOG',tmpcmdline[1]) -elif '--install' in tmpcmdline: +elif '--update-masquerade' in tmpcmdline: isroot() - print 'Creating',envfile+'...' - distcc_env = open(envfile, 'w') - distcc_env.write('# This file is managed by distcc-config; use it to change these settings.\n') - distcc_env.write('DISTCC_LOG=""\n') - distcc_env.write('DCCC_PATH="/usr/lib/distcc/bin"\n') - distcc_env.write('DISTCC_VERBOSE="0"\n') - - if os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/useradd -u 240 -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) == 9: - os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/usermod -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) - - foobar = pwd.getpwnam('distcc') - user = foobar[2] - group = foobar[3] - - makeconf = open('/etc/make.conf', 'r').read() - chost = re.compile('CHOST="(.*)"').search(makeconf).group(1) - print 'Creating symlinks...' + uninstalllinks() + print('Creating symlinks...') + installlink() + installlinks() +elif '--update-masquerade-with-crossdev' in tmpcmdline: + isroot() + uninstalllinks() + print('Creating symlinks...') installlinks() - installlinks(chost) - - print 'Checking permissions...' - permissions('/usr/lib/distcc/bin/',user,group) - permissions('/var/run/distccd/',user,group) elif '--get-env' in tmpcmdline: if len(tmpcmdline) == 1: - print rstrip(open(envfile, 'r').read()) + print(open(envfile, 'r').read().rstrip()) elif len(tmpcmdline) == 2: readenv(tmpcmdline[1]) else: - print '!!! Error: Specify only one variable.' + print('!!! Error: Specify only one variable.') elif '--set-env' in tmpcmdline: if len(tmpcmdline) > 2 and len(tmpcmdline) <= 3: isroot() writeenv(tmpcmdline[1],tmpcmdline[2]) else: - print '!!! Error: Awaiting two parameters.' + print('!!! Error: Awaiting two parameters.') else: - print 'Usage: /usr/bin/distcc-config --set-hosts DISTCC_HOSTS | --get-hosts' - print ' /usr/bin/distcc-config --set-verbose { 0 | 1 } | --get-verbose' - print ' /usr/bin/distcc-config --set-log FILE | --get-log' - print ' /usr/bin/distcc-config --set-env VARIABLE VALUE | --get-env [VARIABLE]' + cmd = sys.argv[:1][0] + print('Usage: %s --set-hosts DISTCC_HOSTS | --get-hosts' % (cmd)) + print(' %s --set-verbose { 0 | 1 } | --get-verbose' % (cmd)) + print(' %s --set-log FILE | --get-log' % (cmd)) + print(' %s --set-env VARIABLE VALUE | --get-env [VARIABLE]' % (cmd)) + print(' %s --update-masquerade' % (cmd)) + print(' %s --update-masquerade-with-crossdev' % (cmd)) diff --git a/sys-devel/distcc/files/distccd.confd b/sys-devel/distcc/files/distccd.confd new file mode 100644 index 000000000000..bc08d40777d3 --- /dev/null +++ b/sys-devel/distcc/files/distccd.confd @@ -0,0 +1,37 @@ +# /etc/conf.d/distccd: config file for /etc/init.d/distccd + +DISTCCD_OPTS="" + +# this is the distccd executable +DISTCCD_EXEC="/usr/bin/distccd" + +# set this option to run distccd with extra parameters +# Default port is 3632. For most people the default is okay. +DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632" + +# Logging +# You can change some logging options here: +# --log-file FILE +# --log-level LEVEL [critical,error,warning, notice, info, debug] +# +# Leaving --log-file blank will log to syslog +# example: --log-file /dev/null --log-level warning +# example: --log-level critical + +DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical" + +# SECURITY NOTICE: +# It is HIGHLY recommended that you use the --listen option +# for increased security. You can specify an IP to permit connections +# from or a CIDR mask +# --listen accepts only a single IP +# --allow is now mandatory as of distcc-2.18. +# example: --allow 192.168.0.0/24 +# example: --allow 192.168.0.5 --allow 192.168.0.150 +# example: --listen 192.168.0.2 +DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24" +#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2" + +# set this for niceness +# Default is 15 +DISTCCD_OPTS="${DISTCCD_OPTS} -N 15" diff --git a/sys-devel/distcc/files/distccd.initd b/sys-devel/distcc/files/distccd.initd new file mode 100644 index 000000000000..7673ff2cf429 --- /dev/null +++ b/sys-devel/distcc/files/distccd.initd @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net + use avahi-daemon ypbind +} + +command="${DISTCCD_EXEC:-usr/bin/distccd}" +command_args="--user distcc --daemon --no-detach ${DISTCCD_OPTS}" +command_background="true" +pidfile="/run/${RC_SVCNAME}.pid" diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml index cae1134187b6..5daba0cb6edd 100644 --- a/sys-devel/distcc/metadata.xml +++ b/sys-devel/distcc/metadata.xml @@ -1,6 +1,10 @@ + + mgorny@gentoo.org + Michał Górny + cluster@gentoo.org Gentoo Cluster Project -- cgit v1.2.3