diff options
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/samba/ChangeLog | 13 | ||||
-rw-r--r-- | net-fs/samba/Manifest | 43 | ||||
-rw-r--r-- | net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch | 57 | ||||
-rw-r--r-- | net-fs/samba/samba-3.6.24.ebuild (renamed from net-fs/samba/samba-3.6.22.ebuild) | 166 | ||||
-rw-r--r-- | net-fs/samba/samba-4.0.19.ebuild (renamed from net-fs/samba/samba-4.0.17.ebuild) | 6 | ||||
-rw-r--r-- | net-fs/samba/samba-4.1.9.ebuild (renamed from net-fs/samba/samba-4.1.7.ebuild) | 5 |
6 files changed, 187 insertions, 103 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 9610a01a7c62..6eef7bf8af04 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-fs/samba # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.673 2014/06/18 20:35:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.674 2014/07/11 13:07:20 polynomial-c Exp $ + +*samba-4.1.9 (11 Jul 2014) +*samba-4.0.19 (11 Jul 2014) +*samba-3.6.24 (11 Jul 2014) + + 11 Jul 2014; Lars Wendler <polynomial-c@gentoo.org> -samba-3.6.22.ebuild, + +samba-3.6.24.ebuild, -samba-4.0.17.ebuild, +samba-4.0.19.ebuild, + -samba-4.1.7.ebuild, +samba-4.1.9.ebuild, + +files/samba-4.0.19-automagic_aio_fix.patch: + Version bump. Removed old. Fixed automagic dependency on libaio (bug + #489764). 18 Jun 2014; Michał Górny <mgorny@gentoo.org> samba-3.6.23-r1.ebuild: Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index a2f76650d721..85a418e96042 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -31,6 +31,7 @@ AUX 4.1/samba4.initd-r1 1225 SHA256 9f4eaba0b966fd30351fa66cac9a666b5ec1dc54035d AUX named.conf.dlz.patch 500 SHA256 477117ab87047e1a40c6c97a674008e2e671ae096a2fef70ad5b87c1e80c1127 SHA512 1f69654fca44530ac488dddc3fa5cabf6bc59fd17d66db9ac9106e586c940add1e29c0c1c53f7336d9b20e155b4d3496b707a3000b593963db87f761005b1c72 WHIRLPOOL 414654a12509b3bd75dd3f53ebcf2fa26977eda57d619af32a2d41eb3a81923f02b7fa2c21ea53952fd4d900d351790d6a6c9bdfa7ef0ca43b01b7fb4e63607b AUX nmbd.service 224 SHA256 a5e25c11714206c4fb129333dd45152c5753716c6445cbe78c28275df1a1cb77 SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d WHIRLPOOL 2f7c342a60c09d5e40e968a026aa17d8c2fe3fd032331c7bb26599bb0f8ec8a77c2a3e329498ed16b1602451fd85a8ef076c436e8a092740cfbd01a82ca52e30 AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153 SHA512 0bd691d7678737fa815da9e1934db056fa833aa6d6d2d48cf8da559987a899ae4c5ac18e4b3594d634363f515028a3d30711484dbda578aa7506fbe2df55197c WHIRLPOOL 061b3e33b327563f52648931428cce433505353e73bf9851abb33f4f13e7c723c17c3413442dd343477bb0c49fd3284c0155ff59829df448952a6e1d07475251 +AUX samba-4.0.19-automagic_aio_fix.patch 2020 SHA256 99a67b4e8a5847ac416ceadb4d97bf004019d0ab4e75663443b3bee071665fbf SHA512 2a694760a82f484d454be988bc614e90fd8feb67db6b08e3770e45f322964ffa03e2840e70a7981cb60764a8bd3a8c1be7f22fc26a8de2438cdd94de43556626 WHIRLPOOL d0c25b7f1b557a995a668e11c9e9ca75203673b91aee12fad8e9ec35e576cbada71adc4515d0501f63801edf7bf3696673442811d99b425a603656bbe8d333c6 AUX samba-4.1.0-remove-dmapi-automagic.patch 2755 SHA256 debf37a220205526ec54b121f23d1be93d8595fff54184099ae647759876eedd SHA512 dcd96d1ce66918072de7c60e116cb01320b5b8ac5f06856d3298628b31c69a8fdd00771100540889b57c8a4a38a142d56b145a05950617488849243cd7b339b4 WHIRLPOOL 81c31a4c8cc011327c8e7d16bf15e3fd96a36c47dd985bd146c2559c20102517b2aa643ce24a64c52331fc4ec0858299cf3cf8d705a34e22ca94b093c4101c7e AUX samba-4.x-readline63_typedef_fix.patch 932 SHA256 a97b47021c0b38ee1db12b2d3a9cbd73fb4ceb60a616cb38c2be52b02f9d6d0c SHA512 a074eb59a2915d2f60bed79f3ba118b72cdba78a13f5d1fa1a79c346aab21c3676a803aae2b18414bebf42891e064fdbb22b57b37d76a90ba59ccfb012170707 WHIRLPOOL adbbd60446eb1d9534868902f4ce310165b9b93a6a4a8a9ac97803e07ddb789f35c598f977d876913f7f2b62ac0ade570dfe2e5f52439fafb966f54eb89cde4f AUX samba.conf 32 SHA256 d578d8d4f86c61f4055164d0065b117c7345f7531a7759b78fba80dbb94c5c25 SHA512 b5d8905fb72d517d78274e4a928263bed3c57ed1cdbda773caf5cd5f7531da5c21ef9a310084d3d399c9c636be0c8424e5fc010336560ca5b41b40616398c9dd WHIRLPOOL 652b5254e0ffe78dc4c58901b35683f1c98e057da6d83e53610e5688b948623415000141d4d627f0752941558ca88d6e2cf6af411e5a8fc9fb8dfbd49e0a8e5c @@ -42,41 +43,39 @@ AUX smbd_at.service 145 SHA256 909dddfd80982035739081d86d2c524f6a25440d9c10b8a80 AUX winbindd.service 240 SHA256 755036bc419cce90200ac3c04986fbb7cf718c128c2a1288c634658bb779bf3a SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7 WHIRLPOOL eb4d7f30b4ce3341e3d24a6c05965bdce9ded78a7327b44d3d04d00837d6e8109857b1fb1b78c8325680588cf9abe94158755a962fb8f7e8dac04b336308c268 DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae -DIST samba-3.6.22.tar.gz 34122131 SHA256 30bdf20e7788785573196a33905e7e27083a32d749285c22958edce0721cdeea SHA512 13b7d4c7ee24434626cf7e835e302252a281f00dfff1b83fd3c28f8264c1ce7afa0aa6ad237c28015fd2a39a38954189a140b36c27d8b0434a48b46d56936981 WHIRLPOOL 0daaeee4a7c7c3807ceda6558041708cca6c28ad20051cfff5547477f2acab8b896a4168f44a85eb7722dec5d3772bbc59566e79e1876820057f1f3107962cb5 DIST samba-3.6.23.tar.gz 34122387 SHA256 25bbfa81b9a26609a0be744240b63e1f5030bbcfab684cf7aea3b86ed0db2dd0 SHA512 54189079a4f65f1e9c818f9edc9d862c4261c3a4925146f3ab19603052d2c08d32b59ddc243422683338dc4f1192b22f02acaa719e11aa44146c5d3bb11fdcb0 WHIRLPOOL 4919b8911bab8182456ba5bcdc264ca028dea0300bce409bcad338965936849c61695bc99af6e006f373a0c502cc3bf1a596d52d706181674ca2b7bc5aeb19fc -DIST samba-4.0.17.tar.gz 22126553 SHA256 6775cc093dc1f5b4feec3b47b458b78ad44f14de11f4bc8838b69e86d1ddf6ed SHA512 507561d122d0628b95b6e5837d175d951e535523be6a519836390651cb552b4a7f695e3bd519bdee22bf5287e3981c8f042c15197ea47071f8213b5b4ed83adb WHIRLPOOL a99771797c4903173c701f0b726e22bae9efc19e9dc4e460923cff97ef5a6ee7d6637c68fbf43e87ed62d9ce0e2aa399f430e96494881ab05eaae02023ffe37b +DIST samba-3.6.24.tar.gz 34122116 SHA256 11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7 SHA512 40f054ab0e1ef07fa4bb4934229c42eb0e484596c4d4b81edbf43951acd56e7b04b6efb17e6cb269b329f1a84d60cbe10a3ff04e86c1983ec603bdcf7fc7ecbb WHIRLPOOL e98d3ae62e5d57e5d16b320213961ba7221b8b38912b90434296323549e1673f25682ec8da469dd771d68ec222a6be7d30e24224e0cde0d9dc1e9c393590c68a DIST samba-4.0.18.tar.gz 22126135 SHA256 5e524418d890830472a1124631eb5951013c676c320707755f6f15b79be904b1 SHA512 567b2316a0ed2d594ef4f85a33fcf54b74aafe84a0854031aa1178b2229cde06c118a50f907f631624d43360441e77b981abd7eac62366285e97e4b4a9e54dea WHIRLPOOL 42c909fc39dd398f896416995fa595deed2cdbc9a027e0a9a9a8791d3f43b88b17d43c075de74f50dde1d4c83d2545d3c8b5ee1829f88e4164f4e9358e4f11bd -DIST samba-4.1.7.tar.gz 23187644 SHA256 15a0ccc2fd90166c4231574f4f1a1229769be2cc4da7af9c16304e8659529d89 SHA512 fc6fe651da34f27e4d7dd2c500b9c1d9de8190fc095021c492c32890c8682b50c8f2fccdb02f9bbaf832239b67b67d1af7d992009c2f2cf1912a11469ed291c1 WHIRLPOOL e9e9c83542144bd52863fbab4f6c7ec0cfcd75cc04e716849ebc74094c06b2ad8feb4e1d9eee883dbd7c3b91ed2463631d6c29b02e4d5f9d1ac85a3a347edea3 +DIST samba-4.0.19.tar.gz 22131987 SHA256 966ba09c99ba5ff679e444e56b1282c974630bade4a289a71f3327865bbedf85 SHA512 5a0562f7a547cd1e0e26053a12700d893e8cdc902300544d44f3ea0b87b156da95aa823a85584134d2544bd527ef9b2fb031ef8163f6a67d2e3d148995959570 WHIRLPOOL 5d9829f1791a3848178824d3b70587660617f4aa65da7dfaf91f1acc0e828a48e3ff8aa176825c2a7b505d8873a9abca8d269361a4d8ef360c59eaaea48c399b DIST samba-4.1.8.tar.gz 23192555 SHA256 7f39757e629f1e866bf402da2fe08fe577b4bb71b0f4d60ca9a61e60ad81c715 SHA512 8084c3dc888c205310b962d6df3fd5d94ffa0a3450464b8a1ccad863eb287a691fe19c0c85836724ca8925d6966ed0ec64c265b142a69eb288580fa25d8e50f2 WHIRLPOOL 436a3f360e466b4db642a9c95ecf9167d4a7bf60298aae40ef79c368a1448804369e1902ff6634abd93ef9e68635dfbe2b29b6b5b2969b93fec2b4e15c347435 +DIST samba-4.1.9.tar.gz 23192788 SHA256 1484542db4b462bc562541412a061ad03a0e8af7199a916d74b063dd1881c6bd SHA512 806f46a26acd388fe1359aa3fc6968e9c778d534a892aae21ce46d84722ab8b2ece217c865163881cb44a0c36bfb6e00202beb83b1486118b95ac6da75af46d4 WHIRLPOOL fcdecac469a811793c02f10415e6cbd545832b77e3f55504b5f7045e871f278370738a337508135b8eafc2b4734fd9de9dcb9ed9b2d2a16f2b042f018a71c3cf DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8 -EBUILD samba-3.6.22.ebuild 12795 SHA256 c762901545642fa9a73a20215dfdd59f68016f9ff52bcc075b089fa69a799815 SHA512 c882fa703e9bcae93dfab822d91a24f3222c748c2b371294b7610a031e55a142702ff7bce361bcf6d3578bd5100fb5b6246697e89c1ec3f104d546070d108c18 WHIRLPOOL dd2d473025a081aed8479cfe16db0e180a00baa0e71bff6c0c171f13e01e9af496d52e549e4ac18d05b0f6d1008c5e758ce8c7d010ebaac4853a481ed8ab1dec EBUILD samba-3.6.23-r1.ebuild 13530 SHA256 efdcbc86b5e15fbdc72ab1e0d37df523bbf0946d7e921c70998f05208e79a743 SHA512 240e887b4615a81d05e51469cb0f49d814fbac550392a02f1944c5b196fdea689903e581a7ac7e377e1d051c160f6ff8a1f64892cb0a81b8f621a5cc5f70518c WHIRLPOOL 08320c9dc44349fbf0a4852af4795afeff2d1b242d77b61da4fbdc14c7b441e18b84bba32c3d5356ff1dfdb9e9ba6bdcea3aba0224673cd676806aca1f4fa797 EBUILD samba-3.6.23.ebuild 12795 SHA256 99bd47dd825dcb1a663a1c29c3d3704a7b41e5ad065ba202eed3488693a83ca8 SHA512 50a40edf70b0e83f59ebe546da3e9939cee293732d50e45c22911115507dfc47e93bca18746582548efd8bd027877e1b5a0f6328a0fab003520b7da9c65fa6fe WHIRLPOOL e53646ca53ad9064180c2a63b7ff5976c8af8f1e351480fc0f61bb6c26e35edaa4ac9960f0af34a7b50a8bdb5822a12fd2542f24dd994e5c2a1030bd2de65199 -EBUILD samba-4.0.17.ebuild 4813 SHA256 ec98ed3faab01945f06557ab6aa652e9c65b16ff0053bdb434c76614a83ed65f SHA512 a3bc70bc74b451dfb7a30767371e1c43a20032de6359bbcc8a2ce7f12810e03c11d3df71dafc48d8070300932caf46c989688bf892eb03af5e3de60e89542653 WHIRLPOOL 28b457101b6e843fadf53a63f571887dc8730a3db01bc8d840570c9676fb76c4865e91264af32353ff9fcca871a85810e3651f17e3cb7edcab700defb91b950e +EBUILD samba-3.6.24.ebuild 13533 SHA256 096993c4609c429fc0f3af79e8cbe194010ddbfe232ee8491cc2fd77ac1df072 SHA512 76b6d67d34f65ce8410d9729552e4f141b6f1911bdc6f064848092e7dfb3b8e997cce1e858ac525a08e7b52d8b7b3abce9de17a234cf1597b9bd3527ceaa323a WHIRLPOOL f09d9428cd68e5f823a80f2d2eb7094ffc0c590744fa175d1801e8126e113188a8386d13162c452d0db6091c02bf3b12cf20f119e36c7f61ce8341ddd926b9b7 EBUILD samba-4.0.18.ebuild 4813 SHA256 1a87dbe228774fd8e0f433a69e278eba071f32e8d00b2648ec55346a20b83c84 SHA512 4dba363acf46e50f704a21e6e51f8460663bbdc070fff94537d375a6e387737bd2cfeb1f3f484cea037ce67a7ae688c7156a17aa7d9402b323dec1c82923dad6 WHIRLPOOL ca59d2cbd78d8c37c290b2e6b22f375f1ef1b24b9ba36ecac19195a5aea2b59d05ccfb8f7cf7be167985b3693c79a0e10e9c18b7e5192301e5e4c9075d663163 -EBUILD samba-4.1.7.ebuild 4656 SHA256 253ad25f2b98acaac807d572d12bc703745006a9f299b079044061ba26d449f0 SHA512 244fd932d564e43df2ec19c3a5d7137d8e0299326d8727e37f39ec0e99cea30f9bd398a286caae99e3bdec1762ffe601c20b6fb193ff9be48c3d1fd0f0aad0ea WHIRLPOOL 85faffb9c38bb4c4e6ad81de8c1aeed60d77def33ebea80b373f07febba4832c56ad5e1bc81818ff21be157d9137bc906ee1c93ef8fc35d56a1f75823c077da9 +EBUILD samba-4.0.19.ebuild 4811 SHA256 ab9992a4259b17117e0a04aad439c98860a2e8c09a8fb7d6b04be493a721a4ff SHA512 a601587c7bfa1e4054ef5d245505afb21a73cbda9f7bd5f82f33c520f42daa532659530333e917695802036ea3fd6b89208636ebbbf3599db8339fd6b289c862 WHIRLPOOL 3ae61fa0cbe344984725ba94010a8119dc504af0373f6a5b8e5c17a3c3ba13590a6021f30786d125eecc39c24b49e601093acb9ceedf881c84093493d5390714 EBUILD samba-4.1.8.ebuild 4665 SHA256 91afaca7cef147e128c80096a24dc97ae368142959c53e96da6c87b891cb3543 SHA512 254630e39543e7ff2c5bb86ebf17e76a4a03312dce7beba1faae308334f1501c261b3b6f0244e0b38af076fc2b9bd8b121572aa2fb7e5f8f48aa46ad2491c60e WHIRLPOOL 31f2544a2e1efc3f494845ebd81a1142ba9f508218e03a08a6e95deab198042edf64f94296afcee9ef94cac00add848dfa4f491261e3208b5bc8a2e3ad38cb2b -MISC ChangeLog 4415 SHA256 ada8b6f6f386bfa14d878f447c26f05f29ccfce60b59c117b2fbbf1f3ec9ac9d SHA512 c9b3b71edf72f31451868c4d155acb536b9574547b47465447e890ab0e110a7ed1e30f140ca3a80e991dae7e11aec300c020448dbb42925338a8e5c14b7c5aee WHIRLPOOL 2c1cd91d07e07753a8ae5e4f76c58ead83206b2d81643807a97994fb772a0d76f066460d90f749ffc0a00222a9c05f436aafd6ae740b10f8d866a09b01ad8603 +EBUILD samba-4.1.9.ebuild 4726 SHA256 09bbc25d05f601ee107de7197a79979608b43c368b4f224719068e55abec77a6 SHA512 1dcc1a0980f9607f2ae996958a3288fa7cfd7a747014e4c81011368ed81983051dfbab0c07f39649fbe943ecf097a25ac7b9110a9c39592341db72cd834f6418 WHIRLPOOL 02cb2e7afd76832d860b14cad78c89707a86d97bea4c8e3b5420cba284b28de8aaa98dc5a56f3e0c8065d807317268d3c07cbbb1579aad8b46cfc0ccb5053e61 +MISC ChangeLog 4824 SHA256 0185bca1c77bb369b65aed6f917656099384f2a3acc18beb0e166b8caa0722b0 SHA512 fffcd37fbb5e65b7fd7892176d113821cffdc58ba2a318c69fa5a2eabba2f45ee1afde74b2f9e7f51fdfd823a720e358306c8e253ecd56a951a6deead850d483 WHIRLPOOL 00bcc861638267ac6828179d22d493580ad6362a49e1ce5beb91790a1d821a430e0f42dbb7f35e2b46eb24283c5e0a1751cabd3db160f6bad9842d4ab4c15f52 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJTofgNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtEsQAKQ9/p4LAXqd/kgPf3jfpcFK -sw5KTvwuhHH2dautgoJ5kpgJGz54f02cklEBcniNxRlz2BUNPhoOzmsdi4U134Mv -9GRxdpwrR0oqsQQ7PJpcZ6rFj559uEMJesqujdk/I3GsRBI9qlk9bg6f9/u+rCfZ -FwUBTQMuIAYM10TvFN1q0N4Vf1oEV/3S8REw+MrMCW/8PN7cjVoU8uPYVs2uej1k -35ccW3P5woF85j1YSCmEZAfIzBZUEtZmPNpw8hU7j/0deEyKuQkt8PRymq8QXx/A -L1gamhmL0uOzpgzPKJrRReQ6C9/Nm6z381jRD1TzIC/naryrMzFfn45vxOODzban -7RhhWdSQFlajuWL6p4eR5i0zkpopXwh2+0CwyydsGTA5Iq0b1HYPb0UUhuBg+DHS -eCYT2Ke2rVAJj5Nkbs1+Cjfo9nVZYrPtQA6SdCRj6iD30V6FI1xm8XDyo1SekB+e -Tvy7cOCmiT3Bh8aaj5I9UKg2mjpXZZDmAXavDhmGe6LI/RjueqauLnvP1+gqKgkM -Wm4crHWJ4kEgAiY08JxVlpvINO9XtvthiJEsp/KqhuHFPfzfE9XXeDPRnv3TMGYA -MIA8n9PKxDGKTUguCVEcmbTO+04ehCbjsLGETrSbvqgzTKDGs41ltoXvMb10Qgbj -5eWUFk5TItPWigW0WPZ4 -=1Cwy +iQIcBAEBCAAGBQJTv+GJAAoJEPiazRVxLXTFBBUP/jhy7TrNRlwz5mwO55lXvC6P +esxafVcJjUYBHvG2tzDhXxoi+AiReqHPcMkJg4FB6yhZcolfuEHRYLG0gaQQFTQ8 +TeglFM8QPEGLFQxVHDxO3nBVA0dnN2XI/3WFLj6ntSFuqdEQjfGjjWhmkOsIYBp4 +cSlmTZrLJwzWC3u4hb0wyjzdC1b07bCgpgGU+/nZxE5TMFGDhaMVlDPQKELf7qyp +17mYhkhbEiuVKm9brm90/+HEDhoVuJifo/TfF4JpoovaqH+ikG0V7Dh/6aREWlME +SOWyFO4JA6TZO69I1hmV4UUQy1AFI6w/ekOMiaIs4UM19Yl8E0zaJG4MO+E1ERBO +KekQ6noRUdDwktjy7EoDcXw+u9CMWVzNwR4Mp1tw+Etr3rF7fl40Qu1M6nufhFzp +WMXwghUADCE8bWimfnSj3mcjWAlFhWPnVf9bKaKjfIyCx1IkcbanhiXdAXMTwioe +PfLsneHwrpNI7ZYy+m78oafHZzpOLO4FE1Js/Upr1IpyTm/Lj6fjdiFcLyqJCGB2 +fY8J9vChl6FXebEPKTca47OoihEnq2iTdtcUfpw8eQ05c3dRspn8CrV4sZsF3sCl +2Kfl9YTK/cLPqaBTE8LKh1cEy4iT3TuPXBPQoS7FCWvONfIcIvXpjIZt2uxbgI6x +coKo4quNv8SwMszmPSM4 +=WvX7 -----END PGP SIGNATURE----- diff --git a/net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch b/net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch new file mode 100644 index 000000000000..ec351db7a2d0 --- /dev/null +++ b/net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch @@ -0,0 +1,57 @@ +https://bugzilla.samba.org/show_bug.cgi?id=10370 + +--- samba-4.0.19/source3/wscript ++++ samba-4.0.19/source3/wscript +@@ -507,9 +507,10 @@ + else: + conf.DEFINE('HAVE_NO_AIO', '1') + +- if host_os.rfind('linux') > -1: +- conf.CHECK_FUNCS_IN('io_submit', 'aio') +- conf.CHECK_CODE(''' ++ if Options.options.with_aio_support != False: ++ if host_os.rfind('linux') > -1: ++ conf.CHECK_FUNCS_IN('io_submit', 'aio') ++ conf.CHECK_CODE(''' + struct io_event ioev; + struct iocb *ioc; + io_context_t ctx; +@@ -526,11 +527,11 @@ + io_getevents(ctx, 1, 1, &ioev, &ts); + ''', + 'HAVE_LINUX_KERNEL_AIO', +- msg='Checking for linux kernel asynchronous io support', +- headers='unistd.h stdlib.h sys/types.h fcntl.h sys/eventfd.h libaio.h', +- lib='aio') ++ msg='Checking for linux kernel asynchronous io support', ++ headers='unistd.h stdlib.h sys/types.h fcntl.h sys/eventfd.h libaio.h', ++ lib='aio') + +- conf.CHECK_CODE(''' ++ conf.CHECK_CODE(''' + struct msghdr msg; + union { + struct cmsghdr cm; +@@ -540,17 +541,17 @@ + msg.msg_controllen = sizeof(control_un.control); + ''', + 'HAVE_MSGHDR_MSG_CONTROL', +- msg='Checking if we can use msg_control for passing file descriptors', +- headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h') +- conf.CHECK_CODE(''' ++ msg='Checking if we can use msg_control for passing file descriptors', ++ headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h') ++ conf.CHECK_CODE(''' + struct msghdr msg; + int fd; + msg.msg_acctrights = (caddr_t) &fd; + msg.msg_acctrightslen = sizeof(fd); + ''', + 'HAVE_MSGHDR_MSG_ACCTRIGHTS', +- msg='Checking if we can use msg_acctrights for passing file descriptors', +- headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h') ++ msg='Checking if we can use msg_acctrights for passing file descriptors', ++ headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h') + + if Options.options.with_winbind: + conf.env.build_winbind = True diff --git a/net-fs/samba/samba-3.6.22.ebuild b/net-fs/samba/samba-3.6.24.ebuild index 6bca53451a62..223ef7e6c97f 100644 --- a/net-fs/samba/samba-3.6.22.ebuild +++ b/net-fs/samba/samba-3.6.24.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.22.ebuild,v 1.10 2014/01/12 13:14:39 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.24.ebuild,v 1.1 2014/07/11 13:07:20 polynomial-c Exp $ -EAPI=4 +EAPI=5 -inherit pam versionator multilib eutils flag-o-matic systemd +inherit pam versionator multilib multilib-minimal eutils flag-o-matic systemd MY_PV=${PV/_/} MY_P="${PN}-${MY_PV}" @@ -14,31 +14,31 @@ HOMEPAGE="http://www.samba.org/" SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes swat syslog +winbind" DEPEND="dev-libs/popt - >=sys-libs/talloc-2.0.5 - >=sys-libs/tdb-1.2.9 - >=sys-libs/tevent-0.9.18 - virtual/libiconv - ads? ( virtual/krb5 sys-fs/e2fsprogs + >=sys-libs/talloc-2.0.8-r1[${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.2.13[${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + ads? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] sys-fs/e2fsprogs client? ( sys-apps/keyutils ) ) avahi? ( net-dns/avahi[dbus] ) - caps? ( sys-libs/libcap ) + caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] ) client? ( !net-fs/mount-cifs - dev-libs/iniparser ) + >=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] ) cluster? ( >=dev-db/ctdb-1.13 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - ldap? ( net-nds/openldap ) + fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) ldb? ( sys-libs/ldb ) - pam? ( virtual/pam - winbind? ( dev-libs/iniparser ) + pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] + winbind? ( >=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] ) ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sec-policy/selinux-samba ) @@ -57,7 +57,7 @@ KRBPLUGIN="" PLUGINEXT=".so" SHAREDMODS="" -S="${WORKDIR}/${MY_P}/source3" +S=${WORKDIR}/${MY_P} # TODO: # - enable iPrint on Prefix/OSX and Darwin? @@ -117,56 +117,63 @@ pkg_setup() { } src_prepare() { - cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk" + cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk" # ensure that winbind has correct ldflags (QA notice) sed -i \ -e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \ - configure || die "sed failed" - cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/smb.conf.default.patch + source3/configure || die "sed failed" + epatch "${CONFDIR}"/smb.conf.default.patch + + #bug #399141 wrap newer iniparser version + has_version ">=dev-libs/iniparser-3.0.0" && \ + append-cppflags "-Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)" + + multilib_copy_sources } -src_configure() { - local myconf +multilib_src_configure() { + local myconf=() + + # we can't alter S since build system writes to '../' and therefore + # we need to duplicate the whole structure + cd source3 || die # Filter out -fPIE - [[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie" + [[ ${CHOST} == *-*bsd* ]] && myconf+=( --disable-pie ) #Allowing alpha/s390/sh to build - if use alpha || use s390 || use sh ; then + if use alpha || [[ ${ABI} == s390 ]] || use sh ; then + local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} replace-flags -O? -O1 fi # http://wiki.samba.org/index.php/CTDB_Setup - use cluster && myconf+=" --disable-pie" + use cluster && myconf+=( --disable-pie ) # Upstream refuses to make this configurable - use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no - - #bug #399141 wrap newer iniparser version - has_version ">=dev-libs/iniparser-3.0.0" && \ - export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)" + myconf+=( ac_cv_header_sys_capability_h=$(usex caps) ) # Notes: # - automount is only needed in conjunction with NIS and we don't have that # anymore => LDAP? # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default - econf ${myconf} \ + econf "${myconf[@]}" \ --with-piddir="${EPREFIX}"/var/run/samba \ --sysconfdir="${EPREFIX}"/etc/samba \ --localstatedir="${EPREFIX}"/var \ - $(use_enable debug developer) \ + $(multilib_native_use_enable debug developer) \ --enable-largefile \ --enable-socket-wrapper \ --enable-nss-wrapper \ - $(use_enable swat) \ - $(use_enable debug dmalloc) \ - $(use_enable cups) \ + $(multilib_native_use_enable swat) \ + $(multilib_native_use_enable debug dmalloc) \ + $(multilib_native_use_enable cups) \ --disable-iprint \ $(use_enable fam) \ --enable-shared-libs \ --disable-dnssd \ - $(use_enable avahi) \ + $(multilib_native_use_enable avahi) \ --with-fhs \ --with-privatedir="${EPREFIX}"/var/lib/samba/private \ --with-rootsbindir="${EPREFIX}"/var/cache/samba \ @@ -175,7 +182,7 @@ src_configure() { --with-configdir="${EPREFIX}"/etc/samba \ --with-logfilebase="${EPREFIX}"/var/log/samba \ --with-pammodulesdir=$(getpam_mod_dir) \ - $(use_with dmapi) \ + $(multilib_native_use_with dmapi) \ --without-afs \ --without-fake-kaserver \ --without-vfs-afsacl \ @@ -197,7 +204,7 @@ src_configure() { $(use_with addns libaddns) \ $(use_with cluster ctdb "${EPREFIX}"/usr) \ $(use_with cluster cluster-support) \ - $(use_with acl acl-support) \ + $(multilib_native_use_with acl acl-support) \ $(use_with aio aio-support) \ --with-sendfile-support \ $(use_with winbind) \ @@ -206,7 +213,9 @@ src_configure() { --without-included-iniparser } -src_compile() { +multilib_src_compile() { + cd source3 || die + # compile libs if use addns ; then einfo "make addns library" @@ -241,23 +250,26 @@ src_compile() { fi # compile utilities - if [ -n "${BINPROGS}" ] ; then - einfo "make binprogs" - emake ${BINPROGS} - fi - if [ -n "${SBINPROGS}" ] ; then - einfo "make sbinprogs" - emake ${SBINPROGS} + if multilib_is_native_abi; then + if [ -n "${BINPROGS}" ] ; then + einfo "make binprogs" + emake ${BINPROGS} + fi + if [ -n "${SBINPROGS}" ] ; then + einfo "make sbinprogs" + emake ${SBINPROGS} + fi fi if [ -n "${KRBPLUGIN}" ] ; then einfo "make krbplugin" emake ${KRBPLUGIN}${PLUGINEXT} fi - } -src_install() { +multilib_src_install() { + cd source3 || die + # pkgconfig files installation needed, bug #464818 local pkgconfigdir=/usr/$(get_libdir)/pkgconfig @@ -327,21 +339,23 @@ src_install() { fi # install binaries - insinto /usr - for prog in ${SBINPROGS} ; do - dosbin ${prog} - doman ../docs/manpages/${prog/bin\/}* - done - - for prog in ${BINPROGS} ; do - dobin ${prog} - doman ../docs/manpages/${prog/bin\/}* - done - - # install scripts - if use client ; then - dobin script/findsmb - doman ../docs/manpages/findsmb.1 + if multilib_is_native_abi; then + insinto /usr + for prog in ${SBINPROGS} ; do + dosbin ${prog} + doman ../docs/manpages/${prog/bin\/}* + done + + for prog in ${BINPROGS} ; do + dobin ${prog} + doman ../docs/manpages/${prog/bin\/}* + done + + # install scripts + if use client ; then + dobin script/findsmb + doman ../docs/manpages/findsmb.1 + fi fi # install krbplugin @@ -358,10 +372,12 @@ src_install() { doman ../docs/manpages/${prog/bin\/}* done fi +} +multilib_src_install_all() { # install server components if use server ; then - doman ../docs/manpages/vfs* ../docs/manpages/samba.7 + doman docs/manpages/vfs* docs/manpages/samba.7 diropts -m0700 keepdir /var/lib/samba/private @@ -383,7 +399,7 @@ src_install() { if use ldap ; then insinto /etc/openldap/schema - doins ../examples/LDAP/samba.schema + doins examples/LDAP/samba.schema fi if use swat ; then @@ -392,7 +408,7 @@ src_install() { script/installswat.sh "${ED}" "${EROOT}/usr/share/doc/${PF}/swat" "${S}" fi - dodoc ../MAINTAINERS.txt ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS + dodoc MAINTAINERS.txt README* Roadmap WHATSNEW.txt docs/THANKS fi # install the spooler to cups @@ -402,16 +418,16 @@ src_install() { # install misc files insinto /etc/samba - doins ../examples/smb.conf.default - doman ../docs/manpages/smb.conf.5 + doins examples/smb.conf.default + doman docs/manpages/smb.conf.5 insinto /usr/"$(get_libdir)"/samba - doins ../codepages/{valid.dat,upcase.dat,lowcase.dat} + doins codepages/{valid.dat,upcase.dat,lowcase.dat} # install docs if use doc ; then - dohtml -r ../docs/htmldocs/* - dodoc ../docs/*.pdf + dohtml -r docs/htmldocs/. + dodoc docs/*.pdf fi # install examples @@ -419,18 +435,18 @@ src_install() { insinto /usr/share/doc/${PF}/examples if use smbclient ; then - doins -r ../examples/libsmbclient + doins -r examples/libsmbclient fi if use winbind ; then - doins -r ../examples/pam_winbind ../examples/nss + doins -r examples/pam_winbind examples/nss fi if use server ; then - cd ../examples + cd examples || die doins -r auth autofs dce-dfs LDAP logon misc pdb \ - perfcounter printer-accounting printing scripts tridge \ - validchars VFS + perfcounter printer-accounting printing scripts tridge \ + validchars VFS fi fi diff --git a/net-fs/samba/samba-4.0.17.ebuild b/net-fs/samba/samba-4.0.19.ebuild index 8be6bea0acbc..a3aa382ba50d 100644 --- a/net-fs/samba/samba-4.0.17.ebuild +++ b/net-fs/samba/samba-4.0.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.17.ebuild,v 1.1 2014/04/15 11:37:58 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.19.ebuild,v 1.1 2014/07/11 13:07:20 polynomial-c Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -29,12 +29,10 @@ IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap quota selinux swat syslog test winbind" # sys-apps/attr is an automagic dependency (see bug #489748) -# dev-libs/libaio is an automagic dependency (see bug #489764) # sys-libs/pam is an automagic dependency (see bug #489770) CDEPEND="${PYTHON_DEPS} >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser - dev-libs/libaio dev-libs/popt sys-libs/readline virtual/libiconv @@ -49,6 +47,7 @@ CDEPEND="${PYTHON_DEPS} virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) + aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) @@ -74,6 +73,7 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" PATCHES=( "${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch" "${FILESDIR}/named.conf.dlz.patch" + "${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch" ) WAF_BINARY="${S}/buildtools/bin/waf" diff --git a/net-fs/samba/samba-4.1.7.ebuild b/net-fs/samba/samba-4.1.9.ebuild index 7b13a1405a35..e247f1e4fac7 100644 --- a/net-fs/samba/samba-4.1.7.ebuild +++ b/net-fs/samba/samba-4.1.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.7.ebuild,v 1.3 2014/04/17 22:10:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.9.ebuild,v 1.1 2014/07/11 13:07:20 polynomial-c Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -28,7 +28,6 @@ ldap quota selinux syslog test winbind" CDEPEND="${PYTHON_DEPS} >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser - dev-libs/libaio dev-libs/popt sys-libs/readline virtual/libiconv @@ -44,6 +43,7 @@ CDEPEND="${PYTHON_DEPS} virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) + aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) @@ -69,6 +69,7 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" PATCHES=( "${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch" "${FILESDIR}/named.conf.dlz.patch" + "${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch" ) WAF_BINARY="${S}/buildtools/bin/waf" |